@astryxdesign/core 0.4.5 → 0.4.6-canary.cea9ecd

package/src/Item/Item.test.tsx

@@ -508,4 +508,54 @@ describe('Item', () => {
     expect(screen.getByText('Alice')).toBeInTheDocument();
     expect(screen.getByText(/commented/)).toBeInTheDocument();
   });
+  it('puts the label and description in one row when layout is inline', () => {
+    const stacked = render(
+      <Item label="Private" description="Only members can access" />,
+    );
+    const stackedRow = screen.getByText('Private').parentElement;
+    stacked.unmount();
+
+    render(
+      <Item
+        label="Private"
+        description="Only members can access"
+        layout="inline"
+      />,
+    );
+    const inlineRow = screen.getByText('Private').parentElement;
+
+    // Same container, different styling: the shared content box switches from
+    // a column to a row, so its class list must differ from the stacked one.
+    expect(inlineRow?.className).not.toBe(stackedRow?.className);
+  });
+
+  it('ellipsizes a ReactNode description when layout is inline', () => {
+    // A stacked ReactNode description is left alone (it may wrap); an inline
+    // one is one line by definition, so it truncates like a string does.
+    const stacked = render(
+      <Item
+        label="Private"
+        description={<span>Only members can access</span>}
+      />,
+    );
+    const stackedDescription = screen.getByText('Only members can access')
+      .parentElement?.className;
+    stacked.unmount();
+
+    render(
+      <Item
+        label="Private"
+        description={<span>Only members can access</span>}
+        layout="inline"
+      />,
+    );
+    expect(
+      screen.getByText('Only members can access').parentElement?.className,
+    ).not.toBe(stackedDescription);
+  });
+
+  it('ignores inline layout when there is no description', () => {
+    render(<Item label="Private" layout="inline" />);
+    expect(screen.getByText('Private')).toBeInTheDocument();
+  });
 });

package/src/Item/Item.tsx

@@ -106,6 +106,15 @@ export interface ItemProps extends BaseProps<HTMLElement> {
    */
   descriptionLines?: number;
 
+  /**
+   * How the label and description sit together. `stacked` puts the description
+   * on its own line below the label; `inline` keeps both on one line, with the
+   * description ellipsizing first, so the row fits a fixed-height host.
+   *
+   * @default 'stacked'
+   */
+  layout?: 'stacked' | 'inline';
+
   /**
    * Click handler. Makes the item clickable with button semantics.
    */
@@ -207,13 +216,16 @@ const styles = stylex.create({
     alignItems: 'flex-start',
   },
   interactive: {
-    cursor: 'pointer',
+    cursor: {
+      default: 'pointer',
+      ':is(:disabled,[aria-disabled="true"])': 'default',
+    },
     transitionProperty: 'background-color',
     transitionDuration: durationVars['--duration-fast-min'],
     transitionTimingFunction: easeVars['--ease-standard'],
     backgroundColor: {
       default: 'transparent',
-      ':hover': {
+      ':hover:where(:not(:disabled,[aria-disabled="true"]))': {
         '@media (hover: hover)': colorVars['--color-overlay-hover'],
       },
       ':active': colorVars['--color-overlay-pressed'],
@@ -226,7 +238,7 @@ const styles = stylex.create({
     backgroundColor: colorVars['--color-accent-muted'],
   },
   disabled: {
-    cursor: 'not-allowed',
+    cursor: 'default',
     pointerEvents: 'none' as const,
   },
   disabledContent: {
@@ -234,7 +246,10 @@ const styles = stylex.create({
   },
   invisibleButton: {
     all: 'unset',
-    cursor: 'inherit',
+    cursor: {
+      default: 'inherit',
+      ':is(:disabled,[aria-disabled="true"])': 'default',
+    },
     font: 'inherit',
     color: 'inherit',
     display: 'flex',
@@ -246,7 +261,10 @@ const styles = stylex.create({
   },
   invisibleAnchor: {
     all: 'unset',
-    cursor: 'inherit',
+    cursor: {
+      default: 'inherit',
+      ':is(:disabled,[aria-disabled="true"])': 'default',
+    },
     font: 'inherit',
     color: 'inherit',
     display: 'flex',
@@ -264,6 +282,25 @@ const styles = stylex.create({
     minWidth: 0,
     textAlign: 'start',
   },
+  // `layout="inline"`: label and description share one line, so the row fits a
+  // fixed-height host such as a Selector trigger inside an InputGroup.
+  inlineContent: {
+    flexDirection: 'row',
+    // Centered, not baseline-aligned: two different font sizes on a shared
+    // baseline make a line box taller than either line, which would push a
+    // fixed-height host (a Selector trigger) a pixel off its size token.
+    alignItems: 'center',
+    columnGap: spacingVars['--spacing-1'],
+  },
+  inlineLabel: {
+    flexShrink: 0,
+  },
+  // The description yields width first, so the label — the part that identifies
+  // the item — is the last thing to ellipsize.
+  inlineDescription: {
+    flexShrink: 1,
+    minWidth: 0,
+  },
   label: {
     // Falls back to the primary text token; a parent (e.g. a destructive menu
     // item) can recolor the label by setting --_item-label-color.
@@ -358,6 +395,7 @@ export function Item({
   density = 'balanced',
   labelLines,
   descriptionLines,
+  layout = 'stacked',
   onClick,
   interactiveRef,
   href,
@@ -420,12 +458,16 @@ export function Item({
         ? styles.labelSingleTruncate
         : null;
 
+  // Inline rows are one line by definition, so the description always
+  // ellipsizes there — a ReactNode description cannot wrap the row open.
+  const isInline = layout === 'inline' && description != null;
+
   const descriptionTruncateStyle =
     descriptionLines != null
       ? descriptionLines === 1
         ? styles.descriptionSingleTruncate
         : styles.descriptionMultiTruncate
-      : isStringDescription
+      : isStringDescription || isInline
         ? styles.descriptionSingleTruncate
         : null;
 
@@ -434,6 +476,7 @@ export function Item({
       <span
         {...stylex.props(
           styles.label,
+          isInline && styles.inlineLabel,
           labelTruncateStyle,
           labelLines != null &&
             labelLines > 1 &&
@@ -445,6 +488,7 @@ export function Item({
         <span
           {...stylex.props(
             styles.description,
+            isInline && styles.inlineDescription,
             descriptionTruncateStyle,
             descriptionLines != null &&
               descriptionLines > 1 &&
@@ -481,6 +525,7 @@ export function Item({
         <span
           {...stylex.props(
             styles.content,
+            isInline && styles.inlineContent,
             isDisabled && styles.disabledContent,
           )}>
           {labelAndDescription}
@@ -494,6 +539,7 @@ export function Item({
           tabIndex={isDisabled ? -1 : undefined}
           {...stylex.props(
             styles.invisibleAnchor,
+            isInline && styles.inlineContent,
             isDisabled && styles.disabledContent,
           )}>
           {labelAndDescription}
@@ -505,6 +551,7 @@ export function Item({
           disabled={isDisabled}
           {...stylex.props(
             styles.invisibleButton,
+            isInline && styles.inlineContent,
             isDisabled && styles.disabledContent,
           )}>
           {labelAndDescription}
@@ -513,6 +560,7 @@ export function Item({
         <span
           {...stylex.props(
             styles.content,
+            isInline && styles.inlineContent,
             isDisabled && styles.disabledContent,
           )}>
           {labelAndDescription}

package/src/Layer/index.ts

@@ -29,6 +29,14 @@ export type {
   FixedLayerReturn,
 } from './useLayer';
 
+// Shared touch behavior for the hover layers
+export {useTouchTrigger, isActionTrigger} from './useTouchTrigger';
+export type {
+  LayerTouchTrigger,
+  UseTouchTriggerOptions,
+  UseTouchTriggerReturn,
+} from './useTouchTrigger';
+
 // Layer provider
 export {LayerProvider} from './LayerProvider';
 export type {LayerProviderProps} from './LayerProvider';
@@ -50,6 +58,7 @@ export type {
 export {useHoverCard, HoverCard} from '../HoverCard';
 export type {
   HoverCardFocusTrigger,
+  HoverCardTouchTrigger,
   HoverCardOptions,
   HoverCardReturn,
   HoverCardProps,
@@ -59,6 +68,7 @@ export type {
 export {useTooltip, Tooltip} from '../Tooltip';
 export type {
   TooltipFocusTrigger,
+  TooltipTouchTrigger,
   TooltipOptions,
   TooltipReturn,
   TooltipProps,

package/src/Layer/useLayer.tsx

@@ -29,6 +29,7 @@ import {createPortal} from 'react-dom';
 import {addAnchorName, removeAnchorName} from './anchorName';
 import {resolveLayerPortalTarget} from './layerHost';
 import {typeScaleVars, typographyVars} from '../theme/tokens.stylex';
+import {overlayPaddingReset} from '../Layout/padding.stylex';
 
 const styles = stylex.create({
   // Base reset for all layers
@@ -771,7 +772,12 @@ export function useLayer(
             : styles.offsetInline(toCssLength(offset))
           : null;
 
-      const stylexResult = stylex.props(styles.base, offsetStyle, xstyle);
+      const stylexResult = stylex.props(
+        styles.base,
+        overlayPaddingReset.reset,
+        offsetStyle,
+        xstyle,
+      );
       const combinedClassName = extraClassName
         ? `${extraClassName} ${stylexResult.className ?? ''}`
         : stylexResult.className;
@@ -835,7 +841,12 @@ export function useLayer(
         left: x,
       };
 
-      const stylexResult = stylex.props(styles.base, styles.fixed, xstyle);
+      const stylexResult = stylex.props(
+        styles.base,
+        overlayPaddingReset.reset,
+        styles.fixed,
+        xstyle,
+      );
       const combinedClassName = extraClassName
         ? `${extraClassName} ${stylexResult.className ?? ''}`
         : stylexResult.className;

package/src/Layer/useTouchTrigger.test.ts

@@ -0,0 +1,70 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file useTouchTrigger.test.ts
+ * @input Uses vitest, isActionTrigger
+ * @output Unit tests for the action-trigger rule behind touchTrigger="auto"
+ * @position Testing; validates useTouchTrigger.ts implementation
+ *
+ * SYNC: When useTouchTrigger.ts changes, update tests to match new behavior
+ *
+ * The tap-versus-suppress decision rests entirely on this predicate, and it is
+ * the part a new element type silently falls through. The per-component tests
+ * (Tooltip.test.tsx, HoverCard.test.tsx) cover the gestures it feeds.
+ */
+
+import {describe, it, expect} from 'vitest';
+import {isActionTrigger} from './useTouchTrigger';
+
+function element(html: string): HTMLElement {
+  const host = document.createElement('div');
+  host.innerHTML = html;
+  return host.firstElementChild as HTMLElement;
+}
+
+describe('isActionTrigger', () => {
+  it.each([
+    ['<button type="button">Save</button>'],
+    ['<input type="text" />'],
+    ['<select></select>'],
+    ['<textarea></textarea>'],
+    ['<summary>More</summary>'],
+    ['<label>Name</label>'],
+    ['<a href="/somewhere">Link</a>'],
+  ])('treats %s as an action', html => {
+    expect(isActionTrigger(element(html))).toBe(true);
+  });
+
+  it.each([
+    ['<span>Plain text</span>'],
+    ['<svg></svg>'],
+    ['<abbr title="what">WCAG</abbr>'],
+    // An anchor without href is a link that goes nowhere.
+    ['<a>Not a link</a>'],
+  ])('treats %s as inert', html => {
+    expect(isActionTrigger(element(html))).toBe(false);
+  });
+
+  it('reads an explicit role over the tag it sits on', () => {
+    expect(isActionTrigger(element('<span role="button">Go</span>'))).toBe(
+      true,
+    );
+    // Scenery: the role says this button is not the control it looks like.
+    expect(
+      isActionTrigger(element('<button role="presentation">x</button>')),
+    ).toBe(false);
+  });
+
+  it('does not treat mere focusability as an action', () => {
+    // The wrapper a text-only Tooltip renders: reachable by keyboard so the
+    // hint is not mouse-only, and it still does nothing when activated.
+    expect(isActionTrigger(element('<span tabindex="0">Term</span>'))).toBe(
+      false,
+    );
+  });
+
+  it('treats a contenteditable surface as an action', () => {
+    const editable = element('<div contenteditable="true"></div>');
+    expect(isActionTrigger(editable)).toBe(true);
+  });
+});