react-complex-tree - npm Package Compare versions

Comparing version 2.3.1 to 2.3.2

lib/cjs/uncontrolledEnvironment/UncontrolledTreeEnvironment.js

@@ -88,2 +88,3 @@ "use strict";
 var useIsMounted_1 = require("../useIsMounted");
+var useRefCopy_1 = require("../useRefCopy");
 /* const createCompleteDataProvider = (provider: TreeDataProvider): CompleteTreeDataProvider => ({ // TODO Write class that internally uses provider instead
@@ -100,2 +101,3 @@ ...provider,
     var _b = (0, react_1.useState)(props.viewState), viewState = _b[0], setViewState = _b[1];
+    var viewStateRef = (0, useRefCopy_1.useRefCopy)(viewState);
     var missingItemIds = (0, react_1.useRef)([]);
@@ -150,12 +152,13 @@ var dataProvider = (0, react_1.useMemo)(function () { return new CompleteTreeDataProvider_1.CompleteTreeDataProvider(props.dataProvider); }, [props.dataProvider]);
         }, onSelectItems: function (items, treeId) {
-            amendViewState(treeId, function (old) {
-                var _a, _b;
-                if (props.disableMultiselect) {
-                    var newSelected = old.focusedItem ? [old.focusedItem] : [];
-                    (_a = props.onSelectItems) === null || _a === void 0 ? void 0 : _a.call(props, newSelected, treeId);
-                    return __assign(__assign({}, old), { selectedItems: newSelected });
-                }
-                (_b = props.onSelectItems) === null || _b === void 0 ? void 0 : _b.call(props, items, treeId);
-                return __assign(__assign({}, old), { selectedItems: items });
-            });
+            var _a, _b, _c;
+            var oldFocusedItem = (_a = viewStateRef.current[treeId]) === null || _a === void 0 ? void 0 : _a.focusedItem;
+            if (props.disableMultiselect) {
+                var newSelected_1 = oldFocusedItem ? [oldFocusedItem] : [];
+                (_b = props.onSelectItems) === null || _b === void 0 ? void 0 : _b.call(props, newSelected_1, treeId);
+                amendViewState(treeId, function (old) { return (__assign(__assign({}, old), { selectedItems: newSelected_1 })); });
+            }
+            else {
+                (_c = props.onSelectItems) === null || _c === void 0 ? void 0 : _c.call(props, items, treeId);
+                amendViewState(treeId, function (old) { return (__assign(__assign({}, old), { selectedItems: items })); });
+            }
         }, onFocusItem: function (item, treeId) {
@@ -162,0 +165,0 @@ var _a;

lib/esm/uncontrolledEnvironment/UncontrolledTreeEnvironment.js

@@ -62,2 +62,3 @@ var __assign = (this && this.__assign) || function () {
 import { useIsMounted } from '../useIsMounted';
+import { useRefCopy } from '../useRefCopy';
 /* const createCompleteDataProvider = (provider: TreeDataProvider): CompleteTreeDataProvider => ({ // TODO Write class that internally uses provider instead
@@ -74,2 +75,3 @@ ...provider,
     var _b = useState(props.viewState), viewState = _b[0], setViewState = _b[1];
+    var viewStateRef = useRefCopy(viewState);
     var missingItemIds = useRef([]);
@@ -124,12 +126,13 @@ var dataProvider = useMemo(function () { return new CompleteTreeDataProvider(props.dataProvider); }, [props.dataProvider]);
         }, onSelectItems: function (items, treeId) {
-            amendViewState(treeId, function (old) {
-                var _a, _b;
-                if (props.disableMultiselect) {
-                    var newSelected = old.focusedItem ? [old.focusedItem] : [];
-                    (_a = props.onSelectItems) === null || _a === void 0 ? void 0 : _a.call(props, newSelected, treeId);
-                    return __assign(__assign({}, old), { selectedItems: newSelected });
-                }
-                (_b = props.onSelectItems) === null || _b === void 0 ? void 0 : _b.call(props, items, treeId);
-                return __assign(__assign({}, old), { selectedItems: items });
-            });
+            var _a, _b, _c;
+            var oldFocusedItem = (_a = viewStateRef.current[treeId]) === null || _a === void 0 ? void 0 : _a.focusedItem;
+            if (props.disableMultiselect) {
+                var newSelected_1 = oldFocusedItem ? [oldFocusedItem] : [];
+                (_b = props.onSelectItems) === null || _b === void 0 ? void 0 : _b.call(props, newSelected_1, treeId);
+                amendViewState(treeId, function (old) { return (__assign(__assign({}, old), { selectedItems: newSelected_1 })); });
+            }
+            else {
+                (_c = props.onSelectItems) === null || _c === void 0 ? void 0 : _c.call(props, items, treeId);
+                amendViewState(treeId, function (old) { return (__assign(__assign({}, old), { selectedItems: items })); });
+            }
         }, onFocusItem: function (item, treeId) {
@@ -136,0 +139,0 @@ var _a;

lib/esnext/uncontrolledEnvironment/UncontrolledTreeEnvironment.js

@@ -62,2 +62,3 @@ var __assign = (this && this.__assign) || function () {
 import { useIsMounted } from '../useIsMounted';
+import { useRefCopy } from '../useRefCopy';
 /* const createCompleteDataProvider = (provider: TreeDataProvider): CompleteTreeDataProvider => ({ // TODO Write class that internally uses provider instead
@@ -74,2 +75,3 @@ ...provider,
     var _b = useState(props.viewState), viewState = _b[0], setViewState = _b[1];
+    var viewStateRef = useRefCopy(viewState);
     var missingItemIds = useRef([]);
@@ -124,12 +126,13 @@ var dataProvider = useMemo(function () { return new CompleteTreeDataProvider(props.dataProvider); }, [props.dataProvider]);
         }, onSelectItems: function (items, treeId) {
-            amendViewState(treeId, function (old) {
-                var _a, _b;
-                if (props.disableMultiselect) {
-                    var newSelected = old.focusedItem ? [old.focusedItem] : [];
-                    (_a = props.onSelectItems) === null || _a === void 0 ? void 0 : _a.call(props, newSelected, treeId);
-                    return __assign(__assign({}, old), { selectedItems: newSelected });
-                }
-                (_b = props.onSelectItems) === null || _b === void 0 ? void 0 : _b.call(props, items, treeId);
-                return __assign(__assign({}, old), { selectedItems: items });
-            });
+            var _a, _b, _c;
+            var oldFocusedItem = (_a = viewStateRef.current[treeId]) === null || _a === void 0 ? void 0 : _a.focusedItem;
+            if (props.disableMultiselect) {
+                var newSelected_1 = oldFocusedItem ? [oldFocusedItem] : [];
+                (_b = props.onSelectItems) === null || _b === void 0 ? void 0 : _b.call(props, newSelected_1, treeId);
+                amendViewState(treeId, function (old) { return (__assign(__assign({}, old), { selectedItems: newSelected_1 })); });
+            }
+            else {
+                (_c = props.onSelectItems) === null || _c === void 0 ? void 0 : _c.call(props, items, treeId);
+                amendViewState(treeId, function (old) { return (__assign(__assign({}, old), { selectedItems: items })); });
+            }
         }, onFocusItem: function (item, treeId) {
@@ -136,0 +139,0 @@ var _a;

package.json

 {
   "name": "react-complex-tree",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "main": "lib/cjs/index.js",
@@ -37,3 +37,3 @@ "module": "lib/esm/index.js",
     "cpy-cli": "^3.1.1",
-    "demodata": "^2.3.1",
+    "demodata": "^2.3.2",
     "jest": "^29.2.2",
@@ -70,3 +70,3 @@ "jest-dom": "^4.0.0",
   },
-  "gitHead": "ec3eec734973fb48762b6b3b2a291a96e82c282d"
+  "gitHead": "da00eeeca6d01566eaa16f5f0e1501e054a7012e"
 }

No alert changes

Improved metrics

Total package byte prevSize

1241746

increased by0.18%

Lines of code

19175

increased by0.22%

No dependency changes