@react-stately/selection 3.14.3 → 3.15.1

package/dist/useMultipleSelectionState.mjs

@@ -0,0 +1,96 @@
+import {Selection as $e40ea825a81a3709$export$52baac22726c72bf} from "./Selection.mjs";
+import {useControlledState as $6tM1y$useControlledState} from "@react-stately/utils";
+import {useRef as $6tM1y$useRef, useState as $6tM1y$useState, useMemo as $6tM1y$useMemo, useEffect as $6tM1y$useEffect} from "react";
+
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+
+
+function $7af3f5b51489e0b5$var$equalSets(setA, setB) {
+    if (setA.size !== setB.size) return false;
+    for (let item of setA){
+        if (!setB.has(item)) return false;
+    }
+    return true;
+}
+function $7af3f5b51489e0b5$export$253fe78d46329472(props) {
+    let { selectionMode: selectionMode = 'none', disallowEmptySelection: disallowEmptySelection, allowDuplicateSelectionEvents: allowDuplicateSelectionEvents, selectionBehavior: selectionBehaviorProp = 'toggle', disabledBehavior: disabledBehavior = 'all' } = props;
+    // We want synchronous updates to `isFocused` and `focusedKey` after their setters are called.
+    // But we also need to trigger a react re-render. So, we have both a ref (sync) and state (async).
+    let isFocusedRef = (0, $6tM1y$useRef)(false);
+    let [, setFocused] = (0, $6tM1y$useState)(false);
+    let focusedKeyRef = (0, $6tM1y$useRef)(null);
+    let childFocusStrategyRef = (0, $6tM1y$useRef)(null);
+    let [, setFocusedKey] = (0, $6tM1y$useState)(null);
+    let selectedKeysProp = (0, $6tM1y$useMemo)(()=>$7af3f5b51489e0b5$var$convertSelection(props.selectedKeys), [
+        props.selectedKeys
+    ]);
+    let defaultSelectedKeys = (0, $6tM1y$useMemo)(()=>$7af3f5b51489e0b5$var$convertSelection(props.defaultSelectedKeys, new (0, $e40ea825a81a3709$export$52baac22726c72bf)()), [
+        props.defaultSelectedKeys
+    ]);
+    let [selectedKeys, setSelectedKeys] = (0, $6tM1y$useControlledState)(selectedKeysProp, defaultSelectedKeys, props.onSelectionChange);
+    let disabledKeysProp = (0, $6tM1y$useMemo)(()=>props.disabledKeys ? new Set(props.disabledKeys) : new Set(), [
+        props.disabledKeys
+    ]);
+    let [selectionBehavior, setSelectionBehavior] = (0, $6tM1y$useState)(selectionBehaviorProp);
+    // If the selectionBehavior prop is set to replace, but the current state is toggle (e.g. due to long press
+    // to enter selection mode on touch), and the selection becomes empty, reset the selection behavior.
+    if (selectionBehaviorProp === 'replace' && selectionBehavior === 'toggle' && typeof selectedKeys === 'object' && selectedKeys.size === 0) setSelectionBehavior('replace');
+    // If the selectionBehavior prop changes, update the state as well.
+    let lastSelectionBehavior = (0, $6tM1y$useRef)(selectionBehaviorProp);
+    (0, $6tM1y$useEffect)(()=>{
+        if (selectionBehaviorProp !== lastSelectionBehavior.current) {
+            setSelectionBehavior(selectionBehaviorProp);
+            lastSelectionBehavior.current = selectionBehaviorProp;
+        }
+    }, [
+        selectionBehaviorProp
+    ]);
+    return {
+        selectionMode: selectionMode,
+        disallowEmptySelection: disallowEmptySelection,
+        selectionBehavior: selectionBehavior,
+        setSelectionBehavior: setSelectionBehavior,
+        get isFocused () {
+            return isFocusedRef.current;
+        },
+        setFocused (f) {
+            isFocusedRef.current = f;
+            setFocused(f);
+        },
+        get focusedKey () {
+            return focusedKeyRef.current;
+        },
+        get childFocusStrategy () {
+            return childFocusStrategyRef.current;
+        },
+        setFocusedKey (k, childFocusStrategy = 'first') {
+            focusedKeyRef.current = k;
+            childFocusStrategyRef.current = childFocusStrategy;
+            setFocusedKey(k);
+        },
+        selectedKeys: selectedKeys,
+        setSelectedKeys (keys) {
+            if (allowDuplicateSelectionEvents || !$7af3f5b51489e0b5$var$equalSets(keys, selectedKeys)) setSelectedKeys(keys);
+        },
+        disabledKeys: disabledKeysProp,
+        disabledBehavior: disabledBehavior
+    };
+}
+function $7af3f5b51489e0b5$var$convertSelection(selection, defaultValue) {
+    if (!selection) return defaultValue;
+    return selection === 'all' ? 'all' : new (0, $e40ea825a81a3709$export$52baac22726c72bf)(selection);
+}
+
+
+export {$7af3f5b51489e0b5$export$253fe78d46329472 as useMultipleSelectionState};
+//# sourceMappingURL=useMultipleSelectionState.module.js.map

package/dist/useMultipleSelectionState.module.js

@@ -0,0 +1,96 @@
+import {Selection as $e40ea825a81a3709$export$52baac22726c72bf} from "./Selection.module.js";
+import {useControlledState as $6tM1y$useControlledState} from "@react-stately/utils";
+import {useRef as $6tM1y$useRef, useState as $6tM1y$useState, useMemo as $6tM1y$useMemo, useEffect as $6tM1y$useEffect} from "react";
+
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+
+
+function $7af3f5b51489e0b5$var$equalSets(setA, setB) {
+    if (setA.size !== setB.size) return false;
+    for (let item of setA){
+        if (!setB.has(item)) return false;
+    }
+    return true;
+}
+function $7af3f5b51489e0b5$export$253fe78d46329472(props) {
+    let { selectionMode: selectionMode = 'none', disallowEmptySelection: disallowEmptySelection, allowDuplicateSelectionEvents: allowDuplicateSelectionEvents, selectionBehavior: selectionBehaviorProp = 'toggle', disabledBehavior: disabledBehavior = 'all' } = props;
+    // We want synchronous updates to `isFocused` and `focusedKey` after their setters are called.
+    // But we also need to trigger a react re-render. So, we have both a ref (sync) and state (async).
+    let isFocusedRef = (0, $6tM1y$useRef)(false);
+    let [, setFocused] = (0, $6tM1y$useState)(false);
+    let focusedKeyRef = (0, $6tM1y$useRef)(null);
+    let childFocusStrategyRef = (0, $6tM1y$useRef)(null);
+    let [, setFocusedKey] = (0, $6tM1y$useState)(null);
+    let selectedKeysProp = (0, $6tM1y$useMemo)(()=>$7af3f5b51489e0b5$var$convertSelection(props.selectedKeys), [
+        props.selectedKeys
+    ]);
+    let defaultSelectedKeys = (0, $6tM1y$useMemo)(()=>$7af3f5b51489e0b5$var$convertSelection(props.defaultSelectedKeys, new (0, $e40ea825a81a3709$export$52baac22726c72bf)()), [
+        props.defaultSelectedKeys
+    ]);
+    let [selectedKeys, setSelectedKeys] = (0, $6tM1y$useControlledState)(selectedKeysProp, defaultSelectedKeys, props.onSelectionChange);
+    let disabledKeysProp = (0, $6tM1y$useMemo)(()=>props.disabledKeys ? new Set(props.disabledKeys) : new Set(), [
+        props.disabledKeys
+    ]);
+    let [selectionBehavior, setSelectionBehavior] = (0, $6tM1y$useState)(selectionBehaviorProp);
+    // If the selectionBehavior prop is set to replace, but the current state is toggle (e.g. due to long press
+    // to enter selection mode on touch), and the selection becomes empty, reset the selection behavior.
+    if (selectionBehaviorProp === 'replace' && selectionBehavior === 'toggle' && typeof selectedKeys === 'object' && selectedKeys.size === 0) setSelectionBehavior('replace');
+    // If the selectionBehavior prop changes, update the state as well.
+    let lastSelectionBehavior = (0, $6tM1y$useRef)(selectionBehaviorProp);
+    (0, $6tM1y$useEffect)(()=>{
+        if (selectionBehaviorProp !== lastSelectionBehavior.current) {
+            setSelectionBehavior(selectionBehaviorProp);
+            lastSelectionBehavior.current = selectionBehaviorProp;
+        }
+    }, [
+        selectionBehaviorProp
+    ]);
+    return {
+        selectionMode: selectionMode,
+        disallowEmptySelection: disallowEmptySelection,
+        selectionBehavior: selectionBehavior,
+        setSelectionBehavior: setSelectionBehavior,
+        get isFocused () {
+            return isFocusedRef.current;
+        },
+        setFocused (f) {
+            isFocusedRef.current = f;
+            setFocused(f);
+        },
+        get focusedKey () {
+            return focusedKeyRef.current;
+        },
+        get childFocusStrategy () {
+            return childFocusStrategyRef.current;
+        },
+        setFocusedKey (k, childFocusStrategy = 'first') {
+            focusedKeyRef.current = k;
+            childFocusStrategyRef.current = childFocusStrategy;
+            setFocusedKey(k);
+        },
+        selectedKeys: selectedKeys,
+        setSelectedKeys (keys) {
+            if (allowDuplicateSelectionEvents || !$7af3f5b51489e0b5$var$equalSets(keys, selectedKeys)) setSelectedKeys(keys);
+        },
+        disabledKeys: disabledKeysProp,
+        disabledBehavior: disabledBehavior
+    };
+}
+function $7af3f5b51489e0b5$var$convertSelection(selection, defaultValue) {
+    if (!selection) return defaultValue;
+    return selection === 'all' ? 'all' : new (0, $e40ea825a81a3709$export$52baac22726c72bf)(selection);
+}
+
+
+export {$7af3f5b51489e0b5$export$253fe78d46329472 as useMultipleSelectionState};
+//# sourceMappingURL=useMultipleSelectionState.module.js.map

package/dist/useMultipleSelectionState.module.js.map

@@ -0,0 +1 @@
+{"mappings":";;;;AAAA;;;;;;;;;;CAUC;;;AAQD,SAAS,gCAAU,IAAI,EAAE,IAAI;IAC3B,IAAI,KAAK,IAAI,KAAK,KAAK,IAAI,EACzB,OAAO;IAGT,KAAK,IAAI,QAAQ,KAAM;QACrB,IAAI,CAAC,KAAK,GAAG,CAAC,OACZ,OAAO;IAEX;IAEA,OAAO;AACT;AAcO,SAAS,0CAA0B,KAAkC;IAC1E,IAAI,iBACF,gBAAgB,gCAChB,sBAAsB,iCACtB,6BAA6B,EAC7B,mBAAmB,wBAAwB,QAAQ,oBACnD,mBAAmB,OACpB,GAAG;IAEJ,8FAA8F;IAC9F,kGAAkG;IAClG,IAAI,eAAe,CAAA,GAAA,aAAK,EAAE;IAC1B,IAAI,GAAG,WAAW,GAAG,CAAA,GAAA,eAAO,EAAE;IAC9B,IAAI,gBAAgB,CAAA,GAAA,aAAK,EAAE;IAC3B,IAAI,wBAAwB,CAAA,GAAA,aAAK,EAAE;IACnC,IAAI,GAAG,cAAc,GAAG,CAAA,GAAA,eAAO,EAAE;IACjC,IAAI,mBAAmB,CAAA,GAAA,cAAM,EAAE,IAAM,uCAAiB,MAAM,YAAY,GAAG;QAAC,MAAM,YAAY;KAAC;IAC/F,IAAI,sBAAsB,CAAA,GAAA,cAAM,EAAE,IAAM,uCAAiB,MAAM,mBAAmB,EAAE,IAAI,CAAA,GAAA,yCAAQ,MAAM;QAAC,MAAM,mBAAmB;KAAC;IACjI,IAAI,CAAC,cAAc,gBAAgB,GAAG,CAAA,GAAA,yBAAiB,EACrD,kBACA,qBACA,MAAM,iBAAiB;IAEzB,IAAI,mBAAmB,CAAA,GAAA,cAAM,EAAE,IAC7B,MAAM,YAAY,GAAG,IAAI,IAAI,MAAM,YAAY,IAAI,IAAI,OACvD;QAAC,MAAM,YAAY;KAAC;IACtB,IAAI,CAAC,mBAAmB,qBAAqB,GAAG,CAAA,GAAA,eAAO,EAAE;IAEzD,2GAA2G;IAC3G,oGAAoG;IACpG,IAAI,0BAA0B,aAAa,sBAAsB,YAAY,OAAO,iBAAiB,YAAY,aAAa,IAAI,KAAK,GACrI,qBAAqB;IAGvB,mEAAmE;IACnE,IAAI,wBAAwB,CAAA,GAAA,aAAK,EAAE;IACnC,CAAA,GAAA,gBAAQ,EAAE;QACR,IAAI,0BAA0B,sBAAsB,OAAO,EAAE;YAC3D,qBAAqB;YACrB,sBAAsB,OAAO,GAAG;QAClC;IACF,GAAG;QAAC;KAAsB;IAE1B,OAAO;uBACL;gCACA;2BACA;8BACA;QACA,IAAI,aAAY;YACd,OAAO,aAAa,OAAO;QAC7B;QACA,YAAW,CAAC;YACV,aAAa,OAAO,GAAG;YACvB,WAAW;QACb;QACA,IAAI,cAAa;YACf,OAAO,cAAc,OAAO;QAC9B;QACA,IAAI,sBAAqB;YACvB,OAAO,sBAAsB,OAAO;QACtC;QACA,eAAc,CAAC,EAAE,qBAAqB,OAAO;YAC3C,cAAc,OAAO,GAAG;YACxB,sBAAsB,OAAO,GAAG;YAChC,cAAc;QAChB;sBACA;QACA,iBAAgB,IAAI;YAClB,IAAI,iCAAiC,CAAC,gCAAU,MAAM,eACpD,gBAAgB;QAEpB;QACA,cAAc;0BACd;IACF;AACF;AAEA,SAAS,uCAAiB,SAAgC,EAAE,YAAwB;IAClF,IAAI,CAAC,WACH,OAAO;IAGT,OAAO,cAAc,QACjB,QACA,IAAI,CAAA,GAAA,yCAAQ,EAAE;AACpB","sources":["packages/@react-stately/selection/src/useMultipleSelectionState.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {DisabledBehavior, Key, MultipleSelection, SelectionBehavior, SelectionMode} from '@react-types/shared';\nimport {MultipleSelectionState} from './types';\nimport {Selection} from './Selection';\nimport {useControlledState} from '@react-stately/utils';\nimport {useEffect, useMemo, useRef, useState} from 'react';\n\nfunction equalSets(setA, setB) {\n  if (setA.size !== setB.size) {\n    return false;\n  }\n\n  for (let item of setA) {\n    if (!setB.has(item)) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\nexport interface MultipleSelectionStateProps extends MultipleSelection {\n  /** How multiple selection should behave in the collection. */\n  selectionBehavior?: SelectionBehavior,\n  /** Whether onSelectionChange should fire even if the new set of keys is the same as the last. */\n  allowDuplicateSelectionEvents?: boolean,\n  /** Whether `disabledKeys` applies to all interactions, or only selection. */\n  disabledBehavior?: DisabledBehavior\n}\n\n/**\n * Manages state for multiple selection and focus in a collection.\n */\nexport function useMultipleSelectionState(props: MultipleSelectionStateProps): MultipleSelectionState {\n  let {\n    selectionMode = 'none' as SelectionMode,\n    disallowEmptySelection,\n    allowDuplicateSelectionEvents,\n    selectionBehavior: selectionBehaviorProp = 'toggle',\n    disabledBehavior = 'all'\n  } = props;\n\n  // We want synchronous updates to `isFocused` and `focusedKey` after their setters are called.\n  // But we also need to trigger a react re-render. So, we have both a ref (sync) and state (async).\n  let isFocusedRef = useRef(false);\n  let [, setFocused] = useState(false);\n  let focusedKeyRef = useRef(null);\n  let childFocusStrategyRef = useRef(null);\n  let [, setFocusedKey] = useState(null);\n  let selectedKeysProp = useMemo(() => convertSelection(props.selectedKeys), [props.selectedKeys]);\n  let defaultSelectedKeys = useMemo(() => convertSelection(props.defaultSelectedKeys, new Selection()), [props.defaultSelectedKeys]);\n  let [selectedKeys, setSelectedKeys] = useControlledState(\n    selectedKeysProp,\n    defaultSelectedKeys,\n    props.onSelectionChange\n  );\n  let disabledKeysProp = useMemo(() =>\n    props.disabledKeys ? new Set(props.disabledKeys) : new Set<Key>()\n  , [props.disabledKeys]);\n  let [selectionBehavior, setSelectionBehavior] = useState(selectionBehaviorProp);\n\n  // If the selectionBehavior prop is set to replace, but the current state is toggle (e.g. due to long press\n  // to enter selection mode on touch), and the selection becomes empty, reset the selection behavior.\n  if (selectionBehaviorProp === 'replace' && selectionBehavior === 'toggle' && typeof selectedKeys === 'object' && selectedKeys.size === 0) {\n    setSelectionBehavior('replace');\n  }\n\n  // If the selectionBehavior prop changes, update the state as well.\n  let lastSelectionBehavior = useRef(selectionBehaviorProp);\n  useEffect(() => {\n    if (selectionBehaviorProp !== lastSelectionBehavior.current) {\n      setSelectionBehavior(selectionBehaviorProp);\n      lastSelectionBehavior.current = selectionBehaviorProp;\n    }\n  }, [selectionBehaviorProp]);\n\n  return {\n    selectionMode,\n    disallowEmptySelection,\n    selectionBehavior,\n    setSelectionBehavior,\n    get isFocused() {\n      return isFocusedRef.current;\n    },\n    setFocused(f) {\n      isFocusedRef.current = f;\n      setFocused(f);\n    },\n    get focusedKey() {\n      return focusedKeyRef.current;\n    },\n    get childFocusStrategy() {\n      return childFocusStrategyRef.current;\n    },\n    setFocusedKey(k, childFocusStrategy = 'first') {\n      focusedKeyRef.current = k;\n      childFocusStrategyRef.current = childFocusStrategy;\n      setFocusedKey(k);\n    },\n    selectedKeys,\n    setSelectedKeys(keys) {\n      if (allowDuplicateSelectionEvents || !equalSets(keys, selectedKeys)) {\n        setSelectedKeys(keys);\n      }\n    },\n    disabledKeys: disabledKeysProp,\n    disabledBehavior\n  };\n}\n\nfunction convertSelection(selection: 'all' | Iterable<Key>, defaultValue?: Selection): 'all' | Set<Key> {\n  if (!selection) {\n    return defaultValue;\n  }\n\n  return selection === 'all'\n    ? 'all'\n    : new Selection(selection);\n}\n"],"names":[],"version":3,"file":"useMultipleSelectionState.module.js.map"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-stately/selection",
-  "version": "3.14.3",
+  "version": "3.15.1",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -22,9 +22,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/collections": "^3.10.5",
-    "@react-stately/utils": "^3.9.1",
-    "@react-types/shared": "^3.22.1",
+    "@react-stately/collections": "^3.10.7",
+    "@react-stately/utils": "^3.10.1",
+    "@react-types/shared": "^3.23.1",
     "@swc/helpers": "^0.5.0"
   },
   "peerDependencies": {
@@ -33,5 +33,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "de9f84a22583fc741c29b341d14cd35ef4cca161"
+  "gitHead": "b77d7d594dff4dcfb5359bffbcfd18142b146433"
 }

package/src/SelectionManager.ts

@@ -480,7 +480,7 @@ export class SelectionManager implements MultipleSelectionManager {
     }
 
     let item = this.collection.getItem(key);
-    if (!item || (item.type === 'cell' && !this.allowsCellSelection)) {
+    if (!item || item?.props?.isDisabled || (item.type === 'cell' && !this.allowsCellSelection)) {
       return false;
     }
 
@@ -488,10 +488,14 @@ export class SelectionManager implements MultipleSelectionManager {
   }
 
   isDisabled(key: Key) {
-    return this.state.disabledKeys.has(key) && this.state.disabledBehavior === 'all';
+    return this.state.disabledBehavior === 'all' && (this.state.disabledKeys.has(key) || !!this.collection.getItem(key)?.props?.isDisabled);
   }
 
   isLink(key: Key) {
     return !!this.collection.getItem(key)?.props?.href;
   }
+
+  getItemProps(key: Key) {
+    return this.collection.getItem(key)?.props;
+  }
 }

package/src/types.ts

@@ -105,5 +105,7 @@ export interface MultipleSelectionManager extends FocusState {
   /** Sets the selection behavior for the collection. */
   setSelectionBehavior(selectionBehavior: SelectionBehavior): void,
   /** Returns whether the given key is a hyperlink. */
-  isLink(key: Key): boolean
+  isLink(key: Key): boolean,
+  /** Returns the props for the given item. */
+  getItemProps(key: Key): any
 }