@react-aria/grid 3.6.2-nightly.3731 → 3.6.2-nightly.3737

package/dist/import.mjs

@@ -1,3 +1,4 @@
+import {getNthItem as $cVkRF$getNthItem, getChildNodes as $cVkRF$getChildNodes, getLastItem as $cVkRF$getLastItem, getFirstItem as $cVkRF$getFirstItem} from "@react-stately/collections";
 import {Rect as $cVkRF$Rect} from "@react-stately/virtualizer";
 import {useId as $cVkRF$useId, filterDOMProps as $cVkRF$filterDOMProps, mergeProps as $cVkRF$mergeProps, useUpdateEffect as $cVkRF$useUpdateEffect, useDescription as $cVkRF$useDescription, scrollIntoViewport as $cVkRF$scrollIntoViewport, getScrollParent as $cVkRF$getScrollParent} from "@react-aria/utils";
 import {useMemo as $cVkRF$useMemo, useRef as $cVkRF$useRef} from "react";
@@ -31,6 +32,7 @@ function $parcel$interopDefault(a) {
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
+
 class $d1c300d9c497e402$export$de9feff04fda126e {
     isCell(node) {
         return node.type === "cell";
@@ -42,7 +44,7 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
         let key = fromKey != null ? this.collection.getKeyBefore(fromKey) : this.collection.getLastKey();
         while(key != null){
             let item = this.collection.getItem(key);
-            if (!pred || pred(item)) return key;
+            if (!this.disabledKeys.has(key) && (!pred || pred(item))) return key;
             key = this.collection.getKeyBefore(key);
         }
     }
@@ -50,7 +52,7 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
         let key = fromKey != null ? this.collection.getKeyAfter(fromKey) : this.collection.getFirstKey();
         while(key != null){
             let item = this.collection.getItem(key);
-            if (!pred || pred(item)) return key;
+            if (!this.disabledKeys.has(key) && (!pred || pred(item))) return key;
             key = this.collection.getKeyAfter(key);
         }
     }
@@ -65,9 +67,7 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
             // If focus was on a cell, focus the cell with the same index in the next row.
             if (this.isCell(startItem)) {
                 let item = this.collection.getItem(key);
-                return [
-                    ...item.childNodes
-                ][startItem.index].key;
+                return (0, $cVkRF$getNthItem)((0, $cVkRF$getChildNodes)(item, this.collection), startItem.index).key;
             }
             // Otherwise, focus the next row
             if (this.focusMode === "row") return key;
@@ -84,9 +84,7 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
             // If focus was on a cell, focus the cell with the same index in the previous row.
             if (this.isCell(startItem)) {
                 let item = this.collection.getItem(key);
-                return [
-                    ...item.childNodes
-                ][startItem.index].key;
+                return (0, $cVkRF$getNthItem)((0, $cVkRF$getChildNodes)(item, this.collection), startItem.index).key;
             }
             // Otherwise, focus the previous row
             if (this.focusMode === "row") return key;
@@ -97,19 +95,15 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
         if (!item) return;
         // If focus is on a row, focus the first child cell.
         if (this.isRow(item)) {
-            let children = [
-                ...item.childNodes
-            ];
-            return this.direction === "rtl" ? children[children.length - 1].key : children[0].key;
+            let children = (0, $cVkRF$getChildNodes)(item, this.collection);
+            return this.direction === "rtl" ? (0, $cVkRF$getLastItem)(children).key : (0, $cVkRF$getFirstItem)(children).key;
         }
         // If focus is on a cell, focus the next cell if any,
         // otherwise focus the parent row.
         if (this.isCell(item)) {
             let parent = this.collection.getItem(item.parentKey);
-            let children1 = [
-                ...parent.childNodes
-            ];
-            let next = this.direction === "rtl" ? children1[item.index - 1] : children1[item.index + 1];
+            let children1 = (0, $cVkRF$getChildNodes)(parent, this.collection);
+            let next = this.direction === "rtl" ? (0, $cVkRF$getNthItem)(children1, item.index - 1) : (0, $cVkRF$getNthItem)(children1, item.index + 1);
             if (next) return next.key;
             // focus row only if focusMode is set to row
             if (this.focusMode === "row") return item.parentKey;
@@ -121,19 +115,15 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
         if (!item) return;
         // If focus is on a row, focus the last child cell.
         if (this.isRow(item)) {
-            let children = [
-                ...item.childNodes
-            ];
-            return this.direction === "rtl" ? children[0].key : children[children.length - 1].key;
+            let children = (0, $cVkRF$getChildNodes)(item, this.collection);
+            return this.direction === "rtl" ? (0, $cVkRF$getFirstItem)(children).key : (0, $cVkRF$getLastItem)(children).key;
         }
         // If focus is on a cell, focus the previous cell if any,
         // otherwise focus the parent row.
         if (this.isCell(item)) {
             let parent = this.collection.getItem(item.parentKey);
-            let children1 = [
-                ...parent.childNodes
-            ];
-            let prev = this.direction === "rtl" ? children1[item.index + 1] : children1[item.index - 1];
+            let children1 = (0, $cVkRF$getChildNodes)(parent, this.collection);
+            let prev = this.direction === "rtl" ? (0, $cVkRF$getNthItem)(children1, item.index + 1) : (0, $cVkRF$getNthItem)(children1, item.index - 1);
             if (prev) return prev.key;
             // focus row only if focusMode is set to row
             if (this.focusMode === "row") return item.parentKey;
@@ -149,9 +139,7 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
             // move focus to the first cell in the parent row.
             if (this.isCell(item) && !global) {
                 let parent = this.collection.getItem(item.parentKey);
-                return [
-                    ...parent.childNodes
-                ][0].key;
+                return (0, $cVkRF$getFirstItem)((0, $cVkRF$getChildNodes)(parent, this.collection)).key;
             }
         }
         // Find the first row
@@ -159,9 +147,7 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
         // If global flag is set (or if focus mode is cell), focus the first cell in the first row.
         if (key != null && item && this.isCell(item) && global || this.focusMode === "cell") {
             let item1 = this.collection.getItem(key);
-            key = [
-                ...item1.childNodes
-            ][0].key;
+            key = (0, $cVkRF$getFirstItem)((0, $cVkRF$getChildNodes)(item1, this.collection)).key;
         }
         // Otherwise, focus the row itself.
         return key;
@@ -175,10 +161,8 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
             // move focus to the last cell in the parent row.
             if (this.isCell(item) && !global) {
                 let parent = this.collection.getItem(item.parentKey);
-                let children = [
-                    ...parent.childNodes
-                ];
-                return children[children.length - 1].key;
+                let children = (0, $cVkRF$getChildNodes)(parent, this.collection);
+                return (0, $cVkRF$getLastItem)(children).key;
             }
         }
         // Find the last row
@@ -186,10 +170,8 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
         // If global flag is set (or if focus mode is cell), focus the last cell in the last row.
         if (key != null && item && this.isCell(item) && global || this.focusMode === "cell") {
             let item1 = this.collection.getItem(key);
-            let children1 = [
-                ...item1.childNodes
-            ];
-            key = children1[children1.length - 1].key;
+            let children1 = (0, $cVkRF$getChildNodes)(item1, this.collection);
+            key = (0, $cVkRF$getLastItem)(children1).key;
         }
         // Otherwise, focus the row itself.
         return key;
@@ -251,9 +233,7 @@ class $d1c300d9c497e402$export$de9feff04fda126e {
             if (item.textValue) {
                 let substring = item.textValue.slice(0, search.length);
                 if (this.collator.compare(substring, search) === 0) {
-                    if (this.isRow(item) && this.focusMode === "cell") return [
-                        ...item.childNodes
-                    ][0].key;
+                    if (this.isRow(item) && this.focusMode === "cell") return (0, $cVkRF$getFirstItem)((0, $cVkRF$getChildNodes)(item, this.collection)).key;
                     return item.key;
                 }
             }
@@ -978,9 +958,10 @@ function $83c6e2eafa584c67$export$f6b86a04e5d66d90(props, state, ref) {
         sensitivity: "base"
     });
     let { direction: direction  } = (0, $cVkRF$useLocale)();
+    let disabledBehavior = state.selectionManager.disabledBehavior;
     let delegate = (0, $cVkRF$useMemo)(()=>keyboardDelegate || new (0, $d1c300d9c497e402$export$de9feff04fda126e)({
             collection: state.collection,
-            disabledKeys: state.disabledKeys,
+            disabledKeys: disabledBehavior === "selection" ? new Set() : state.disabledKeys,
             ref: ref,
             direction: direction,
             collator: collator,
@@ -989,6 +970,7 @@ function $83c6e2eafa584c67$export$f6b86a04e5d66d90(props, state, ref) {
         keyboardDelegate,
         state.collection,
         state.disabledKeys,
+        disabledBehavior,
         ref,
         direction,
         collator,
@@ -1068,7 +1050,7 @@ function $83c6e2eafa584c67$export$f6b86a04e5d66d90(props, state, ref) {
 function $4159a7a9cbb0cc18$export$96357d5a73f686fa(props, state, ref) {
     let { node: node , isVirtualized: isVirtualized , shouldSelectOnPressUp: shouldSelectOnPressUp , onAction: onAction  } = props;
     let { actions: { onRowAction: onRowAction  }  } = (0, $1af922eb41e03c8f$export$e6235c0d09b995d0).get(state);
-    let { itemProps: itemProps , isPressed: isPressed  } = (0, $cVkRF$useSelectableItem)({
+    let { itemProps: itemProps , ...states } = (0, $cVkRF$useSelectableItem)({
         selectionManager: state.selectionManager,
         key: node.key,
         ref: ref,
@@ -1081,12 +1063,13 @@ function $4159a7a9cbb0cc18$export$96357d5a73f686fa(props, state, ref) {
     let rowProps = {
         role: "row",
         "aria-selected": state.selectionManager.selectionMode !== "none" ? isSelected : undefined,
+        "aria-disabled": states.isDisabled || undefined,
         ...itemProps
     };
     if (isVirtualized) rowProps["aria-rowindex"] = node.index + 1; // aria-rowindex is 1 based
     return {
         rowProps: rowProps,
-        isPressed: isPressed
+        ...states
     };
 }
 

package/dist/main.js

@@ -1,3 +1,4 @@
+var $2oePb$reactstatelycollections = require("@react-stately/collections");
 var $2oePb$reactstatelyvirtualizer = require("@react-stately/virtualizer");
 var $2oePb$reactariautils = require("@react-aria/utils");
 var $2oePb$react = require("react");
@@ -43,6 +44,7 @@ $parcel$export(module.exports, "useGridSelectionAnnouncement", () => $1eb174acfe
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
+
 class $3187c0e19200cb16$export$de9feff04fda126e {
     isCell(node) {
         return node.type === "cell";
@@ -54,7 +56,7 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
         let key = fromKey != null ? this.collection.getKeyBefore(fromKey) : this.collection.getLastKey();
         while(key != null){
             let item = this.collection.getItem(key);
-            if (!pred || pred(item)) return key;
+            if (!this.disabledKeys.has(key) && (!pred || pred(item))) return key;
             key = this.collection.getKeyBefore(key);
         }
     }
@@ -62,7 +64,7 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
         let key = fromKey != null ? this.collection.getKeyAfter(fromKey) : this.collection.getFirstKey();
         while(key != null){
             let item = this.collection.getItem(key);
-            if (!pred || pred(item)) return key;
+            if (!this.disabledKeys.has(key) && (!pred || pred(item))) return key;
             key = this.collection.getKeyAfter(key);
         }
     }
@@ -77,9 +79,7 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
             // If focus was on a cell, focus the cell with the same index in the next row.
             if (this.isCell(startItem)) {
                 let item = this.collection.getItem(key);
-                return [
-                    ...item.childNodes
-                ][startItem.index].key;
+                return (0, $2oePb$reactstatelycollections.getNthItem)((0, $2oePb$reactstatelycollections.getChildNodes)(item, this.collection), startItem.index).key;
             }
             // Otherwise, focus the next row
             if (this.focusMode === "row") return key;
@@ -96,9 +96,7 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
             // If focus was on a cell, focus the cell with the same index in the previous row.
             if (this.isCell(startItem)) {
                 let item = this.collection.getItem(key);
-                return [
-                    ...item.childNodes
-                ][startItem.index].key;
+                return (0, $2oePb$reactstatelycollections.getNthItem)((0, $2oePb$reactstatelycollections.getChildNodes)(item, this.collection), startItem.index).key;
             }
             // Otherwise, focus the previous row
             if (this.focusMode === "row") return key;
@@ -109,19 +107,15 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
         if (!item) return;
         // If focus is on a row, focus the first child cell.
         if (this.isRow(item)) {
-            let children = [
-                ...item.childNodes
-            ];
-            return this.direction === "rtl" ? children[children.length - 1].key : children[0].key;
+            let children = (0, $2oePb$reactstatelycollections.getChildNodes)(item, this.collection);
+            return this.direction === "rtl" ? (0, $2oePb$reactstatelycollections.getLastItem)(children).key : (0, $2oePb$reactstatelycollections.getFirstItem)(children).key;
         }
         // If focus is on a cell, focus the next cell if any,
         // otherwise focus the parent row.
         if (this.isCell(item)) {
             let parent = this.collection.getItem(item.parentKey);
-            let children1 = [
-                ...parent.childNodes
-            ];
-            let next = this.direction === "rtl" ? children1[item.index - 1] : children1[item.index + 1];
+            let children1 = (0, $2oePb$reactstatelycollections.getChildNodes)(parent, this.collection);
+            let next = this.direction === "rtl" ? (0, $2oePb$reactstatelycollections.getNthItem)(children1, item.index - 1) : (0, $2oePb$reactstatelycollections.getNthItem)(children1, item.index + 1);
             if (next) return next.key;
             // focus row only if focusMode is set to row
             if (this.focusMode === "row") return item.parentKey;
@@ -133,19 +127,15 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
         if (!item) return;
         // If focus is on a row, focus the last child cell.
         if (this.isRow(item)) {
-            let children = [
-                ...item.childNodes
-            ];
-            return this.direction === "rtl" ? children[0].key : children[children.length - 1].key;
+            let children = (0, $2oePb$reactstatelycollections.getChildNodes)(item, this.collection);
+            return this.direction === "rtl" ? (0, $2oePb$reactstatelycollections.getFirstItem)(children).key : (0, $2oePb$reactstatelycollections.getLastItem)(children).key;
         }
         // If focus is on a cell, focus the previous cell if any,
         // otherwise focus the parent row.
         if (this.isCell(item)) {
             let parent = this.collection.getItem(item.parentKey);
-            let children1 = [
-                ...parent.childNodes
-            ];
-            let prev = this.direction === "rtl" ? children1[item.index + 1] : children1[item.index - 1];
+            let children1 = (0, $2oePb$reactstatelycollections.getChildNodes)(parent, this.collection);
+            let prev = this.direction === "rtl" ? (0, $2oePb$reactstatelycollections.getNthItem)(children1, item.index + 1) : (0, $2oePb$reactstatelycollections.getNthItem)(children1, item.index - 1);
             if (prev) return prev.key;
             // focus row only if focusMode is set to row
             if (this.focusMode === "row") return item.parentKey;
@@ -161,9 +151,7 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
             // move focus to the first cell in the parent row.
             if (this.isCell(item) && !global) {
                 let parent = this.collection.getItem(item.parentKey);
-                return [
-                    ...parent.childNodes
-                ][0].key;
+                return (0, $2oePb$reactstatelycollections.getFirstItem)((0, $2oePb$reactstatelycollections.getChildNodes)(parent, this.collection)).key;
             }
         }
         // Find the first row
@@ -171,9 +159,7 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
         // If global flag is set (or if focus mode is cell), focus the first cell in the first row.
         if (key != null && item && this.isCell(item) && global || this.focusMode === "cell") {
             let item1 = this.collection.getItem(key);
-            key = [
-                ...item1.childNodes
-            ][0].key;
+            key = (0, $2oePb$reactstatelycollections.getFirstItem)((0, $2oePb$reactstatelycollections.getChildNodes)(item1, this.collection)).key;
         }
         // Otherwise, focus the row itself.
         return key;
@@ -187,10 +173,8 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
             // move focus to the last cell in the parent row.
             if (this.isCell(item) && !global) {
                 let parent = this.collection.getItem(item.parentKey);
-                let children = [
-                    ...parent.childNodes
-                ];
-                return children[children.length - 1].key;
+                let children = (0, $2oePb$reactstatelycollections.getChildNodes)(parent, this.collection);
+                return (0, $2oePb$reactstatelycollections.getLastItem)(children).key;
             }
         }
         // Find the last row
@@ -198,10 +182,8 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
         // If global flag is set (or if focus mode is cell), focus the last cell in the last row.
         if (key != null && item && this.isCell(item) && global || this.focusMode === "cell") {
             let item1 = this.collection.getItem(key);
-            let children1 = [
-                ...item1.childNodes
-            ];
-            key = children1[children1.length - 1].key;
+            let children1 = (0, $2oePb$reactstatelycollections.getChildNodes)(item1, this.collection);
+            key = (0, $2oePb$reactstatelycollections.getLastItem)(children1).key;
         }
         // Otherwise, focus the row itself.
         return key;
@@ -263,9 +245,7 @@ class $3187c0e19200cb16$export$de9feff04fda126e {
             if (item.textValue) {
                 let substring = item.textValue.slice(0, search.length);
                 if (this.collator.compare(substring, search) === 0) {
-                    if (this.isRow(item) && this.focusMode === "cell") return [
-                        ...item.childNodes
-                    ][0].key;
+                    if (this.isRow(item) && this.focusMode === "cell") return (0, $2oePb$reactstatelycollections.getFirstItem)((0, $2oePb$reactstatelycollections.getChildNodes)(item, this.collection)).key;
                     return item.key;
                 }
             }
@@ -990,9 +970,10 @@ function $11d770dfabe45077$export$f6b86a04e5d66d90(props, state, ref) {
         sensitivity: "base"
     });
     let { direction: direction  } = (0, $2oePb$reactariai18n.useLocale)();
+    let disabledBehavior = state.selectionManager.disabledBehavior;
     let delegate = (0, $2oePb$react.useMemo)(()=>keyboardDelegate || new (0, $3187c0e19200cb16$export$de9feff04fda126e)({
             collection: state.collection,
-            disabledKeys: state.disabledKeys,
+            disabledKeys: disabledBehavior === "selection" ? new Set() : state.disabledKeys,
             ref: ref,
             direction: direction,
             collator: collator,
@@ -1001,6 +982,7 @@ function $11d770dfabe45077$export$f6b86a04e5d66d90(props, state, ref) {
         keyboardDelegate,
         state.collection,
         state.disabledKeys,
+        disabledBehavior,
         ref,
         direction,
         collator,
@@ -1080,7 +1062,7 @@ function $11d770dfabe45077$export$f6b86a04e5d66d90(props, state, ref) {
 function $eed398987c639831$export$96357d5a73f686fa(props, state, ref) {
     let { node: node , isVirtualized: isVirtualized , shouldSelectOnPressUp: shouldSelectOnPressUp , onAction: onAction  } = props;
     let { actions: { onRowAction: onRowAction  }  } = (0, $8ee34951196858d0$export$e6235c0d09b995d0).get(state);
-    let { itemProps: itemProps , isPressed: isPressed  } = (0, $2oePb$reactariaselection.useSelectableItem)({
+    let { itemProps: itemProps , ...states } = (0, $2oePb$reactariaselection.useSelectableItem)({
         selectionManager: state.selectionManager,
         key: node.key,
         ref: ref,
@@ -1093,12 +1075,13 @@ function $eed398987c639831$export$96357d5a73f686fa(props, state, ref) {
     let rowProps = {
         role: "row",
         "aria-selected": state.selectionManager.selectionMode !== "none" ? isSelected : undefined,
+        "aria-disabled": states.isDisabled || undefined,
         ...itemProps
     };
     if (isVirtualized) rowProps["aria-rowindex"] = node.index + 1; // aria-rowindex is 1 based
     return {
         rowProps: rowProps,
-        isPressed: isPressed
+        ...states
     };
 }