From b5f09cabe985df40f1a031b1ddbfa2cfbd1fa8c1 Mon Sep 17 00:00:00 2001 From: NikolaBorislavovHristov Date: Sat, 5 Oct 2019 22:12:53 +0300 Subject: [PATCH] ColorPicker moved inside ColorInput --- src/common/ColorInput/ColorInput.js | 2 +- src/common/{ => ColorInput}/ColorPicker/ColorPicker.js | 0 src/common/{ => ColorInput}/ColorPicker/index.js | 0 src/common/{ => ColorInput}/ColorPicker/styles.less | 0 src/common/index.js | 2 -- storybook/stories/ColorPicker/ColorPicker.js | 2 +- 6 files changed, 2 insertions(+), 4 deletions(-) rename src/common/{ => ColorInput}/ColorPicker/ColorPicker.js (100%) rename src/common/{ => ColorInput}/ColorPicker/index.js (100%) rename src/common/{ => ColorInput}/ColorPicker/styles.less (100%) diff --git a/src/common/ColorInput/ColorInput.js b/src/common/ColorInput/ColorInput.js index 883f9e4ff..cafb010d3 100644 --- a/src/common/ColorInput/ColorInput.js +++ b/src/common/ColorInput/ColorInput.js @@ -3,8 +3,8 @@ const PropTypes = require('prop-types'); const Icon = require('stremio-icons/dom'); const Button = require('stremio/common/Button'); const Popup = require('stremio/common/Popup'); -const ColorPicker = require('stremio/common/ColorPicker'); const useBinaryState = require('stremio/common/useBinaryState'); +const ColorPicker = require('./ColorPicker'); const styles = require('./styles'); const ColorInput = ({ className, id, value, onChange, ...props }) => { diff --git a/src/common/ColorPicker/ColorPicker.js b/src/common/ColorInput/ColorPicker/ColorPicker.js similarity index 100% rename from src/common/ColorPicker/ColorPicker.js rename to src/common/ColorInput/ColorPicker/ColorPicker.js diff --git a/src/common/ColorPicker/index.js b/src/common/ColorInput/ColorPicker/index.js similarity index 100% rename from src/common/ColorPicker/index.js rename to src/common/ColorInput/ColorPicker/index.js diff --git a/src/common/ColorPicker/styles.less b/src/common/ColorInput/ColorPicker/styles.less similarity index 100% rename from src/common/ColorPicker/styles.less rename to src/common/ColorInput/ColorPicker/styles.less diff --git a/src/common/index.js b/src/common/index.js index 347d6a07b..6fd87f1e9 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -1,6 +1,5 @@ const Button = require('./Button'); const Checkbox = require('./Checkbox'); -const ColorPicker = require('./ColorPicker'); const ColorInput = require('./ColorInput'); const Dropdown = require('./Dropdown'); const Image = require('./Image'); @@ -29,7 +28,6 @@ const useSpreadState = require('./useSpreadState'); module.exports = { Button, Checkbox, - ColorPicker, ColorInput, Dropdown, Image, diff --git a/storybook/stories/ColorPicker/ColorPicker.js b/storybook/stories/ColorPicker/ColorPicker.js index 8ceefe947..385d40142 100644 --- a/storybook/stories/ColorPicker/ColorPicker.js +++ b/storybook/stories/ColorPicker/ColorPicker.js @@ -1,6 +1,6 @@ const React = require('react'); const { storiesOf } = require('@storybook/react'); -const { ColorPicker } = require('stremio/common'); +const ColorPicker = require('stremio/common/ColorInput/ColorPicker'); const styles = require('./styles'); storiesOf('ColorPicker', module).add('ColorPicker', () => {