refactor(multiselectfield): move to ui-widgets

BREAKING CHANGE: MultiSelectField import path changes from @dhis2/ui-core to @dhis2/ui-widgets or @dhis2/ui
dhis2 · Mar 9, 2020 · c3d42ad · c3d42ad
1 parent 1dadf93
commit c3d42ad
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/packages/core/src/index.js b/packages/core/src/index.js
@@ -80,7 +80,6 @@ export { ToggleGroup } from './ToggleGroup/ToggleGroup.js'
 /* widgets */
 export { Menu } from './Menu/Menu.js'
 export { Modal } from './Modal/Modal.js'
-export { MultiSelectField } from './MultiSelectField/MultiSelectField.js'
 export { SingleSelectField } from './SingleSelectField/SingleSelectField.js'
 export { SwitchField } from './SwitchField/SwitchField.js'
 export { TextAreaField } from './TextAreaField/TextAreaField.js'
diff --git a/.../src/MultiSelectField/MultiSelectField.js → .../src/MultiSelectField/MultiSelectField.js b/.../src/MultiSelectField/MultiSelectField.js → .../src/MultiSelectField/MultiSelectField.js
@@ -1,15 +1,19 @@
 import propTypes from '@dhis2/prop-types'
 import React from 'react'
 
-import { statusPropType, multiSelectedPropType } from '../common-prop-types.js'
+import { Field, Label, Help, Box, MultiSelect } from '@dhis2/ui-core'
 
-import { Field } from '../Field/Field.js'
-import { Label } from '../Label/Label.js'
-import { Help } from '../Help/Help.js'
-import { Box } from '../Box/Box.js'
+const statusPropType = propTypes.mutuallyExclusive(
+    ['valid', 'warning', 'error'],
+    propTypes.bool
+)
 
-import { MultiSelect } from '../MultiSelect/MultiSelect.js'
-;('') // TODO: https://github.com/jsdoc/jsdoc/issues/1718
+const multiSelectedPropType = propTypes.arrayOf(
+    propTypes.shape({
+        label: propTypes.string,
+        value: propTypes.string,
+    })
+)
 
 /**
  * @module

diff --git a/...lectField/MultiSelectField.stories.e2e.js → ...lectField/MultiSelectField.stories.e2e.js b/...lectField/MultiSelectField.stories.e2e.js → ...lectField/MultiSelectField.stories.e2e.js
diff --git a/...tiSelectField/MultiSelectField.stories.js → ...tiSelectField/MultiSelectField.stories.js b/...tiSelectField/MultiSelectField.stories.js → ...tiSelectField/MultiSelectField.stories.js
diff --git a/packages/widgets/src/index.js b/packages/widgets/src/index.js
@@ -5,4 +5,5 @@ export { CheckboxField } from './CheckboxField/CheckboxField.js'
 export { FileInputField } from './FileInputField/FileInputField.js'
 export { FileInputFieldWithList } from './FileInputFieldWithList/FileInputFieldWithList.js'
 export { InputField } from './InputField/InputField.js'
+export { MultiSelectField } from './MultiSelectField/MultiSelectField.js'
 export { ToggleGroupField } from './ToggleGroupField/ToggleGroupField.js'