@mui/x-tree-view 7.3.0 → 7.4.0

package/node/internals/utils/tree.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPreviousNavigableItem = exports.getNextNavigableItem = exports.getNavigableItemsInRange = exports.getLastNavigableItem = exports.getFirstNavigableItem = void 0;
+exports.getPreviousNavigableItem = exports.getNonDisabledItemsInRange = exports.getNextNavigableItem = exports.getLastNavigableItem = exports.getFirstNavigableItem = exports.getAllNavigableItems = exports.findOrderInTremauxTree = void 0;
 const getLastNavigableItemInArray = (instance, items) => {
   // Equivalent to Array.prototype.findLastIndex
   let itemIndex = items.length - 1;
@@ -135,14 +135,46 @@ const findOrderInTremauxTree = (instance, itemAId, itemBId) => {
   const bSide = bFamily[bFamily.indexOf(commonAncestor) - 1];
   return ancestorFamily.indexOf(aSide) < ancestorFamily.indexOf(bSide) ? [itemAId, itemBId] : [itemBId, itemAId];
 };
-const getNavigableItemsInRange = (instance, itemAId, itemBId) => {
+exports.findOrderInTremauxTree = findOrderInTremauxTree;
+const getNonDisabledItemsInRange = (instance, itemAId, itemBId) => {
+  const getNextItem = itemId => {
+    // If the item is expanded and has some children, return the first of them.
+    if (instance.isItemExpandable(itemId) && instance.isItemExpanded(itemId)) {
+      return instance.getItemOrderedChildrenIds(itemId)[0];
+    }
+    let itemMeta = instance.getItemMeta(itemId);
+    while (itemMeta != null) {
+      // Try to find the first navigable sibling after the current item.
+      const siblings = instance.getItemOrderedChildrenIds(itemMeta.parentId);
+      const currentItemIndex = instance.getItemIndex(itemMeta.id);
+      if (currentItemIndex < siblings.length - 1) {
+        return siblings[currentItemIndex + 1];
+      }
+
+      // If the item is the last of its siblings, go up a level to the parent and try again.
+      itemMeta = instance.getItemMeta(itemMeta.parentId);
+    }
+    throw new Error('Invalid range');
+  };
   const [first, last] = findOrderInTremauxTree(instance, itemAId, itemBId);
   const items = [first];
   let current = first;
   while (current !== last) {
-    current = getNextNavigableItem(instance, current);
-    items.push(current);
+    current = getNextItem(current);
+    if (!instance.isItemDisabled(current)) {
+      items.push(current);
+    }
   }
   return items;
 };
-exports.getNavigableItemsInRange = getNavigableItemsInRange;
+exports.getNonDisabledItemsInRange = getNonDisabledItemsInRange;
+const getAllNavigableItems = instance => {
+  let item = getFirstNavigableItem(instance);
+  const navigableItems = [];
+  while (item != null) {
+    navigableItems.push(item);
+    item = getNextNavigableItem(instance, item);
+  }
+  return navigableItems;
+};
+exports.getAllNavigableItems = getAllNavigableItems;

package/node/useTreeItem2/useTreeItem2.js

@@ -112,7 +112,7 @@ const useTreeItem2 = parameters => {
     });
   };
   const getContentProps = (externalProps = {}) => {
-    const externalEventHandlers = (0, _extends2.default)({}, (0, _utils.extractEventHandlers)(parameters), (0, _utils.extractEventHandlers)(externalProps));
+    const externalEventHandlers = (0, _utils.extractEventHandlers)(externalProps);
     return (0, _extends2.default)({}, externalEventHandlers, externalProps, {
       ref: contentRef,
       onClick: createContentHandleClick(externalEventHandlers),
@@ -127,11 +127,11 @@ const useTreeItem2 = parameters => {
     }, externalProps);
   };
   const getIconContainerProps = (externalProps = {}) => {
-    const externalEventHandlers = (0, _extends2.default)({}, (0, _utils.extractEventHandlers)(parameters), (0, _utils.extractEventHandlers)(externalProps));
+    const externalEventHandlers = (0, _utils.extractEventHandlers)(externalProps);
     return (0, _extends2.default)({}, externalEventHandlers, externalProps);
   };
   const getGroupTransitionProps = (externalProps = {}) => {
-    const externalEventHandlers = (0, _extends2.default)({}, (0, _utils.extractEventHandlers)(parameters), (0, _utils.extractEventHandlers)(externalProps));
+    const externalEventHandlers = (0, _utils.extractEventHandlers)(externalProps);
     return (0, _extends2.default)({}, externalEventHandlers, {
       unmountOnExit: true,
       component: 'ul',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-tree-view",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "The community edition of the Tree View components (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -15,7 +15,8 @@
   },
   "sideEffects": false,
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "directory": "build"
   },
   "keywords": [
     "react",
@@ -37,7 +38,7 @@
     "@mui/system": "^5.15.14",
     "@mui/utils": "^5.15.14",
     "@types/react-transition-group": "^4.4.10",
-    "clsx": "^2.1.0",
+    "clsx": "^2.1.1",
     "prop-types": "^15.8.1",
     "react-transition-group": "^4.4.5"
   },
@@ -48,9 +49,6 @@
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },
-  "setupFiles": [
-    "<rootDir>/src/setupTests.js"
-  ],
   "engines": {
     "node": ">=14.0.0"
   },

package/useTreeItem2/useTreeItem2.js

@@ -105,7 +105,7 @@ export const useTreeItem2 = parameters => {
     });
   };
   const getContentProps = (externalProps = {}) => {
-    const externalEventHandlers = _extends({}, extractEventHandlers(parameters), extractEventHandlers(externalProps));
+    const externalEventHandlers = extractEventHandlers(externalProps);
     return _extends({}, externalEventHandlers, externalProps, {
       ref: contentRef,
       onClick: createContentHandleClick(externalEventHandlers),
@@ -120,11 +120,11 @@ export const useTreeItem2 = parameters => {
     }, externalProps);
   };
   const getIconContainerProps = (externalProps = {}) => {
-    const externalEventHandlers = _extends({}, extractEventHandlers(parameters), extractEventHandlers(externalProps));
+    const externalEventHandlers = extractEventHandlers(externalProps);
     return _extends({}, externalEventHandlers, externalProps);
   };
   const getGroupTransitionProps = (externalProps = {}) => {
-    const externalEventHandlers = _extends({}, extractEventHandlers(parameters), extractEventHandlers(externalProps));
+    const externalEventHandlers = extractEventHandlers(externalProps);
     return _extends({}, externalEventHandlers, {
       unmountOnExit: true,
       component: 'ul',