From cd88f3dad4572b117d302bcbb3188a67c0b5d64f Mon Sep 17 00:00:00 2001 From: NikolaBorislavovHristov Date: Sun, 4 Aug 2019 11:41:21 +0300 Subject: [PATCH] Input moved to stremio-common --- src/common/Checkbox/Checkbox.js | 2 +- src/{navigation => common}/Input/Input.js | 2 +- src/{navigation => common}/Input/index.js | 0 src/common/MetaItem/MetaItem.js | 2 +- src/common/MetaPreview/MetaPreview.js | 3 ++- src/common/NavBar/NavBarButton/NavBarButton.js | 2 +- src/common/NavBar/NavMenu/NavMenu.js | 2 +- src/common/NavBar/SearchBar/SearchBar.js | 3 ++- src/common/index.js | 2 ++ src/navigation/index.js | 2 -- src/routes/Board/BoardRow/BoardRow.js | 3 +-- src/routes/Discover/PickerMenu.js | 3 +-- src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js | 3 +-- src/routes/Intro/Intro.js | 2 +- 14 files changed, 15 insertions(+), 16 deletions(-) rename src/{navigation => common}/Input/Input.js (97%) rename src/{navigation => common}/Input/index.js (100%) diff --git a/src/common/Checkbox/Checkbox.js b/src/common/Checkbox/Checkbox.js index d4f8fe663..b3ed13f90 100644 --- a/src/common/Checkbox/Checkbox.js +++ b/src/common/Checkbox/Checkbox.js @@ -2,7 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); -const { Input } = require('stremio-navigation'); +const Input = require('../Input'); const styles = require('./styles'); const Checkbox = React.forwardRef(({ className, checked = false, disabled = false, onClick, children }, ref) => { diff --git a/src/navigation/Input/Input.js b/src/common/Input/Input.js similarity index 97% rename from src/navigation/Input/Input.js rename to src/common/Input/Input.js index 4944071d0..f671e78d3 100644 --- a/src/navigation/Input/Input.js +++ b/src/common/Input/Input.js @@ -1,6 +1,6 @@ const React = require('react'); const PropTypes = require('prop-types'); -const { useFocusable } = require('../FocusableContext'); +const { useFocusable } = require('stremio-navigation'); const ENTER_KEY_CODE = 13; const BUTTON_INPUT_TYPES = ['button', 'link', 'checkbox']; diff --git a/src/navigation/Input/index.js b/src/common/Input/index.js similarity index 100% rename from src/navigation/Input/index.js rename to src/common/Input/index.js diff --git a/src/common/MetaItem/MetaItem.js b/src/common/MetaItem/MetaItem.js index 9bfdbc488..231e29738 100644 --- a/src/common/MetaItem/MetaItem.js +++ b/src/common/MetaItem/MetaItem.js @@ -1,8 +1,8 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const { Input } = require('stremio-navigation'); const Icon = require('stremio-icons/dom'); +const Input = require('../Input'); const useBinaryState = require('../useBinaryState'); const Popup = require('../Popup'); const styles = require('./styles'); diff --git a/src/common/MetaPreview/MetaPreview.js b/src/common/MetaPreview/MetaPreview.js index d5ec0bb07..b8227185f 100644 --- a/src/common/MetaPreview/MetaPreview.js +++ b/src/common/MetaPreview/MetaPreview.js @@ -2,7 +2,8 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); -const { Input, Modal } = require('stremio-navigation'); +const { Modal } = require('stremio-navigation'); +const Input = require('../Input'); const useBinaryState = require('../useBinaryState'); const styles = require('./styles'); diff --git a/src/common/NavBar/NavBarButton/NavBarButton.js b/src/common/NavBar/NavBarButton/NavBarButton.js index 3dae2fb2c..c6bc59252 100644 --- a/src/common/NavBar/NavBarButton/NavBarButton.js +++ b/src/common/NavBar/NavBarButton/NavBarButton.js @@ -3,7 +3,7 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const UrlUtils = require('url'); const Icon = require('stremio-icons/dom'); -const { Input } = require('stremio-navigation'); +const Input = require('../../Input'); const routesRegexp = require('../../routesRegexp'); const useLocationHash = require('../../useLocationHash'); const styles = require('./styles'); diff --git a/src/common/NavBar/NavMenu/NavMenu.js b/src/common/NavBar/NavMenu/NavMenu.js index 2641361e5..b6372b4b2 100644 --- a/src/common/NavBar/NavMenu/NavMenu.js +++ b/src/common/NavBar/NavMenu/NavMenu.js @@ -2,7 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); -const { Input } = require('stremio-navigation'); +const Input = require('../../Input'); const Popup = require('../../Popup'); const styles = require('./styles'); diff --git a/src/common/NavBar/SearchBar/SearchBar.js b/src/common/NavBar/SearchBar/SearchBar.js index 66ea7ca7b..6b0e5a46d 100644 --- a/src/common/NavBar/SearchBar/SearchBar.js +++ b/src/common/NavBar/SearchBar/SearchBar.js @@ -3,7 +3,8 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const UrlUtils = require('url'); const Icon = require('stremio-icons/dom'); -const { Input, useFocusable } = require('stremio-navigation'); +const { useFocusable } = require('stremio-navigation'); +const Input = require('../../Input'); const useLocationHash = require('../../useLocationHash'); const styles = require('./styles'); diff --git a/src/common/index.js b/src/common/index.js index de3a88e81..b58d5d7c1 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -1,5 +1,6 @@ const Checkbox = require('./Checkbox'); const ColorPicker = require('./ColorPicker'); +const Input = require('./Input'); const Loader = require('./Loader'); const MainNavBar = require('./MainNavBar'); const MetaItem = require('./MetaItem'); @@ -15,6 +16,7 @@ const useLocationHash = require('./useLocationHash'); module.exports = { Checkbox, ColorPicker, + Input, Loader, MainNavBar, MetaItem, diff --git a/src/navigation/index.js b/src/navigation/index.js index 8f7a4cd72..9407ff0da 100644 --- a/src/navigation/index.js +++ b/src/navigation/index.js @@ -1,11 +1,9 @@ const { useFocusable } = require('./FocusableContext'); -const Input = require('./Input'); const Modal = require('./Modal'); const Router = require('./Router'); module.exports = { useFocusable, - Input, Modal, Router }; diff --git a/src/routes/Board/BoardRow/BoardRow.js b/src/routes/Board/BoardRow/BoardRow.js index ef79cabe6..1bd726a8a 100644 --- a/src/routes/Board/BoardRow/BoardRow.js +++ b/src/routes/Board/BoardRow/BoardRow.js @@ -2,8 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); -const { Input } = require('stremio-navigation'); -const { MetaItem } = require('stremio/common'); +const { Input, MetaItem } = require('stremio/common'); require('./styles'); const BoardRow = ({ className, title, items = [], itemMenuOptions = [] }) => { diff --git a/src/routes/Discover/PickerMenu.js b/src/routes/Discover/PickerMenu.js index 9cf3cd971..3ea38b483 100644 --- a/src/routes/Discover/PickerMenu.js +++ b/src/routes/Discover/PickerMenu.js @@ -2,8 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); -const { Input } = require('stremio-navigation'); -const { Popup, useBinaryState } = require('stremio/common'); +const { Input, Popup, useBinaryState } = require('stremio/common'); const styles = require('./styles'); const PickerMenu = ({ name, value, options, onChange }) => { diff --git a/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js b/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js index a9d780a9f..f88b09f4e 100644 --- a/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js +++ b/src/routes/Intro/ConsentCheckbox/ConsentCheckbox.js @@ -1,8 +1,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const { Input } = require('stremio-navigation'); -const { Checkbox } = require('stremio/common'); +const { Input, Checkbox } = require('stremio/common'); require('./styles'); const ConsentCheckbox = React.forwardRef(({ className, checked, label, link, href, toggle }, ref) => { diff --git a/src/routes/Intro/Intro.js b/src/routes/Intro/Intro.js index c91f274c1..49342e530 100644 --- a/src/routes/Intro/Intro.js +++ b/src/routes/Intro/Intro.js @@ -1,7 +1,7 @@ const React = require('react'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); -const { Input } = require('stremio-navigation'); +const { Input } = require('stremio/common'); const ConsentCheckbox = require('./ConsentCheckbox'); require('./styles');