@mui/x-tree-view 7.8.0 → 7.9.0

package/modern/SimpleTreeView/SimpleTreeView.js

@@ -95,6 +95,8 @@ process.env.NODE_ENV !== "production" ? SimpleTreeView.propTypes = {
     current: PropTypes.shape({
       focusItem: PropTypes.func.isRequired,
       getItem: PropTypes.func.isRequired,
+      getItemDOMElement: PropTypes.func.isRequired,
+      selectItem: PropTypes.func.isRequired,
       setItemExpansion: PropTypes.func.isRequired
     })
   }),
@@ -170,34 +172,34 @@ process.env.NODE_ENV !== "production" ? SimpleTreeView.propTypes = {
   multiSelect: PropTypes.bool,
   /**
    * Callback fired when tree items are expanded/collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemIds The ids of the expanded items.
    */
   onExpandedItemsChange: PropTypes.func,
   /**
    * Callback fired when a tree item is expanded or collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isExpanded `true` if the item has just been expanded, `false` if it has just been collapsed.
    */
   onItemExpansionToggle: PropTypes.func,
   /**
    * Callback fired when tree items are focused.
-   * @param {React.SyntheticEvent} event The event source of the callback **Warning**: This is a generic event not a focus event.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
    * @param {string} itemId The id of the focused item.
    * @param {string} value of the focused item.
    */
   onItemFocus: PropTypes.func,
   /**
    * Callback fired when a tree item is selected or deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isSelected `true` if the item has just been selected, `false` if it has just been deselected.
    */
   onItemSelectionToggle: PropTypes.func,
   /**
    * Callback fired when tree items are selected/deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {string[] | string} itemIds The ids of the selected items.
    * When `multiSelect` is `true`, this is an array of strings; when false (default) a string.
    */

package/modern/TreeItem/useTreeItemState.js

@@ -39,10 +39,18 @@ export function useTreeItemState(itemId) {
         if (event.shiftKey) {
           instance.expandSelectionRange(event, itemId);
         } else {
-          instance.selectItem(event, itemId, true);
+          instance.selectItem({
+            event,
+            itemId,
+            keepExistingSelection: true
+          });
         }
       } else {
-        instance.selectItem(event, itemId, false);
+        instance.selectItem({
+          event,
+          itemId,
+          shouldBeSelected: true
+        });
       }
     }
   };
@@ -54,7 +62,12 @@ export function useTreeItemState(itemId) {
     if (multiSelect && hasShift) {
       instance.expandSelectionRange(event, itemId);
     } else {
-      instance.selectItem(event, itemId, multiSelect, event.target.checked);
+      instance.selectItem({
+        event,
+        itemId,
+        keepExistingSelection: multiSelect,
+        shouldBeSelected: event.target.checked
+      });
     }
   };
   const preventSelection = event => {

package/modern/TreeView/TreeView.js

@@ -72,6 +72,8 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
     current: PropTypes.shape({
       focusItem: PropTypes.func.isRequired,
       getItem: PropTypes.func.isRequired,
+      getItemDOMElement: PropTypes.func.isRequired,
+      selectItem: PropTypes.func.isRequired,
       setItemExpansion: PropTypes.func.isRequired
     })
   }),
@@ -147,34 +149,34 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
   multiSelect: PropTypes.bool,
   /**
    * Callback fired when tree items are expanded/collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemIds The ids of the expanded items.
    */
   onExpandedItemsChange: PropTypes.func,
   /**
    * Callback fired when a tree item is expanded or collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isExpanded `true` if the item has just been expanded, `false` if it has just been collapsed.
    */
   onItemExpansionToggle: PropTypes.func,
   /**
    * Callback fired when tree items are focused.
-   * @param {React.SyntheticEvent} event The event source of the callback **Warning**: This is a generic event not a focus event.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
    * @param {string} itemId The id of the focused item.
    * @param {string} value of the focused item.
    */
   onItemFocus: PropTypes.func,
   /**
    * Callback fired when a tree item is selected or deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isSelected `true` if the item has just been selected, `false` if it has just been deselected.
    */
   onItemSelectionToggle: PropTypes.func,
   /**
    * Callback fired when tree items are selected/deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {string[] | string} itemIds The ids of the selected items.
    * When `multiSelect` is `true`, this is an array of strings; when false (default) a string.
    */

package/modern/hooks/useTreeItem2Utils/useTreeItem2Utils.js

@@ -57,10 +57,18 @@ export const useTreeItem2Utils = ({
       if (event.shiftKey) {
         instance.expandSelectionRange(event, itemId);
       } else {
-        instance.selectItem(event, itemId, true);
+        instance.selectItem({
+          event,
+          itemId,
+          keepExistingSelection: true
+        });
       }
     } else {
-      instance.selectItem(event, itemId, false);
+      instance.selectItem({
+        event,
+        itemId,
+        shouldBeSelected: true
+      });
     }
   };
   const handleCheckboxSelection = event => {
@@ -68,7 +76,12 @@ export const useTreeItem2Utils = ({
     if (multiSelect && hasShift) {
       instance.expandSelectionRange(event, itemId);
     } else {
-      instance.selectItem(event, itemId, multiSelect, event.target.checked);
+      instance.selectItem({
+        event,
+        itemId,
+        keepExistingSelection: multiSelect,
+        shouldBeSelected: event.target.checked
+      });
     }
   };
   const interactions = {

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-tree-view v7.8.0
+ * @mui/x-tree-view v7.9.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/internals/plugins/useTreeViewFocus/useTreeViewFocus.js

@@ -43,8 +43,7 @@ export const useTreeViewFocus = ({
     return itemMeta && (itemMeta.parentId == null || instance.isItemExpanded(itemMeta.parentId));
   };
   const innerFocusItem = (event, itemId) => {
-    const itemMeta = instance.getItemMeta(itemId);
-    const itemElement = document.getElementById(instance.getTreeItemIdAttribute(itemId, itemMeta.idAttribute));
+    const itemElement = instance.getItemDOMElement(itemId);
     if (itemElement) {
       itemElement.focus();
     }

package/modern/internals/plugins/useTreeViewItems/useTreeViewItems.js

@@ -92,6 +92,13 @@ export const useTreeViewItems = ({
     return state.items.itemChildrenIndexes[parentId][itemId];
   }, [instance, state.items.itemChildrenIndexes]);
   const getItemOrderedChildrenIds = React.useCallback(itemId => state.items.itemOrderedChildrenIds[itemId ?? TREE_VIEW_ROOT_PARENT_ID] ?? [], [state.items.itemOrderedChildrenIds]);
+  const getItemDOMElement = itemId => {
+    const itemMeta = instance.getItemMeta(itemId);
+    if (itemMeta == null) {
+      return null;
+    }
+    return document.getElementById(instance.getTreeItemIdAttribute(itemId, itemMeta.idAttribute));
+  };
   const isItemNavigable = itemId => {
     if (params.disabledItemsFocusable) {
       return true;
@@ -145,13 +152,15 @@ export const useTreeViewItems = ({
       }
     }),
     publicAPI: {
-      getItem
+      getItem,
+      getItemDOMElement
     },
     instance: {
       getItemMeta,
       getItem,
       getItemsToRender,
       getItemIndex,
+      getItemDOMElement,
       getItemOrderedChildrenIds,
       isItemDisabled,
       isItemNavigable,

package/modern/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js

@@ -74,10 +74,13 @@ export const useTreeViewKeyboardNavigation = ({
           event.preventDefault();
           if (params.multiSelect && event.shiftKey) {
             instance.expandSelectionRange(event, itemId);
-          } else if (params.multiSelect) {
-            instance.selectItem(event, itemId, true);
           } else {
-            instance.selectItem(event, itemId, false);
+            instance.selectItem({
+              event,
+              itemId,
+              keepExistingSelection: params.multiSelect,
+              shouldBeSelected: params.multiSelect ? undefined : true
+            });
           }
           break;
         }
@@ -92,9 +95,16 @@ export const useTreeViewKeyboardNavigation = ({
           } else if (canToggleItemSelection(itemId)) {
             if (params.multiSelect) {
               event.preventDefault();
-              instance.selectItem(event, itemId, true);
+              instance.selectItem({
+                event,
+                itemId,
+                keepExistingSelection: true
+              });
             } else if (!instance.isItemSelected(itemId)) {
-              instance.selectItem(event, itemId, false);
+              instance.selectItem({
+                event,
+                itemId
+              });
               event.preventDefault();
             }
           }

package/modern/internals/plugins/useTreeViewSelection/useTreeViewSelection.js

@@ -46,7 +46,12 @@ export const useTreeViewSelection = ({
     models.selectedItems.setControlledValue(newSelectedItems);
   };
   const isItemSelected = itemId => selectedItemsMap.has(itemId);
-  const selectItem = (event, itemId, keepExistingSelection, newValue) => {
+  const selectItem = ({
+    event,
+    itemId,
+    keepExistingSelection = false,
+    shouldBeSelected
+  }) => {
     if (params.disableSelection) {
       return;
     }
@@ -54,16 +59,16 @@ export const useTreeViewSelection = ({
     if (keepExistingSelection) {
       const cleanSelectedItems = convertSelectedItemsToArray(models.selectedItems.value);
       const isSelectedBefore = instance.isItemSelected(itemId);
-      if (isSelectedBefore && (newValue === false || newValue == null)) {
+      if (isSelectedBefore && (shouldBeSelected === false || shouldBeSelected == null)) {
         newSelected = cleanSelectedItems.filter(id => id !== itemId);
-      } else if (!isSelectedBefore && (newValue === true || newValue == null)) {
+      } else if (!isSelectedBefore && (shouldBeSelected === true || shouldBeSelected == null)) {
         newSelected = [itemId].concat(cleanSelectedItems);
       } else {
         newSelected = cleanSelectedItems;
       }
     } else {
       // eslint-disable-next-line no-lonely-if
-      if (newValue === false) {
+      if (shouldBeSelected === false || shouldBeSelected == null && instance.isItemSelected(itemId)) {
         newSelected = params.multiSelect ? [] : null;
       } else {
         newSelected = params.multiSelect ? [itemId] : itemId;
@@ -142,6 +147,9 @@ export const useTreeViewSelection = ({
     getRootProps: () => ({
       'aria-multiselectable': params.multiSelect
     }),
+    publicAPI: {
+      selectItem
+    },
     instance: {
       isItemSelected,
       selectItem,

package/node/RichTreeView/RichTreeView.js

@@ -146,6 +146,8 @@ process.env.NODE_ENV !== "production" ? RichTreeView.propTypes = {
     current: _propTypes.default.shape({
       focusItem: _propTypes.default.func.isRequired,
       getItem: _propTypes.default.func.isRequired,
+      getItemDOMElement: _propTypes.default.func.isRequired,
+      selectItem: _propTypes.default.func.isRequired,
       setItemExpansion: _propTypes.default.func.isRequired
     })
   }),
@@ -243,34 +245,34 @@ process.env.NODE_ENV !== "production" ? RichTreeView.propTypes = {
   multiSelect: _propTypes.default.bool,
   /**
    * Callback fired when tree items are expanded/collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemIds The ids of the expanded items.
    */
   onExpandedItemsChange: _propTypes.default.func,
   /**
    * Callback fired when a tree item is expanded or collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isExpanded `true` if the item has just been expanded, `false` if it has just been collapsed.
    */
   onItemExpansionToggle: _propTypes.default.func,
   /**
    * Callback fired when tree items are focused.
-   * @param {React.SyntheticEvent} event The event source of the callback **Warning**: This is a generic event not a focus event.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
    * @param {string} itemId The id of the focused item.
    * @param {string} value of the focused item.
    */
   onItemFocus: _propTypes.default.func,
   /**
    * Callback fired when a tree item is selected or deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isSelected `true` if the item has just been selected, `false` if it has just been deselected.
    */
   onItemSelectionToggle: _propTypes.default.func,
   /**
    * Callback fired when tree items are selected/deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {string[] | string} itemIds The ids of the selected items.
    * When `multiSelect` is `true`, this is an array of strings; when false (default) a string.
    */

package/node/SimpleTreeView/SimpleTreeView.js

@@ -104,6 +104,8 @@ process.env.NODE_ENV !== "production" ? SimpleTreeView.propTypes = {
     current: _propTypes.default.shape({
       focusItem: _propTypes.default.func.isRequired,
       getItem: _propTypes.default.func.isRequired,
+      getItemDOMElement: _propTypes.default.func.isRequired,
+      selectItem: _propTypes.default.func.isRequired,
       setItemExpansion: _propTypes.default.func.isRequired
     })
   }),
@@ -179,34 +181,34 @@ process.env.NODE_ENV !== "production" ? SimpleTreeView.propTypes = {
   multiSelect: _propTypes.default.bool,
   /**
    * Callback fired when tree items are expanded/collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemIds The ids of the expanded items.
    */
   onExpandedItemsChange: _propTypes.default.func,
   /**
    * Callback fired when a tree item is expanded or collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isExpanded `true` if the item has just been expanded, `false` if it has just been collapsed.
    */
   onItemExpansionToggle: _propTypes.default.func,
   /**
    * Callback fired when tree items are focused.
-   * @param {React.SyntheticEvent} event The event source of the callback **Warning**: This is a generic event not a focus event.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
    * @param {string} itemId The id of the focused item.
    * @param {string} value of the focused item.
    */
   onItemFocus: _propTypes.default.func,
   /**
    * Callback fired when a tree item is selected or deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isSelected `true` if the item has just been selected, `false` if it has just been deselected.
    */
   onItemSelectionToggle: _propTypes.default.func,
   /**
    * Callback fired when tree items are selected/deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {string[] | string} itemIds The ids of the selected items.
    * When `multiSelect` is `true`, this is an array of strings; when false (default) a string.
    */

package/node/TreeItem/useTreeItemState.js

@@ -45,10 +45,18 @@ function useTreeItemState(itemId) {
         if (event.shiftKey) {
           instance.expandSelectionRange(event, itemId);
         } else {
-          instance.selectItem(event, itemId, true);
+          instance.selectItem({
+            event,
+            itemId,
+            keepExistingSelection: true
+          });
         }
       } else {
-        instance.selectItem(event, itemId, false);
+        instance.selectItem({
+          event,
+          itemId,
+          shouldBeSelected: true
+        });
       }
     }
   };
@@ -60,7 +68,12 @@ function useTreeItemState(itemId) {
     if (multiSelect && hasShift) {
       instance.expandSelectionRange(event, itemId);
     } else {
-      instance.selectItem(event, itemId, multiSelect, event.target.checked);
+      instance.selectItem({
+        event,
+        itemId,
+        keepExistingSelection: multiSelect,
+        shouldBeSelected: event.target.checked
+      });
     }
   };
   const preventSelection = event => {

package/node/TreeView/TreeView.js

@@ -81,6 +81,8 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
     current: _propTypes.default.shape({
       focusItem: _propTypes.default.func.isRequired,
       getItem: _propTypes.default.func.isRequired,
+      getItemDOMElement: _propTypes.default.func.isRequired,
+      selectItem: _propTypes.default.func.isRequired,
       setItemExpansion: _propTypes.default.func.isRequired
     })
   }),
@@ -156,34 +158,34 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
   multiSelect: _propTypes.default.bool,
   /**
    * Callback fired when tree items are expanded/collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemIds The ids of the expanded items.
    */
   onExpandedItemsChange: _propTypes.default.func,
   /**
    * Callback fired when a tree item is expanded or collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isExpanded `true` if the item has just been expanded, `false` if it has just been collapsed.
    */
   onItemExpansionToggle: _propTypes.default.func,
   /**
    * Callback fired when tree items are focused.
-   * @param {React.SyntheticEvent} event The event source of the callback **Warning**: This is a generic event not a focus event.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
    * @param {string} itemId The id of the focused item.
    * @param {string} value of the focused item.
    */
   onItemFocus: _propTypes.default.func,
   /**
    * Callback fired when a tree item is selected or deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {array} itemId The itemId of the modified item.
    * @param {array} isSelected `true` if the item has just been selected, `false` if it has just been deselected.
    */
   onItemSelectionToggle: _propTypes.default.func,
   /**
    * Callback fired when tree items are selected/deselected.
-   * @param {React.SyntheticEvent} event The event source of the callback
+   * @param {React.SyntheticEvent} event The DOM event that triggered the change.
    * @param {string[] | string} itemIds The ids of the selected items.
    * When `multiSelect` is `true`, this is an array of strings; when false (default) a string.
    */

package/node/hooks/useTreeItem2Utils/useTreeItem2Utils.js

@@ -63,10 +63,18 @@ const useTreeItem2Utils = ({
       if (event.shiftKey) {
         instance.expandSelectionRange(event, itemId);
       } else {
-        instance.selectItem(event, itemId, true);
+        instance.selectItem({
+          event,
+          itemId,
+          keepExistingSelection: true
+        });
       }
     } else {
-      instance.selectItem(event, itemId, false);
+      instance.selectItem({
+        event,
+        itemId,
+        shouldBeSelected: true
+      });
     }
   };
   const handleCheckboxSelection = event => {
@@ -74,7 +82,12 @@ const useTreeItem2Utils = ({
     if (multiSelect && hasShift) {
       instance.expandSelectionRange(event, itemId);
     } else {
-      instance.selectItem(event, itemId, multiSelect, event.target.checked);
+      instance.selectItem({
+        event,
+        itemId,
+        keepExistingSelection: multiSelect,
+        shouldBeSelected: event.target.checked
+      });
     }
   };
   const interactions = {

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-tree-view v7.8.0
+ * @mui/x-tree-view v7.9.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/node/internals/plugins/useTreeViewFocus/useTreeViewFocus.js

@@ -52,8 +52,7 @@ const useTreeViewFocus = ({
     return itemMeta && (itemMeta.parentId == null || instance.isItemExpanded(itemMeta.parentId));
   };
   const innerFocusItem = (event, itemId) => {
-    const itemMeta = instance.getItemMeta(itemId);
-    const itemElement = document.getElementById(instance.getTreeItemIdAttribute(itemId, itemMeta.idAttribute));
+    const itemElement = instance.getItemDOMElement(itemId);
     if (itemElement) {
       itemElement.focus();
     }

package/node/internals/plugins/useTreeViewItems/useTreeViewItems.js

@@ -101,6 +101,13 @@ const useTreeViewItems = ({
     return state.items.itemChildrenIndexes[parentId][itemId];
   }, [instance, state.items.itemChildrenIndexes]);
   const getItemOrderedChildrenIds = React.useCallback(itemId => state.items.itemOrderedChildrenIds[itemId ?? _useTreeViewItems.TREE_VIEW_ROOT_PARENT_ID] ?? [], [state.items.itemOrderedChildrenIds]);
+  const getItemDOMElement = itemId => {
+    const itemMeta = instance.getItemMeta(itemId);
+    if (itemMeta == null) {
+      return null;
+    }
+    return document.getElementById(instance.getTreeItemIdAttribute(itemId, itemMeta.idAttribute));
+  };
   const isItemNavigable = itemId => {
     if (params.disabledItemsFocusable) {
       return true;
@@ -154,13 +161,15 @@ const useTreeViewItems = ({
       }
     }),
     publicAPI: {
-      getItem
+      getItem,
+      getItemDOMElement
     },
     instance: {
       getItemMeta,
       getItem,
       getItemsToRender,
       getItemIndex,
+      getItemDOMElement,
       getItemOrderedChildrenIds,
       isItemDisabled,
       isItemNavigable,

package/node/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js

@@ -83,10 +83,13 @@ const useTreeViewKeyboardNavigation = ({
           event.preventDefault();
           if (params.multiSelect && event.shiftKey) {
             instance.expandSelectionRange(event, itemId);
-          } else if (params.multiSelect) {
-            instance.selectItem(event, itemId, true);
           } else {
-            instance.selectItem(event, itemId, false);
+            instance.selectItem({
+              event,
+              itemId,
+              keepExistingSelection: params.multiSelect,
+              shouldBeSelected: params.multiSelect ? undefined : true
+            });
           }
           break;
         }
@@ -101,9 +104,16 @@ const useTreeViewKeyboardNavigation = ({
           } else if (canToggleItemSelection(itemId)) {
             if (params.multiSelect) {
               event.preventDefault();
-              instance.selectItem(event, itemId, true);
+              instance.selectItem({
+                event,
+                itemId,
+                keepExistingSelection: true
+              });
             } else if (!instance.isItemSelected(itemId)) {
-              instance.selectItem(event, itemId, false);
+              instance.selectItem({
+                event,
+                itemId
+              });
               event.preventDefault();
             }
           }

package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.js

@@ -55,7 +55,12 @@ const useTreeViewSelection = ({
     models.selectedItems.setControlledValue(newSelectedItems);
   };
   const isItemSelected = itemId => selectedItemsMap.has(itemId);
-  const selectItem = (event, itemId, keepExistingSelection, newValue) => {
+  const selectItem = ({
+    event,
+    itemId,
+    keepExistingSelection = false,
+    shouldBeSelected
+  }) => {
     if (params.disableSelection) {
       return;
     }
@@ -63,16 +68,16 @@ const useTreeViewSelection = ({
     if (keepExistingSelection) {
       const cleanSelectedItems = (0, _useTreeViewSelection.convertSelectedItemsToArray)(models.selectedItems.value);
       const isSelectedBefore = instance.isItemSelected(itemId);
-      if (isSelectedBefore && (newValue === false || newValue == null)) {
+      if (isSelectedBefore && (shouldBeSelected === false || shouldBeSelected == null)) {
         newSelected = cleanSelectedItems.filter(id => id !== itemId);
-      } else if (!isSelectedBefore && (newValue === true || newValue == null)) {
+      } else if (!isSelectedBefore && (shouldBeSelected === true || shouldBeSelected == null)) {
         newSelected = [itemId].concat(cleanSelectedItems);
       } else {
         newSelected = cleanSelectedItems;
       }
     } else {
       // eslint-disable-next-line no-lonely-if
-      if (newValue === false) {
+      if (shouldBeSelected === false || shouldBeSelected == null && instance.isItemSelected(itemId)) {
         newSelected = params.multiSelect ? [] : null;
       } else {
         newSelected = params.multiSelect ? [itemId] : itemId;
@@ -151,6 +156,9 @@ const useTreeViewSelection = ({
     getRootProps: () => ({
       'aria-multiselectable': params.multiSelect
     }),
+    publicAPI: {
+      selectItem
+    },
     instance: {
       isItemSelected,
       selectItem,