@onehat/ui 0.2.54 → 0.2.55

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.2.54",
+	"version": "0.2.55",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",
@@ -19,7 +19,7 @@
 	},
 	"license": "UNLICENSED",
 	"dependencies": {
-		"@onehat/data": "^1.16.10",
+		"@onehat/data": "^1.17.0",
 		"@hookform/resolvers": "^2.9.11",
 		"@k-renwick/colour-mixer": "^1.2.1",
 		"ckeditor5-custom-build": "file:ckeditor5",

package/src/Components/Editor/Editor.js

@@ -27,7 +27,7 @@ export default function Editor(props) {
 		onEditMode = () => {
 			setEditorMode(EDITOR_MODE__EDIT);
 		},
-		onBack = () => {
+		onViewMode = () => {
 			setEditorMode(EDITOR_MODE__VIEW);
 		};
 
@@ -49,7 +49,7 @@ export default function Editor(props) {
 
 	return <Form
 				record={selection}
-				onBack={onBack}
+				onViewMode={onViewMode}
 				onCancel={onCancel}
 				onSave={onSave}
 				onClose={onClose}

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

@@ -147,16 +147,16 @@ function FileElement(props) {
 			setIsDropping(false);
 		};
 
-	useEffect(() => {
-		const {
-				dataUri,
-				control,
-				filename,
-			} = value;
-		setLocalDataUri(localDataUri);
-		setLocalControl(localControl);
-		setLocalFilename(localFilename);
-	}, []);
+	// useEffect(() => {
+	// 	const {
+	// 			dataUri,
+	// 			control,
+	// 			filename,
+	// 		} = value;
+	// 	setLocalDataUri(dataUri);
+	// 	setLocalControl(control);
+	// 	setLocalFilename(filename);
+	// }, []);
 
 	if (CURRENT_MODE === UI_MODE_REACT_NATIVE) {
 		throw new Error('Not yet implemented for RN.');

package/src/Components/Form/Form.js

@@ -282,14 +282,10 @@ function Form(props) {
 				});
 				return <Element key={ix} title={title} {...defaults} {...propsToPass} {...editorTypeProps}>{children}</Element>;
 			}
-			
-			if (!name) {
-				throw new Error('name is required');
-			}
 
 			if (isViewOnly || !isEditable) {
 				const Text = getComponentFromType('Text');
-				if (!label && Repository) {
+				if (!label && Repository && model.titles?.[name]) {
 					label = model.titles[name];
 				}
 				const value = (record && record[name]) || (startingValues && startingValues[name]) || null;
@@ -307,7 +303,7 @@ function Form(props) {
 				return <Row key={ix} px={2} pb={1}>{element}</Row>;
 			}
 
-			if (!label && Repository) {
+			if (!label && Repository && model.titles?.[name]) {
 				label = model.titles[name];
 			}
 

package/src/Components/Form/Label.js

@@ -10,7 +10,7 @@ export default function Label(props) {
 		} = props;
 	return <Row
 				w={w}
-				// maxWidth="30%"
+				minWidth="220px"
 				alignItems="center"
 				pl={2}
 				{...props}

package/src/Components/Grid/Grid.js

@@ -52,18 +52,6 @@ import _ from 'lodash';
 // The default export is *with* the HOC. A separate *raw* component is
 // exported which can be combined with many HOCs for various functionality.
 
-	// Desired features: ---------
-	// Rows
-		// Rows with ability to use multiple lines (I was thinking custom render fns on rows, could possibly already do this!)
-	// selection
-		// Draggable selection (not super important)
-	// editor
-		// [ ] Show inline editor for selected row
-		// Dragging of window (see withWindowedEditor)
-	// custom cell types
-		// Most would use text, and depend on @onehat/data for formatting
-	// Display tree data
-
 export function Grid(props) {
 	const {
 
@@ -74,9 +62,6 @@ export function Grid(props) {
 				return {
 					borderBottomWidth: 1,
 					borderBottomColor: 'trueGray.500',
-					py: 2,
-					pl: 4,
-					pr: 2,
 				};
 			},
 			flatListProps = {},
@@ -363,8 +348,10 @@ export function Grid(props) {
 								mixWith = styles.GRID_ROW_HOVER_BG;
 							}
 							if (mixWith) {
-								const mixWithObj = nbToRgb(mixWith);
-								bg = colourMixer.blend(bg, 0.9, mixWithObj.color);
+								const
+									mixWithObj = nbToRgb(mixWith),
+									ratio = mixWithObj.alpha ? 1 - mixWithObj.alpha : 0.5;
+								bg = colourMixer.blend(bg, ratio, mixWithObj.color);
 							}
 							let WhichGridRow = GridRow,
 								rowReorderProps = {};
@@ -676,6 +663,7 @@ export function Grid(props) {
 							sortable = true,
 							w,
 							flex,
+							...propsToPass
 						} = columnConfig,
 
 						config = {
@@ -693,6 +681,7 @@ export function Grid(props) {
 							w,
 							flex,
 							showDragHandles: false,
+							...propsToPass,
 						};
 
 					if (!config.w && !config.flex) {

package/src/Components/Grid/GridRow.js

@@ -32,10 +32,39 @@ export default function GridRow(props) {
 			const renderColumns = (item) => {
 				if (_.isArray(columnsConfig)) {
 					return _.map(columnsConfig, (config, key) => {
+						const propsToPass = columnProps[key] || {};
+						if (config.w) {
+							propsToPass.w = config.w;
+						} else if (config.flex) {
+							propsToPass.flex = config.flex;
+							propsToPass.minWidth = 100;
+						} else {
+							propsToPass.flex = 1;
+						}
+						propsToPass.p = 1;
+						propsToPass.justifyContent = 'center';
+
 						let value;
 						if (_.isPlainObject(config)) {
 							if (config.renderer) {
-								return config.renderer(item, key);
+								const extraProps = _.omit(config, [
+									'columnId',
+									'header',
+									'fieldName',
+									'type',
+									'isEditable',
+									'editor',
+									'format',
+									'renderer',
+									'reorderable',
+									'resizable',
+									'sortable',
+									'w',
+									'flex',
+									'showDragHandles',
+								]);
+
+								return <Row key={key} {...propsToPass} {...extraProps}>{config.renderer(item)}</Row>;
 							}
 							if (config.fieldName) {
 								if (item.properties && item.properties[config.fieldName]) {
@@ -63,16 +92,6 @@ export default function GridRow(props) {
 						if (_.isFunction(value)) {
 							return value(key);
 						}
-
-						const propsToPass = columnProps[key] || {};
-						if (config.w) {
-							propsToPass.w = config.w;
-						} else if (config.flex) {
-							propsToPass.flex = config.flex;
-							propsToPass.minWidth = 100;
-						} else {
-							propsToPass.flex = 1;
-						}
 						
 						return <Text
 									key={key}

package/src/Components/Hoc/withData.js

@@ -51,10 +51,8 @@ export default function withData(WrappedComponent) {
 					Repository = oneHatData.getRepository(model);
 				}
 
-
-				if (autoLoad && Repository && !Repository.isLoaded && Repository.isRemote && !Repository.isAutoLoad && !Repository.isLoading) {
+				if (Repository && (autoLoad || Repository.autoLoad) && !Repository.isLoaded && Repository.isRemote && !Repository.isAutoLoad && !Repository.isLoading) {
 					await Repository.load();
-					// TODO: Implement some method by which I can detect if Repository is still loading and wait until it's done!
 				}
 	
 				setLocalRepository(Repository);

package/src/Constants/Styles.js

@@ -33,7 +33,7 @@ const defaults = {
 	FORM_INPUT_BG: WHITE,
 	FORM_INPUT_FONTSIZE: DEFAULT_FONTSIZE,
 	FORM_INPUT_FOCUS_BG: FOCUS,
-	FORM_LABEL_WIDTH: '170px',
+	FORM_LABEL_WIDTH: '30%',
 	FORM_LABEL_FONTSIZE: DEFAULT_FONTSIZE,
 	FORM_NUMBER_FONTSIZE: DEFAULT_FONTSIZE,
 	FORM_TEXT_FONTSIZE: DEFAULT_FONTSIZE,

package/src/Functions/nbToRgb.js

@@ -12,6 +12,8 @@ function isRgb(color) {
 // Try to convert this to actual RGB colors.
 export default function nbToRgb(color) {
 
+	let regex, alpha, matches;
+
 	if (isRgb(color)) {
 		// already in RGB format; simply return it
 		return {
@@ -25,13 +27,12 @@ export default function nbToRgb(color) {
 		color = themeOverrideColors[color];
 	}
 
-	let regex, alpha, matches;
-
+	// Detect 'primary.100:alpha.20' format
 	regex = /^([\w#\.]+)(:alpha\.([\d]{1,2}))?$/;
 	matches = color.match(regex);
 	if (matches[3]) {
 		// alpha part exists. parse it
-		alpha = parseInt(matches[3], 10) / 100;
+		alpha = parseInt(matches[3], 10) / 100; // convert '20' to .2
 	}
 	if (matches[1]) {
 		// color part exists. parse it

package/src/Functions/setSaved.js

@@ -3,11 +3,10 @@ import UiGlobals from '../UiGlobals.js';
 import _ from 'lodash';
 
 export default async function setSaved(key, value) {
-	const Repo = oneHatData.getRepository(UiGlobals.uiSavesRepo);
-	if (!Repo) {
-		return null;
-	}
-
+	const
+		Repo = oneHatData.getRepository(UiGlobals.uiSavesRepo),
+		entity = Repo?.getById(key);
+	
 	let isOneBuild = false,
 		isJson = false,
 		model = null;
@@ -33,8 +32,6 @@ export default async function setSaved(key, value) {
 		}
 		isJson = true;
 	}
-	
-	const entity = Repo.getById(key);
 	if (entity) {
 		entity.setValues({
 			value,

package/src/Hooks/useAdjustedWindowSize.js

@@ -3,7 +3,7 @@ import useWindowSize from './useWindowSize.js';
 // This hook takes the submitted window size and adjusts it
 // to fit the actual screen size
 
-export default function(width, height, percentage = 0.9) {
+export default function(width, height, percentage = 1) {
 
 	const windowSize = useWindowSize();
 	

package/src/Hooks/useWindowSize.js

@@ -1,16 +1,25 @@
 // from https://designcode.io/react-hooks-usewindowsize-hook
 
 import { useLayoutEffect, useState } from 'react';
+import _ from 'lodash';
 
 // For web only!
 export default function useWindowSize() {
-	const [windowSize, setWindowSize] = useState({ width: 0, height: 0 });
+	const [windowSize, setWindowSize] = useState({
+		width: window.innerWidth,
+		height: window.innerHeight
+	});
 
 	const handleSize = () => {
-		setWindowSize({
-			width: window.innerWidth,
-			height: window.innerHeight
-		});
+		const
+			existingSize = windowSize,
+			newSize = {
+				width: window.innerWidth,
+				height: window.innerHeight
+			};
+		if (!_.isEqual(existingSize, newSize)) {
+			setWindowSize(newSize);
+		}
 	};
 
 	useLayoutEffect(() => {

package/src/Styles/ThemeOverrides.js

@@ -14,9 +14,9 @@ const ThemeOverrides = {
 		// secondary: {
 		// 	500: '#1F3854', // default for buttons
 		// },
-		selected: '#ffc',
-		hover: '#eee',
-		selectedHover: '#eeb',
+		selected: '#ff0:alpha.20',
+		hover: '#000:alpha.10',
+		selectedHover: '#cc0',
 		unselected: '#bbb',
 		disabled: '#ccc',
 		control: '#1B518C',