@onehat/ui 0.2.28 → 0.2.30

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.2.28",
+	"version": "0.2.30",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",
@@ -33,7 +33,6 @@
 	  "react-datetime": "^3.2.0",
 	  "react-draggable": "^4.4.5",
 	  "react-native-draggable": "^3.3.0",
-	  "react-native-ckeditor5": "^1.0.9",
 	  "react-dom": "*",
 	  "react-native": "*"
 	},

package/src/Components/Form/Field/{HtmlEditor.js → CKEditor/CKEditor.js}

@@ -4,21 +4,22 @@ import {
 } from 'native-base';
 import {
 	AUTO_SUBMIT_DELAY,
-} from '../../../Constants/Input.js';
+} from '../../../../Constants/Input.js';
+import { CKEditor } from '@ckeditor/ckeditor5-react'; // https://ckeditor.com/docs/ckeditor5/latest/installation/frameworks/react.html
+import './ckeditor.css';
 import Editor from 'ckeditor5-custom-build/build/ckeditor.js'; // built using https://ckeditor.com/ckeditor-5/online-builder/
-import getComponentFromType from '../../../Functions/getComponentFromType.js';
-import withValue from '../../Hoc/withValue.js';
-import withTooltip from '../../Hoc/withTooltip.js';
+import withValue from '../../../Hoc/withValue.js';
+import withTooltip from '../../../Hoc/withTooltip.js';
 import _ from 'lodash';
 
+
 const
-	HtmlEditorElement = (props) => {
+	CKEditorElement = (props) => {
 		const {
 				value,
 				setValue,
 				h = 150,
 			} = props,
-			CKEditor = getComponentFromType('CKEditor'),
 			debouncedSetValueRef = useRef(),
 			[editor, setEditor] = useState(null), // in case you need to adjust things procedurally
 			config = {
@@ -52,12 +53,12 @@ const
 					/>
 				</Row>;
 	},
-	HtmlEditorField = withValue(HtmlEditorElement);
+	CKEditorField = withValue(CKEditorElement);
 	
 
-export default HtmlEditorField;
+export default CKEditorField;
 
 // // Tooltip needs us to forwardRef
 // export default withTooltip(React.forwardRef((props, ref) => {
-// 	return <HtmlEditorField {...props} outerRef={ref} />;
+// 	return <CKEditorField {...props} outerRef={ref} />;
 // }));

package/src/Components/index.js

@@ -9,6 +9,7 @@ import ArrayRadioGroup from './Form/Field/RadioGroup/ArrayRadioGroup.js';
 import Blank from './Blank.js';
 import BooleanCombo from './Form/Field/Combo/BooleanCombo.js';
 // import CartButtonWithBadge from '../Components/Buttons/CartButtonWithBadge.js';
+// import CKEditor from './Form/Field/CKEditor/CKEditor.js'; // web only
 import CheckboxGroup from './Form/Field/CheckboxGroup/CheckboxGroup.js';
 import Color from './Form/Field/Color.js';
 import Combo from './Form/Field/Combo/Combo.js';
@@ -25,7 +26,6 @@ import FiltersForm from './Form/FiltersForm.js';
 import Form from './Form/Form.js';
 import Grid from './Grid/Grid.js';
 import GridPanel from './Panel/GridPanel.js';
-import HtmlEditor from './Form/Field/HtmlEditor.js';
 import IconButton from './Buttons/IconButton.js';
 import Input from './Form/Field/Input.js';
 import IntervalsCombo from './Form/Field/Combo/IntervalsCombo.js';
@@ -56,6 +56,7 @@ const components = {
 	BooleanCombo,
 	// CartButtonWithBadge,
 	CheckboxGroup,
+	// CKEditor,
 	Color,
 	Column,
 	Combo,
@@ -72,7 +73,6 @@ const components = {
 	Form,
 	Grid,
 	GridPanel,
-	HtmlEditor,
 	IconButton,
 	Input,
 	IntervalsCombo,

package/src/Functions/registerReactNativeComponents.js

@@ -1,5 +1,4 @@
 import UiGlobals from '../UiGlobals.js';
-import CKEditor from '../PlatformImports/ReactNative/CKEditor';
 import Datetime from '../PlatformImports/ReactNative/Datetime';
 import Draggable from '../PlatformImports/ReactNative/Draggable';
 import ScreenContainer from '../Components/Container/ScreenContainer';
@@ -7,7 +6,6 @@ import _ from 'lodash';
 
 export default function registerReactNativeComponents() {
 	_.merge(UiGlobals.components, {
-		CKEditor,
 		Datetime,
 		Draggable,
 		ScreenContainer,

package/src/Functions/registerWebComponents.js

@@ -1,5 +1,5 @@
 import UiGlobals from '../UiGlobals.js';
-import CKEditor from '../PlatformImports/Web/CKEditor.js';
+import CKEditor from '../Components/Form/Field/CKEditor/CKEditor.js';
 import Datetime from '../PlatformImports/Web/Datetime.js';
 import Draggable from '../PlatformImports/Web/Draggable.js';
 import File from '../Components/Form/Field/File.js';

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

@@ -1,12 +0,0 @@
-import {
-	Box,
-} from 'native-base';
-import _ from 'lodash';
-
-export default function CKEditor(props) {
-
-	// See ExtJS compatible OneBuild implementation for ideas.
-	// Also see es6 folder in Venpal
-
-	throw new Error('not yet implemented');
-}

package/src/PlatformImports/ReactNative/CKEditor.js

@@ -1,3 +0,0 @@
-import CKEditor5 from '@ckeditor/ckeditor5-react'; // https://ckeditor.com/docs/ckeditor5/latest/installation/frameworks/react.html
-
-export default CKEditor5.default || CKEditor5;

package/src/PlatformImports/Web/CKEditor.js

@@ -1,4 +0,0 @@
-import { CKEditor } from '@ckeditor/ckeditor5-react'; // https://ckeditor.com/docs/ckeditor5/latest/installation/frameworks/react.html
-import './ckeditor.css';
-
-export default CKEditor.default || CKEditor;