chore: reorganize editors package

ccontrols · Feb 28, 2020 · e5b3838 · e5b3838
1 parent 8c11dcc
commit e5b3838
Show file tree

Hide file tree

Showing 44 changed files with 9 additions and 16 deletions.
diff --git a/integrations/storybook/package.json b/integrations/storybook/package.json
@@ -34,6 +34,7 @@
   "license": "MIT",
   "dependencies": {
     "@component-controls/block-components": "^0.6.0",
+    "@component-controls/components": "^0.6.0",
     "@component-controls/editors": "^0.6.0",
     "@component-controls/loader": "^0.6.0",
     "@component-controls/specification": "^0.6.0",

diff --git a/integrations/storybook/src/preview/PropsTable.tsx b/integrations/storybook/src/preview/PropsTable.tsx
@@ -1,10 +1,7 @@
 import React from 'react';
 import { styled } from '@storybook/theming';
-import {
-  FlexContainer,
-  PropertyEditor,
-  getPropertyEditor,
-} from '@component-controls/editors';
+import { FlexContainer } from '@component-controls/components';
+import { PropertyEditor, getPropertyEditor } from '@component-controls/editors';
 import { PropDef } from '../shared/smartControls';
 
 const TitleIcon = styled.div({

diff --git a/...omponents/FlexContainer/FlexContainer.tsx → ...nents/src/FlexContainer/FlexContainer.tsx b/...omponents/FlexContainer/FlexContainer.tsx → ...nents/src/FlexContainer/FlexContainer.tsx
diff --git a/ui/components/src/FlexContainer/index.ts b/ui/components/src/FlexContainer/index.ts
@@ -0,0 +1 @@
+export * from './FlexContainer';
diff --git a/ui/components/src/Popover/Popover.tsx b/ui/components/src/Popover/Popover.tsx
@@ -15,10 +15,6 @@ const match = (
   fallback: number | string = 0,
 ) => (actual.split('-')[0] === requested ? value : fallback);
 
-export interface FlexContainerProps {
-  align?: string;
-}
-
 export const Wrapper = styled.div<{
   placement: string;
   borderColor: string;

diff --git a/ui/components/src/index.ts b/ui/components/src/index.ts
@@ -1,4 +1,5 @@
 export * from './ActionBar';
+export * from './FlexContainer';
 export * from './Popover';
 export * from './Tabs';
 export * from './Toggle';
diff --git a/...itors/ArrayEditor/ArrayEditor.stories.tsx → ...s/src/ArrayEditor/ArrayEditor.stories.tsx b/...itors/ArrayEditor/ArrayEditor.stories.tsx → ...s/src/ArrayEditor/ArrayEditor.stories.tsx
diff --git a/...s/src/editors/ArrayEditor/ArrayEditor.tsx → ui/editors/src/ArrayEditor/ArrayEditor.tsx b/...s/src/editors/ArrayEditor/ArrayEditor.tsx → ui/editors/src/ArrayEditor/ArrayEditor.tsx
diff --git a/ui/editors/src/editors/ArrayEditor/index.ts → ui/editors/src/ArrayEditor/index.ts b/ui/editors/src/editors/ArrayEditor/index.ts → ui/editors/src/ArrayEditor/index.ts
diff --git a/...s/BooleanEditor/BooleanEditor.stories.tsx → ...c/BooleanEditor/BooleanEditor.stories.tsx b/...s/BooleanEditor/BooleanEditor.stories.tsx → ...c/BooleanEditor/BooleanEditor.stories.tsx
diff --git a/...c/editors/BooleanEditor/BooleanEditor.tsx → ...itors/src/BooleanEditor/BooleanEditor.tsx b/...c/editors/BooleanEditor/BooleanEditor.tsx → ...itors/src/BooleanEditor/BooleanEditor.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { ComponentControlBoolean } from '@component-controls/specification';
-import { Toggle } from '@component-controls/components';
-import { FlexContainer } from '../../components/FlexContainer/FlexContainer';
+import { Toggle, FlexContainer } from '@component-controls/components';
 import { PropertyControlProps, PropertyEditor } from '../types';
 
 export interface BooleanEditorProps extends PropertyControlProps {

diff --git a/...ditors/src/editors/BooleanEditor/index.ts → ui/editors/src/BooleanEditor/index.ts b/...ditors/src/editors/BooleanEditor/index.ts → ui/editors/src/BooleanEditor/index.ts
diff --git a/...ors/ButtonEditor/ButtonEditor.stories.tsx → ...src/ButtonEditor/ButtonEditor.stories.tsx b/...ors/ButtonEditor/ButtonEditor.stories.tsx → ...src/ButtonEditor/ButtonEditor.stories.tsx
diff --git a/...src/editors/ButtonEditor/ButtonEditor.tsx → ui/editors/src/ButtonEditor/ButtonEditor.tsx b/...src/editors/ButtonEditor/ButtonEditor.tsx → ui/editors/src/ButtonEditor/ButtonEditor.tsx
diff --git a/ui/editors/src/editors/ButtonEditor/index.ts → ui/editors/src/ButtonEditor/index.ts b/ui/editors/src/editors/ButtonEditor/index.ts → ui/editors/src/ButtonEditor/index.ts
diff --git a/...itors/ColorEditor/ColorEditor.stories.tsx → ...s/src/ColorEditor/ColorEditor.stories.tsx b/...itors/ColorEditor/ColorEditor.stories.tsx → ...s/src/ColorEditor/ColorEditor.stories.tsx
diff --git a/...s/src/editors/ColorEditor/ColorEditor.tsx → ui/editors/src/ColorEditor/ColorEditor.tsx b/...s/src/editors/ColorEditor/ColorEditor.tsx → ui/editors/src/ColorEditor/ColorEditor.tsx
diff --git a/ui/editors/src/editors/ColorEditor/index.ts → ui/editors/src/ColorEditor/index.ts b/ui/editors/src/editors/ColorEditor/index.ts → ui/editors/src/ColorEditor/index.ts
diff --git a/...editors/DateEditor/DateEditor.stories.tsx → ...ors/src/DateEditor/DateEditor.stories.tsx b/...editors/DateEditor/DateEditor.stories.tsx → ...ors/src/DateEditor/DateEditor.stories.tsx
diff --git a/...ors/src/editors/DateEditor/DateEditor.tsx → ui/editors/src/DateEditor/DateEditor.tsx b/...ors/src/editors/DateEditor/DateEditor.tsx → ui/editors/src/DateEditor/DateEditor.tsx
diff --git a/ui/editors/src/editors/DateEditor/index.ts → ui/editors/src/DateEditor/index.ts b/ui/editors/src/editors/DateEditor/index.ts → ui/editors/src/DateEditor/index.ts
diff --git a/...itors/FilesEditor/FilesEditor.stories.tsx → ...s/src/FilesEditor/FilesEditor.stories.tsx b/...itors/FilesEditor/FilesEditor.stories.tsx → ...s/src/FilesEditor/FilesEditor.stories.tsx
diff --git a/...s/src/editors/FilesEditor/FilesEditor.tsx → ui/editors/src/FilesEditor/FilesEditor.tsx b/...s/src/editors/FilesEditor/FilesEditor.tsx → ui/editors/src/FilesEditor/FilesEditor.tsx
diff --git a/ui/editors/src/editors/FilesEditor/index.ts → ui/editors/src/FilesEditor/index.ts b/ui/editors/src/editors/FilesEditor/index.ts → ui/editors/src/FilesEditor/index.ts
diff --git a/...ors/NumberEditor/NumberEditor.stories.tsx → ...src/NumberEditor/NumberEditor.stories.tsx b/...ors/NumberEditor/NumberEditor.stories.tsx → ...src/NumberEditor/NumberEditor.stories.tsx
diff --git a/...src/editors/NumberEditor/NumberEditor.tsx → ui/editors/src/NumberEditor/NumberEditor.tsx b/...src/editors/NumberEditor/NumberEditor.tsx → ui/editors/src/NumberEditor/NumberEditor.tsx
diff --git a/ui/editors/src/editors/NumberEditor/index.ts → ui/editors/src/NumberEditor/index.ts b/ui/editors/src/editors/NumberEditor/index.ts → ui/editors/src/NumberEditor/index.ts
diff --git a/...ors/ObjectEditor/ObjectEditor.stories.tsx → ...src/ObjectEditor/ObjectEditor.stories.tsx b/...ors/ObjectEditor/ObjectEditor.stories.tsx → ...src/ObjectEditor/ObjectEditor.stories.tsx
diff --git a/...src/editors/ObjectEditor/ObjectEditor.tsx → ui/editors/src/ObjectEditor/ObjectEditor.tsx b/...src/editors/ObjectEditor/ObjectEditor.tsx → ui/editors/src/ObjectEditor/ObjectEditor.tsx
@@ -6,9 +6,8 @@ import {
   ComponentControlObject,
 } from '@component-controls/specification';
 import { mergeControlValues, getControlValues } from '@component-controls/core';
-import { Popover } from '@component-controls/components';
+import { Popover, FlexContainer } from '@component-controls/components';
 import { PropertyControlProps, PropertyEditor } from '../types';
-import { FlexContainer } from '../../components/FlexContainer/FlexContainer';
 
 import { PropertyEditors } from '../PropertyEditors';
 

diff --git a/ui/editors/src/editors/ObjectEditor/index.ts → ui/editors/src/ObjectEditor/index.ts b/ui/editors/src/editors/ObjectEditor/index.ts → ui/editors/src/ObjectEditor/index.ts
diff --git a/.../editors/OptionsEditor/CheckboxEditor.tsx → ...tors/src/OptionsEditor/CheckboxEditor.tsx b/.../editors/OptionsEditor/CheckboxEditor.tsx → ...tors/src/OptionsEditor/CheckboxEditor.tsx
diff --git a/...s/OptionsEditor/OptionsEditor.stories.tsx → ...c/OptionsEditor/OptionsEditor.stories.tsx b/...s/OptionsEditor/OptionsEditor.stories.tsx → ...c/OptionsEditor/OptionsEditor.stories.tsx
diff --git a/...c/editors/OptionsEditor/OptionsEditor.tsx → ...itors/src/OptionsEditor/OptionsEditor.tsx b/...c/editors/OptionsEditor/OptionsEditor.tsx → ...itors/src/OptionsEditor/OptionsEditor.tsx
diff --git a/...rc/editors/OptionsEditor/RadiosEditor.tsx → ...ditors/src/OptionsEditor/RadiosEditor.tsx b/...rc/editors/OptionsEditor/RadiosEditor.tsx → ...ditors/src/OptionsEditor/RadiosEditor.tsx
diff --git a/...ditors/src/editors/OptionsEditor/index.ts → ui/editors/src/OptionsEditor/index.ts b/...ditors/src/editors/OptionsEditor/index.ts → ui/editors/src/OptionsEditor/index.ts
diff --git a/...s/src/editors/OptionsEditor/utils.test.ts → ui/editors/src/OptionsEditor/utils.test.ts b/...s/src/editors/OptionsEditor/utils.test.ts → ui/editors/src/OptionsEditor/utils.test.ts
diff --git a/...ditors/src/editors/OptionsEditor/utils.ts → ui/editors/src/OptionsEditor/utils.ts b/...ditors/src/editors/OptionsEditor/utils.ts → ui/editors/src/OptionsEditor/utils.ts
diff --git a/ui/editors/src/editors/PropertyEditors.ts → ui/editors/src/PropertyEditors.ts b/ui/editors/src/editors/PropertyEditors.ts → ui/editors/src/PropertyEditors.ts
diff --git a/...editors/TextEditor/TextEditor.stories.tsx → ...ors/src/TextEditor/TextEditor.stories.tsx b/...editors/TextEditor/TextEditor.stories.tsx → ...ors/src/TextEditor/TextEditor.stories.tsx
diff --git a/...ors/src/editors/TextEditor/TextEditor.tsx → ui/editors/src/TextEditor/TextEditor.tsx b/...ors/src/editors/TextEditor/TextEditor.tsx → ui/editors/src/TextEditor/TextEditor.tsx
diff --git a/ui/editors/src/editors/TextEditor/index.ts → ui/editors/src/TextEditor/index.ts b/ui/editors/src/editors/TextEditor/index.ts → ui/editors/src/TextEditor/index.ts
diff --git a/ui/editors/src/index.ts b/ui/editors/src/index.ts
@@ -1,3 +1,2 @@
-export * from './editors/prop-factory';
-export * from './editors/types';
-export { FlexContainer } from './components/FlexContainer/FlexContainer';
+export * from './prop-factory';
+export * from './types';
diff --git a/ui/editors/src/editors/prop-factory.ts → ui/editors/src/prop-factory.ts b/ui/editors/src/editors/prop-factory.ts → ui/editors/src/prop-factory.ts
diff --git a/ui/editors/src/editors/types.ts → ui/editors/src/types.ts b/ui/editors/src/editors/types.ts → ui/editors/src/types.ts