@onehat/ui 0.3.350 → 0.3.352

package/package.json

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

package/src/Components/Form/Form.js

@@ -794,7 +794,7 @@ function Form(props) {
 			doReset(defaultValues);
 		}
 		if (formSetup) {
-			formSetup(formSetValue, formGetValues, formState)
+			formSetup(formSetValue, formGetValues, formState);
 		}
 	}, [record]);
 

package/src/Components/Hoc/withPdfButtons.js

@@ -58,6 +58,27 @@ export default function withPdfButtons(WrappedComponent) {
 			buildModalItems = () => {
 				const modalItems = _.map(_.cloneDeep(items), (item, ix) => buildNextLayer(item, ix, columnDefaults)); // clone, as we don't want to alter the item by reference
 
+				// remove additionalEditButtons from the modal
+				function walkTreeToDeleteAdditionalEditButtons(item) {
+					if (!item) {
+						return;
+					}
+
+					let {
+							additionalEditButtons,
+							items,
+						} = item;
+					if (!_.isEmpty(items)) {
+						_.each(items, (item) => {
+							walkTreeToDeleteAdditionalEditButtons(item);
+						});
+					}
+					if (additionalEditButtons) {
+						delete item.additionalEditButtons;
+					}
+				}
+				_.each(modalItems, walkTreeToDeleteAdditionalEditButtons);
+
 				if (!_.isEmpty(ancillaryItems)) {
 					const
 						ancillaryItemsClone = _.cloneDeep(ancillaryItems),
@@ -144,7 +165,7 @@ export default function withPdfButtons(WrappedComponent) {
 			},
 			getStartingValues = (modalItems) => {
 				const startingValues = {};
-				function walkTree(item) {
+				function walkTreeToSetStartingValues(item) {
 					if (!item) {
 						return;
 					}
@@ -155,14 +176,14 @@ export default function withPdfButtons(WrappedComponent) {
 						} = item;
 					if (!_.isEmpty(items)) {
 						_.each(items, (item) => {
-							walkTree(item);
+							walkTreeToSetStartingValues(item);
 						});
 					}
 					if (name) {
 						startingValues[name] = true;
 					}
 				}
-				_.each(modalItems, walkTree);
+				_.each(modalItems, walkTreeToSetStartingValues);
 				return startingValues;
 			},
 			onChooseFields = (userWantsToEmail = false) => {

package/src/Components/Viewer/Viewer.js

@@ -1,4 +1,4 @@
-import { useRef, useState, } from 'react';
+import { useEffect, useRef, useState, } from 'react';
 import {
 	Column,
 	Icon,
@@ -37,7 +37,8 @@ function Viewer(props) {
 			record,
 			additionalViewButtons,
 			canRecordBeEdited,
-
+			viewerSetup, // this fn will be executed after the viewer setup is complete
+		
 			// withComponent
 			self,
 
@@ -235,6 +236,12 @@ function Viewer(props) {
 			setContainerWidth(e.nativeEvent.layout.width);
 		};
 
+	useEffect(() => {
+		if (viewerSetup && record?.getSubmitValues) {
+			viewerSetup(record.getSubmitValues());
+		}
+	}, [record]);
+	
 	if (self) {
 		self.ref = scrollViewRef;
 	}