@onehat/ui 0.2.4 → 0.2.6

package/package.json

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

package/src/Components/Form/Form.js

@@ -504,9 +504,9 @@ function disableRequiredYupFields(validator) {
 				if (Array.isArray(nestedField.conditions) && nestedField.conditions.length > 0) {
 					// Next is done to disable required() inside a condition
 					// https://github.com/jquense/yup/issues/1002
-					nestedFieldNext = nestedFieldNext.when('whatever', (_: unknown, schema: yup.AnySchema) =>
-						schema.notRequired(),
-					);
+					nestedFieldNext = nestedFieldNext.when('whatever', (unused, schema) => {
+						return schema.notRequired();
+					});
 				}
 		
 				next.fields[key] = nestedFieldNext;

package/src/Components/index.js

@@ -0,0 +1,96 @@
+import {
+	Column,
+} from 'native-base';
+// import AccordionGridPanel from '../Components/Panel/AccordionGridPanel.js';
+import ArrayCheckboxGroup from './Form/Field/CheckboxGroup/ArrayCheckboxGroup.js';
+import ArrayCombo from './Form/Field/Combo/ArrayCombo.js';
+import ArrayRadioGroup from './Form/Field/RadioGroup/ArrayRadioGroup.js';
+// import BackButton from '../Components/Buttons/BackButton.js';
+import Blank from './Blank.js';
+import BooleanCombo from './Form/Field/Combo/BooleanCombo.js';
+// import CartButtonWithBadge from '../Components/Buttons/CartButtonWithBadge.js';
+import CheckboxGroup from './Form/Field/CheckboxGroup/CheckboxGroup.js';
+import CKEditor from './Form/Field/CKEditor/CKEditor.js';
+import Color from './Form/Field/Color.js';
+import Combo from './Form/Field/Combo/Combo.js';
+// import ComboEditor from '../Components/Form/Field/Combo/ComboEditor.js';
+import Container from './Container/Container.js';
+import DataMgt from './Screens/DataMgt.js';
+import Date from './Form/Field/Date.js';
+import DateRange from './Filter/DateRange.js';
+import DisplayField from './Form/Field/DisplayField.js';
+import FieldSet from './Form/FieldSet.js';
+import File from './Form/Field/File.js';
+import FiltersForm from './Form/FiltersForm.js';
+// import FiltersToolbar from '../Components/Toolbar/FiltersToolbar.js';
+import Form from './Form/Form.js';
+import Grid from './Grid/Grid.js';
+import GridPanel from './Panel/GridPanel.js';
+import IconButton from './Buttons/IconButton.js';
+import Input from './Form/Field/Input.js';
+import IntervalsCombo from './Form/Field/Combo/IntervalsCombo.js';
+import Label from './Form/Label.js';
+import MonthsCombo from './Form/Field/Combo/MonthsCombo.js';
+import Number from './Form/Field/Number.js';
+import NumberRange from './Filter/NumberRange.js';
+import Panel from './Panel/Panel.js';
+// import Picker from '../Components/Panel/Picker.js';
+import RadioGroup from './Form/Field/RadioGroup/RadioGroup.js';
+import TabPanel from './Panel/TabPanel.js';
+import Tag from './Form/Field/Combo/Tag.js';
+import TextArea from './Form/Field/TextArea.js';
+import Text from './Form/Field/Text.js';
+import TimezonesCombo from './Form/Field/Combo/TimezonesCombo.js';
+import Toggle from './Form/Field/Toggle.js';
+import Toolbar from './Toolbar/Toolbar.js';
+import YearsCombo from './Form/Field/Combo/YearsCombo.js';
+import _ from 'lodash';
+
+const components = {
+	// AccordionGridPanel,
+	ArrayCheckboxGroup,
+	ArrayCombo,
+	ArrayRadioGroup,
+	// BackButton,
+	Blank,
+	BooleanCombo,
+	// CartButtonWithBadge,
+	CheckboxGroup,
+	CKEditor,
+	Color,
+	Column,
+	Combo,
+	// ComboEditor,
+	Container,
+	DataMgt,
+	Date,
+	DateRange,
+	DisplayField,
+	FieldSet,
+	File,
+	FiltersForm,
+	// FiltersToolbar,
+	Form,
+	Grid,
+	GridPanel,
+	IconButton,
+	Input,
+	IntervalsCombo,
+	Label,
+	MonthsCombo,
+	Number,
+	NumberRange,
+	Panel,
+	// Picker,
+	RadioGroup,
+	TabPanel,
+	Tag,
+	Text,
+	TextArea,
+	TimezonesCombo,
+	Toggle,
+	Toolbar,
+	YearsCombo,
+};
+
+export default components;

package/src/Functions/getComponentFromType.js

@@ -1,106 +1,11 @@
-import {
-	Column,
-} from 'native-base';
-// import AccordionGridPanel from '../Components/Panel/AccordionGridPanel.js';
-import ArrayCheckboxGroup from '../Components/Form/Field/CheckboxGroup/ArrayCheckboxGroup.js';
-import ArrayCombo from '../Components/Form/Field/Combo/ArrayCombo.js';
-import ArrayRadioGroup from '../Components/Form/Field/RadioGroup/ArrayRadioGroup.js';
-// import BackButton from '../Components/Buttons/BackButton.js';
-import Blank from '../Components/Blank.js';
-import BooleanCombo from '../Components/Form/Field/Combo/BooleanCombo.js';
-// import CartButtonWithBadge from '../Components/Buttons/CartButtonWithBadge.js';
-import CheckboxGroup from '../Components/Form/Field/CheckboxGroup/CheckboxGroup.js';
-import CKEditor from '../Components/Form/Field/CKEditor/CKEditor.js';
-import Color from '../Components/Form/Field/Color.js';
-import Combo from '../Components/Form/Field/Combo/Combo.js';
-// import ComboEditor from '../Components/Form/Field/Combo/ComboEditor.js';
-import Container from '../Components/Container/Container.js';
-import DataMgt from '../Components/Screens/DataMgt.js';
-import Date from '../Components/Form/Field/Date.js';
-import DateRange from '../Components/Filter/DateRange.js';
-import DisplayField from '../Components/Form/Field/DisplayField.js';
-import FieldSet from '../Components/Form/FieldSet.js';
-import File from '../Components/Form/Field/File.js';
-import FiltersForm from '../Components/Form/FiltersForm.js';
-// import FiltersToolbar from '../Components/Toolbar/FiltersToolbar.js';
-import Form from '../Components/Form/Form.js';
-import Grid from '../Components/Grid/Grid.js';
-import GridPanel from '../Components/Panel/GridPanel.js';
-import IconButton from '../Components/Buttons/IconButton.js';
-import Input from '../Components/Form/Field/Input.js';
-import IntervalsCombo from '../Components/Form/Field/Combo/IntervalsCombo.js';
-import Label from '../Components/Form/Label.js';
-import MonthsCombo from '../Components/Form/Field/Combo/MonthsCombo.js';
-import Number from '../Components/Form/Field/Number.js';
-import NumberRange from '../Components/Filter/NumberRange.js';
-import Panel from '../Components/Panel/Panel.js';
-// import Picker from '../Components/Panel/Picker.js';
-import RadioGroup from '../Components/Form/Field/RadioGroup/RadioGroup.js';
-import TabPanel from '../Components/Panel/TabPanel.js';
-import Tag from '../Components/Form/Field/Combo/Tag.js';
-import TextArea from '../Components/Form/Field/TextArea.js';
-import Text from '../Components/Form/Field/Text.js';
-import TimezonesCombo from '../Components/Form/Field/Combo/TimezonesCombo.js';
-import Toggle from '../Components/Form/Field/Toggle.js';
-import Toolbar from '../Components/Toolbar/Toolbar.js';
-import YearsCombo from '../Components/Form/Field/Combo/YearsCombo.js';
-import _ from 'lodash';
-
-const
-	mapping = {
-		// AccordionGridPanel,
-		ArrayCheckboxGroup,
-		ArrayCombo,
-		ArrayRadioGroup,
-		// BackButton,
-		Blank,
-		BooleanCombo,
-		// CartButtonWithBadge,
-		CheckboxGroup,
-		CKEditor,
-		Color,
-		Column,
-		Combo,
-		// ComboEditor,
-		Container,
-		DataMgt,
-		Date,
-		DateRange,
-		DisplayField,
-		FieldSet,
-		File,
-		FiltersForm,
-		// FiltersToolbar,
-		Form,
-		Grid,
-		GridPanel,
-		IconButton,
-		Input,
-		IntervalsCombo,
-		Label,
-		MonthsCombo,
-		Number,
-		NumberRange,
-		Panel,
-		// Picker,
-		RadioGroup,
-		TabPanel,
-		Tag,
-		Text,
-		TextArea,
-		TimezonesCombo,
-		Toggle,
-		Toolbar,
-		YearsCombo,
-	};
+import UiGlobals from '../UiGlobals.js';
 
 export default function getComponentFromType(type) {
 	if (_.isString(type)) {
-		return mapping[type];
+		if (UiGlobals.components[type]) {
+			return UiGlobals.components[type];
+		}
+		throw new Error('No mapping for ' + type + ' exists!');
 	}
 	return type;
 }
-
-export function registerComponents(newMapping) {
-	_.merge(mapping, newMapping);
-}

package/src/Functions/registerComponents.js

@@ -0,0 +1,5 @@
+import UiGlobals from '../UiGlobals.js';
+
+export default function registerComponents(newComponents) {
+	_.merge(UiGlobals.components, newComponents);
+}

package/src/OneHatUi.js

@@ -1,6 +1,8 @@
 /** @module OneHatUi */
 
 import EventEmitter from '@onehat/events';
+import Components from './Components/index.js';
+import UiGlobals from './UiGlobals.js';
 import _ from 'lodash';
 
 /**
@@ -11,6 +13,7 @@ export class OneHatUi extends EventEmitter {
 	constructor() {
 		super(...arguments);
 
+		UiGlobals.components = Components;
 
 		this.registerEvents([
 			'error',

package/src/UiGlobals.js

@@ -0,0 +1,3 @@
+const Globals = {};
+
+export default Globals;