@onehat/ui 0.3.42 → 0.3.44

package/package.json

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

package/src/Components/Buttons/SquareButton.js

@@ -13,6 +13,7 @@ export default function SquareButton(props) {
 			activeColor,
 			invertColorWhenActive = false,
 			disableInteractions = false,
+			fontSize = '20px',
 			...propsToPass
 		} = props,
 		styles = UiGlobals.styles,
@@ -54,7 +55,7 @@ export default function SquareButton(props) {
 				// _pressed={pressedProps}
 			>
 				<Icon as={icon} color={color} size="xl" />
-				<Text fontSize={20} color={color}>{text}</Text>
+				<Text fontSize={fontSize} color={color}>{text}</Text>
 			</Pressable>;
 }
 

package/src/Components/Form/Form.js

@@ -77,6 +77,7 @@ function Form(props) {
 			submitBtnLabel,
 			onSubmit,
 			additionalEditButtons,
+			useAdditionalEditButtons = true,
 			additionalFooterButtons,
 			
 			// sizing of outer container
@@ -290,6 +291,9 @@ function Form(props) {
 				editorTypeProps = {};
 
 			const propertyDef = name && Repository?.getSchema().getPropertyDefinition(name);
+			if (!useAdditionalEditButtons) {
+				item = _.omit(item, 'additionalEditButtons');
+			}
 			if (propertyDef?.isEditingDisabled && checkIsEditingDisabled) {
 				isEditable = false;
 			}

package/src/Components/Hoc/withEditor.js

@@ -30,6 +30,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					return 'record' + (selection[0].displayValue ? ' "' + selection[0].displayValue + '"' : '') + '?';
 				},
 				record,
+				onChange,
 
 				// withComponent
 				self,
@@ -123,6 +124,9 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				if (getListeners().onAfterAdd) {
 					await getListeners().onAfterAdd(entity);
 				}
+				if (onChange) {
+					onChange();
+				}
 			},
 			onEdit = async () => {
 				if (_.isEmpty(selection) || (_.isArray(selection) && (selection.length > 1 || selection[0]?.isDestroyed))) {
@@ -206,6 +210,9 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				if (cb) {
 					cb();
 				}
+				if (onChange) {
+					onChange();
+				}
 			},
 			onView = async () => {
 				if (!userCanView) {
@@ -312,6 +319,9 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				if (getListeners().onAfterEdit) {
 					await getListeners().onAfterEdit(what);
 				}
+				if (onChange) {
+					onChange();
+				}
 
 				return true;
 			},

package/src/Components/Hoc/withPdfButton.js

@@ -42,7 +42,7 @@ export default function withPdfButton(WrappedComponent) {
 
 			} = props,
 			[isModalShown, setIsModalShown] = useState(false),
-			[width, height] = useAdjustedWindowSize(500, 800);
+			[width, height] = useAdjustedWindowSize(500, 800),
 			buildModalItems = () => {
 				const modalItems = _.map(_.cloneDeep(items), (item, ix) => buildNextLayer(item, ix, columnDefaults)); // clone, as we don't want to alter the item by reference
 
@@ -195,6 +195,7 @@ export default function withPdfButton(WrappedComponent) {
 									setIsModalShown(false);
 								}}
 								submitBtnLabel="View PDF"
+								useAdditionalEditButtons={false}
 							/>
 						</Column>
 					</Modal>;

package/src/Components/Hoc/withSelection.js

@@ -313,6 +313,7 @@ export default function withSelection(WrappedComponent) {
 		}, []);
 
 		if (self) {
+			self.selection = localSelection;
 			self.setSelection = setSelection;
 			self.selectNext = selectNext;
 			self.selectPrev = selectPrev;