@react-spectrum/listbox 3.14.0 → 3.14.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-spectrum/listbox",
-  "version": "3.14.0",
+  "version": "3.14.2",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -36,23 +36,23 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.19.0",
-    "@react-aria/i18n": "^3.12.4",
-    "@react-aria/interactions": "^3.22.5",
-    "@react-aria/listbox": "^3.13.6",
-    "@react-aria/utils": "^3.26.0",
-    "@react-aria/virtualizer": "^4.1.0",
-    "@react-spectrum/layout": "^3.6.10",
-    "@react-spectrum/progress": "^3.7.11",
-    "@react-spectrum/text": "^3.5.10",
-    "@react-spectrum/utils": "^3.12.0",
-    "@react-stately/collections": "^3.12.0",
-    "@react-stately/layout": "^4.1.0",
-    "@react-stately/list": "^3.11.1",
-    "@react-stately/virtualizer": "^4.2.0",
-    "@react-types/listbox": "^3.5.3",
-    "@react-types/shared": "^3.26.0",
-    "@spectrum-icons/ui": "^3.6.11",
+    "@react-aria/focus": "^3.20.0",
+    "@react-aria/i18n": "^3.12.6",
+    "@react-aria/interactions": "^3.24.0",
+    "@react-aria/listbox": "^3.14.1",
+    "@react-aria/utils": "^3.28.0",
+    "@react-aria/virtualizer": "^4.1.2",
+    "@react-spectrum/layout": "^3.6.12",
+    "@react-spectrum/progress": "^3.7.13",
+    "@react-spectrum/text": "^3.5.12",
+    "@react-spectrum/utils": "^3.12.2",
+    "@react-stately/collections": "^3.12.2",
+    "@react-stately/layout": "^4.2.0",
+    "@react-stately/list": "^3.12.0",
+    "@react-stately/virtualizer": "^4.3.0",
+    "@react-types/listbox": "^3.5.5",
+    "@react-types/shared": "^3.28.0",
+    "@spectrum-icons/ui": "^3.6.13",
     "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "71f0ef23053f9e03ee7e97df736e8b083e006849"
+  "gitHead": "4d3c72c94eea2d72eb3a0e7d56000c6ef7e39726"
 }

package/src/ListBox.tsx

@@ -17,7 +17,14 @@ import {SpectrumListBoxProps} from '@react-types/listbox';
 import {useDOMRef} from '@react-spectrum/utils';
 import {useListState} from '@react-stately/list';
 
-function ListBox<T extends object>(props: SpectrumListBoxProps<T>, ref: DOMRef<HTMLDivElement>) {
+// forwardRef doesn't support generic parameters, so cast the result to the correct type
+// https://stackoverflow.com/questions/58469229/react-with-typescript-generics-while-using-react-forwardref
+
+
+/**
+ * A list of options that can allow selection of one or more.
+ */
+export const ListBox = React.forwardRef(function ListBox<T extends object>(props: SpectrumListBoxProps<T>, ref: DOMRef<HTMLDivElement>) {
   let state = useListState(props);
   let layout = useListBoxLayout();
   let domRef = useDOMRef(ref);
@@ -29,14 +36,4 @@ function ListBox<T extends object>(props: SpectrumListBoxProps<T>, ref: DOMRef<H
       state={state}
       layout={layout} />
   );
-}
-
-// forwardRef doesn't support generic parameters, so cast the result to the correct type
-// https://stackoverflow.com/questions/58469229/react-with-typescript-generics-while-using-react-forwardref
-
-
-/**
- * A list of options that can allow selection of one or more.
- */
-const _ListBox = React.forwardRef(ListBox) as <T>(props: SpectrumListBoxProps<T> & {ref?: DOMRef<HTMLDivElement>}) => ReactElement;
-export {_ListBox as ListBox};
+}) as <T>(props: SpectrumListBoxProps<T> & {ref?: DOMRef<HTMLDivElement>}) => ReactElement;

package/src/ListBoxBase.tsx

@@ -54,7 +54,7 @@ export function useListBoxLayout<T>(): ListBoxLayout<T> {
     new ListBoxLayout<T>({
       estimatedRowHeight: scale === 'large' ? 48 : 32,
       estimatedHeadingHeight: scale === 'large' ? 33 : 26,
-      padding: scale === 'large' ? 5 : 4, // TODO: get from DNA
+      paddingY: scale === 'large' ? 5 : 4, // TODO: get from DNA
       placeholderHeight: scale === 'large' ? 48 : 32
     })
   , [scale]);
@@ -62,8 +62,10 @@ export function useListBoxLayout<T>(): ListBoxLayout<T> {
   return layout;
 }
 
+// forwardRef doesn't support generic parameters, so cast the result to the correct type
+// https://stackoverflow.com/questions/58469229/react-with-typescript-generics-while-using-react-forwardref
 /** @private */
-function ListBoxBase<T extends object>(props: ListBoxBaseProps<T>, ref: ForwardedRef<HTMLDivElement | null>) {
+export const ListBoxBase = React.forwardRef(function ListBoxBase<T extends object>(props: ListBoxBaseProps<T>, ref: ForwardedRef<HTMLDivElement | null>) {
   let {layout, state, shouldFocusOnHover = false, shouldUseVirtualFocus = false, domProps = {}, isLoading, showLoadingSpinner = isLoading, onScroll, renderEmptyState} = props;
   let objectRef = useObjectRef(ref);
   let {listBoxProps} = useListBox({
@@ -145,12 +147,7 @@ function ListBoxBase<T extends object>(props: ListBoxBaseProps<T>, ref: Forwarde
       </FocusScope>
     </ListBoxContext.Provider>
   );
-}
-
-// forwardRef doesn't support generic parameters, so cast the result to the correct type
-// https://stackoverflow.com/questions/58469229/react-with-typescript-generics-while-using-react-forwardref
-const _ListBoxBase = React.forwardRef(ListBoxBase) as <T>(props: ListBoxBaseProps<T> & {ref?: RefObject<HTMLDivElement | null>}) => ReactElement;
-export {_ListBoxBase as ListBoxBase};
+}) as <T>(props: ListBoxBaseProps<T> & {ref?: RefObject<HTMLDivElement | null>}) => ReactElement;
 
 function LoadingState() {
   let {state} = useContext(ListBoxContext)!;

package/src/ListBoxLayout.ts

@@ -2,24 +2,24 @@ import {InvalidationContext, LayoutInfo, Rect} from '@react-stately/virtualizer'
 import {LayoutNode, ListLayout, ListLayoutOptions} from '@react-stately/layout';
 import {Node} from '@react-types/shared';
 
-interface ListBoxLayoutProps {
+interface ListBoxLayoutProps extends ListLayoutOptions {
   isLoading?: boolean
 }
 
 interface ListBoxLayoutOptions extends ListLayoutOptions {
   placeholderHeight: number,
-  padding: number
+  paddingY: number
 }
 
 export class ListBoxLayout<T> extends ListLayout<T, ListBoxLayoutProps> {
   private isLoading: boolean = false;
   private placeholderHeight: number;
-  private padding: number;
+  private paddingY: number;
 
   constructor(opts: ListBoxLayoutOptions) {
     super(opts);
     this.placeholderHeight = opts.placeholderHeight;
-    this.padding = opts.padding;
+    this.paddingY = opts.paddingY;
   }
 
   update(invalidationContext: InvalidationContext<ListBoxLayoutProps>): void {
@@ -28,7 +28,7 @@ export class ListBoxLayout<T> extends ListLayout<T, ListBoxLayoutProps> {
   }
 
   protected buildCollection(): LayoutNode[] {
-    let nodes = super.buildCollection(this.padding);
+    let nodes = super.buildCollection(this.paddingY);
     let y = this.contentSize.height;
 
     if (this.isLoading) {
@@ -55,7 +55,7 @@ export class ListBoxLayout<T> extends ListLayout<T, ListBoxLayoutProps> {
       y = placeholder.rect.maxY;
     }
 
-    this.contentSize.height = y + this.padding;
+    this.contentSize.height = y + this.paddingY;
     return nodes;
   }
 

package/dist/vars.487ba452.css.map

@@ -1 +0,0 @@
-{"mappings":"AA4DA;;;;;AAIE;;;;AAIA;;;;AAIA;;;;AAIA;;;;AAIA;;;;AAIA;;;;AAQA;;;;AAIA;;;;AAKF;;;;;;;;AAOE;;;;;;;;;;;AAqBE;;;;;AAQF;;;;AAKE;;;;;AAOJ;EACE;;;;EAIE;;;;;AAMJ;;;;;;;;;;AAWA;;;;AAIA;;;;AAIA;;;;;;;;;;;;;AAmBE;;;;;AAMA;;;;AAKF;;;;;;;AAWA;;;;;;;;;;;;;AAgBE;;;;AAIA;;;;AAIA;;;;AAKE;;;;AAKF;;;;AAMF;;;;;;AAMA;;;;;;AAMA;;;;;;AAOA;;;;;;;;;AAaA;;;;;;;;;;;;AAcE;;;;AAGA;;;;AAKF;;;;;AAMA;;;;;;;;;;AAgBE;;;;AAOF;;;;;;AAOA;;;;;;AAOA;;;;;;AAOA;;;;;;AAMA;;;;;;;;AAUA;;;;;;;;AASA;;;;AAGE;;;;;;AAKE;;;;AAKF;;;;;;;;AAOE;;;;;;;;AAQA;;;;;AAIE;;;;;;;;;;AAyBN;;;;;;;AAWA;;;;;AAKA;;;;AAIA;;;;;AAIE;;;;;;AAOA;;;;;AASE;;;;AAKF;;;;AAKA;;;;;;;AACE;;;;AAUJ;;;;AAIA;;;;AAIA;;;;AAIA;;;;;;AAQA;;;;AAIA;;;;;;;;;;AASA;;;;;;;;;;AASA;;;;;;;;;;AASA;;;;;;;;;;AASA;;;;;;;AAKE;;;;AAAA;;;;AAKF;;;;;;;AAKE;;;;AAAA;;;;AAKF;EACE;;;;;EAIA;;;;;;;;;;;;;;;;;;;EAkBE;;;;EAGA;;;;;EAOI;;;;EAIF;;;;;EAXF;;;;;EAOI;;;;EAIF;;;;;EAXF;;;;;EAOI;;;;EAIF;;;;;EAXF;;;;;EAOI;;;;EAIF;;;;;EAXF;;;;;EAOI;;;;EAIF;;;;;EAXF;;;;;EAOI;;;;EAIF","sources":["packages/@adobe/spectrum-css-temp/components/menu/vars.css"],"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\n@import './index.css';\n@import './skin.css';\n"],"names":[],"version":3,"file":"vars.487ba452.css.map"}