@onehat/ui 0.3.10 → 0.3.11

package/package.json

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

package/src/Components/Editor/Editor.js

@@ -11,7 +11,7 @@ export default function Editor(props) {
 	const {
 			Form,
 			Viewer,
-			isEditorViewOnly: isViewOnly,
+			isEditorViewOnly,
 			onEditorCancel: onCancel,
 			onEditorSave: onSave,
 			onEditorClose: onClose,
@@ -36,7 +36,7 @@ export default function Editor(props) {
 		return <Viewer
 					{...props}
 					record={selection[0]}
-					onEditMode={isViewOnly ? null : onEditMode}
+					onEditMode={isEditorViewOnly ? null : onEditMode}
 					onClose={onClose}
 					onDelete={onDelete}
 				/>;

package/src/Components/Editor/Viewer.js

@@ -49,7 +49,7 @@ export default function Viewer(props) {
 						Element = getComponentFromType(type),
 						element = <Element
 										selectorId={selectorId}
-										selectorSelected={selectorId ? record : selectorSelected}
+										selectorSelected={selectorSelected || record}
 										flex={1}
 										{...propsToPass}
 									/>;

package/src/Components/Form/Form.js

@@ -81,7 +81,7 @@ function Form(props) {
 			Repository,
 			
 			// withEditor
-			isViewOnly = false,
+			isEditorViewOnly = false,
 			editorMode,
 			onCancel,
 			onSave,
@@ -299,7 +299,7 @@ function Form(props) {
 				label = propertyDef.title;
 			}
 
-			if (isViewOnly || !isEditable) {
+			if (isEditorViewOnly || !isEditable) {
 				const
 					Text = getComponentFromType('Text'),
 					value = (record && record[name]) || (startingValues && startingValues[name]) || null;
@@ -585,7 +585,7 @@ function Form(props) {
 						</Row>}
 					<Button.Group space={2} {...buttonGroupProps}>
 				
-						{!isViewOnly && <IconButton
+						{!isEditorViewOnly && <IconButton
 											key="resetBtn"
 											onPress={() => {
 												if (onReset) {
@@ -595,19 +595,19 @@ function Form(props) {
 											}}
 											icon={<Rotate color="#fff" />}
 										/>}
-						{!isViewOnly && onCancel && <Button
+						{!isEditorViewOnly && onCancel && <Button
 														key="cancelBtn"
 														variant="ghost"
 														onPress={onCancel}
 														color="#fff"
 													>Cancel</Button>}
-						{!isViewOnly && onSave && <Button
+						{!isEditorViewOnly && onSave && <Button
 														key="saveBtn"
 														onPress={(e) => handleSubmit(onSave, onSubmitError)(e)}
 														isDisabled={isSaveDisabled}
 														color="#fff"
 													>{editorMode === EDITOR_MODE__ADD ? 'Add' : 'Save'}</Button>}
-						{isViewOnly && onClose && <Button
+						{isEditorViewOnly && onClose && <Button
 														key="closeBtn"
 														onPress={onClose}
 														color="#fff"

package/src/Components/Hoc/withEditor.js

@@ -14,9 +14,9 @@ export default function withEditor(WrappedComponent, isTree = false) {
 
 		let [editorMode, setEditorMode] = useState(EDITOR_MODE__VIEW); // Can change below, so use 'let'
 		const {
-				useEditor = true,
 				userCanEdit = true,
 				userCanView = true,
+				canEditorViewOnly = false,
 				disableAdd = false,
 				disableEdit = false,
 				disableDelete = false,
@@ -50,7 +50,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			editorStateRef = useRef(),
 			[currentRecord, setCurrentRecord] = useState(null),
 			[isEditorShown, setIsEditorShown] = useState(false),
-			[isEditorViewOnly, setIsEditorViewOnly] = useState(false),
+			[isEditorViewOnly, setIsEditorViewOnly] = useState(canEditorViewOnly),
 			[lastSelection, setLastSelection] = useState(),
 			setSelectionDecorated = (newSelection) => {
 				function doIt() {
@@ -198,8 +198,8 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				setEditorMode(EDITOR_MODE__VIEW);
 				setIsEditorShown(true);
 
-				if (getListeners().onAfterDelete) {
-					await getListeners().onAfterDelete(entity);
+				if (getListeners().onAfterView) {
+					await getListeners().onAfterView(entity);
 				}
 			},
 			duplicateRecord = async () => {
@@ -279,8 +279,8 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				});
 			},
 			calculateEditorMode = () => {
-				let mode = EDITOR_MODE__VIEW;
-				if (userCanEdit) {
+				let mode = editorMode;
+				if (!canEditorViewOnly && userCanEdit) {
 					if (selection.length > 1) {
 						if (!disableEdit) {
 							// For multiple entities selected, change it to edit multiple mode
@@ -314,6 +314,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			// When selection changes, set the mode appropriately
 			const mode = calculateEditorMode();
 			setEditorMode(mode);
+
 			setLastSelection(selection);
 		}, [selection]);
 
@@ -345,7 +346,6 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					onEditorClose={onEditorClose}
 					setWithEditListeners={setListeners}
 					isEditor={true}
-					useEditor={useEditor}
 					userCanEdit={userCanEdit}
 					userCanView={userCanView}
 					disableAdd={disableAdd}

package/src/Components/Hoc/withInlineEditor.js

@@ -21,9 +21,8 @@ import _ from 'lodash';
 export default function withInlineEditor(WrappedComponent) {
 	return withEditor((props) => {
 		const {
-				useEditor = false,
 				editorType,
-				isEditorShown,
+				isEditorShown = false,
 				setIsEditorShown,
 				isEditorViewOnly,
 				onEditorCancel,
@@ -79,7 +78,7 @@ export default function withInlineEditor(WrappedComponent) {
 		}
 
 		let inlineEditor = null;
-		if (useEditor && Repository) {
+		if (Repository) {
 			inlineEditor = <>
 								{isEditorShown && <Box
 													ref={maskRef}
@@ -108,7 +107,7 @@ export default function withInlineEditor(WrappedComponent) {
 															record={selection[0]}
 															Repository={Repository}
 															isMultiple={selection.length > 1}
-															isViewOnly={isEditorViewOnly}
+															isEditorViewOnly={isEditorViewOnly}
 															columnsConfig={localColumnsConfig}
 															onCancel={onEditorCancel}
 															onSave={onEditorSave}

package/src/Components/Hoc/withPresetButtons.js

@@ -16,8 +16,8 @@ const presetButtons = [
 	'add',
 	'edit',
 	'delete',
-	'copy',
 	'view',
+	'copy',
 	'duplicate',
 	// 'print',
 ];
@@ -41,13 +41,14 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				// for local use
 				isEditor = false,
 				isTree = false,
-				useEditor = true,
+				isSideEditor = false,
+				canEditorViewOnly = false,
 				disableAdd = !isEditor,
 				disableEdit = !isEditor,
 				disableDelete = !isEditor,
 				disableView = !isGrid,
 				disableCopy = !isGrid,
-				disableDuplicate = !isGrid,
+				disableDuplicate = !isEditor,
 				disablePrint = !isGrid,
 
 				// withEditor
@@ -81,22 +82,22 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				let isDisabled = false;
 				switch(type) {
 					case 'add':
-						if (disableAdd || !useEditor) {
+						if (disableAdd || canEditorViewOnly) {
 							isDisabled = true;
 						}
 						break;
 					case 'edit':
-						if (disableEdit || !useEditor) {
+						if (disableEdit || canEditorViewOnly) {
 							isDisabled = true;
 						}
 						break;
 					case 'delete':
-						if (disableDelete || !useEditor) {
+						if (disableDelete || canEditorViewOnly) {
 							isDisabled = true;
 						}
 						break;
 					case 'view':
-						if (disableView) {
+						if (disableView || isSideEditor) {
 							isDisabled = true;
 						}
 						break;
@@ -106,7 +107,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						}
 						break;
 					case 'duplicate':
-						if (disableDuplicate || !useEditor) {
+						if (disableDuplicate || canEditorViewOnly) {
 							isDisabled = true;
 						}
 						break;

package/src/Components/Hoc/withSideEditor.js

@@ -21,6 +21,7 @@ export default function withSideEditor(WrappedComponent, isTree = false) {
 		return <Container
 					center={<WrappedComponent
 								isTree={isTree}
+								isSideEditor={true}
 								{...props}
 							/>}
 					east={<Editor

package/src/Components/Hoc/withWindowedEditor.js

@@ -28,8 +28,7 @@ import _ from 'lodash';
 export default function withWindowedEditor(WrappedComponent, isTree = false) {
 	return withEditor((props) => {
 		const {
-				useEditor = false,
-				isEditorShown,
+				isEditorShown = false,
 				setIsEditorShown,
 				Editor,
 				editorProps = {},
@@ -41,7 +40,7 @@ export default function withWindowedEditor(WrappedComponent, isTree = false) {
 
 		return <>
 					<WrappedComponent {...props} />
-					{useEditor && isEditorShown && 
+					{isEditorShown && 
 						<Modal
 							isOpen={true}
 							onClose={() => setIsEditorShown(false)}