@onehat/ui 0.2.19 → 0.2.20

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.2.19",
+	"version": "0.2.20",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",

package/src/Components/Form/Field/Date.js

@@ -23,16 +23,9 @@ import IconButton from '../../Buttons/IconButton.js';
 import withValue from '../../Hoc/withValue.js';
 import emptyFn from '../../../Functions/emptyFn.js';
 import Calendar from '../../Icons/Calendar.js';
+import getComponentFromType from '../../../Functions/getComponentFromType';
 import _ from 'lodash';
 
-// eslint-disable-next-line
-let Datetime;
-if (CURRENT_MODE === UI_MODE_WEB) {
-	Datetime = await import('../../../PlatformImports/Web/Datetime.js');
-} else if (CURRENT_MODE === UI_MODE_REACT_NATIVE) {
-	Datetime = await import('../../../PlatformImports/ReactNative/Datetime.js');
-}
-
 
 export function DateElement(props) {
 	const {
@@ -45,6 +38,7 @@ export function DateElement(props) {
 			tooltipPlacement = 'bottom',
 		} = props,
 		styles = UiGlobals.styles,
+		Datetime = getComponentFromType('Draggable'),
 		inputRef = useRef(),
 		triggerRef = useRef(),
 		pickerRef = useRef(),

package/src/Components/Hoc/withDraggable.js

@@ -12,15 +12,7 @@ import useBlocking from '../../Hooks/useBlocking.js';
 import {
 	v4 as uuid,
 } from 'uuid';
-
-
-// eslint-disable-next-line
-let Draggable;
-if (CURRENT_MODE === UI_MODE_WEB) {
-	Draggable = await import('../../PlatformImports/Web/Draggable.js');
-} else if (CURRENT_MODE === UI_MODE_REACT_NATIVE) {
-	Draggable = await import('../../PlatformImports/ReactNative/Draggable.js');
-}
+import getComponentFromType from '../../Functions/getComponentFromType';
 
 
 
@@ -48,6 +40,7 @@ export default function withDraggable(WrappedComponent) {
 				// for local use
 				mode = HORIZONTAL, // HORIZONTAL, VERTICAL
 			} = props,
+			Draggable = getComponentFromType('Draggable'),
 			[isDragging, setIsDraggingRaw] = useState(false),
 			[node, setNode] = useState(false),
 			[bounds, setBounds] = useState(null),

package/src/Functions/registerReactNativeComponents.js

@@ -0,0 +1,11 @@
+import UiGlobals from '../UiGlobals.js';
+import Datetime from '../PlatformImports/ReactNative/Datetime';
+import Draggable from '../PlatformImports/ReactNative/Draggable';
+import _ from 'lodash';
+
+export function registerReactNativeComponents() {
+	_.merge(UiGlobals.components, {
+		Datetime,
+		Draggable,
+	});
+}

package/src/Functions/registerWebComponents.js

@@ -1,9 +1,13 @@
 import UiGlobals from '../UiGlobals.js';
 import CKEditor from '../Components/Form/Field/CKEditor/CKEditor.js';
+import Datetime from '../PlatformImports/Web/Datetime';
+import Draggable from '../PlatformImports/Web/Draggable';
 import _ from 'lodash';
 
 export function registerWebComponents() {
 	_.merge(UiGlobals.components, {
 		CKEditor,
+		Datetime,
+		Draggable,
 	});
 }