@onehat/ui 0.3.101 → 0.3.104

package/package.json

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

package/src/Components/Hoc/withEditor.js

@@ -87,15 +87,15 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			getNewEntityDisplayValue = () => {
 				return newEntityDisplayValueRef.current;
 			},
-			onAdd = async () => {
+			onAdd = async (values) => {
 				const defaultValues = Repository.getSchema().getDefaultValues();
-				let addValues = _.clone(defaultValues);
+				let addValues = values || _.clone(defaultValues);
 
 				if (selectorId && !_.isEmpty(selectorSelected)) {
 					addValues[selectorId] = selectorSelected.id;
 				}
 
-				if (getNewEntityDisplayValue()) {
+				if (!values && getNewEntityDisplayValue()) {
 					const displayPropertyName = Repository.getSchema().model.displayProperty;
 					addValues[displayPropertyName] = getNewEntityDisplayValue();
 				}

package/src/Components/Hoc/withFilters.js

@@ -265,11 +265,10 @@ export default function withFilters(WrappedComponent) {
 								field,
 								type: filterType,
 								title,
-							} = filter,
-
-							propertyDef = Repository.getSchema().getPropertyDefinition(field);
+							} = filter;
 						
 						if (!title) {
+							const propertyDef = Repository.getSchema().getPropertyDefinition(field);
 							title = propertyDef?.title;
 						}
 
@@ -328,7 +327,7 @@ export default function withFilters(WrappedComponent) {
 
 					if (!isReady) {
 						const savedFilters = await getSaved(id + '-filters');
-						if (!_.isEmpty(savedFilters)) {
+						if (!_.isEmpty(savedFilters) && !isUsingCustomFilters) {
 							// load saved filters
 							filtersToUse = savedFilters;
 							setFilters(savedFilters, true, false); // false to skip save
@@ -337,7 +336,7 @@ export default function withFilters(WrappedComponent) {
 
 					if (isUsingCustomFilters) {
 						_.each(filtersToUse, (filter) => {
-							const repoFiltersFromFilter = filter.getRepoFilters(value);
+							const repoFiltersFromFilter = filter.getRepoFilters(filter.value);
 							_.each(repoFiltersFromFilter, (repoFilter) => { // one custom filter might generate multiple filters for the repository
 								newRepoFilters.push(repoFilter);
 							});
@@ -410,10 +409,12 @@ export default function withFilters(WrappedComponent) {
 			const
 				renderedFilters = renderFilters(),
 				hasFilters = !!renderedFilters.length;
-			topToolbar = <Toolbar justifyContent="space-between" alignItems="center">
-							<Text pr={2} userSelect="none">Filters:{hasFilters ? '' : ' None'}</Text>
-							{renderedFilters}
-							<Row flex={hasFilters ? null : 1} justifyContent="flex-end">
+			topToolbar = <Toolbar>
+							<Row flex={1} alignItems="center">
+								<Text pr={2} userSelect="none">Filters:{hasFilters ? '' : ' None'}</Text>
+								{renderedFilters}
+							</Row>
+							<Row flex={hasFilters ? null : 1} alignItems="center" alignSelf="flex-end">
 								<IconButton
 									key="clear"
 									_icon={{

package/src/Components/Icons/Bell.js

@@ -0,0 +1,23 @@
+// Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+import { Icon } from 'native-base';
+
+function SvgComponent(props) {
+  return (
+    <Icon
+      xmlns="http://www.w3.org/2000/svg"
+      height={16}
+      width={14}
+      viewBox="0 0 448 512"
+      {...props}
+    >
+      <Path
+        fill="#1E3050"
+        d="M224 0c-17.7 0-32 14.3-32 32v19.2C119 66 64 130.6 64 208v18.8c0 47-17.3 92.4-48.5 127.6l-7.4 8.3c-8.4 9.4-10.4 22.9-5.3 34.4S19.4 416 32 416h384c12.6 0 24-7.4 29.2-18.9s3.1-25-5.3-34.4l-7.4-8.3c-31.2-35.2-48.5-80.5-48.5-127.6V208c0-77.4-55-142-128-156.8V32c0-17.7-14.3-32-32-32zm45.3 493.3c12-12 18.7-28.3 18.7-45.3H160c0 17 6.7 33.3 18.7 45.3S207 512 224 512s33.3-6.7 45.3-18.7z"
+      />
+    </Icon>
+  )
+}
+
+export default SvgComponent

package/src/Components/Screens/Manager.js

@@ -22,7 +22,7 @@ function ManagerScreen(props) {
 			title,
 			sideModeComponent,
 			fullModeComponent,
-			id,
+			reference,
 		} = props,
 		styles = UiGlobals.styles,
 		[isReady, setIsReady] = useState(false),
@@ -32,18 +32,22 @@ function ManagerScreen(props) {
 				return; // no change
 			}
 			setModeRaw(newMode);
-			setSaved(id + '-mode', newMode);
+			if (reference) {
+				setSaved(reference + '-mode', newMode);
+			}
 		};
 
 	useEffect(() => {
 		// Restore saved settings
 		(async () => {
 
-			let key, val;
-			key = id + '-mode';
-			val = await getSaved(key);
-			if (!_.isNil(val)) {
-				setMode(val);
+			if (reference) {
+				const
+					key = reference + '-mode',
+					val = await getSaved(key);
+				if (!_.isNil(val)) {
+					setMode(val);
+				}
 			}
 
 			if (!isReady) {

package/src/Components/Tab/TabBar.js

@@ -432,7 +432,7 @@ function TabBar(props) {
 					p={2}
 					pb={0}
 					bg={styles.TAB_BAR_BG}
-					h={isCollapsed ? '30px' : tabHeight}
+					h={isCollapsed ? '38px' : tabHeight}
 				>
 					<ScrollView
 						horizontal={true}