@dxos/react-ui 0.7.5-main.e9bb01b → 0.7.5-staging.2ff1350

package/dist/types/src/components/Tooltip/Tooltip.stories.d.ts

@@ -2,6 +2,7 @@ import '@dxos-theme';
 import React from 'react';
 type StoryTooltipProps = {
     content: string;
+    defaultOpen?: boolean;
 };
 declare const _default: {
     title: string;
@@ -17,7 +18,7 @@ declare const _default: {
             classNames?: import("packages/ui/react-ui-types/dist/types/src").ClassNameValue;
         } & React.RefAttributes<HTMLDivElement>>;
     };
-    render: ({ content }: StoryTooltipProps) => React.JSX.Element;
+    render: ({ content, defaultOpen }: StoryTooltipProps) => import("react/jsx-runtime").JSX.Element;
     decorators: import("@storybook/react/*").Decorator[];
     parameters: {
         chromatic: {
@@ -36,4 +37,15 @@ export declare const Default: {
         };
     };
 };
+export declare const Testing: {
+    args: {
+        defaultOption: boolean;
+        content: string;
+    };
+    parameters: {
+        chromatic: {
+            delay: number;
+        };
+    };
+};
 //# sourceMappingURL=Tooltip.stories.d.ts.map

package/dist/types/src/components/Tooltip/Tooltip.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tooltip.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/Tooltip/Tooltip.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;;;;;;;;;;;;;;;0BAEiC,iBAAiB;;;;;;;;AAcpD,wBAME;AAEF,eAAO,MAAM,OAAO;;;;;;;;;CAOnB,CAAC"}
+{"version":3,"file":"Tooltip.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/Tooltip/Tooltip.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;;;;;;;;;;;;;;;uCAE8C,iBAAiB;;;;;;;;AAcjE,wBAME;AAEF,eAAO,MAAM,OAAO;;;;;;;;;CAOnB,CAAC;AAEF,eAAO,MAAM,OAAO;;;;;;;;;;CAQnB,CAAC"}

package/dist/types/src/playground/Controls.stories.d.ts

@@ -1,9 +1,8 @@
 import '@dxos-theme';
-import React from 'react';
 export declare const Default: {};
 declare const _default: {
     title: string;
-    render: () => React.JSX.Element;
+    render: () => import("react/jsx-runtime").JSX.Element;
     decorators: import("@storybook/react/*").Decorator[];
     parameters: {
         chromatic: {

package/dist/types/src/playground/Controls.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Controls.stories.d.ts","sourceRoot":"","sources":["../../../../src/playground/Controls.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAGrB,OAAO,KAAmB,MAAM,OAAO,CAAC;AA4ExC,eAAO,MAAM,OAAO,IAAK,CAAC;;;;;;;;;;;AAE1B,wBAKE"}
+{"version":3,"file":"Controls.stories.d.ts","sourceRoot":"","sources":["../../../../src/playground/Controls.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AA+ErB,eAAO,MAAM,OAAO,IAAK,CAAC;;;;;;;;;;;AAE1B,wBAKE"}

package/dist/types/src/playground/Typography.stories.d.ts

@@ -1,8 +1,7 @@
 import '@dxos-theme';
-import React from 'react';
 declare const _default: {
     title: string;
-    render: () => React.JSX.Element;
+    render: () => import("react/jsx-runtime").JSX.Element;
     decorators: import("@storybook/react/*").Decorator[];
     parameters: {
         chromatic: {

package/dist/types/src/playground/Typography.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Typography.stories.d.ts","sourceRoot":"","sources":["../../../../src/playground/Typography.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;;;;;;;;;;;AAuC1B,wBAKE;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}
+{"version":3,"file":"Typography.stories.d.ts","sourceRoot":"","sources":["../../../../src/playground/Typography.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;;;;;;;;;;;AAyCrB,wBAKE;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}

package/dist/types/src/util/ThemedClassName.d.ts

@@ -1,5 +1,5 @@
 import { type ClassNameValue } from '@dxos/react-ui-types';
-export type ThemedClassName<P> = Omit<P, 'className'> & {
+export type ThemedClassName<P = {}> = Omit<P, 'className'> & {
     classNames?: ClassNameValue;
 };
 //# sourceMappingURL=ThemedClassName.d.ts.map

package/dist/types/src/util/ThemedClassName.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemedClassName.d.ts","sourceRoot":"","sources":["../../../../src/util/ThemedClassName.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG;IAAE,UAAU,CAAC,EAAE,cAAc,CAAA;CAAE,CAAC"}
+{"version":3,"file":"ThemedClassName.d.ts","sourceRoot":"","sources":["../../../../src/util/ThemedClassName.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG;IAAE,UAAU,CAAC,EAAE,cAAc,CAAA;CAAE,CAAC"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dxos/react-ui",
-  "version": "0.7.5-main.e9bb01b",
+  "version": "0.7.5-staging.2ff1350",
   "description": "Low-level React components for DXOS, applying a theme to a core group of primitives",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/types/src/index.d.ts",
@@ -60,13 +61,13 @@
     "keyborg": "^2.5.0",
     "react-i18next": "^11.18.6",
     "react-remove-scroll": "^2.6.0",
-    "@dxos/debug": "0.7.5-main.e9bb01b",
-    "@dxos/log": "0.7.5-main.e9bb01b",
-    "@dxos/react-hooks": "0.7.5-main.e9bb01b",
-    "@dxos/react-input": "0.7.5-main.e9bb01b",
-    "@dxos/react-ui-types": "0.7.5-main.e9bb01b",
-    "@dxos/util": "0.7.5-main.e9bb01b",
-    "@dxos/react-list": "0.7.5-main.e9bb01b"
+    "@dxos/debug": "0.7.5-staging.2ff1350",
+    "@dxos/react-hooks": "0.7.5-staging.2ff1350",
+    "@dxos/log": "0.7.5-staging.2ff1350",
+    "@dxos/react-input": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-types": "0.7.5-staging.2ff1350",
+    "@dxos/react-list": "0.7.5-staging.2ff1350",
+    "@dxos/util": "0.7.5-staging.2ff1350"
   },
   "devDependencies": {
     "@dnd-kit/core": "^6.0.5",
@@ -78,15 +79,15 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.7.5-main.e9bb01b",
-    "@dxos/react-ui-theme": "0.7.5-main.e9bb01b",
-    "@dxos/util": "0.7.5-main.e9bb01b"
+    "@dxos/random": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-theme": "0.7.5-staging.2ff1350",
+    "@dxos/util": "0.7.5-staging.2ff1350"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.7.5-main.e9bb01b"
+    "@dxos/react-ui-theme": "0.7.5-staging.2ff1350"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Avatars/Avatar.tsx

@@ -112,15 +112,10 @@ const AvatarFrame = forwardRef<HTMLSpanElement, AvatarFrameProps>(
             </mask>
           </defs>
           {variant === 'circle' ? (
-            <circle
-              className={hue ? tx('hue.fill', 'avatar__frame__circle', { hue }) : 'fill-[var(--surface-bg)]'}
-              cx='50%'
-              cy='50%'
-              r={r}
-            />
+            <circle cx='50%' cy='50%' r={r} fill={hue ? `var(--dx-${hue}Fill)` : 'var(--surface-bg)'} />
           ) : (
             <rect
-              className={hue ? tx('hue.fill', 'avatar__frame__rect', { hue }) : 'fill-[var(--surface-bg)]'}
+              fill={hue ? `var(--dx-${hue}Fill)` : 'var(--surface-bg)'}
               x={ringGap + ringWidth}
               y={ringGap + ringWidth}
               width={2 * r}

package/src/components/Buttons/IconButton.tsx

@@ -14,6 +14,7 @@ type IconButtonProps = Omit<ButtonProps, 'children'> &
   Pick<IconProps, 'icon' | 'size'> & {
     label: NonNullable<ReactNode>;
     iconOnly?: boolean;
+    noTooltip?: boolean;
     caretDown?: boolean;
     // TODO(burdon): Create slots abstraction?
     iconClassNames?: ThemedClassName<any>['classNames'];
@@ -24,8 +25,14 @@ type IconButtonProps = Omit<ButtonProps, 'children'> &
   };
 
 const IconOnlyButton = forwardRef<HTMLButtonElement, IconButtonProps>(
-  ({ tooltipPortal = true, tooltipZIndex: zIndex, tooltipSide, suppressNextTooltip, ...props }, forwardedRef) => {
+  (
+    { noTooltip, tooltipPortal = true, tooltipZIndex: zIndex, tooltipSide, suppressNextTooltip, ...props },
+    forwardedRef,
+  ) => {
     const [triggerTooltipOpen, setTriggerTooltipOpen] = useState(false);
+    if (noTooltip) {
+      return <LabelledIconButton {...props} ref={forwardedRef} />;
+    }
     const content = (
       <Tooltip.Content {...(zIndex && { style: { zIndex } })} side={tooltipSide}>
         {props.label}

package/src/components/Clipboard/CopyButton.tsx

@@ -44,11 +44,15 @@ export const CopyButton = ({ value, classNames, iconProps, ...props }: CopyButto
   );
 };
 
-export const CopyButtonIconOnly = ({ value, classNames, iconProps, variant, ...props }: CopyButtonProps) => {
+type CopyButtonIconOnlyProps = CopyButtonProps & {
+  label?: string;
+};
+
+export const CopyButtonIconOnly = ({ value, classNames, iconProps, variant, ...props }: CopyButtonIconOnlyProps) => {
   const { t } = useTranslation('os');
   const { textValue, setTextValue } = useClipboard();
   const isCopied = textValue === value;
-  const label = isCopied ? t('copy success label') : t('copy label');
+  const label = isCopied ? t('copy success label') : props.label ?? t('copy label');
   const [open, setOpen] = useState(false);
   return (
     <Tooltip.Root delayDuration={1500} open={open} onOpenChange={setOpen}>

package/src/components/Dialogs/AlertDialog.tsx

@@ -95,7 +95,9 @@ const [OverlayLayoutProvider, useOverlayLayoutContext] = createContext<OverlayLa
   },
 );
 
-type AlertDialogOverlayProps = ThemedClassName<AlertDialogOverlayPrimitiveProps> & { blockAlign?: 'center' | 'start' };
+type AlertDialogOverlayProps = ThemedClassName<AlertDialogOverlayPrimitiveProps> & {
+  blockAlign?: 'center' | 'start' | 'end';
+};
 
 const AlertDialogOverlay: ForwardRefExoticComponent<AlertDialogOverlayProps> = forwardRef<
   HTMLDivElement,

package/src/components/Dialogs/Dialog.stories.tsx

@@ -59,7 +59,7 @@ export const Default = {
   argTypes: {
     blockAlign: {
       type: 'select',
-      options: ['center', 'start'],
+      options: ['center', 'start', 'end'],
     },
   },
 };

package/src/components/Dialogs/Dialog.tsx

@@ -85,7 +85,7 @@ const [OverlayLayoutProvider, useOverlayLayoutContext] = createContext<OverlayLa
   inOverlayLayout: false,
 });
 
-type DialogOverlayProps = ThemedClassName<DialogOverlayPrimitiveProps> & { blockAlign?: 'center' | 'start' };
+type DialogOverlayProps = ThemedClassName<DialogOverlayPrimitiveProps> & { blockAlign?: 'center' | 'start' | 'end' };
 
 const DialogOverlay: ForwardRefExoticComponent<DialogOverlayProps> = forwardRef<HTMLDivElement, DialogOverlayProps>(
   ({ classNames, children, blockAlign, ...props }, forwardedRef) => {
@@ -106,17 +106,22 @@ const DialogOverlay: ForwardRefExoticComponent<DialogOverlayProps> = forwardRef<
 
 DialogOverlay.displayName = DIALOG_OVERLAY_NAME;
 
-type DialogContentProps = ThemedClassName<DialogContentPrimitiveProps>;
+type DialogContentProps = ThemedClassName<DialogContentPrimitiveProps> & { inOverlayLayout?: boolean };
 
 const DialogContent: ForwardRefExoticComponent<DialogContentProps> = forwardRef<HTMLDivElement, DialogContentProps>(
-  ({ classNames, children, ...props }, forwardedRef) => {
+  ({ classNames, children, inOverlayLayout: propsInOverlayLayout, ...props }, forwardedRef) => {
     const { tx } = useThemeContext();
     const { inOverlayLayout } = useOverlayLayoutContext(DIALOG_CONTENT_NAME);
 
     return (
       <DialogContentPrimitive
         {...props}
-        className={tx('dialog.content', 'dialog', { inOverlayLayout }, classNames)}
+        className={tx(
+          'dialog.content',
+          'dialog',
+          { inOverlayLayout: propsInOverlayLayout || inOverlayLayout },
+          classNames,
+        )}
         ref={forwardedRef}
       >
         {children}

package/src/components/Icon/Icon.tsx

@@ -12,7 +12,10 @@ import { type ThemedClassName } from '../../util';
 
 const ICONS_URL = '/icons.svg';
 
-export type IconProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.svg>> & { icon: string; size?: Size };
+export type IconProps = ThemedClassName<ComponentPropsWithRef<typeof Primitive.svg>> & {
+  icon: string;
+  size?: Size;
+};
 
 export const Icon = memo(
   forwardRef<SVGSVGElement, IconProps>(({ icon, classNames, size, ...props }, forwardedRef) => {

package/src/components/Lists/ListDropIndicator.tsx

@@ -15,8 +15,10 @@ const edgeToOrientationMap: Record<Edge, Orientation> = {
 };
 
 const orientationStyles: Record<Orientation, HTMLAttributes<HTMLElement>['className']> = {
-  horizontal: 'h-[--line-thickness] left-[--terminal-radius] right-0 before:left-[--negative-terminal-size]',
-  vertical: 'w-[--line-thickness] top-[--terminal-radius] bottom-0 before:top-[--negative-terminal-size]',
+  horizontal:
+    'h-[--line-thickness] left-[calc(var(--line-inset)+var(--terminal-radius))] right-[--line-inset] before:left-[--terminal-inset]',
+  vertical:
+    'w-[--line-thickness] top-[calc(var(--line-inset)+var(--terminal-radius))] bottom-[--line-inset] before:top-[--terminal-inset]',
 };
 
 const edgeStyles: Record<Edge, HTMLAttributes<HTMLElement>['className']> = {
@@ -33,14 +35,19 @@ const offsetToAlignTerminalWithLine = (strokeSize - terminalSize) / 2;
 export type DropIndicatorProps = {
   edge: Edge;
   gap?: number;
+  terminalInset?: number;
+  lineInset?: number;
 };
 
 /**
  * This is a tailwind port of `@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box`
  */
-export const ListDropIndicator = ({ edge, gap = 0 }: DropIndicatorProps) => {
-  const lineOffset = `calc(-0.5 * (${gap}px + ${strokeSize}px))`;
-
+export const ListDropIndicator = ({
+  edge,
+  gap = 0,
+  lineInset = 0,
+  terminalInset = lineInset - terminalSize,
+}: DropIndicatorProps) => {
   const orientation = edgeToOrientationMap[edge];
 
   return (
@@ -49,10 +56,11 @@ export const ListDropIndicator = ({ edge, gap = 0 }: DropIndicatorProps) => {
       style={
         {
           '--line-thickness': `${strokeSize}px`,
-          '--line-offset': `${lineOffset}`,
+          '--line-offset': `calc(-0.5 * (${gap}px + ${strokeSize}px))`,
+          '--line-inset': `${lineInset}px`,
           '--terminal-size': `${terminalSize}px`,
           '--terminal-radius': `${terminalSize / 2}px`,
-          '--negative-terminal-size': `-${terminalSize}px`,
+          '--terminal-inset': `${terminalInset}px`,
           '--offset-terminal': `${offsetToAlignTerminalWithLine}px`,
         } as CSSProperties
       }

package/src/components/Tag/Tag.stories.tsx

@@ -3,17 +3,14 @@
 //
 import React from 'react';
 
-import { hueTokenThemes } from '@dxos/react-ui-theme';
+import { hues } from '@dxos/react-ui-theme';
 import '@dxos-theme';
 import { type ChromaticPalette, type MessageValence } from '@dxos/react-ui-types';
 
 import { Tag } from './Tag';
 import { withTheme } from '../../testing';
 
-const palettes = ['neutral', 'success', 'info', 'warning', 'error', ...Object.keys(hueTokenThemes)] as (
-  | ChromaticPalette
-  | MessageValence
-)[];
+const palettes = ['neutral', 'success', 'info', 'warning', 'error', ...hues] as (ChromaticPalette | MessageValence)[];
 
 export default {
   title: 'ui/react-ui-core/Tag',

package/src/components/Tooltip/Tooltip.stories.tsx

@@ -12,11 +12,12 @@ import { Button } from '../Buttons';
 
 type StoryTooltipProps = {
   content: string;
+  defaultOpen?: boolean;
 };
 
-const StoryTooltip = ({ content }: StoryTooltipProps) => (
+const StoryTooltip = ({ content, defaultOpen }: StoryTooltipProps) => (
   <Tooltip.Provider>
-    <Tooltip.Root defaultOpen>
+    <Tooltip.Root defaultOpen={defaultOpen}>
       <Tooltip.Trigger asChild>
         <Button>Trigger tooltip</Button>
       </Tooltip.Trigger>
@@ -44,3 +45,13 @@ export const Default = {
     chromatic: { delay: 500 },
   },
 };
+
+export const Testing = {
+  args: {
+    defaultOption: true,
+    content: 'This is the tooltip content',
+  },
+  parameters: {
+    chromatic: { delay: 500 },
+  },
+};

package/src/util/ThemedClassName.ts

@@ -4,4 +4,4 @@
 
 import { type ClassNameValue } from '@dxos/react-ui-types';
 
-export type ThemedClassName<P> = Omit<P, 'className'> & { classNames?: ClassNameValue };
+export type ThemedClassName<P = {}> = Omit<P, 'className'> & { classNames?: ClassNameValue };