@react-spectrum/s2 3.0.0-nightly-b0f156972-241202 → 3.0.0-nightly-e94e36431-241203

package/src/Tabs.tsx

@@ -11,29 +11,35 @@
  */
 
 import {
-    TabListProps as AriaTabListProps,
-    TabPanel as AriaTabPanel,
-    TabPanelProps as AriaTabPanelProps,
-    TabProps as AriaTabProps,
-    TabsProps as AriaTabsProps,
-    ContextValue,
-    Provider,
-    Tab as RACTab,
-    TabList as RACTabList,
-    Tabs as RACTabs,
-    TabListStateContext,
-    useSlottedContext
-  } from 'react-aria-components';
+  TabListProps as AriaTabListProps,
+  TabPanel as AriaTabPanel,
+  TabPanelProps as AriaTabPanelProps,
+  TabProps as AriaTabProps,
+  TabsProps as AriaTabsProps,
+  CollectionRenderer,
+  ContextValue,
+  Provider,
+  Tab as RACTab,
+  TabList as RACTabList,
+  Tabs as RACTabs,
+  TabListStateContext,
+  UNSTABLE_CollectionRendererContext,
+  UNSTABLE_DefaultCollectionRenderer
+} from 'react-aria-components';
 import {centerBaseline} from './CenterBaseline';
-import {Collection, DOMRef, DOMRefValue, Key, Node, Orientation} from '@react-types/shared';
-import {createContext, forwardRef, ReactNode, useCallback, useContext, useEffect, useRef, useState} from 'react';
+import {Collection, DOMRef, DOMRefValue, FocusableRef, FocusableRefValue, Key, Node, Orientation, RefObject} from '@react-types/shared';
+import {createContext, forwardRef, Fragment, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import {focusRing, style} from '../style' with {type: 'macro'};
 import {getAllowedOverrides, StyleProps, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {IconContext} from './Icon';
+// @ts-ignore
+import intlMessages from '../intl/*.json';
+import {Picker, PickerItem} from './TabsPicker';
 import {Text, TextContext} from './Content';
+import {useControlledState} from '@react-stately/utils';
 import {useDOMRef} from '@react-spectrum/utils';
-import {useLayoutEffect} from '@react-aria/utils';
-import {useLocale} from '@react-aria/i18n';
+import {useEffectEvent, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
+import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface TabsProps extends Omit<AriaTabsProps, 'className' | 'style' | 'children'>, UnsafeStyles {
@@ -45,18 +51,19 @@ export interface TabsProps extends Omit<AriaTabsProps, 'className' | 'style' | '
    * The amount of space between the tabs.
    * @default 'regular'
    */
-  density?: 'compact' | 'regular'
+  density?: 'compact' | 'regular',
+  /**
+   * If the tabs should only display icons and no text.
+   */
+  iconOnly?: boolean
 }
 
 export interface TabProps extends Omit<AriaTabProps, 'children' | 'style' | 'className'>, StyleProps {
   /** The content to display in the tab. */
-  children?: ReactNode
+  children: ReactNode
 }
 
-export interface TabListProps<T> extends Omit<AriaTabListProps<T>, 'children' | 'style' | 'className'>, StyleProps {
-  /** The content to display in the tablist. */
-  children?: ReactNode
-}
+export interface TabListProps<T> extends Omit<AriaTabListProps<T>, 'style' | 'className'>, StyleProps {}
 
 export interface TabPanelProps extends Omit<AriaTabPanelProps, 'children' | 'style' | 'className'>, UnsafeStyles {
   /** Spectrum-defined styles, returned by the `style()` macro. */
@@ -66,82 +73,64 @@ export interface TabPanelProps extends Omit<AriaTabPanelProps, 'children' | 'sty
 }
 
 export const TabsContext = createContext<ContextValue<TabsProps, DOMRefValue<HTMLDivElement>>>(null);
+const InternalTabsContext = createContext<TabsProps & {onFocus:() => void, pickerRef?: FocusableRef<HTMLButtonElement>}>({onFocus: () => {}});
 
-const tabPanel = style({
-  marginTop: 4,
-  color: 'gray-800',
-  flexGrow: 1,
-  flexBasis: '[0%]',
-  minHeight: 0,
-  minWidth: 0
-}, getAllowedOverrides({height: true}));
-
-export function TabPanel(props: TabPanelProps) {
-  return (
-    <AriaTabPanel
-      {...props}
-      style={props.UNSAFE_style}
-      className={(props.UNSAFE_className || '') + tabPanel(null, props.styles)} />
-  );
-}
-
-const tab = style({
-  ...focusRing(),
+const tabs = style({
   display: 'flex',
-  color: {
-    default: 'neutral-subdued',
-    isSelected: 'neutral',
-    isHovered: 'neutral-subdued',
-    isDisabled: 'disabled',
-    forcedColors: {
-      isSelected: 'Highlight',
-      isDisabled: 'GrayText'
-    }
-  },
-  borderRadius: 'sm',
-  gap: 'text-to-visual',
-  height: {
-    density: {
-      compact: 32,
-      regular: 48
-    }
-  },
-  alignItems: 'center',
-  position: 'relative',
-  cursor: 'default',
-  flexShrink: 0,
-  transition: 'default'
-}, getAllowedOverrides());
-
-const icon = style({
   flexShrink: 0,
-  '--iconPrimary': {
-    type: 'fill',
-    value: 'currentColor'
+  font: 'ui',
+  flexDirection: {
+    orientation: {
+      horizontal: 'column'
+    }
   }
-});
+}, getAllowedOverrides({height: true}));
 
-export function Tab(props: TabProps) {
-  let {density} = useSlottedContext(TabsContext) ?? {};
+/**
+ * Tabs organize content into multiple sections and allow users to navigate between them. The content under the set of tabs should be related and form a coherent unit.
+ */
+export const Tabs = forwardRef(function Tabs(props: TabsProps, ref: DOMRef<HTMLDivElement>) {
+  [props, ref] = useSpectrumContextProps(props, ref, TabsContext);
+  let {
+    density = 'regular',
+    isDisabled,
+    disabledKeys,
+    orientation = 'horizontal',
+    iconOnly = false
+  } = props;
+  let domRef = useDOMRef(ref);
+  let [value, setValue] = useControlledState(props.selectedKey, props.defaultSelectedKey ?? null!, props.onSelectionChange);
+  let pickerRef = useRef<FocusableRefValue<HTMLButtonElement>>(null);
 
   return (
-    <RACTab
-      {...props}
-      style={props.UNSAFE_style}
-      className={renderProps => (props.UNSAFE_className || '') + tab({...renderProps, density}, props.styles)}>
-      <Provider
-        values={[
-          [TextContext, {styles: style({order: 1})}],
-          [IconContext, {
-            render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
-            styles: icon
-          }]
-        ]}>
-        {typeof props.children === 'string' ? <Text>{props.children}</Text> : props.children}
-      </Provider>
-    </RACTab>
+    <Provider
+      values={[
+        [InternalTabsContext, {
+          density,
+          isDisabled,
+          orientation,
+          disabledKeys,
+          selectedKey: value,
+          onSelectionChange: setValue,
+          iconOnly,
+          onFocus: () => pickerRef.current?.focus(),
+          pickerRef
+        }]
+      ]}>
+      <CollapsingCollection containerRef={domRef}>
+        <RACTabs
+          {...props}
+          ref={domRef}
+          selectedKey={value}
+          onSelectionChange={setValue}
+          style={props.UNSAFE_style}
+          className={renderProps => (props.UNSAFE_className || '') + tabs({...renderProps}, props.styles)}>
+          {props.children}
+        </RACTabs>
+      </CollapsingCollection>
+    </Provider>
   );
-}
+});
 
 const tablist = style({
   display: 'flex',
@@ -151,6 +140,12 @@ const tablist = style({
         density: {
           compact: 24,
           regular: 32
+        },
+        isIconOnly: {
+          density: {
+            compact: 16,
+            regular: 24
+          }
         }
       }
     }
@@ -175,63 +170,58 @@ const tablist = style({
 });
 
 export function TabList<T extends object>(props: TabListProps<T>) {
-  let {density, isDisabled, disabledKeys, orientation} = useSlottedContext(TabsContext) ?? {};
+  let {density, isDisabled, disabledKeys, orientation, iconOnly, onFocus} = useContext(InternalTabsContext) ?? {};
+  let {showItems} = useContext(CollapseContext) ?? {};
   let state = useContext(TabListStateContext);
   let [selectedTab, setSelectedTab] = useState<HTMLElement | undefined>(undefined);
   let tablistRef = useRef<HTMLDivElement>(null);
 
   useLayoutEffect(() => {
-    if (tablistRef?.current) {
+    if (tablistRef?.current && showItems) {
       let tab: HTMLElement | null = tablistRef.current.querySelector('[role=tab][data-selected=true]');
 
       if (tab != null) {
         setSelectedTab(tab);
       }
+    } else if (tablistRef?.current) {
+      let picker: HTMLElement | null = tablistRef.current.querySelector('button');
+      if (picker != null) {
+        setSelectedTab(picker);
+      }
     }
-  }, [tablistRef, state?.selectedItem?.key]);
+  }, [tablistRef, state?.selectedItem?.key, showItems]);
+
+  let prevFocused = useRef<boolean | undefined>(false);
+  useLayoutEffect(() => {
+    if (!showItems && !prevFocused.current && state?.selectionManager.isFocused) {
+      onFocus();
+    }
+    prevFocused.current = state?.selectionManager.isFocused;
+  }, [state?.selectionManager.isFocused, state?.selectionManager.focusedKey, showItems]);
 
   return (
     <div
       style={props.UNSAFE_style}
       className={(props.UNSAFE_className || '') + style({position: 'relative'}, getAllowedOverrides())(null, props.styles)}>
-      {orientation === 'vertical' &&
+      {showItems && orientation === 'vertical' &&
         <TabLine disabledKeys={disabledKeys} isDisabled={isDisabled} selectedTab={selectedTab} orientation={orientation} density={density} />}
       <RACTabList
         {...props}
         ref={tablistRef}
-        className={renderProps => tablist({...renderProps, density})} />
+        className={renderProps => tablist({...renderProps, isIconOnly: iconOnly, density})} />
       {orientation === 'horizontal' &&
-        <TabLine disabledKeys={disabledKeys} isDisabled={isDisabled} selectedTab={selectedTab} orientation={orientation} density={density} />}
+        <TabLine showItems={showItems} disabledKeys={disabledKeys} isDisabled={isDisabled} selectedTab={selectedTab} orientation={orientation} density={density} />}
     </div>
   );
 }
 
-function isAllTabsDisabled<T>(collection: Collection<Node<T>> | null, disabledKeys: Set<Key>) {
-  let testKey: Key | null = null;
-  if (collection && collection.size > 0) {
-    testKey = collection.getFirstKey();
-
-    let index = 0;
-    while (testKey && index < collection.size) {
-      // We have to check if the item in the collection has a key in disabledKeys or has the isDisabled prop set directly on it
-      if (!disabledKeys.has(testKey) && !collection.getItem(testKey)?.props?.isDisabled) {
-        return false;
-      }
-
-      testKey = collection.getKeyAfter(testKey);
-      index++;
-    }
-    return true;
-  }
-  return false;
-}
-
 interface TabLineProps {
   disabledKeys: Iterable<Key> | undefined,
   isDisabled: boolean | undefined,
   selectedTab: HTMLElement | undefined,
   orientation?: Orientation,
-  density?: 'compact' | 'regular'
+  density?: 'compact' | 'regular',
+  showItems?: boolean
 }
 
 const selectedIndicator = style({
@@ -276,12 +266,9 @@ function TabLine(props: TabLineProps) {
   let {direction} = useLocale();
   let state = useContext(TabListStateContext);
 
-  // We want to add disabled styling to the selection indicator only if all the Tabs are disabled
-  let [isDisabled, setIsDisabled] = useState<boolean>(false);
-  useEffect(() => {
-    let isDisabled = isTabsDisabled || isAllTabsDisabled(state?.collection || null, disabledKeys ? new Set(disabledKeys) : new Set(null));
-    setIsDisabled(isDisabled);
-  }, [state?.collection, disabledKeys, isTabsDisabled, setIsDisabled]);
+  let isDisabled = useMemo(() => {
+    return isTabsDisabled || isAllTabsDisabled(state?.collection, disabledKeys ? new Set(disabledKeys) : new Set());
+  }, [state?.collection, disabledKeys, isTabsDisabled]);
 
   let [style, setStyle] = useState<{transform: string | undefined, width: string | undefined, height: string | undefined}>({
     transform: undefined,
@@ -321,43 +308,303 @@ function TabLine(props: TabLineProps) {
   );
 }
 
-const tabs = style({
+const tab = style({
+  ...focusRing(),
   display: 'flex',
-  flexShrink: 0,
-  fontFamily: 'sans',
-  fontWeight: 'normal',
-  flexDirection: {
-    orientation: {
-      horizontal: 'column'
+  color: {
+    default: 'neutral-subdued',
+    isSelected: 'neutral',
+    isHovered: 'neutral-subdued',
+    isDisabled: 'disabled',
+    forcedColors: {
+      isSelected: 'Highlight',
+      isDisabled: 'GrayText'
     }
+  },
+  borderRadius: 'sm',
+  gap: 'text-to-visual',
+  height: {
+    density: {
+      compact: 32,
+      regular: 48
+    }
+  },
+  alignItems: 'center',
+  position: 'relative',
+  cursor: 'default',
+  flexShrink: 0,
+  transition: 'default'
+}, getAllowedOverrides());
+
+const icon = style({
+  display: 'block',
+  flexShrink: 0,
+  '--iconPrimary': {
+    type: 'fill',
+    value: 'currentColor'
   }
-}, getAllowedOverrides({height: true}));
+});
 
-/**
- * Tabs organize content into multiple sections and allow users to navigate between them. The content under the set of tabs should be related and form a coherent unit.
- */
-export const Tabs = forwardRef(function Tabs(props: TabsProps, ref: DOMRef<HTMLDivElement>) {
-  [props, ref] = useSpectrumContextProps(props, ref, TabsContext);
-  let {
-    density = 'regular',
-    isDisabled,
-    disabledKeys,
-    orientation = 'horizontal'
-  } = props;
-  let domRef = useDOMRef(ref);
+export function Tab(props: TabProps) {
+  let {density, iconOnly} = useContext(InternalTabsContext) ?? {};
 
   return (
-    <RACTabs
+    <RACTab
       {...props}
-      ref={domRef}
+      // @ts-ignore
+      originalProps={props}
       style={props.UNSAFE_style}
-      className={renderProps => (props.UNSAFE_className || '') + tabs({...renderProps}, props.styles)}>
-      <Provider
-        values={[
-          [TabsContext, {density, isDisabled, disabledKeys, orientation}]
-        ]}>
-        {props.children}
-      </Provider>
-    </RACTabs>
+      className={renderProps => (props.UNSAFE_className || '') + tab({...renderProps, density}, props.styles)}>
+      {({
+          // @ts-ignore
+          isMenu
+        }) => {
+        if (isMenu) {
+          return props.children;
+        } else {
+          return (
+            <Provider
+              values={[
+                [TextContext, {
+                  styles:
+                    style({
+                      order: 1,
+                      display: {
+                        isIconOnly: 'none'
+                      }
+                    })({isIconOnly: iconOnly})
+                }],
+                [IconContext, {
+                  render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
+                  styles: icon
+                }]
+              ]}>
+              {typeof props.children === 'string' ? <Text>{props.children}</Text> : props.children}
+            </Provider>
+          );
+        }
+      }}
+    </RACTab>
   );
-});
+}
+
+const tabPanel = style({
+  marginTop: 4,
+  color: 'gray-800',
+  flexGrow: 1,
+  flexBasis: '[0%]',
+  minHeight: 0,
+  minWidth: 0
+}, getAllowedOverrides({height: true}));
+
+export function TabPanel(props: TabPanelProps) {
+  return (
+    <AriaTabPanel
+      {...props}
+      style={props.UNSAFE_style}
+      className={(props.UNSAFE_className || '') + tabPanel(null, props.styles)} />
+  );
+}
+
+function isAllTabsDisabled<T>(collection: Collection<Node<T>> | undefined, disabledKeys: Set<Key>) {
+  let testKey: Key | null = null;
+  if (collection && collection.size > 0) {
+    testKey = collection.getFirstKey();
+
+    let index = 0;
+    while (testKey && index < collection.size) {
+      // We have to check if the item in the collection has a key in disabledKeys or has the isDisabled prop set directly on it
+      if (!disabledKeys.has(testKey) && !collection.getItem(testKey)?.props?.isDisabled) {
+        return false;
+      }
+
+      testKey = collection.getKeyAfter(testKey);
+      index++;
+    }
+    return true;
+  }
+  return false;
+}
+
+let HiddenTabs = function (props: {
+  listRef: RefObject<HTMLDivElement | null>,
+  items: Array<Node<any>>,
+  size?: string,
+  density?: 'compact' | 'regular'
+}) {
+  let {listRef, items, size, density} = props;
+
+  return (
+    <div
+      // @ts-ignore
+      inert="true"
+      ref={listRef}
+      className={style({
+        display: '[inherit]',
+        flexDirection: '[inherit]',
+        gap: '[inherit]',
+        flexWrap: '[inherit]',
+        position: 'absolute',
+        inset: 0,
+        visibility: 'hidden',
+        overflow: 'hidden',
+        opacity: 0
+      })}>
+      {items.map((item) => {
+        // pull off individual props as an allow list, don't want refs or other props getting through
+        return (
+          <div
+            data-hidden-tab
+            style={item.props.UNSAFE_style}
+            key={item.key}
+            className={item.props.className({size, density})}>
+            {item.props.children({size, density})}
+          </div>
+        );
+      })}
+    </div>
+  );
+};
+
+let TabsMenu = (props: {items: Array<Node<any>>, onSelectionChange: TabsProps['onSelectionChange']}) => {
+  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/s2');
+  let {items} = props;
+  let {density, onSelectionChange, selectedKey, isDisabled, disabledKeys, pickerRef} = useContext(InternalTabsContext);
+  let state = useContext(TabListStateContext);
+  let allKeysDisabled = useMemo(() => {
+    return isAllTabsDisabled(state?.collection, disabledKeys ? new Set(disabledKeys) : new Set());
+  }, [state?.collection, disabledKeys]);
+
+  return (
+    <UNSTABLE_CollectionRendererContext.Provider value={UNSTABLE_DefaultCollectionRenderer}>
+      <div
+        className={style({
+          display: 'flex',
+          alignItems: 'center',
+          height: {
+            density: {
+              compact: 32,
+              regular: 48
+            }
+          }})({density})}>
+        <Picker
+          ref={pickerRef ? pickerRef : undefined}
+          isDisabled={isDisabled || allKeysDisabled}
+          density={density!}
+          items={items}
+          disabledKeys={disabledKeys}
+          selectedKey={selectedKey}
+          onSelectionChange={onSelectionChange}
+          aria-label={stringFormatter.format('tabs.selectorLabel')}>
+          {(item: Node<any>) => {
+            // need to determine the best way to handle icon only -> icon and text
+            // good enough to aria-label the picker item?
+            return (
+              <PickerItem
+                {...item.props.originalProps}
+                isDisabled={isDisabled || allKeysDisabled}
+                key={item.key}>
+                {item.props.children({density, isMenu: true})}
+              </PickerItem>
+            );
+          }}
+        </Picker>
+      </div>
+    </UNSTABLE_CollectionRendererContext.Provider>
+  );
+};
+
+// Context for passing the count for the custom renderer
+let CollapseContext = createContext<{
+  containerRef: RefObject<HTMLDivElement | null>,
+  showItems: boolean,
+  setShowItems:(value: boolean) => void
+} | null>(null);
+
+function CollapsingCollection({children, containerRef}) {
+  let [showItems, _setShowItems] = useState(true);
+  let {orientation} = useContext(InternalTabsContext);
+  let setShowItems = useCallback((value: boolean) => {
+    if (orientation === 'vertical') {
+      // if orientation is vertical, we always show the items
+      _setShowItems(true);
+    } else {
+      _setShowItems(value);
+    }
+  }, [orientation]);
+  return (
+    <CollapseContext.Provider value={{containerRef, showItems: orientation === 'vertical' ? true : showItems, setShowItems}}>
+      <UNSTABLE_CollectionRendererContext.Provider value={CollapsingCollectionRenderer}>
+        {children}
+      </UNSTABLE_CollectionRendererContext.Provider>
+    </CollapseContext.Provider>
+  );
+}
+
+let CollapsingCollectionRenderer: CollectionRenderer = {
+  CollectionRoot({collection}) {
+    return useCollectionRender(collection);
+  },
+  CollectionBranch({collection}) {
+    return useCollectionRender(collection);
+  }
+};
+
+
+let useCollectionRender = (collection: Collection<Node<unknown>>) => {
+  let {containerRef, showItems, setShowItems} = useContext(CollapseContext) ?? {};
+  let {density = 'regular', orientation = 'horizontal', onSelectionChange} = useContext(InternalTabsContext);
+  let {direction} = useLocale();
+
+  let children = useMemo(() => {
+    let result: Node<any>[] = [];
+    for (let key of collection.getKeys()) {
+      result.push(collection.getItem(key)!);
+    }
+    return result;
+  }, [collection]);
+
+  let listRef = useRef<HTMLDivElement | null>(null);
+  let updateOverflow = useEffectEvent(() => {
+    if (orientation === 'vertical' || !listRef.current || !containerRef?.current) {
+      return;
+    }
+    let container = listRef.current;
+    let containerRect = container.getBoundingClientRect();
+    let tabs = container.querySelectorAll('[data-hidden-tab]');
+    let lastTab = tabs[tabs.length - 1];
+    let lastTabRect = lastTab.getBoundingClientRect();
+    if (direction === 'ltr') {
+      setShowItems?.(lastTabRect.right <= containerRect.right);
+    } else {
+      setShowItems?.(lastTabRect.left >= containerRect.left);
+    }
+  });
+
+  useResizeObserver({ref: containerRef, onResize: updateOverflow});
+
+  useLayoutEffect(() => {
+    if (collection.size > 0) {
+      queueMicrotask(updateOverflow);
+    }
+  }, [collection.size, updateOverflow]);
+
+  useEffect(() => {
+    // Recalculate visible tags when fonts are loaded.
+    document.fonts?.ready.then(() => updateOverflow());
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return (
+    <>
+      <HiddenTabs items={children} density={density} listRef={listRef} />
+      {showItems ? (
+        children.map(node => <Fragment key={node.key}>{node.render?.(node)}</Fragment>)
+      ) : (
+        <>
+          <TabsMenu items={children} onSelectionChange={onSelectionChange} />
+        </>
+      )}
+    </>
+  );
+};