@onehat/ui 0.4.29 → 0.4.31

package/package.json

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

package/src/Components/Form/Form.js

@@ -1357,7 +1357,7 @@ function Form(props) {
 								web:min-h-[${minHeight}px]
 							`}
 							contentContainerStyle={{
-								height: '100%',
+								// height: '100%',
 							}}
 						>
 							{modeHeader}

package/src/Components/Hoc/withPresetButtons.js

@@ -72,7 +72,8 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				disableCopy = !isGrid,
 				disableDuplicate = !isEditor,
 				disablePrint = !isGrid,
-
+				protectedValues, // records with these values cannot be edited or deleted
+			
 				// withAlert
 				showInfo,
 
@@ -178,6 +179,25 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				}
 				return isDisabled;
 			},
+			isNoSelectorSelected = () => {
+				return selectorId && !selectorSelected;
+			},
+			isEmptySelection = () => {
+				return _.isEmpty(selection);
+			},
+			isMultiSelection = () => {
+				return _.isArray(selection) && selection.length > 1;
+			},
+			isProtectedValue = () => {
+				if (!protectedValues) {
+					return false;
+				}
+				const value = selection[0]?.id;
+				if (_.isNil(value)) {
+					return false;
+				}
+				return inArray(value, protectedValues);
+			},
 			getPresetButtonProps = (type) => {
 				let key,
 					text,
@@ -190,10 +210,9 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						text = 'Add';
 						handler = (parent, e) => onAdd();
 						icon = Plus;
-						if (selectorId && !selectorSelected) {
-							isDisabled = true;
-						}
-						if (isTree && _.isEmpty(selection)) {
+						if (isNoSelectorSelected() ||
+							(isTree && isEmptySelection())
+						) {
 							isDisabled = true;
 						}
 						break;
@@ -202,13 +221,12 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						text = 'Edit';
 						handler = (parent, e) => onEdit();
 						icon = Edit;
-						if (selectorId && !selectorSelected) {
-							isDisabled = true;
-						}
-						if (_.isEmpty(selection) || (_.isArray(selection) && selection.length > 1)) {
-							isDisabled = true;
-						}
-						if (canRecordBeEdited && !canRecordBeEdited(selection)) {
+						if (isNoSelectorSelected() ||
+							isEmptySelection() ||
+							isMultiSelection() ||
+							isProtectedValue() ||
+							(canRecordBeEdited && !canRecordBeEdited(selection))
+						) {
 							isDisabled = true;
 						}
 						break;
@@ -218,13 +236,12 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						handler = onDelete;
 						handler = (parent, e) => onDelete();
 						icon = Trash;
-						if (selectorId && !selectorSelected) {
-							isDisabled = true;
-						}
-						if (_.isEmpty(selection) || (_.isArray(selection) && selection.length > 1)) {
-							isDisabled = true;
-						}
-						if (canRecordBeDeleted && !canRecordBeDeleted(selection)) {
+						if (isNoSelectorSelected() ||
+							isEmptySelection() ||
+							isMultiSelection() ||
+							isProtectedValue() ||
+							(canRecordBeEdited && !canRecordBeEdited(selection))
+						) {
 							isDisabled = true;
 						}
 						if (isTree) {
@@ -240,10 +257,10 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						handler = (parent, e) => onView();
 						icon = Eye;
 						isDisabled = !selection.length || selection.length !== 1;
-						if (selectorId && !selectorSelected) {
-							isDisabled = true;
-						}
-						if (_.isEmpty(selection) || selection.length > 1) {
+						if (isNoSelectorSelected() ||
+							isEmptySelection() ||
+							isMultiSelection()
+						) {
 							isDisabled = true;
 						}
 						break;
@@ -253,10 +270,9 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						handler = (parent, e) => onCopyToClipboard();
 						icon = Clipboard;
 						isDisabled = !selection.length;
-						if (selectorId && !selectorSelected) {
-							isDisabled = true;
-						}
-						if (_.isEmpty(selection)) {
+						if (isNoSelectorSelected() ||
+							isEmptySelection()
+						) {
 							isDisabled = true;
 						}
 						break;
@@ -266,13 +282,11 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						handler = (parent, e) => onDuplicate();
 						icon = Duplicate;
 						isDisabled = !selection.length || selection.length !== 1;
-						if (selectorId && !selectorSelected) {
-							isDisabled = true;
-						}
-						if (_.isEmpty(selection) || selection.length > 1) {
-							isDisabled = true;
-						}
-						if (canRecordBeDuplicated && !canRecordBeDuplicated(selection)) {
+						if (isNoSelectorSelected() ||
+							isEmptySelection() ||
+							isMultiSelection() ||
+							(canRecordBeDuplicated && !canRecordBeDuplicated(selection))
+						) {
 							isDisabled = true;
 						}
 						break;