@onehat/ui 0.3.253 → 0.3.256

package/package.json

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

package/src/Components/Grid/Grid.js

@@ -209,8 +209,7 @@ function GridComponent(props) {
 		[isReady, setIsReady] = useState(false),
 		[isLoading, setIsLoading] = useState(false),
 		[localColumnsConfig, setLocalColumnsConfigRaw] = useState([]),
-		[isDragMode, setIsDragMode] = useState(false),
-		[dragRow, setDragRow] = useState(),
+		[isReorderMode, setIsReorderMode] = useState(false),
 		[isColumnSelectorShown, setIsColumnSelectorShown] = useState(false),
 		getIsExpanded = (index) => {
 			return !!expandedRowsRef.current[index];
@@ -309,8 +308,8 @@ function GridComponent(props) {
 					key="reorderBtn"
 					parent={self}
 					reference="reorderBtn"
-					onPress={() => setIsDragMode(!isDragMode)}
-					icon={<Icon as={isDragMode ? NoReorderRows : ReorderRows} color={styles.GRID_TOOLBAR_ITEMS_COLOR} />}
+					onPress={() => setIsReorderMode(!isReorderMode)}
+					icon={<Icon as={isReorderMode ? NoReorderRows : ReorderRows} color={styles.GRID_TOOLBAR_ITEMS_COLOR} />}
 					tooltip="Reorder Rows"
 				/>);
 			}
@@ -339,7 +338,7 @@ function GridComponent(props) {
 						if (e.preventDefault && e.cancelable) {
 							e.preventDefault();
 						}
-						if (isHeaderRow || isDragMode) {
+						if (isHeaderRow || isReorderMode) {
 							return
 						}
 						if (CURRENT_MODE === UI_MODE_WEB) {
@@ -383,7 +382,7 @@ function GridComponent(props) {
 						if (e.preventDefault && e.cancelable) {
 							e.preventDefault();
 						}
-						if (isHeaderRow || isDragMode) {
+						if (isHeaderRow || isReorderMode) {
 							return
 						}
 						
@@ -454,7 +453,7 @@ function GridComponent(props) {
 							const getSelection = () => dragSelectionRef.current;
 
 							// assign event handlers
-							if (canRowsReorder && isDragMode) {
+							if (canRowsReorder && isReorderMode) {
 								WhichRow = DragSourceGridRow;
 								rowReorderProps.isDragSource = true;
 								rowReorderProps.dragSourceType = 'row';
@@ -691,7 +690,7 @@ function GridComponent(props) {
 			if (CURRENT_MODE !== UI_MODE_WEB) { // TODO: Remove this conditional, and don't even do the double render for RN
 				return;
 			}
-			if (!Repository) {
+			if (!Repository || Repository.isDestroyed) { // This method gets delayed, so it's possible for Repository to have been destroyed. Check for this
 				return;
 			}
 
@@ -894,7 +893,7 @@ function GridComponent(props) {
 
 	isAddingRef.current = isAdding;
 
-	const footerToolbarItemComponents = useMemo(() => getFooterToolbarItems(), [Repository?.hash, additionalToolbarButtons, isDragMode]);
+	const footerToolbarItemComponents = useMemo(() => getFooterToolbarItems(), [Repository?.hash, additionalToolbarButtons, isReorderMode]);
 
 	if (!isInited) {
 		// first time through, render a placeholder so we can get container dimensions
@@ -1000,7 +999,7 @@ function GridComponent(props) {
 	}
 
 	const gridContainerBorderProps = {};
-	if (isDragMode) {
+	if (isReorderMode) {
 		gridContainerBorderProps.borderWidth = styles.REORDER_BORDER_WIDTH;
 		gridContainerBorderProps.borderColor = styles.REORDER_BORDER_COLOR;
 		gridContainerBorderProps.borderStyle = styles.REORDER_BORDER_STYLE;
@@ -1056,7 +1055,7 @@ function GridComponent(props) {
 					minHeight={40}
 					{...gridContainerBorderProps}
 					onClick={() => {
-						if (!isDragMode && !isInlineEditorShown && deselectAll) {
+						if (!isReorderMode && !isInlineEditorShown && deselectAll) {
 							deselectAll();
 						}
 					}}

package/src/Components/Hoc/Secondary/withSecondaryEditor.js

@@ -483,7 +483,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 							if (_.isPlainObject(val1)) {
 								for (let key2 in val1) { if (val1.hasOwnProperty(key2)) {
 									const val2 = val1[key2];
-									msg += "\n" + val2;
+									msg += "\n" + key + ': ' + val2;
 								} }
 							} else if (_.isString(data)) {
 								msg += "\n" + data;

package/src/Components/Hoc/withEditor.js

@@ -492,7 +492,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 							if (_.isPlainObject(val1)) {
 								for (let key2 in val1) { if (val1.hasOwnProperty(key2)) {
 									const val2 = val1[key2];
-									msg += "\n" + val2;
+									msg += "\n" + key + ': ' + val2;
 								} }
 							} else if (_.isString(data)) {
 								msg += "\n" + data;

package/src/Components/Screens/Manager.js

@@ -83,41 +83,38 @@ function ManagerScreen(props) {
 	}
 
 	return <Column maxHeight="100vh" overflow="hidden" flex={1} w="100%" onLayout={onLayout}>
-				{isRendered && isModeSet &&
-					<>
-						<Row
-							h="80px"
-							py={2}
-							borderBottomWidth={2}
-							borderBottomColor="#ccc"
-						>
-							<Text p={4} fontSize="26" fontWeight={700} {...textProps}>{title}</Text>
-							{allowSideBySide &&
-								<>
-									<IconButton
-										icon={FullWidth}
-										_icon={{
-											size: '25px',
-											color: mode === MODE_FULL ? 'primary.100' : '#000',
-										}}
-										disabled={mode === MODE_FULL}
-										onPress={() => setMode(MODE_FULL)}
-										tooltip="Full Width"
-									/>
-									<IconButton
-										icon={SideBySide}
-										_icon={{
-											size: '25px',
-											color: mode === MODE_SIDE ? 'primary.100' : '#000',
-										}}
-										disabled={mode === MODE_SIDE}
-										onPress={() => setMode(MODE_SIDE)}
-										tooltip="Side Editor"
-									/>
-								</>}
-						</Row>
-						{whichComponent}
-					</>}
+				<Row
+					h="80px"
+					py={2}
+					borderBottomWidth={2}
+					borderBottomColor="#ccc"
+				>
+					<Text p={4} fontSize="26" fontWeight={700} {...textProps}>{title}</Text>
+					{allowSideBySide &&
+						<>
+							<IconButton
+								icon={FullWidth}
+								_icon={{
+									size: '25px',
+									color: mode === MODE_FULL ? 'primary.100' : '#000',
+								}}
+								disabled={mode === MODE_FULL}
+								onPress={() => setMode(MODE_FULL)}
+								tooltip="Full Width"
+							/>
+							<IconButton
+								icon={SideBySide}
+								_icon={{
+									size: '25px',
+									color: mode === MODE_SIDE ? 'primary.100' : '#000',
+								}}
+								disabled={mode === MODE_SIDE}
+								onPress={() => setMode(MODE_SIDE)}
+								tooltip="Side Editor"
+							/>
+						</>}
+				</Row>
+				{isRendered && isModeSet && whichComponent}
 			</Column>;
 }