@mui/x-tree-view 9.9.0 → 9.10.1

package/internals/plugins/selection/itemPlugin.js

@@ -16,10 +16,12 @@ const selectorCheckboxSelectionStatus = (0, _store.createSelector)((state, itemI
   let hasUnSelectedDescendant = false;
   const traverseDescendants = itemToTraverseId => {
     if (itemToTraverseId !== itemId) {
-      if (_selectors2.selectionSelectors.isItemSelected(state, itemToTraverseId)) {
-        hasSelectedDescendant = true;
-      } else {
-        hasUnSelectedDescendant = true;
+      if (_selectors2.selectionSelectors.canItemBeSelected(state, itemToTraverseId)) {
+        if (_selectors2.selectionSelectors.isItemSelected(state, itemToTraverseId)) {
+          hasSelectedDescendant = true;
+        } else {
+          hasUnSelectedDescendant = true;
+        }
       }
     }
     _selectors.itemsSelectors.itemOrderedChildrenIds(state, itemToTraverseId).forEach(traverseDescendants);
@@ -52,19 +54,28 @@ const useSelectionItemPlugin = ({
   const isCheckboxSelectionEnabled = (0, _store.useStore)(store, _selectors2.selectionSelectors.isCheckboxSelectionEnabled);
   const isFeatureEnabledForItem = (0, _store.useStore)(store, _selectors2.selectionSelectors.isFeatureEnabledForItem, itemId);
   const canItemBeSelected = (0, _store.useStore)(store, _selectors2.selectionSelectors.canItemBeSelected, itemId);
+  const isItemDisabled = (0, _store.useStore)(store, _selectors.itemsSelectors.isItemDisabled, itemId);
+  const isItemSelectable = (0, _store.useStore)(store, _selectors2.selectionSelectors.isItemSelectable, itemId);
   const selectionStatus = (0, _store.useStore)(store, selectorCheckboxSelectionStatus, itemId);
+
+  // An item is "inherently not selectable" when disabled or excluded via isItemSelectionDisabled,
+  // regardless of the global disableSelection flag. Such items must not have aria-checked.
+  const isItemInherentlyNotSelectable = isItemDisabled || !isItemSelectable;
   return {
     propsEnhancers: {
       root: () => {
         // https://www.w3.org/WAI/ARIA/apg/patterns/treeview/
         let ariaChecked;
-        if (selectionStatus === 'checked') {
+        if (isItemInherentlyNotSelectable) {
+          // - if the tree contains nodes that are not selectable, aria-checked is not present on those nodes.
+          ariaChecked = undefined;
+        } else if (selectionStatus === 'checked') {
           // - each selected node has aria-checked set to true.
           ariaChecked = true;
         } else if (selectionStatus === 'indeterminate') {
           ariaChecked = 'mixed';
         } else if (!canItemBeSelected) {
-          // - if the tree contains nodes that are not selectable, aria-checked is not present on those nodes.
+          // disableSelection=true with an unselected item: aria-checked is not present.
           ariaChecked = undefined;
         } else {
           // - all nodes that are selectable but not selected have aria-checked set to false.

package/internals/plugins/selection/itemPlugin.mjs

@@ -10,10 +10,12 @@ const selectorCheckboxSelectionStatus = createSelector((state, itemId) => {
   let hasUnSelectedDescendant = false;
   const traverseDescendants = itemToTraverseId => {
     if (itemToTraverseId !== itemId) {
-      if (selectionSelectors.isItemSelected(state, itemToTraverseId)) {
-        hasSelectedDescendant = true;
-      } else {
-        hasUnSelectedDescendant = true;
+      if (selectionSelectors.canItemBeSelected(state, itemToTraverseId)) {
+        if (selectionSelectors.isItemSelected(state, itemToTraverseId)) {
+          hasSelectedDescendant = true;
+        } else {
+          hasUnSelectedDescendant = true;
+        }
       }
     }
     itemsSelectors.itemOrderedChildrenIds(state, itemToTraverseId).forEach(traverseDescendants);
@@ -46,19 +48,28 @@ export const useSelectionItemPlugin = ({
   const isCheckboxSelectionEnabled = useStore(store, selectionSelectors.isCheckboxSelectionEnabled);
   const isFeatureEnabledForItem = useStore(store, selectionSelectors.isFeatureEnabledForItem, itemId);
   const canItemBeSelected = useStore(store, selectionSelectors.canItemBeSelected, itemId);
+  const isItemDisabled = useStore(store, itemsSelectors.isItemDisabled, itemId);
+  const isItemSelectable = useStore(store, selectionSelectors.isItemSelectable, itemId);
   const selectionStatus = useStore(store, selectorCheckboxSelectionStatus, itemId);
+
+  // An item is "inherently not selectable" when disabled or excluded via isItemSelectionDisabled,
+  // regardless of the global disableSelection flag. Such items must not have aria-checked.
+  const isItemInherentlyNotSelectable = isItemDisabled || !isItemSelectable;
   return {
     propsEnhancers: {
       root: () => {
         // https://www.w3.org/WAI/ARIA/apg/patterns/treeview/
         let ariaChecked;
-        if (selectionStatus === 'checked') {
+        if (isItemInherentlyNotSelectable) {
+          // - if the tree contains nodes that are not selectable, aria-checked is not present on those nodes.
+          ariaChecked = undefined;
+        } else if (selectionStatus === 'checked') {
           // - each selected node has aria-checked set to true.
           ariaChecked = true;
         } else if (selectionStatus === 'indeterminate') {
           ariaChecked = 'mixed';
         } else if (!canItemBeSelected) {
-          // - if the tree contains nodes that are not selectable, aria-checked is not present on those nodes.
+          // disableSelection=true with an unselected item: aria-checked is not present.
           ariaChecked = undefined;
         } else {
           // - all nodes that are selectable but not selected have aria-checked set to false.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-tree-view",
-  "version": "9.9.0",
+  "version": "9.10.1",
   "author": "MUI Team",
   "description": "The community edition of the MUI X Tree View components.",
   "license": "MIT",
@@ -32,13 +32,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.29.7",
-    "@base-ui/utils": "^0.3.0",
+    "@base-ui/utils": "^0.3.1",
     "@mui/utils": "^9.2.0",
     "@types/react-transition-group": "^4.4.12",
     "clsx": "^2.1.1",
     "prop-types": "^15.8.1",
     "react-transition-group": "^4.4.5",
-    "@mui/x-internals": "^9.9.0"
+    "@mui/x-internals": "^9.10.1"
   },
   "peerDependencies": {
     "@emotion/react": "^11.9.0",