@onehat/ui 0.3.246 → 0.3.248

package/package.json

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

package/src/Components/Grid/Grid.js

@@ -488,6 +488,7 @@ function GridComponent(props) {
 									rowDragProps.isDropTarget = true;
 									rowDragProps.dropTargetAccept = dropTargetAccept;
 									rowDragProps.onDrop = (droppedItem) => {
+										// NOTE: item is sometimes getting destroyed, but it still as the id, so you can still use it
 										onRowDrop(item, droppedItem); // item is what it was dropped on; droppedItem is the dragSourceItem defined above
 									};
 								}
@@ -982,6 +983,9 @@ function GridComponent(props) {
 					{...flatListProps}
 				/>
 	
+	if (CURRENT_MODE === UI_MODE_WEB) {
+		grid = <ScrollView horizontal={false}>{grid}</ScrollView>; // fix scrolling bug on nested FlatLists
+	} else
 	if (CURRENT_MODE === UI_MODE_REACT_NATIVE) {
 		grid = <ScrollView flex={1} w="100%">{grid}</ScrollView>
 	}

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

@@ -112,6 +112,22 @@ export default function withSelection(WrappedComponent) {
 					secondarySetSelection([]);
 				}
 			},
+			secondaryRefreshSelection = () => {
+				// When Repository reloads, the entities get destroyed.
+				// Loop through these destroyed entities and see if new ones exist with same ids.
+				// If so, select these new ones.
+				// That way, after a load event, we'll keep the same selection, if possible.
+				const
+					newSelection = [],
+					ids = _.map(secondaryLocalSelection, (item) => item.id);
+				_.each(ids, (id) => {
+					const found = SecondaryRepository.getById(id);
+					if (found) {
+						newSelection.push(found);
+					}
+				});
+				secondarySetSelection(newSelection);
+			},
 			getMaxMinSelectionIndices = () => {
 				let items,
 					currentlySelectedRowIndices = [];
@@ -283,6 +299,15 @@ export default function withSelection(WrappedComponent) {
 				}
 			};
 
+		if (SecondaryRepository) {
+			useEffect(() => {
+				SecondaryRepository.on('load', secondaryRefreshSelection);
+				return () => {
+					SecondaryRepository.off('load', secondaryRefreshSelection);
+				};
+			}, []);
+		}
+
 		useEffect(() => {
 
 			(async () => {

package/src/Components/Hoc/withSelection.js

@@ -110,6 +110,22 @@ export default function withSelection(WrappedComponent) {
 			deselectAll = () => {
 				setSelection([]);
 			},
+			refreshSelection = () => {
+				// When Repository reloads, the entities get destroyed.
+				// Loop through these destroyed entities and see if new ones exist with same ids.
+				// If so, select these new ones.
+				// That way, after a load event, we'll keep the same selection, if possible.
+				const
+					newSelection = [],
+					ids = _.map(localSelection.current, (item) => item.id);
+				_.each(ids, (id) => {
+					const found = Repository.getById(id);
+					if (found) {
+						newSelection.push(found);
+					}
+				});
+				setSelection(newSelection);
+			},
 			getMaxMinSelectionIndices = () => {
 				let items,
 					currentlySelectedRowIndices = [];
@@ -283,10 +299,9 @@ export default function withSelection(WrappedComponent) {
 
 		if (Repository) {
 			useEffect(() => {
-				// clear the selection when Repository loads
-				Repository.on('load', deselectAll);
+				Repository.on('load', refreshSelection);
 				return () => {
-					Repository.off('load', deselectAll);
+					Repository.off('load', refreshSelection);
 				};
 			}, []);
 		}