@onehat/ui 0.3.351 → 0.3.353

package/package.json

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

package/src/Components/Grid/Grid.js

@@ -105,6 +105,7 @@ function GridComponent(props) {
 			flatListProps = {},
 			onRowPress,
 			onRender,
+			disableLoadOnRender = false,
 			forceLoadOnRender = false,
 			pullToRefresh = true,
 			hideNavColumn = true,
@@ -801,6 +802,10 @@ function GridComponent(props) {
 			}
 		};
 
+	if (forceLoadOnRender && disableLoadOnRender) {
+		throw new Error('incompatible config! forceLoadOnRender and disableLoadOnRender cannot both be true');
+	}
+
 	useEffect(() => {
 		if (!isInited) {
 			// first call -- meant to render placeholder so we get container dimensions
@@ -934,7 +939,7 @@ function GridComponent(props) {
 		applySelectorSelected();
 		Repository.resumeEvents();
 
-		if ((Repository.isRemote && !Repository.isLoaded) || forceLoadOnRender) {
+		if (((Repository.isRemote && !Repository.isLoaded) || forceLoadOnRender) && !disableLoadOnRender) { // default remote repositories to load on render, optionally force or disable load on render
 			Repository.load();
 		}
 

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) => {