@onehat/ui 0.3.11 → 0.3.13

package/package.json

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

package/src/Components/Editor/Editor.js

@@ -29,10 +29,10 @@ export default function Editor(props) {
 
 	if (_.isEmpty(selection)) {
 		return null; // hide the editor when no selection
-		return <Box {...props} bg="#ddd" />;
 	}
 
-	if (Repository?.isRemotePhantomMode && selection.length === 1 && editorMode === EDITOR_MODE__VIEW) {
+	// Repository?.isRemotePhantomMode && selection.length === 1 && 
+	if (editorMode === EDITOR_MODE__VIEW) {
 		return <Viewer
 					{...props}
 					record={selection[0]}

package/src/Components/Editor/Viewer.js

@@ -6,6 +6,9 @@ import {
 	Row,
 	Text,
 } from 'native-base';
+import {
+	EDITOR_TYPE__SIDE,
+} from '../../Constants/Editor.js';
 import UiGlobals from '../../UiGlobals.js';
 import getComponentFromType from '../../Functions/getComponentFromType.js';
 import Label from '../Form/Label.js';
@@ -29,10 +32,12 @@ export default function Viewer(props) {
 			selectorSelected,
 
 			// withEditor
+			editorType,
 			onEditMode,
 			onClose,
 			onDelete,
 		} = props,
+		isSideEditor = editorType === EDITOR_TYPE__SIDE,
 		styles = UiGlobals.styles,
 		flex = props.flex || 1,
 		buildAncillary = () => {
@@ -45,12 +50,17 @@ export default function Viewer(props) {
 						selectorId = null,
 						...propsToPass
 					} = item;
+					if (!propsToPass.h) {
+						propsToPass.h = 400;
+					}
 					const
 						Element = getComponentFromType(type),
 						element = <Element
 										selectorId={selectorId}
 										selectorSelected={selectorSelected || record}
 										flex={1}
+										h={350}
+										canEditorViewOnly={true}
 										{...propsToPass}
 									/>;
 					if (title) {
@@ -65,6 +75,10 @@ export default function Viewer(props) {
 			return components;
 		};
 
+	const
+		showDeleteBtn = onDelete && viewerCanDelete,
+		showCloseBtn = !isSideEditor;
+
 	return <Column flex={flex} {...props}>
 				<ScrollView width="100%" _web={{ height: 1 }}>
 					<Column m={2}>
@@ -88,26 +102,28 @@ export default function Viewer(props) {
 
 					</Column>
 				</ScrollView>
-				<Footer justifyContent="flex-end">
-					{onDelete && viewerCanDelete && 
-						<Row flex={1} justifyContent="flex-start">
-							<Button
-								key="deleteBtn"
-								onPress={onDelete}
-								bg="warning"
-								_hover={{
-									bg: 'warningHover',
-								}}
-								color="#fff"
-							>Delete</Button>
-						</Row>}
-					<Button.Group space={2}>
-						<Button
-							key="closeBtn"
-							onPress={onClose}
-							color="#fff"
-						>Close</Button>
-					</Button.Group>
-				</Footer>
+				{(showDeleteBtn || showCloseBtn) && 
+					<Footer justifyContent="flex-end">
+						{showDeleteBtn && 
+							<Row flex={1} justifyContent="flex-start">
+								<Button
+									key="deleteBtn"
+									onPress={onDelete}
+									bg="warning"
+									_hover={{
+										bg: 'warningHover',
+									}}
+									color="#fff"
+								>Delete</Button>
+							</Row>}
+						{showCloseBtn && 
+							<Button.Group space={2}>
+								<Button
+									key="closeBtn"
+									onPress={onClose}
+									color="#fff"
+								>Close</Button>
+							</Button.Group>}
+					</Footer>}
 			</Column>;
 }

package/src/Components/Form/Field/Combo/Combo.js

@@ -34,7 +34,7 @@ export function ComboComponent(props) {
 			tooltip = null,
 			menuMinWidth = 150,
 			disableDirectEntry = false,
-			disablePagination = true,
+			disablePagination = false,
 			hideMenuOnSelection = true,
 			_input = {},
 			isEditor = false,
@@ -90,16 +90,12 @@ export function ComboComponent(props) {
 					if (rectTop !== top) {
 						setTop(rectTop);
 					}
-					setHeight(null);
 				} else {
 					// Menu is above the combo
-
-					const rectTop = rect.top -200;
+					const rectTop = rect.top - styles.FORM_COMBO_MENU_HEIGHT;
 					if (rectTop !== top) {
 						setTop(rectTop);
 					}
-
-					setHeight(200);
 				}
 				if (rect.left !== left) {
 					setLeft(rect.left);
@@ -489,14 +485,12 @@ export function ComboComponent(props) {
 										top={top + 'px'}
 										left={left + 'px'}
 										w={width + 'px'}
-										h={height ? height + 'px' : null}
 										minWidth={menuMinWidth}
 										overflow="auto"
 										bg="#fff"
 									>
 										<Popover.Body
 											ref={menuRef}
-											maxHeight={200}
 											borderWidth={1}
 											borderColor='trueGray.400'
 											borderTopWidth={0}
@@ -505,8 +499,6 @@ export function ComboComponent(props) {
 											<WhichGrid
 												showHeaders={false}
 												showHovers={true}
-												pageSize={100}
-												disableAdjustingPageSizeToHeight={true}
 												shadow={1}
 												getRowProps={() => {
 													return {
@@ -519,6 +511,7 @@ export function ComboComponent(props) {
 													};
 												}}
 												{...props}
+												h={styles.FORM_COMBO_MENU_HEIGHT + 'px'}
 												disablePresetButtons={!isEditor}
 												disablePagination={disablePagination}
 												setSelection={(selection) => {

package/src/Components/Form/Form.js

@@ -102,6 +102,7 @@ function Form(props) {
 		isMultiple = _.isArray(record),
 		isSingle = !isMultiple, // for convenience
 		forceUpdate = useForceUpdate(),
+		[previousRecord, setPreviousRecord] = useState(record),
 		initialValues =  _.merge(startingValues, (record && !record.isDestroyed ? record.submitValues : {})),
 		defaultValues = isMultiple ? getNullFieldValues(initialValues, Repository) : initialValues, // when multiple entities, set all default values to null
 		{
@@ -420,6 +421,9 @@ function Form(props) {
 						selectorId,
 						...propsToPass
 					} = item;
+					if (!propsToPass.h) {
+						propsToPass.h = 400;
+					}
 					const
 						Element = getComponentFromType(type),
 						element = <Element
@@ -444,8 +448,23 @@ function Form(props) {
 			if (editorType === EDITOR_TYPE__INLINE) {
 				alert(errors.message);
 			}
+		},
+		onSaveDecorated = async (data, e) => {
+			// reset the form after a save
+			const result = await onSave(data, e);
+			if (result) {
+				const values = record.submitValues;
+				reset(values);
+			}
 		};
 
+	useEffect(() => {
+		if (record !== previousRecord) {
+			setPreviousRecord(record);
+			reset(defaultValues);
+		}
+	}, [record]);
+
 	useEffect(() => {
 		if (!Repository) {
 			return () => {};
@@ -603,11 +622,11 @@ function Form(props) {
 													>Cancel</Button>}
 						{!isEditorViewOnly && onSave && <Button
 														key="saveBtn"
-														onPress={(e) => handleSubmit(onSave, onSubmitError)(e)}
+														onPress={(e) => handleSubmit(onSaveDecorated, onSubmitError)(e)}
 														isDisabled={isSaveDisabled}
 														color="#fff"
 													>{editorMode === EDITOR_MODE__ADD ? 'Add' : 'Save'}</Button>}
-						{isEditorViewOnly && onClose && <Button
+						{isEditorViewOnly && onClose && editorType !== EDITOR_TYPE__SIDE && <Button
 														key="closeBtn"
 														onPress={onClose}
 														color="#fff"

package/src/Components/Grid/Grid.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef, useMemo, } from 'react';
+import React, { useState, useEffect, useRef, useMemo, useCallback, } from 'react';
 import {
 	Column,
 	FlatList,
@@ -104,6 +104,7 @@ function GridComponent(props) {
 			onDuplicate,
 			onReset,
 			onContextMenu,
+			isAdding,
 
 			// withData
 			Repository,
@@ -141,6 +142,7 @@ function GridComponent(props) {
 		styles = UiGlobals.styles,
 		forceUpdate = useForceUpdate(),
 		gridRef = useRef(),
+		isAddingRef = useRef(),
 		[isReady, setIsReady] = useState(false),
 		[isLoading, setIsLoading] = useState(false),
 		[localColumnsConfig, setLocalColumnsConfigRaw] = useState([]),
@@ -616,41 +618,34 @@ function GridComponent(props) {
 			setDragRowSlot(null);
 		},
 		onLayout = (e) => {
-			if (disableAdjustingPageSizeToHeight || !Repository) {
+			if (disableAdjustingPageSizeToHeight || !Repository || CURRENT_MODE !== UI_MODE_WEB || !gridRef.current || isAddingRef.current) {
 				return;
 			}
-			const {
-					nativeEvent: {
-						layout,
-						target,
-					},
-				} = e;
-			let pageSize;
-			if (CURRENT_MODE === UI_MODE_WEB) {
-				const
-					targetBoundingBox = target.getBoundingClientRect(),
-					targetHeight = targetBoundingBox.height,
-					firstRow = target.children[0]?.children[0]?.children[0]?.children[0]?.children[0];
-				if (firstRow) {
-					const
-						rowBoundingBox = firstRow.getBoundingClientRect(),
-						rowHeight = rowBoundingBox.height,
-						rowsPerTarget = Math.floor(targetHeight / rowHeight);
-					pageSize = rowsPerTarget;
-					if (showHeaders) {
-						pageSize--;
-					}
-					if (bottomToolbar) {
-						pageSize--;
-					}
-				}
+
+			const
+				gr = gridRef.current,
+				scrollableNode = gr.getScrollableNode(),
+				scrollableNodeBoundingBox = scrollableNode.getBoundingClientRect(),
+				scrollableNodeHeight = scrollableNodeBoundingBox.height,
+				firstRow = scrollableNode.children[0].children[showHeaders ? 1: 0];
+
+			if (!firstRow) {
+				return;
 			}
-			
-			if (pageSize) {
+
+			const
+				rowHeight = firstRow.getBoundingClientRect().height,
+				rowsPerContainer = Math.floor(scrollableNodeHeight / rowHeight);
+			let pageSize = rowsPerContainer;
+			if (showHeaders) {
+				pageSize--;
+			}
+			if (pageSize !== Repository.pageSize) {
 				Repository.setPageSize(pageSize);
 			}
-		};
-		
+		},
+		debouncedOnLayout = useCallback(_.debounce(onLayout, 500), []);
+
 	useEffect(() => {
 
 		const calculateLocalColumnsConfig = () => {
@@ -778,6 +773,9 @@ function GridComponent(props) {
 
 	}, [selectorId, selectorSelected]);
 
+
+	isAddingRef.current = isAdding;
+
 	const footerToolbarItemComponents = useMemo(() => getFooterToolbarItems(), [additionalToolbarButtons, isDragMode]);
 
 	if (!isReady) {
@@ -811,18 +809,19 @@ function GridComponent(props) {
 	} else {
 		sizeProps.flex = flex ?? 1;
 	}
+
 	return <Column
 				{...testProps('Grid')}
 				w="100%"
 				bg={bg}
 				borderWidth={styles.GRID_BORDER_WIDTH}
 				borderColor={styles.GRID_BORDER_COLOR}
-				onLayout={onLayout}
+				onLayout={debouncedOnLayout}
 				{...sizeProps}
 			>
 				{topToolbar}
 
-				<Column w="100%" flex={1} borderTopWidth={isLoading ? 2 : 1} borderTopColor={isLoading ? '#f00' : 'trueGray.300'} onClick={() => {
+				<Column w="100%" flex={1} minHeight={40} borderTopWidth={isLoading ? 2 : 1} borderTopColor={isLoading ? '#f00' : 'trueGray.300'} onClick={() => {
 					if (!isDragMode && !isInlineEditorShown) {
 						deselectAll();
 					}

package/src/Components/Hoc/withEditor.js

@@ -16,7 +16,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 		const {
 				userCanEdit = true,
 				userCanView = true,
-				canEditorViewOnly = false,
+				canEditorViewOnly = false, // whether the editor can *ever* change state out of 'View' mode
 				disableAdd = false,
 				disableEdit = false,
 				disableDelete = false,
@@ -49,8 +49,9 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			listeners = useRef({}),
 			editorStateRef = useRef(),
 			[currentRecord, setCurrentRecord] = useState(null),
+			[isAdding, setIsAdding] = useState(false),
 			[isEditorShown, setIsEditorShown] = useState(false),
-			[isEditorViewOnly, setIsEditorViewOnly] = useState(canEditorViewOnly),
+			[isEditorViewOnly, setIsEditorViewOnly] = useState(canEditorViewOnly), // current state of whether editor is in view-only mode
 			[lastSelection, setLastSelection] = useState(),
 			setSelectionDecorated = (newSelection) => {
 				function doIt() {
@@ -71,7 +72,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				// forceUpdate(); // we don't want to get into an infinite loop of renders. Simply directly assign the listeners in every child render
 			},
 			onAdd = async () => {
-				const defaultValues = Repository.getSchema().model.defaultValues;
+				const defaultValues = Repository.getSchema().getDefaultValues();
 				let addValues = _.clone(defaultValues);
 
 				if (selectorId && !_.isEmpty(selectorSelected)) {
@@ -105,6 +106,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				// Unmap the values, so we can input true originalData
 				addValues = Repository.unmapData(addValues);
 
+				setIsAdding(true);
 				const entity = await Repository.add(addValues, false, true);
 				setSelection([entity]);
 				setIsEditorViewOnly(false);
@@ -245,11 +247,15 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				}
 
 				await Repository.save();
+
+				setIsAdding(false);
 				setIsEditorShown(false);
 				
 				if (getListeners().onAfterEdit) {
 					await getListeners().onAfterEdit(what);
 				}
+
+				return true;
 			},
 			onEditorCancel =  () => {
 				async function doIt() {
@@ -259,6 +265,8 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					if (isSingle && isPhantom) {
 						await deleteRecord();
 					}
+					
+					setIsAdding(false);
 					setEditorMode(EDITOR_MODE__VIEW);
 					setIsEditorShown(false);
 				}
@@ -330,6 +338,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					setCurrentRecord={setCurrentRecord}
 					isEditorShown={isEditorShown}
 					isEditorViewOnly={isEditorViewOnly}
+					isAdding={isAdding}
 					editorMode={editorMode}
 					onEditMode={onEditMode}
 					onViewMode={onViewMode}

package/src/Components/Hoc/withPresetButtons.js

@@ -62,7 +62,6 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 
 				// withSelection
 				selection,
-				setSelection,
 
 				// parent container
 				selectorId,
@@ -87,7 +86,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						}
 						break;
 					case 'edit':
-						if (disableEdit || canEditorViewOnly) {
+						if (disableEdit || canEditorViewOnly || isSideEditor) {
 							isDisabled = true;
 						}
 						break;
@@ -251,7 +250,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				}
 	
 				// Send it to clipboard
-				navigator.clipboard.writeText(text);
+				navigator?.clipboard.writeText(text);
 			};
 			// onPrint = () => {
 			// 	debugger;

package/src/Components/Hoc/withSelection.js

@@ -213,7 +213,7 @@ export default function withSelection(WrappedComponent) {
 					setValue(localValue);
 				}
 			},
-			conformSelectionToValue = () => {
+			conformSelectionToValue = async () => {
 				// adjust the selection to match the value
 				let newSelection = [];
 				if (Repository) {
@@ -222,9 +222,20 @@ export default function withSelection(WrappedComponent) {
 						if (_.isArray(value)) {
 							newSelection = Repository.getBy((entity) => inArray(entity.id, value));
 						} else {
-							const found = Repository.getById(value);
+							let found = Repository.getById(value);
 							if (found) {
 								newSelection.push(found);
+							} else if (Repository?.isRemote && Repository?.entities.length) {
+
+								// Value cannot be found in Repository, but actually exists on server
+								// Try to get this value from the server directly
+								Repository.filter(Repository.schema.model.idProperty, value);
+								await Repository.load();
+								found = Repository.getById(value);
+								if (found) {
+									newSelection.push(found);
+								}
+
 							}
 						}
 					}
@@ -270,7 +281,7 @@ export default function withSelection(WrappedComponent) {
 
 				if (usesWithValue && !_.isNil(value)) {
 
-					conformSelectionToValue();
+					await conformSelectionToValue();
 
 				} else if (autoSelectFirstItem) {
 					let newSelection = [];

package/src/Components/Panel/Panel.js

@@ -9,6 +9,7 @@ import {
 	HORIZONTAL,
 	VERTICAL,
 } from '../../Constants/Directions.js';
+import Inflector from 'inflector-js';
 import Header from './Header.js';
 import Mask from './Mask.js';
 import withCollapsible from '../Hoc/withCollapsible.js';
@@ -33,7 +34,7 @@ function Panel(props) {
 			onLayout = null,
 			
 			// Header
-			title = props.model,
+			title = Inflector.humanize(Inflector.underscore(props.model)),
 			showHeader = true,
 			header = null,
 			isClosable = false,

package/src/Components/Screens/Manager.js

@@ -60,7 +60,7 @@ export default function ManagerScreen(props) {
 		whichComponent = sideModeComponent;
 	}
 
-	return <Column flex={1} w="100%">
+	return <Column maxHeight="100vh" overflow="hidden" flex={1} w="100%">
 				<Row
 					h="80px"
 					py={2}
@@ -89,6 +89,8 @@ export default function ManagerScreen(props) {
 						tooltip="Side Editor"
 					/>
 				</Row>
+
 				{whichComponent}
+
 			</Column>;
 }

package/src/Constants/Styles.js

@@ -16,6 +16,7 @@ const defaults = {
 	FORM_COMBO_INPUT_FONTSIZE: DEFAULT_FONTSIZE,
 	FORM_COMBO_INPUT_BG: WHITE,
 	FORM_COMBO_INPUT_FOCUS_BG: FOCUS,
+	FORM_COMBO_MENU_HEIGHT: 250,
 	FORM_COMBO_TRIGGER_BG: WHITE,
 	FORM_COMBO_TRIGGER_HOVER_BG: 'trueGray.300',
 	FORM_DATE_ICON_BG: 'primary.200',

package/src/PlatformImports/Web/Attachments.js

@@ -49,7 +49,7 @@ function AttachmentsElement(props) {
 
 		} = props,
 		styles = UiGlobals.styles,
-		model = selectorSelected?.repository.name,
+		model = selectorSelected?.repository?.name,
 		modelid = selectorSelected?.id,
 		[isReady, setIsReady] = useState(false),
 		[isUploading, setIsUploading] = useState(false),