@onehat/ui 0.3.323 → 0.3.325

package/README.md

@@ -0,0 +1,24 @@
+# OneHatUi Patterns
+
+The OneHatUi library is a set of pre-built components that make use of the OneHatData library. 
+It is built on top of ReactNative, and either NativeBase or GlueStack.
+
+Many of the components make use of other components internally. 
+For example, the `Grid` component uses `IconButtons` for its pagination toolbar. 
+The `Combo` component makes use of the `Grid` component for its menu. 
+And the `Tag` component is simply a `Combo` with additional functionality.
+
+Many components have “regular” and “editor” versions. For example, there’s a `Grid` and a `GridEditor`. 
+The `Grid` is simply for viewing. The `GridEditor` allows the records within the `Grid` to be managed (add/edit/delete).
+
+For the most part, it follows the React rules of data flowing only top-down through props, and of components not knowing about 
+their relative position in the component tree. But there are some cases where such wooden adherence is counterproductive. 
+In such cases, the library makes use of the `withComponent` HOC, which adds a “self” prop to every component, 
+which has references to parents and children. In this way, a child component can directly reference its parent(s) or children. 
+
+For parentage examples, the `Form` component closes its grandparent `Editor` in some cases, 
+and the `InlineEditor` queries its parent `Grid` to figure out which row it should align with.
+
+For a child example, the `Combo` can directly tell its menu `Grid` to `selectNext()` or `selectPrev()`
+based on user keystrokes.
+

package/package.json

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

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

@@ -484,38 +484,6 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				}
 			};
 
-		useEffect(() => {
-			if (!SecondaryRepository) {
-				return () => {};
-			}
-
-			function handleError(msg, data = null) {
-				if (data) {
-					if (_.isPlainObject(data)) {
-						for (let key in data) { if (data.hasOwnProperty(key)) {
-							const val1 = data[key];
-							if (_.isPlainObject(val1)) {
-								for (let key2 in val1) { if (val1.hasOwnProperty(key2)) {
-									const val2 = val1[key2];
-									msg += "\n" + key + ': ' + val2;
-								} }
-							} else if (_.isString(data)) {
-								msg += "\n" + data;
-							}
-						} }
-					} else {
-						// not sure what to do with data!
-					}
-				}
-				alert(msg);
-			}
-
-			SecondaryRepository.on('error', handleError);
-			return () => {
-				SecondaryRepository.off('error', handleError);
-			};
-		}, []);
-
 		useEffect(() => {
 			secondarySetEditorMode(calculateEditorMode(secondaryIsIgnoreNextSelectionChange));
 

package/src/Components/Hoc/withEditor.js

@@ -498,38 +498,6 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				}
 			};
 
-		useEffect(() => {
-			if (!Repository) {
-				return () => {};
-			}
-
-			function handleError(msg, data = null) {
-				if (data) {
-					if (_.isPlainObject(data)) {
-						for (let key in data) { if (data.hasOwnProperty(key)) {
-							const val1 = data[key];
-							if (_.isPlainObject(val1)) {
-								for (let key2 in val1) { if (val1.hasOwnProperty(key2)) {
-									const val2 = val1[key2];
-									msg += "\n" + key + ': ' + val2;
-								} }
-							} else if (_.isString(data)) {
-								msg += "\n" + data;
-							}
-						} }
-					} else {
-						// not sure what to do with data!
-					}
-				}
-				alert(msg);
-			}
-
-			Repository.on('error', handleError);
-			return () => {
-				Repository.off('error', handleError);
-			};
-		}, []);
-
 		useEffect(() => {
 			setEditorMode(calculateEditorMode(isIgnoreNextSelectionChange));
 

package/src/Components/Hoc/withFilters.js

@@ -44,6 +44,7 @@ export default function withFilters(WrappedComponent) {
 				showClearFiltersButton = true,
 				defaultFilters = [], // likely a list of field names, possibly could be of shape below
 				customFilters = [], // of shape: { title, type, field, value, getRepoFilters(value) }
+				clearExceptions = [], // list of fields that should not be cleared when clearFilters button is pressed
 				minFilters = 3,
 				maxFilters = 6,
 				onFilterChange,
@@ -214,7 +215,9 @@ export default function withFilters(WrappedComponent) {
 					// Clears values for all active filters
 					const newFilters = [];
 					_.each(filters, (filter) => {
-						filter.value = null;
+						if (!inArray(filter.field, clearExceptions)) {
+							filter.value = null;
+						}
 						newFilters.push(filter);
 					});
 					setFilters(newFilters, false);