@dxos/react-ui-tabs 0.8.4-main.c85a9c8dae → 0.8.4-main.cb12b3f963

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-tabs",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.cb12b3f963",
   "description": "Components for facilitating a Tabs pattern.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -21,9 +21,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
@@ -36,25 +33,25 @@
     "@radix-ui/react-slot": "1.1.2",
     "@radix-ui/react-tabs": "1.1.3",
     "@radix-ui/react-use-controllable-state": "1.1.0",
-    "@dxos/react-ui-attention": "0.8.4-main.c85a9c8dae",
-    "@dxos/util": "0.8.4-main.c85a9c8dae"
+    "@dxos/react-ui-attention": "0.8.4-main.cb12b3f963",
+    "@dxos/util": "0.8.4-main.cb12b3f963"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae",
-    "@dxos/random": "0.8.4-main.c85a9c8dae"
+    "vite": "^8.0.10",
+    "@dxos/react-ui": "0.8.4-main.cb12b3f963",
+    "@dxos/random": "0.8.4-main.cb12b3f963",
+    "@dxos/storybook-utils": "0.8.4-main.cb12b3f963",
+    "@dxos/ui-theme": "0.8.4-main.cb12b3f963"
   },
   "peerDependencies": {
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
+    "@dxos/ui-theme": "0.8.4-main.cb12b3f963",
+    "@dxos/react-ui": "0.8.4-main.cb12b3f963"
   },
   "publishConfig": {
     "access": "public"

package/src/Tabs.stories.tsx

@@ -5,66 +5,73 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { faker } from '@dxos/random';
-import { Dialog, Icon } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
+import { random } from '@dxos/random';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { mx } from '@dxos/ui-theme';
 
-import { Tabs as NaturalTabs } from './Tabs';
+import { Tabs, TabsRootProps } from './Tabs';
 
-faker.seed(1234);
+random.seed(1234);
 
-export const DefaultStory = () => {
+const DefaultStory = ({ orientation }: TabsRootProps) => {
   return (
-    <Dialog.Root open>
-      <Dialog.Overlay blockAlign='start'>
-        <Dialog.Content size='xl'>
-          <NaturalTabs.Root orientation='vertical' defaultValue={Object.keys(content)[3]} defaultActivePart='list'>
-            <NaturalTabs.Viewport>
-              <NaturalTabs.Tablist>
-                {Object.entries(content).map(([id, { title }]) => {
-                  return (
-                    <NaturalTabs.Tab key={id} value={id}>
-                      {title}
-                    </NaturalTabs.Tab>
-                  );
-                })}
-              </NaturalTabs.Tablist>
-              {Object.entries(content).map(([id, { panel }]) => {
-                return (
-                  <NaturalTabs.Tabpanel key={id} value={id} classNames='m-1'>
-                    <NaturalTabs.BackButton density='fine'>
-                      <Icon icon='ph--arrow-left--bold' size={4} />
-                      <span>Back to tab list</span>
-                    </NaturalTabs.BackButton>
-                    <p className='px-1'>{panel}</p>
-                  </NaturalTabs.Tabpanel>
-                );
-              })}
-            </NaturalTabs.Viewport>
-          </NaturalTabs.Root>
-        </Dialog.Content>
-      </Dialog.Overlay>
-    </Dialog.Root>
+    <Tabs.Root orientation={orientation} defaultValue={Object.keys(content)[3]} defaultActivePart='list'>
+      <Tabs.Viewport
+        classNames={mx(
+          'w-full overflow-hidden grid',
+          orientation === 'vertical' && 'grid-cols-[minmax(min-content,1fr)_3fr]',
+        )}
+      >
+        <Tabs.Tablist>
+          {Object.entries(content).map(([id, { title }]) => (
+            <Tabs.Tab key={id} value={id}>
+              {title}
+            </Tabs.Tab>
+          ))}
+        </Tabs.Tablist>
+        <div className='dx-container'>
+          {Object.entries(content).map(([id, { panel }]) => (
+            <Tabs.Panel key={id} value={id}>
+              <p className='px-1'>{panel}</p>
+            </Tabs.Panel>
+          ))}
+        </div>
+      </Tabs.Viewport>
+    </Tabs.Root>
   );
 };
 
 const content = [...Array(24)].reduce((acc: { [key: string]: { title: string; panel: string } }, _, index) => {
   acc[`t${index}`] = {
-    title: faker.commerce.productName(),
-    panel: faker.lorem.paragraphs(5),
+    title: random.commerce.productName(),
+    panel: random.lorem.paragraphs(5),
   };
   return acc;
 }, {});
 
 const meta = {
   title: 'ui/react-ui-tabs/Tabs',
-  component: NaturalTabs.Root,
+  component: Tabs.Root,
   render: DefaultStory,
-  decorators: [withTheme()],
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
+  parameters: {
+    layout: 'fullscreen',
+  },
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Default: Story = {};
+// TODO(burdon): Scrolling.
+export const Horizontal: Story = {
+  args: {
+    orientation: 'horizontal',
+  },
+};
+
+export const Vertical: Story = {
+  args: {
+    orientation: 'vertical',
+  },
+};

package/src/Tabs.tsx

@@ -24,7 +24,7 @@ import {
   useForwardedRef,
 } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
-import { ghostSelectedContainerMd, mx } from '@dxos/ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 type TabsActivePart = 'list' | 'panel';
 
@@ -34,21 +34,21 @@ type TabsContextValue = {
   activePart: TabsActivePart;
   setActivePart: (nextActivePart: TabsActivePart) => void;
   attendableId?: string;
-  verticalVariant?: 'stateful' | 'stateless';
 } & Pick<TabsPrimitive.TabsProps, 'orientation' | 'value'>;
 
 const [TabsContextProvider, useTabsContext] = createContext<TabsContextValue>(TABS_NAME, {
+  orientation: 'vertical',
   activePart: 'list',
   setActivePart: () => {},
-  orientation: 'vertical',
 });
 
 type TabsRootProps = ThemedClassName<TabsPrimitive.TabsProps> &
-  Partial<Pick<TabsContextValue, 'activePart' | 'verticalVariant' | 'attendableId'>> &
-  Partial<{
-    onActivePartChange: (nextActivePart: TabsActivePart) => void;
-    defaultActivePart: TabsActivePart;
-  }>;
+  Partial<
+    Pick<TabsContextValue, 'activePart' | 'attendableId'> & {
+      onActivePartChange: (nextActivePart: TabsActivePart) => void;
+      defaultActivePart: TabsActivePart;
+    }
+  >;
 
 const TabsRoot = forwardRef<HTMLDivElement, TabsRootProps>(
   (
@@ -63,7 +63,6 @@ const TabsRoot = forwardRef<HTMLDivElement, TabsRootProps>(
       defaultValue,
       orientation = 'vertical',
       activationMode = 'manual',
-      verticalVariant = 'stateful',
       attendableId,
       ...props
     },
@@ -110,22 +109,15 @@ const TabsRoot = forwardRef<HTMLDivElement, TabsRootProps>(
         setActivePart={setActivePart}
         value={value}
         attendableId={attendableId}
-        verticalVariant={verticalVariant}
       >
         <TabsPrimitive.Root
+          {...props}
+          className={mx('overflow-hidden', classNames)}
+          orientation={orientation}
           activationMode={activationMode}
           data-active={activePart}
-          orientation={orientation}
-          {...props}
           value={value}
           onValueChange={handleValueChange}
-          className={mx(
-            'overflow-hidden',
-            orientation === 'vertical' &&
-              verticalVariant === 'stateful' &&
-              '[&[data-active=list]_[role=tabpanel]]:invisible @md:[&[data-active=list]_[role=tabpanel]]:visible',
-            classNames,
-          )}
           ref={tabsRoot}
         >
           {children}
@@ -138,21 +130,9 @@ const TabsRoot = forwardRef<HTMLDivElement, TabsRootProps>(
 type TabsViewportProps = ThemedClassName<ComponentPropsWithoutRef<'div'>>;
 
 const TabsViewport = ({ classNames, children, ...props }: TabsViewportProps) => {
-  const { orientation, activePart, verticalVariant } = useTabsContext('TabsViewport');
+  const { activePart } = useTabsContext('TabsViewport');
   return (
-    <div
-      role='none'
-      {...props}
-      data-active={activePart}
-      className={mx(
-        orientation === 'vertical' &&
-          verticalVariant === 'stateful' && [
-            'grid w-[200%] grid-cols-2 data-[active=panel]:ms-[-100%]',
-            '@md:w-auto @md:data-[active=panel]:ms-0 @md:grid-cols-[minmax(min-content,1fr)_3fr] @md:gap-1',
-          ],
-        classNames,
-      )}
-    >
+    <div role='none' {...props} data-active={activePart} className={mx(classNames)}>
       {children}
     </div>
   );
@@ -161,16 +141,15 @@ const TabsViewport = ({ classNames, children, ...props }: TabsViewportProps) =>
 type TabsTablistProps = ThemedClassName<TabsPrimitive.TabsListProps>;
 
 const TabsTablist = ({ children, classNames, ...props }: TabsTablistProps) => {
-  const { orientation, verticalVariant } = useTabsContext('TabsTablist');
+  const { orientation } = useTabsContext('TabsTablist');
   return (
     <TabsPrimitive.List
       {...props}
       data-arrow-keys={orientation === 'vertical' ? 'up down' : 'left right'}
       className={mx(
         'max-h-full w-full',
-        // NOTE: Padding should be common to Toolbar.
-        orientation === 'vertical' ? 'overflow-y-auto' : 'flex items-stretch justify-start overflow-x-auto p-1 gap-1',
-        orientation === 'vertical' && verticalVariant === 'stateful' && 'place-self-start p-1',
+        // TODO(burdon): Should be embeddable inside Toolbar (if horizontal).
+        orientation === 'vertical' ? 'overflow-y-auto' : 'flex p-1 gap-1 items-stretch justify-start overflow-x-auto',
         classNames,
       )}
     >
@@ -186,10 +165,10 @@ const TabsBackButton = ({ onClick, classNames, ...props }: ButtonProps) => {
       setActivePart('list');
       return onClick?.(event);
     },
-    [onClick, setActivePart],
+    [setActivePart, onClick],
   );
 
-  return <Button {...props} classNames={['w-full text-start @md:hidden mb-2', classNames]} onClick={handleClick} />;
+  return <Button {...props} classNames={['@md:hidden text-start', classNames]} onClick={handleClick} />;
 };
 
 type TabsTabGroupHeadingProps = ThemedClassName<ComponentPropsWithoutRef<'h2'>>;
@@ -220,17 +199,16 @@ const TabsTab = ({ value, classNames, children, onClick, ...props }: TabsTabProp
   return (
     <TabsPrimitive.Trigger value={value} asChild>
       <Button
-        density='fine'
+        {...props}
         variant={
           orientation === 'horizontal' && contextValue === value ? (hasAttention ? 'primary' : 'default') : 'ghost'
         }
-        {...props}
-        onClick={handleClick}
         classNames={[
           orientation === 'vertical' && 'block justify-start text-start w-full',
-          orientation === 'vertical' && ghostSelectedContainerMd,
+          orientation === 'vertical' && 'dx-selected',
           classNames,
         ]}
+        onClick={handleClick}
       >
         {children}
       </Button>
@@ -256,29 +234,28 @@ const TabsIconTab = ({ value, classNames, onClick, ...props }: TabsIconTabProps)
   return (
     <TabsPrimitive.Trigger value={value} asChild>
       <IconButton
-        density='fine'
+        {...props}
         variant={
           orientation === 'horizontal' && contextValue === value ? (hasAttention ? 'primary' : 'default') : 'ghost'
         }
-        {...props}
-        onClick={handleClick}
         classNames={[
           orientation === 'vertical' && 'justify-start text-start w-full',
-          orientation === 'vertical' && ghostSelectedContainerMd,
+          orientation === 'vertical' && 'dx-selected',
           classNames,
         ]}
+        onClick={handleClick}
       />
     </TabsPrimitive.Trigger>
   );
 };
 
-type TabsTabpanelProps = ThemedClassName<TabsPrimitive.TabsContentProps>;
+type TabsPanelProps = ThemedClassName<TabsPrimitive.TabsContentProps>;
 
-const TabsTabpanel = ({ classNames, children, ...props }: TabsTabpanelProps) => {
+const TabsPanel = ({ classNames, children, ...props }: TabsPanelProps) => {
   const { value: contextValue } = useTabsContext('TabsTab');
   return (
     <Activity mode={contextValue === props.value ? 'visible' : 'hidden'}>
-      <TabsPrimitive.Content {...props} className={mx('dx-focus-ring-inset-over-all', classNames)}>
+      <TabsPrimitive.Content {...props} className={mx('p-0! dx-focus-ring-inset-over-all', classNames)}>
         {children}
       </TabsPrimitive.Content>
     </Activity>
@@ -294,7 +271,7 @@ export const Tabs = {
   IconTab: TabsIconTab,
   TabPrimitive: TabsPrimitive.Trigger,
   TabGroupHeading: TabsTabGroupHeading,
-  Tabpanel: TabsTabpanel,
+  Panel: TabsPanel,
   BackButton: TabsBackButton,
   Viewport: TabsViewport,
 };
@@ -306,6 +283,6 @@ export type {
   TabsTabProps,
   TabsTabPrimitiveProps,
   TabsTabGroupHeadingProps,
-  TabsTabpanelProps,
+  TabsPanelProps,
   TabsViewportProps,
 };