@onehat/ui 0.3.126 → 0.3.130

package/package.json

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

package/src/Components/Editor/Editor.js

@@ -30,6 +30,8 @@ function Editor(props) {
 		return null; // hide the editor when no selection
 	}
 
+	const propsToPass = _.omit(props, ['self', 'reference', 'parent']);
+
 	// Repository?.isRemotePhantomMode && selection.length === 1 && 
 	if (editorMode === EDITOR_MODE__VIEW || isEditorViewOnly) {
 		const record = selection[0];
@@ -37,19 +39,20 @@ function Editor(props) {
 			return null;
 		}
 		return <Viewer
-					{...props}
+					{...propsToPass}
+					{..._viewer}
 					record={record}
 					onEditMode={isEditorViewOnly ? null : onEditMode}
 					onClose={onClose}
 					onDelete={onDelete}
 					parent={self}
 					reference="viewer"
-					{..._viewer}
 				/>;
 	}
 
 	return <Form
-				{...props}
+				{...propsToPass}
+				{..._form}
 				record={selection}
 				onCancel={onCancel}
 				onSave={onSave}
@@ -57,7 +60,6 @@ function Editor(props) {
 				onDelete={onDelete}
 				parent={self}
 				reference="form"
-				{..._form}
 			/>;
 }
 

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

@@ -120,7 +120,7 @@ export function ComboComponent(props) {
 				}
 			}
 			if (Repository && !Repository.isLoaded) {
-				await Repository.load();
+				// await Repository.load(); // this breaks when the menu (Grid) has selectorSelected
 			}
 			setIsMenuShown(true);
 		},
@@ -905,6 +905,22 @@ export function ComboComponent(props) {
 						</Row>;
 	
 	if (isViewerShown && Editor) {
+		const propsForViewer = _.pick(props, [
+			'disableCopy',
+			'disableDuplicate',
+			'disablePrint',
+			'disableView',
+			'value',
+			'Repository',
+			'data',
+			'displayField',
+			'displayIx',
+			'fields',
+			'idField',
+			'idIx',
+			'model',
+			'name',
+		]);
 		assembledComponents = 
 				<>
 					{assembledComponents}
@@ -913,7 +929,7 @@ export function ComboComponent(props) {
 						onClose={onViewerClose}
 					>
 						<Editor
-							{...props}
+							{...propsForViewer}
 							editorType={EDITOR_TYPE__WINDOWED}
 							px={0}
 							py={0}

package/src/Components/Form/Form.js

@@ -227,7 +227,7 @@ function Form(props) {
 											let editorProps = {};
 											if (!editor) {
 												const propertyDef = fieldName && Repository?.getSchema().getPropertyDefinition(fieldName);
-												editor = propertyDef[fieldName].editorType;
+												editor = propertyDef && propertyDef[fieldName].editorType;
 												if (_.isPlainObject(editor)) {
 													const {
 															type,
@@ -323,15 +323,15 @@ function Form(props) {
 						{
 							type: t,
 							...p
-						} =  propertyDef.editorType;
+						} = propertyDef?.editorType;
 					type = t;
 					editorTypeProps = p;
-				} else if (propertyDef.viewerType) {
+				} else if (propertyDef?.viewerType) {
 					const
 						{
 							type: t,
 							...p
-						} =  propertyDef.viewerType;
+						} =  propertyDef?.viewerType;
 					type = t;
 				} else {
 					type = 'Text';
@@ -474,7 +474,9 @@ function Form(props) {
 								editorTypeProps.selectorId = selectorId;
 							}
 							if (propsToPass.selectorId || editorTypeProps.selectorId) { // editorTypeProps.selectorId causes just this one field to use selectorId
-								editorTypeProps.selectorSelected = record;
+								if (_.isNil(propsToPass.selectorSelected)) {
+									editorTypeProps.selectorSelected = record;
+								}
 							}
 							let dynamicProps = {};
 							if (getDynamicProps) {
@@ -691,6 +693,8 @@ function Form(props) {
 	if (self) {
 		self.ref = formRef;
 		self.formState = formState;
+		self.formSetValue = formSetValue;
+		self.formGetValues = formGetValues;
 	}
 	
 	const sizeProps = {};

package/src/Components/Hoc/withFilters.js

@@ -483,7 +483,7 @@ export default function withFilters(WrappedComponent) {
 
 						// basic property filter
 						const propertyDef = Repository.getSchema().getPropertyDefinition(filterField);
-						data.push([ filterField, propertyDef.title ]);
+						data.push([ filterField, propertyDef?.title ]);
 					});
 
 					// sort by title

package/src/Components/Hoc/withPdfButton.js

@@ -108,7 +108,7 @@ export default function withPdfButton(WrappedComponent) {
 
 				if (!item.title) {
 					const propertyDef = name && Repository?.getSchema().getPropertyDefinition(name);
-					if (propertyDef.title) {
+					if (propertyDef?.title) {
 						item.title = propertyDef.title;
 					}
 				}

package/src/Components/Icons/EllipsisHorizontal.js

@@ -0,0 +1,20 @@
+// Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+import { Icon } from 'native-base';
+
+function SvgComponent(props) {
+  return (
+    <Icon
+      xmlns="http://www.w3.org/2000/svg"
+      height={16}
+      width={14}
+      viewBox="0 0 448 512"
+      {...props}
+    >
+      <Path d="M8 256a56 56 0 11112 0 56 56 0 11-112 0zm160 0a56 56 0 11112 0 56 56 0 11-112 0zm216-56a56 56 0 110 112 56 56 0 110-112z" />
+    </Icon>
+  )
+}
+
+export default SvgComponent

package/src/Components/Icons/Js.js

@@ -0,0 +1,20 @@
+// Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+import { Icon } from 'native-base';
+
+function SvgComponent(props) {
+  return (
+    <Icon
+      xmlns="http://www.w3.org/2000/svg"
+      height={16}
+      width={14}
+      viewBox="0 0 448 512"
+      {...props}
+    >
+      <Path d="M0 32v448h448V32H0zm243.8 349.4c0 43.6-25.6 63.5-62.9 63.5-33.7 0-53.2-17.4-63.2-38.5l34.3-20.7c6.6 11.7 12.6 21.6 27.1 21.6 13.8 0 22.6-5.4 22.6-26.5V237.7h42.1v143.7zm99.6 63.5c-39.1 0-64.4-18.6-76.7-43l34.3-19.8c9 14.7 20.8 25.6 41.5 25.6 17.4 0 28.6-8.7 28.6-20.8 0-14.4-11.4-19.5-30.7-28l-10.5-4.5c-30.4-12.9-50.5-29.2-50.5-63.5 0-31.6 24.1-55.6 61.6-55.6 26.8 0 46 9.3 59.8 33.7L368 290c-7.2-12.9-15-18-27.1-18-12.3 0-20.1 7.8-20.1 18 0 12.6 7.8 17.7 25.9 25.6l10.5 4.5c35.8 15.3 55.9 31 55.9 66.2 0 37.8-29.8 58.6-69.7 58.6z" />
+    </Icon>
+  )
+}
+
+export default SvgComponent

package/src/Components/Icons/RightLeft.js

@@ -0,0 +1,14 @@
+// Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+import { Icon } from 'native-base';
+
+function SvgComponent(props) {
+  return (
+    <Icon xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" {...props}>
+      <Path d="M32 96h320V32c0-12.9 7.8-24.6 19.8-29.6s25.7-2.2 34.9 6.9l96 96c6 6 9.4 14.1 9.4 22.6s-3.4 16.6-9.4 22.6l-96 96c-9.2 9.2-22.9 11.9-34.9 6.9S352 236.8 352 223.8V160H32c-17.7 0-32-14.3-32-32s14.3-32 32-32zm448 256c17.7 0 32 14.3 32 32s-14.3 32-32 32H160v64c0 12.9-7.8 24.6-19.8 29.6s-25.7 2.2-34.9-6.9l-96-96c-6-6-9.4-14.1-9.4-22.6s3.4-16.6 9.4-22.6l96-96c9.2-9.2 22.9-11.9 34.9-6.9s19.8 16.6 19.8 29.6v64h320z" />
+    </Icon>
+  )
+}
+
+export default SvgComponent

package/src/Components/Icons/Table.js

@@ -0,0 +1,20 @@
+// Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+import { Icon } from 'native-base';
+
+function SvgComponent(props) {
+  return (
+    <Icon
+      xmlns="http://www.w3.org/2000/svg"
+      height={16}
+      width={16}
+      viewBox="0 0 512 512"
+      {...props}
+    >
+      <Path d="M64 256v-96h160v96H64zm0 64h160v96H64v-96zm224 96v-96h160v96H288zm160-160H288v-96h160v96zM64 32C28.7 32 0 60.7 0 96v320c0 35.3 28.7 64 64 64h384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64z" />
+    </Icon>
+  )
+}
+
+export default SvgComponent

package/src/Components/Viewer/Viewer.js

@@ -73,12 +73,12 @@ function Viewer(props) {
 
 			const propertyDef = name && Repository?.getSchema().getPropertyDefinition(name);
 			if (!type) {
-				if (propertyDef.viewerType) {
+				if (propertyDef?.viewerType) {
 					const
 						{
 							type: t,
 							...p
-						} =  propertyDef.viewerType;
+						} = propertyDef.viewerType;
 					type = t
 				} else {
 					type = 'Text';
@@ -121,7 +121,7 @@ function Viewer(props) {
 				return <Element key={ix} title={title} {...defaults} {...propsToPass} {...editorTypeProps}>{children}</Element>;
 			}
 
-			if (!label && Repository && propertyDef.title) {
+			if (!label && Repository && propertyDef?.title) {
 				label = propertyDef.title;
 			}
 

package/src/Components/index.js

@@ -60,6 +60,7 @@ import Copyright from '../Components/Icons/Copyright.js';
 import Dot from '../Components/Icons/Dot.js';
 import Duplicate from '../Components/Icons/Duplicate.js';
 import Edit from '../Components/Icons/Edit.js';
+import EllipsisHorizontal from '../Components/Icons/EllipsisHorizontal.js';
 import EllipsisVertical from '../Components/Icons/EllipsisVertical.js';
 import Envelope from '../Components/Icons/Envelope.js';
 import EnvelopeRegular from '../Components/Icons/EnvelopeRegular.js';
@@ -90,6 +91,7 @@ import House from '../Components/Icons/House.js';
 import Images from '../Components/Icons/Images.js';
 import Info from '../Components/Icons/Info.js';
 import ItunesNote from '../Components/Icons/ItunesNote.js';
+import Js from '../Components/Icons/Js.js';
 import Leaf from '../Components/Icons/Leaf.js';
 import List from '../Components/Icons/List.js';
 import ListCheck from '../Components/Icons/ListCheck.js';
@@ -142,6 +144,7 @@ import RectangleXmark from '../Components/Icons/RectangleXmark.js';
 import RectangleXmarkRegular from '../Components/Icons/RectangleXmarkRegular.js';
 import ReorderRows from '../Components/Icons/ReorderRows.js';
 import RightFromBracket from '../Components/Icons/RightFromBracket.js';
+import RightLeft from '../Components/Icons/RightLeft.js';
 import RightToBracket from '../Components/Icons/RightToBracket.js';
 import Rotate from '../Components/Icons/Rotate.js';
 import RotateLeft from '../Components/Icons/RotateLeft.js';
@@ -161,6 +164,7 @@ import SquareCheckRegular from '../Components/Icons/SquareCheckRegular.js';
 import SquareMinus from '../Components/Icons/SquareMinus.js';
 import SquareRegular from '../Components/Icons/SquareRegular.js';
 import Store from '../Components/Icons/Store.js';
+import Table from '../Components/Icons/Table.js';
 import ThumbsDown from '../Components/Icons/ThumbsDown.js';
 import ThumbsDownRegular from '../Components/Icons/ThumbsDownRegular.js';
 import ThumbsUp from '../Components/Icons/ThumbsUp.js';
@@ -287,6 +291,7 @@ const components = {
 	Dot,
 	Duplicate,
 	Edit,
+	EllipsisHorizontal,
 	EllipsisVertical,
 	Envelope,
 	EnvelopeRegular,
@@ -317,6 +322,7 @@ const components = {
 	Images,
 	Info,
 	ItunesNote,
+	Js,
 	Leaf,
 	List,
 	ListCheck,
@@ -369,6 +375,7 @@ const components = {
 	RectangleXmarkRegular,
 	ReorderRows,
 	RightFromBracket,
+	RightLeft,
 	RightToBracket,
 	Rotate,
 	RotateLeft,
@@ -388,6 +395,7 @@ const components = {
 	SquareMinus,
 	SquareRegular,
 	Store,
+	Table,
 	ThumbsDown,
 	ThumbsDownRegular,
 	ThumbsUp,