@dxos/ui-theme 0.8.4-main.8360d9e660 → 0.8.4-main.8baae0fced

package/src/css/components/selected.css

@@ -1,23 +1,76 @@
 /**
- * Selected / Highlighted state utilities
+ * Selected / Current / Highlighted state utilities.
+ *
+ * See `./selected.md` for the ARIA pairing grammar — every class below
+ * fires off a specific attribute and silently does nothing without it.
  */
 
 @layer dx-components {
+  /*
+   * Pure visual affordance, no ARIA pair. Combine with dx-selected or dx-current.
+   *
+   * Picks the hover variant matching the element's underlying state:
+   *   - neither aria-selected nor aria-current → hover-surface
+   *   - aria-selected="true"                   → selected-surface-hover
+   *   - aria-current="true"                    → current-surface-hover (wins if both)
+   *
+   * Higher-specificity rules (attribute selectors) override the plain :hover rule,
+   * and `aria-current` is listed last so it beats `aria-selected` at equal specificity.
+   */
   .dx-hover {
-    @apply hover:bg-highlight-surface! hover:text-highlight-surface-text!;
+    @apply cursor-pointer
+      hover:bg-hover-surface! hover:text-hover-foreground!
+      hover:aria-selected:bg-selected-surface-hover! hover:aria-selected:text-selected-foreground!
+      hover:aria-[current=true]:bg-current-surface-hover! hover:aria-[current=true]:text-current-foreground!;
   }
-
-  .dx-highlighted {
-    @apply data-[highlighted]:bg-highlight-surface
-      data-[highlighted]:text-highlight-surface-text
-      hover:data-[highlighted]:bg-highlight-surface-hover;
+  .dx-hover-row {
+    @apply group-hover/row:bg-hover-surface! group-hover/row:text-hover-foreground!
+      group-hover/row:group-aria-selected/row:bg-selected-surface-hover!
+      group-hover/row:group-aria-selected/row:text-selected-foreground!
+      group-hover/row:group-aria-[current=true]/row:bg-current-surface-hover!
+      group-hover/row:group-aria-[current=true]/row:text-current-foreground!;
   }
 
+  /*
+   * Pairs with `aria-selected`. Use for listbox/option selection (master/detail).
+   * `!` is required: these utilities live in the `dx-components` layer, but
+   * background utilities like `bg-card-surface` live in Tailwind's
+   * `utilities` layer (declared later in the cascade), so without
+   * `!important` the card background would override the state colour.
+   *
+   * NOTE: Declared before `.dx-current` so that when an element has both
+   * `aria-selected="true"` and `aria-current="true"`, `dx-current` wins at
+   * equal specificity (consistent with how `dx-hover` resolves the same
+   * conflict).
+   */
   .dx-selected {
-    @apply aria-selected:bg-selected-surface
-      aria-selected:text-selected-surface-text
-      hover:aria-selected:text-selected-surface-text
+    @apply aria-selected:bg-selected-surface! aria-selected:text-selected-foreground!
       aria-selected:font-semibold aria-selected:tracking-normal
       transition-[color,font-variation-settings,letter-spacing];
   }
+
+  /*
+   * Pairs with `aria-current="true|page|…"`. Use for "you are here" navigation.
+   *
+   * The ring uses the subdued focus indicator (neutral) rather than the
+   * accent blue — `dx-current` marks position, not focus, so a saturated
+   * ring would compete with the actual keyboard focus ring.
+   */
+  .dx-current {
+    @apply dx-ring-pseudo
+      aria-[current=true]:bg-current-surface! aria-[current=true]:text-current-foreground!
+      aria-[current=true]:after:ring-focus-ring-subtle!;
+  }
+  .dx-current-row {
+    @apply group-aria-[current=true]/row:bg-current-surface! group-aria-[current=true]/row:text-current-foreground!;
+  }
+
+  /*
+   * Pairs with Radix-managed `data-highlighted`. Don't set the attribute manually.
+   */
+  .dx-highlighted {
+    @apply data-[highlighted]:bg-current-surface
+      data-[highlighted]:text-current-foreground
+      hover:data-[highlighted]:bg-current-surface-hover;
+  }
 }

package/src/css/components/selected.md

@@ -0,0 +1,101 @@
+# `dx-*` selection / navigation grammar
+
+Companion to `selected.css`. The four selection-state utilities below are
+each bound to a specific ARIA attribute (or `data-*`) selector. **The
+class only fires when the matching ARIA attribute is set on the same
+element.** Mismatches (e.g. `dx-current` paired with `aria-selected`)
+silently render as a plain row.
+
+| Class            | Bound selector         | Pair with                          | Use when                                                                                                                                                                                                    |
+| ---------------- | ---------------------- | ---------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `dx-hover`       | `hover:`               | (no ARIA — pure visual affordance) | Always, on any clickable row. Adds the cursor + hover bg/text.                                                                                                                                              |
+| `dx-selected`    | `aria-selected:`       | `aria-selected={boolean}`          | A row is "the chosen one" driving a master/detail panel. Listbox / option pattern. Multi-select OK.                                                                                                         |
+| `dx-current`     | `aria-[current=true]:` | `aria-current='true'`              | A row is "where you are" in a navigation set (current page, current step). At most one current per group. The CSS variant fires only on `aria-current='true'`, so use that literal even on `<a>`/nav links. |
+| `dx-highlighted` | `data-[highlighted]:`  | Radix `data-highlighted` (managed) | A Radix-managed transient highlight (menu / combobox active option). Don't set the attribute manually.                                                                                                      |
+
+## Rules
+
+1. **Never combine `dx-selected` and `dx-current` on the same element**
+   unless you also set both `aria-selected` and `aria-current`. They
+   express different things (chosen vs you-are-here) and the visual
+   weight is similar enough that combining them defeats both.
+2. **`aria-pressed`, `aria-checked`, `aria-expanded`, `aria-disabled`
+   are not selection-row attributes.** None of the `dx-*` selection
+   utilities pair with them. Toggle buttons (mute/unmute) want
+   `aria-pressed`; a selection row wants `aria-selected`.
+3. **`aria-selected` is only valid on roles that admit it** — `option`,
+   `tab`, `gridcell`, `row`, `treeitem`, `columnheader`, `rowheader`.
+   On a plain `<button>` inside a `<ul role='listbox'>`, give the button
+   `role='option'` so assistive tech sees the attribute.
+4. **`dx-active` does not exist.** If you see it in code it's a no-op
+   string. Use `dx-selected` (selection) or `dx-current` (navigation)
+   instead.
+5. **Set ARIA before adding the class.** The class is inert without
+   the attribute; it's not a fallback styler. Reviewers should reject
+   PRs that add `dx-selected` without `aria-selected`.
+
+## Canonical patterns
+
+### Selectable row in a list (master/detail)
+
+```tsx
+<ul role='listbox' aria-label='…'>
+  {items.map((item) => (
+    <li key={item.id} role='presentation'>
+      <button
+        type='button'
+        role='option'
+        aria-selected={item.id === selectedId}
+        className='dx-hover dx-selected'
+        onClick={() => onSelect(item.id)}
+      >
+        {item.label}
+      </button>
+    </li>
+  ))}
+</ul>
+```
+
+### "You are here" in a navigation list
+
+```tsx
+<nav>
+  <ul>
+    {pages.map((page) => (
+      <li key={page.href}>
+        <a
+          href={page.href}
+          aria-current={page.href === currentHref ? 'true' : undefined}
+          className='dx-hover dx-current'
+        >
+          {page.label}
+        </a>
+      </li>
+    ))}
+  </ul>
+</nav>
+```
+
+### Toggle button (NOT a row)
+
+Don't reach for `dx-selected` here. Toggle buttons want their own
+visual treatment via `aria-pressed:` variants — out of scope for this
+file.
+
+```tsx
+<button type='button' aria-pressed={muted} onClick={toggleMute}>
+  {muted ? 'Unmute' : 'Mute'}
+</button>
+```
+
+## Enforcing the grammar
+
+A future ESLint rule could flag:
+
+- `dx-selected` without `aria-selected` on the same element.
+- `dx-current` without `aria-current` on the same element.
+- `dx-active` literal anywhere.
+
+Until that exists, reviewers and the `react-ui-list` `RowList` /
+`CardList` containers (which set both attribute and class together)
+are the enforcement.

package/src/css/components/surface.css

@@ -4,22 +4,22 @@
 
 @layer dx-components {
   .dx-base-surface {
-    @apply bg-base-surface text-base-surface-text;
+    @apply bg-base-surface text-base-foreground;
     --surface-bg: var(--color-base-surface);
   }
 
   .dx-sidebar-surface {
-    @apply bg-sidebar-surface text-base-surface-text;
+    @apply bg-sidebar-surface text-base-foreground;
     --surface-bg: var(--color-sidebar-surface);
   }
 
   .dx-modal-surface {
-    @apply bg-modal-surface text-base-surface-text backdrop-blur-md;
+    @apply bg-modal-surface text-base-foreground backdrop-blur-md;
     --surface-bg: var(--color-modal-surface);
   }
 
   .dx-attention-surface {
-    @apply bg-attention-surface text-base-surface-text;
+    @apply bg-attention-surface text-base-foreground;
     --surface-bg: var(--color-attention-surface);
   }
 }

package/src/css/components/tag.css

@@ -11,7 +11,9 @@
 
   .dx-tag--anchor {
     /* NOTE: Margin offsets padding so that border is flush with text. This should only apply to anchor tags inside of Codemirror. */
-    @apply inline cursor-pointer -mx-[4px] px-[3px] py-0.5 border border-separator rounded-xs bg-group-surface transition-colors;
+    @apply inline cursor-pointer -mx-[3px] px-[2px] py-0.5 border rounded-xs transition-colors;
+    /** TODO(burdon): Configure secondary color. */
+    @apply bg-group-surface text-sky-foreground border-sky-border;
 
     &:hover {
       @apply bg-hover-surface;
@@ -20,111 +22,111 @@
 
   .dx-tag[data-hue='neutral'],
   .dx-tag--neutral {
-    @apply bg-neutral-surface text-neutral-surface-text;
+    @apply bg-neutral-surface text-neutral-foreground;
   }
 
   .dx-tag[data-hue='red'],
   .dx-tag--red {
-    @apply bg-red-surface text-red-surface-text;
+    @apply bg-red-surface text-red-foreground;
   }
 
   .dx-tag[data-hue='orange'],
   .dx-tag--orange {
-    @apply bg-orange-surface text-orange-surface-text;
+    @apply bg-orange-surface text-orange-foreground;
   }
 
   .dx-tag[data-hue='amber'],
   .dx-tag--amber {
-    @apply bg-amber-surface text-amber-surface-text;
+    @apply bg-amber-surface text-amber-foreground;
   }
 
   .dx-tag[data-hue='yellow'],
   .dx-tag--yellow {
-    @apply bg-yellow-surface text-yellow-surface-text;
+    @apply bg-yellow-surface text-yellow-foreground;
   }
 
   .dx-tag[data-hue='lime'],
   .dx-tag--lime {
-    @apply bg-lime-surface text-lime-surface-text;
+    @apply bg-lime-surface text-lime-foreground;
   }
 
   .dx-tag[data-hue='green'],
   .dx-tag--green {
-    @apply bg-green-surface text-green-surface-text;
+    @apply bg-green-surface text-green-foreground;
   }
 
   .dx-tag[data-hue='emerald'],
   .dx-tag--emerald {
-    @apply bg-emerald-surface text-emerald-surface-text;
+    @apply bg-emerald-surface text-emerald-foreground;
   }
 
   .dx-tag[data-hue='teal'],
   .dx-tag--teal {
-    @apply bg-teal-surface text-teal-surface-text;
+    @apply bg-teal-surface text-teal-foreground;
   }
 
   .dx-tag[data-hue='cyan'],
   .dx-tag--cyan {
-    @apply bg-cyan-surface text-cyan-surface-text;
+    @apply bg-cyan-surface text-cyan-foreground;
   }
 
   .dx-tag[data-hue='sky'],
   .dx-tag--sky {
-    @apply bg-sky-surface text-sky-surface-text;
+    @apply bg-sky-surface text-sky-foreground;
   }
 
   .dx-tag[data-hue='blue'],
   .dx-tag--blue {
-    @apply bg-blue-surface text-blue-surface-text;
+    @apply bg-blue-surface text-blue-foreground;
   }
 
   .dx-tag[data-hue='indigo'],
   .dx-tag--indigo {
-    @apply bg-indigo-surface text-indigo-surface-text;
+    @apply bg-indigo-surface text-indigo-foreground;
   }
 
   .dx-tag[data-hue='violet'],
   .dx-tag--violet {
-    @apply bg-violet-surface text-violet-surface-text;
+    @apply bg-violet-surface text-violet-foreground;
   }
 
   .dx-tag[data-hue='purple'],
   .dx-tag--purple {
-    @apply bg-purple-surface text-purple-surface-text;
+    @apply bg-purple-surface text-purple-foreground;
   }
 
   .dx-tag[data-hue='fuchsia'],
   .dx-tag--fuchsia {
-    @apply bg-fuchsia-surface text-fuchsia-surface-text;
+    @apply bg-fuchsia-surface text-fuchsia-foreground;
   }
 
   .dx-tag[data-hue='pink'],
   .dx-tag--pink {
-    @apply bg-pink-surface text-pink-surface-text;
+    @apply bg-pink-surface text-pink-foreground;
   }
 
   .dx-tag[data-hue='rose'],
   .dx-tag--rose {
-    @apply bg-rose-surface text-rose-surface-text;
+    @apply bg-rose-surface text-rose-foreground;
   }
 
   .dx-tag[data-hue='info'],
   .dx-tag--info {
-    @apply bg-cyan-surface text-cyan-surface-text;
+    @apply bg-cyan-surface text-cyan-foreground;
   }
 
   .dx-tag[data-hue='success'],
   .dx-tag--success {
-    @apply bg-emerald-surface text-emerald-surface-text;
+    @apply bg-emerald-surface text-emerald-foreground;
   }
 
   .dx-tag[data-hue='warning'],
   .dx-tag--warning {
-    @apply bg-amber-surface text-amber-surface-text;
+    @apply bg-amber-surface text-amber-foreground;
   }
 
   .dx-tag[data-hue='error'],
   .dx-tag--error {
-    @apply bg-rose-surface text-rose-surface-text;
+    @apply bg-rose-surface text-rose-foreground;
   }
 }

package/src/css/integrations/codemirror.css

@@ -6,6 +6,7 @@
  * TODO(burdon): This could move into the ui-editor package (similar to graph.css).
  */
 
+/** TODO(burdon): Move to ui-editor */
 @theme {
   --color-cm-codeblock: oklch(from var(--color-neutral-500) l c h / 0.1);
   --color-cm-active-line: light-dark(
@@ -25,8 +26,9 @@
   --color-cm-comment-surface: light-dark(var(--color-amber-800), var(--color-amber-200));
 
   /* Markdown syntax highlighting */
-  --color-cm-code: light-dark(var(--color-neutral-700), var(--color-neutral-300));
+  --color-cm-code: light-dark(var(--color-stone-600), var(--color-stone-400));
+  --color-cm-code-inline: light-dark(var(--color-green-500), var(--color-green-500));
   --color-cm-code-mark: var(--color-blue-500);
-  --color-cm-mark-opacity: 0.5;
-  --color-cm-heading: light-dark(var(--color-neutral-900), var(--color-neutral-400));
+  --color-cm-heading: light-dark(var(--color-blue-700), var(--color-blue-300));
+  --color-cm-heading-number: light-dark(var(--color-blue-600), var(--color-blue-400));
 }

package/src/css/integrations/tldraw.css

@@ -2,6 +2,7 @@
  * Tldraw
  */
 
+/** TODO(burdon): Move to tldraw */
 .tl-background {
   --color-background: var(--color-base-surface);
 }

package/src/css/layout/main.css

@@ -18,13 +18,6 @@
     z-index: 0;
   }
 
-  /**
-   * Main Mobile app.
-   */
-  .dx-main-mobile-layout {
-    @apply absolute inset-0 overflow-hidden flex flex-col;
-  }
-
   /** TODO(burdon): Reconcile with dx-main-bounce-layout */
   .dx-main-content-padding-transitions {
     transition-duration: 200ms;

package/src/css/layout/size.css

@@ -3,40 +3,26 @@
  */
 
 @layer dx-components {
-  /** 
-   * Registers the element as a size query container. 
+  /**
+   * Registers the element as a size query container.
    * Children can use @container queries to apply styles based on the container's dimensions (both width and height).
+   * Also enables children to use cqi/cqb units (e.g., max-w-[100cqi]).
+   * NOTE: `container-type: size` implies layout/size containment, which breaks CodeMirror's
+   * coordinate measurement (causes blank viewport sections during scroll until a click forces
+   * a re-measure). For editor content where only inline (width-based) queries are needed,
+   * use `.dx-inline-size-container` instead.
    */
   .dx-size-container {
     container-type: size;
   }
 
   /**
-   * Layout rules for flex-based scroll containment:
-   * `flex flex-col`
-   *   On a container: makes it a flex column so children stack and can use `flex-1`.
-   * `flex-1`
-   *   On a child: grows to fill the flex parent. Requires the parent to be `flex`.
-   * `min-h-0` (alongside `flex-1`):
-   *   Overrides default flex children: `min-height:auto` (sized to content), which prevents shrinking.
-   *   Allows element to shrink and trigger overflow/scrolling.
-   *   Always pair with `flex-1` when scroll is needed.
-   * `h-full`:
-   *   Fills 100% of the parent's *computed* height.
-   *   Use when the parent has a definite height but is not a flex container (e.g. `overflow:hidden` wrapper).
-   *   Unlike `flex-1`, does not require the parent to be flex.
-   *
-   * Pattern for a scrollable region inside a flex ancestor:
-   *   ancestor         → `flex flex-col`             (or `flex flex-row`)
-   *   scroll root      → `flex-1 min-h-0`            (fills ancestor, can shrink)
-   *   scroll viewport  → `h-full overflow-y-scroll`  (fills root, scrolls)
-   */
-
-  /**
-   * Container that fills the available space.
+   * Inline-only size query container. Provides cqi units for children without the layout
+   * containment side-effects of `container-type: size`. Use this in CodeMirror content
+   * wrappers where size containment would break viewport measurement.
    */
-  .dx-container {
-    @apply flex-1 min-h-0 min-w-0 h-full w-full;
+  .dx-inline-size-container {
+    container-type: inline-size;
   }
 
   /**
@@ -50,6 +36,10 @@
    * Card
    */
 
+  .dx-card {
+    @apply flex flex-col w-full;
+  }
+
   .dx-card-square {
     inline-size: min(
       min(var(--radix-popper-available-width), var(--spacing-card-max-width)),

package/src/css/theme/animation.css

@@ -227,3 +227,34 @@
   }
   --animate-blink: blink 1s step-start infinite;
 }
+
+/**
+ * Shimmer (text)
+ * Sweeps a brighter band across text via mask alpha — preserves the consumer's color.
+ * Translates exactly one tile period (2× element width) per cycle so the loop seam is invisible.
+ */
+@keyframes shimmer-text {
+  from {
+    mask-position-x: 100%;
+    -webkit-mask-position-x: 100%;
+  }
+  to {
+    mask-position-x: -100%;
+    -webkit-mask-position-x: -100%;
+  }
+}
+
+/**
+ * Honor user reduced-motion preference for decorative animations.
+ * Functional transitions (fade/slide/toast/blink) are intentionally excluded —
+ * suppressing them would hide UI state changes.
+ */
+@media (prefers-reduced-motion: reduce) {
+  .animate-halo-pulse,
+  .animate-spin-slow,
+  .animate-trail,
+  .animate-trail-offset,
+  .animate-shimmer {
+    animation: none;
+  }
+}

package/src/css/theme/palette.css

@@ -27,4 +27,10 @@
   --color-primary-800: var(--color-blue-800);
   --color-primary-900: var(--color-blue-900);
   --color-primary-950: var(--color-blue-950);
+
+  /* Composer logo colors */
+  --color-composer-100: rgb(5 40 61);
+  --color-composer-200: rgb(10 75 105);
+  --color-composer-300: rgb(1 122 183);
+  --color-composer-400: rgb(6 197 253);
 }