@dxos/ui-theme 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License 
-Copyright (c) 2022 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/README.md

@@ -22,4 +22,4 @@ pnpm i @dxos/ui-theme
 
 Your ideas, issues, and code are most welcome. Please take a look at our [community code of conduct](https://github.com/dxos/dxos/blob/main/CODE_OF_CONDUCT.md), the [issue guide](https://github.com/dxos/dxos/blob/main/CONTRIBUTING.md#submitting-issues), and the [PR contribution guide](https://github.com/dxos/dxos/blob/main/CONTRIBUTING.md#submitting-prs).
 
-License: [MIT](./LICENSE) Copyright 2022 © DXOS
+License: [FSL-1.1-Apache-2.0](./LICENSE) Copyright 2022 © DXOS

package/dist/lib/browser/index.mjs

@@ -35,7 +35,7 @@ var hueShades = [
 var roles = [
   "fill",
   "surface",
-  "surface-text",
+  "foreground",
   "text",
   "border"
 ];
@@ -46,18 +46,18 @@ var cardMinBlockSize = 18;
 var cardMaxBlockSize = 30;
 
 // src/fragments/density.ts
-var coarseBlockSize = "min-h-[2.5rem]";
-var coarseDimensions = `${coarseBlockSize} px-3`;
 var fineBlockSize = "min-h-[2.5rem] pointer-fine:min-h-[2rem]";
+var coarseBlockSize = "min-h-[2.5rem]";
 var fineDimensions = `${fineBlockSize} px-2`;
-var densityBlockSize = (density = "coarse") => density === "fine" ? fineBlockSize : coarseBlockSize;
+var coarseDimensions = `${coarseBlockSize} px-3`;
+var densityDimensions = (density = "fine") => density === "fine" ? fineDimensions : coarseDimensions;
+var densityBlockSize = (density = "fine") => density === "fine" ? fineBlockSize : coarseBlockSize;
 
 // src/fragments/disabled.ts
 var staticDisabled = "opacity-40 cursor-not-allowed shadow-none";
 var dataDisabled = "data-[disabled]:opacity-40 data-[disabled]:cursor-not-allowed";
 
 // src/fragments/hover.ts
-var subtleHover = "hover:bg-hover-overlay";
 var ghostHover = "hover:bg-hover-surface";
 var ghostFocusWithin = "focus-within:bg-hover-surface";
 var hoverableControls = "[--controls-opacity:1] hover-hover:[--controls-opacity:0] hover-hover:hover:[--controls-opacity:1]";
@@ -68,7 +68,6 @@ var hoverableOpenControlItem = "hover-hover:aria-[expanded=true]:[--controls-opa
 var hoverableControlItem = "opacity-(--controls-opacity)";
 
 // src/fragments/text.ts
-var descriptionTextPrimary = "text-sm font-normal text-base-surface-text";
 var descriptionMessage = "text-description border border-dashed border-separator rounded-sm p-4";
 
 // src/util/elevation.ts
@@ -109,7 +108,7 @@ var neutral = {
   hue: "neutral",
   fill: "bg-neutral-fill",
   surface: "bg-neutral-surface",
-  surfaceText: "text-neutral-surface-text",
+  foreground: "text-neutral-foreground",
   text: "text-neutral-text",
   border: "border-neutral-border"
 };
@@ -118,7 +117,7 @@ var styles = [
     hue: "red",
     fill: "bg-red-fill",
     surface: "bg-red-surface",
-    surfaceText: "text-red-surface-text",
+    foreground: "text-red-foreground",
     text: "text-red-text",
     border: "border-red-border"
   },
@@ -126,7 +125,7 @@ var styles = [
     hue: "orange",
     fill: "bg-orange-fill",
     surface: "bg-orange-surface",
-    surfaceText: "text-orange-surface-text",
+    foreground: "text-orange-foreground",
     text: "text-orange-text",
     border: "border-orange-border"
   },
@@ -134,7 +133,7 @@ var styles = [
     hue: "amber",
     fill: "bg-amber-fill",
     surface: "bg-amber-surface",
-    surfaceText: "text-amber-surface-text",
+    foreground: "text-amber-foreground",
     text: "text-amber-text",
     border: "border-amber-border"
   },
@@ -142,7 +141,7 @@ var styles = [
     hue: "yellow",
     fill: "bg-yellow-fill",
     surface: "bg-yellow-surface",
-    surfaceText: "text-yellow-surface-text",
+    foreground: "text-yellow-foreground",
     text: "text-yellow-text",
     border: "border-yellow-border"
   },
@@ -150,7 +149,7 @@ var styles = [
     hue: "lime",
     fill: "bg-lime-fill",
     surface: "bg-lime-surface",
-    surfaceText: "text-lime-surface-text",
+    foreground: "text-lime-foreground",
     text: "text-lime-text",
     border: "border-lime-border"
   },
@@ -158,7 +157,7 @@ var styles = [
     hue: "green",
     fill: "bg-green-fill",
     surface: "bg-green-surface",
-    surfaceText: "text-green-surface-text",
+    foreground: "text-green-foreground",
     text: "text-green-text",
     border: "border-green-border"
   },
@@ -166,7 +165,7 @@ var styles = [
     hue: "emerald",
     fill: "bg-emerald-fill",
     surface: "bg-emerald-surface",
-    surfaceText: "text-emerald-surface-text",
+    foreground: "text-emerald-foreground",
     text: "text-emerald-text",
     border: "border-emerald-border"
   },
@@ -174,7 +173,7 @@ var styles = [
     hue: "teal",
     fill: "bg-teal-fill",
     surface: "bg-teal-surface",
-    surfaceText: "text-teal-surface-text",
+    foreground: "text-teal-foreground",
     text: "text-teal-text",
     border: "border-teal-border"
   },
@@ -182,7 +181,7 @@ var styles = [
     hue: "cyan",
     fill: "bg-cyan-fill",
     surface: "bg-cyan-surface",
-    surfaceText: "text-cyan-surface-text",
+    foreground: "text-cyan-foreground",
     text: "text-cyan-text",
     border: "border-cyan-border"
   },
@@ -190,7 +189,7 @@ var styles = [
     hue: "sky",
     fill: "bg-sky-fill",
     surface: "bg-sky-surface",
-    surfaceText: "text-sky-surface-text",
+    foreground: "text-sky-foreground",
     text: "text-sky-text",
     border: "border-sky-border"
   },
@@ -198,7 +197,7 @@ var styles = [
     hue: "blue",
     fill: "bg-blue-fill",
     surface: "bg-blue-surface",
-    surfaceText: "text-blue-surface-text",
+    foreground: "text-blue-foreground",
     text: "text-blue-text",
     border: "border-blue-border"
   },
@@ -206,7 +205,7 @@ var styles = [
     hue: "indigo",
     fill: "bg-indigo-fill",
     surface: "bg-indigo-surface",
-    surfaceText: "text-indigo-surface-text",
+    foreground: "text-indigo-foreground",
     text: "text-indigo-text",
     border: "border-indigo-border"
   },
@@ -214,7 +213,7 @@ var styles = [
     hue: "violet",
     fill: "bg-violet-fill",
     surface: "bg-violet-surface",
-    surfaceText: "text-violet-surface-text",
+    foreground: "text-violet-foreground",
     text: "text-violet-text",
     border: "border-violet-border"
   },
@@ -222,7 +221,7 @@ var styles = [
     hue: "purple",
     fill: "bg-purple-fill",
     surface: "bg-purple-surface",
-    surfaceText: "text-purple-surface-text",
+    foreground: "text-purple-foreground",
     text: "text-purple-text",
     border: "border-purple-border"
   },
@@ -230,7 +229,7 @@ var styles = [
     hue: "fuchsia",
     fill: "bg-fuchsia-fill",
     surface: "bg-fuchsia-surface",
-    surfaceText: "text-fuchsia-surface-text",
+    foreground: "text-fuchsia-foreground",
     text: "text-fuchsia-text",
     border: "border-fuchsia-border"
   },
@@ -238,7 +237,7 @@ var styles = [
     hue: "pink",
     fill: "bg-pink-fill",
     surface: "bg-pink-surface",
-    surfaceText: "text-pink-surface-text",
+    foreground: "text-pink-foreground",
     text: "text-pink-text",
     border: "border-pink-border"
   },
@@ -246,7 +245,7 @@ var styles = [
     hue: "rose",
     fill: "bg-rose-fill",
     surface: "bg-rose-surface",
-    surfaceText: "text-rose-surface-text",
+    foreground: "text-rose-foreground",
     text: "text-rose-text",
     border: "border-rose-border"
   }
@@ -315,12 +314,18 @@ var mx = extendTailwindMerge({
     }
   }
 });
-var composableProps = ({ className, classNames, role, ...props }, { classNames: defaultClassNames, ...defaults } = {}) => ({
+var composableProps = ({ className, classNames, role, style, ...props }, { classNames: defaultClassNames, ...defaults } = {}) => ({
   // Default props.
   ...defaults,
-  // Spread supplied props; prefer explicit role, then defaults role, then 'none'.
-  role: role ?? defaults.role ?? "none",
+  // Spread supplied props.
   ...props,
+  // Prefer explicit role, then defaults role, then 'none'.
+  role: role ?? defaults.role ?? "none",
+  // Merge styles.
+  style: {
+    ...defaults.style,
+    ...style
+  },
   // Compose classnames.
   className: mx(defaultClassNames, className, classNames)
 });
@@ -335,12 +340,7 @@ function slottable(render) {
           warn = true;
           log.warn("slot child is not composable; create it with composable() or slottable()", {
             child: child.type.displayName ?? child.type.name
-          }, {
-            F: __dxlog_file,
-            L: 119,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 100, S: this });
         }
       } catch {
       }
@@ -612,7 +612,7 @@ var breadcrumbTheme = {
 var cardRoot = ({ border, fullWidth }, ...etc) => mx("dx-card dx-card-min-width dx-card-max-width min-h-(--dx-rail-item) group/card relative overflow-hidden", border && "bg-card-surface border border-separator dark:border-subdued-separator rounded-xs dx-focus-ring-group-y-indicator", fullWidth && "max-w-none!", ...etc);
 var cardToolbar = (_, ...etc) => mx("dx-card__toolbar dx-density-fine bg-transparent p-0! gap-0! col-span-3 grid! grid-cols-subgrid! [contain:none]", ...etc);
 var cardTitle = (_props, ...etc) => mx("dx-card__title grow truncate", ...etc);
-var cardContent = (_props, ...etc) => mx("dx-card__content contents [&>:last-child]:pb-1", ...etc);
+var cardContent = (_props, ...etc) => mx("dx-card__content contents pb-1 last:pb-0", ...etc);
 var cardHeading = ({ variant = "default" }, ...etc) => mx("dx-card__heading", variant === "default" && "py-1", variant === "subtitle" && "py-2 text-xs text-description font-medium uppercase", ...etc);
 var cardText = ({ variant = "default", truncate: _truncate }, ...etc) => mx("dx-card__text items-center overflow-hidden", variant === "default" && "py-1", variant === "description" && "py-1.5 text-description", ...etc);
 var cardTextSpan = ({ variant = "default", truncate }, ...etc) => mx(variant === "description" && "text-sm text-description line-clamp-3", truncate && "truncate", ...etc);
@@ -622,12 +622,14 @@ var cardAction = (_props, ...etc) => mx("dx-card__acztion col-span-3 !grid grid-
 var cardActionLabel = (_props, ...etc) => mx("dx-card__action-label min-w-0 flex-1 truncate", ...etc);
 var cardLink = (_props, ...etc) => mx("dx-card__link col-span-3 !grid grid-cols-subgrid group p-0! dx-button dx-focus-ring min-h-1!", ...etc);
 var cardLinkLabel = (_props, ...etc) => mx("dx-card__link-label min-w-0 flex-1 truncate", ...etc);
+var cardRow = (_, ...etc) => mx("dx-card__row col-span-3 grid grid-cols-subgrid", ...etc);
 var cardIconBlock = ({ padding }, ...etc) => mx("dx-card__icon-block grid h-[var(--dx-rail-item)] w-[var(--dx-rail-item)] place-items-center", padding && "[&>*]:p-1", ...etc);
 var cardTheme = {
   root: cardRoot,
   toolbar: cardToolbar,
   title: cardTitle,
   content: cardContent,
+  row: cardRow,
   heading: cardHeading,
   text: cardText,
   "text-span": cardTextSpan,
@@ -641,8 +643,8 @@ var cardTheme = {
 };
 
 // src/theme/components/button.ts
-var primaryButtonColors = "text-accent-surface-text bg-accent-surface hover:bg-accent-surface-hover aria-pressed:bg-primary-500 dark:aria-pressed:bg-primary-500 data-[state=open]:bg-primary-500 dark:data-[state=open]:bg-primary-500 aria-checked:bg-primary-500 dark:aria-checked:bg-primary-500 aria-checked:text-primary-100";
-var staticDefaultButtonColors = "bg-input-surface text-input-surface-text";
+var primaryButtonColors = "text-accent-foreground bg-accent-surface hover:bg-accent-surface-hover aria-pressed:bg-primary-500 dark:aria-pressed:bg-primary-500 data-[state=open]:bg-primary-500 dark:data-[state=open]:bg-primary-500 aria-checked:bg-primary-500 dark:aria-checked:bg-primary-500 aria-checked:text-primary-100";
+var staticDefaultButtonColors = "bg-input-surface text-input-foreground";
 var defaultButtonColors = mx(staticDefaultButtonColors, "data-[state=open]:bg-input-surface aria-pressed:text-accent-text aria-pressed:bg-base-surface aria-checked:text-accent-text aria-checked:bg-base-surface");
 var ghostButtonColors = mx(ghostHover, "hover:text-inherit data-[state=open]:bg-input-surface aria-pressed:text-accent-text aria-pressed:bg-base-surface aria-checked:text-accent-text aria-checked:bg-base-surface");
 var buttonRoot = (_props, ...etc) => {
@@ -656,6 +658,35 @@ var buttonTheme = {
   group: buttonGroup
 };
 
+// src/theme/primitives/column.ts
+var withColumn = {
+  /** Centers element in the Column grid via --dx-col. No-op outside Column or inside ScrollArea. */
+  center: () => "[grid-column:var(--dx-col,auto)]",
+  /** Propagates the Column grid to children via subgrid. No-op outside Column.
+  *  Direct children default to center column unless they are a dx-container (ScrollArea). */
+  propagate: () => "[.dx-column-root_&]:col-span-full [.dx-column-root_&]:grid [.dx-column-root_&]:grid-cols-subgrid [.dx-column-root_&]:[&>*:not(.dx-container)]:[grid-column:var(--dx-col,auto)]",
+  /** Resets --dx-col after consuming --gutter. Applied by ScrollArea.Viewport. */
+  consumed: () => "[--dx-col:auto]"
+};
+var columnRoot = (_, ...etc) => {
+  return mx("dx-column-root grid", ...etc);
+};
+var columnRow = (_, ...etc) => {
+  return mx("col-span-3 grid grid-cols-subgrid", ...etc);
+};
+var columnBleed = (_, ...etc) => {
+  return mx("col-span-full grid grid-cols-subgrid min-h-0", ...etc);
+};
+var columnCenter = (_, ...etc) => {
+  return mx(withColumn.center(), "min-h-0", ...etc);
+};
+var columnTheme = {
+  root: columnRoot,
+  row: columnRow,
+  bleed: columnBleed,
+  center: columnCenter
+};
+
 // src/theme/components/dialog.ts
 var sizeMap2 = {
   sm: "md:max-w-[24rem]",
@@ -667,9 +698,9 @@ var dialogOverlay = (_props, ...etc) => mx("dx-dialog__overlay", ...etc);
 var dialogContent = ({ inOverlayLayout, size = "md" }, ...etc) => {
   return mx("@container", "dx-dialog__content dx-focus-ring dx-modal-surface dx-density-coarse py-4", !inOverlayLayout && "fixed z-50 top-[50%] left-[50%] -translate-x-[50%] -translate-y-[50%]", sizeMap2[size], ...etc);
 };
-var dialogHeader = (_props, ...etc) => mx("dx-dialog__header flex pb-4 items-center justify-between", ...etc);
-var dialogBody = (_props, ...etc) => mx("dx-dialog__body", ...etc);
-var dialogActionBar = (_props, ...etc) => mx("dx-dialog__actionbar flex items-center pt-4 gap-2 dx-density-coarse", ...etc);
+var dialogHeader = (_props, ...etc) => mx("dx-dialog__header flex pb-4 items-center justify-between", withColumn.center(), ...etc);
+var dialogBody = (_props, ...etc) => mx("dx-dialog__body dx-expander", withColumn.propagate(), ...etc);
+var dialogActionBar = (_props, ...etc) => mx("dx-dialog__actionbar flex items-center pt-4 gap-2 dx-density-coarse", withColumn.center(), ...etc);
 var dialogTitle = ({ srOnly }, ...etc) => mx("dx-dialog__title", srOnly && "sr-only", ...etc);
 var dialogDescription = ({ srOnly }, ...etc) => mx("dx-dialog__description", "text-description", srOnly && "sr-only", ...etc);
 var dialogTheme = {
@@ -683,7 +714,7 @@ var dialogTheme = {
 };
 
 // src/theme/components/focus.ts
-var focusRing = ({ border }, ...etc) => mx("dx-ring-pseudo outline-hidden", "focus:after:ring-neutral-focus-indicator", "data-[focus-state=active]:after:ring-neutral-focus-indicator", "data-[focus-state=error]:after:ring-rose-500", border && "border border-separator", ...etc);
+var focusRing = ({ border }, ...etc) => mx("dx-ring-pseudo outline-hidden", "focus:after:ring-focus-ring-subtle", "data-[focus-state=active]:after:ring-focus-ring-subtle", "data-[focus-state=error]:after:ring-rose-500", border && "border border-separator", ...etc);
 var focusTheme = {
   group: focusRing,
   item: focusRing
@@ -698,8 +729,8 @@ var iconTheme = {
 };
 
 // src/theme/components/icon-button.ts
-var iconButtonRoot = ({ iconOnly }, ...etc) => {
-  return mx("px-1.5", !iconOnly && "gap-2", ...etc);
+var iconButtonRoot = ({ iconOnly, square }, ...etc) => {
+  return mx("px-1.5", !iconOnly && "gap-1.5", square && "aspect-square", ...etc);
 };
 var iconButtonTheme = {
   root: iconButtonRoot
@@ -724,22 +755,22 @@ var inputValence = (valence) => {
   }
 };
 var sharedSubduedInputStyles = (props) => [
-  "py-0 w-full bg-transparent text-current placeholder-placeholder",
   '[[data-drag-autoscroll="active"]_&]:pointer-events-none',
-  props.density === "fine" ? fineBlockSize : coarseBlockSize,
+  "py-0 w-full bg-transparent text-current placeholder-placeholder",
   "dx-focus-subdued",
+  densityDimensions(props.density),
   props.disabled && staticDisabled
 ];
 var sharedDefaultInputStyles = (props) => [
-  "py-0 w-full text-base-surface-text rounded-xs placeholder-placeholder",
   '[[data-drag-autoscroll="active"]_&]:pointer-events-none',
+  "py-0 w-full text-base-foreground rounded-xs placeholder-placeholder",
   textInputSurfaceFocus,
-  props.density === "fine" ? fineDimensions : coarseDimensions,
+  densityDimensions(props.density),
   props.disabled ? staticDisabled : textInputSurfaceHover
 ];
 var sharedStaticInputStyles = (props) => [
-  "py-0 w-full text-base-surface-text rounded-xs placeholder-placeholder",
   '[[data-drag-autoscroll="active"]_&]:pointer-events-none',
+  "py-0 w-full text-base-foreground rounded-xs placeholder-placeholder",
   textInputSurfaceFocus,
   textInputSurfaceHover,
   props.focused && "bg-attention-surface",
@@ -763,7 +794,7 @@ var inputSwitch = ({ size = 5, disabled }, ...etc) => mx(
 );
 var inputSwitchThumb = ({ size = 5 }, ...etc) => mx(getSize(size === "px" ? "px" : size - 2), "block bg-white rounded-full transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[100%]", ...etc);
 var inputWithSegmentsInput = (props, ...etc) => mx("font-mono selection:bg-transparent mx-auto", props.density === "fine" ? "text-base pointer-fine:text-sm" : "text-lg", props.disabled && "cursor-not-allowed", ...etc);
-var inputSegment = (props, ...etc) => mx("flex items-center justify-center font-mono", props.density === "fine" ? "size-10 pointer-fine:size-8 rounded-xs" : "size-12 rounded-xs", "bg-input-surface text-base-surface-text transition-colors border border-separator", "data-[focused]:bg-attention-surface data-[focused]:border-neutral-focus-indicator", "data-[focused]:ring-2 data-[focused]:ring-offset-0 data-[focused]:ring-neutral-focus-indicator", inputValence(props.validationValence), props.disabled && staticDisabled, ...etc);
+var inputSegment = (props, ...etc) => mx("flex items-center justify-center font-mono", props.density === "fine" ? "size-10 pointer-fine:size-8 rounded-xs" : "size-12 rounded-xs", "bg-input-surface text-base-foreground transition-colors border border-separator", "data-[focused]:bg-attention-surface data-[focused]:border-focus-ring-subtle", "data-[focused]:ring-2 data-[focused]:ring-offset-0 data-[focused]:ring-focus-ring-subtle", inputValence(props.validationValence), props.disabled && staticDisabled, ...etc);
 var inputLabel = (props, ...etc) => mx("block", inputTextLabel, props.srOnly && "sr-only", ...etc);
 var inputDescription = (props, ...etc) => mx("text-description", props.srOnly && "sr-only", ...etc);
 var inputDescriptionAndValidation = (props, ...etc) => mx("leading-none my-1.5", props.srOnly && "sr-only", ...etc);
@@ -849,19 +880,19 @@ var menuTheme = {
 
 // src/theme/components/message.ts
 var messageRoot = ({ valence }, etc) => {
-  return mx("grid grid-cols-[min-content_1fr] gap-x-2 p-trim-sm rounded-sm", messageValence(valence), etc);
+  return mx("grid grid-cols-[2rem_1fr_2rem] p-1 rounded-sm", messageValence(valence), etc);
 };
 var messageHeader = (_, etc) => {
-  return mx("col-span-2 grid grid-cols-subgrid items-center", etc);
+  return mx("col-span-full grid grid-cols-subgrid items-center", etc);
 };
 var messageTitle = (_, etc) => {
-  return mx("col-start-2 gap-trim-sm [&>svg]:inline-block", etc);
+  return mx("col-start-2 truncate", etc);
 };
 var messageIcon = (_, etc) => {
-  return mx("col-start-1", etc);
+  return mx("col-start-1 grid place-items-center", etc);
 };
 var messageContent = (_, etc) => {
-  return mx("grid grid-cols-subgrid col-start-2 first:font-medium", etc);
+  return mx("col-start-2 grid grid-cols-subgrid inline first:font-medium", etc);
 };
 var messageTheme = {
   root: messageRoot,
@@ -878,7 +909,7 @@ var popoverContent = ({ elevation }, ...etc) => mx("dx-modal-surface border bord
   elevation,
   level: "menu"
 }), "dx-focus-ring", ...etc);
-var popoverViewport = ({ constrainBlock, constrainInline }, ...etc) => mx("flex flex-col min-h-0 min-w-popover-min-width", (constrainBlock || constrainInline) && "overflow-hidden", constrainBlock && "max-h-(--radix-popover-content-available-height)", constrainBlock && "max-h-[min(var(--radix-popover-content-available-height),calc(100dvh-var(--spacing-screen-border)*2))]", constrainInline && "max-w-(--radix-popover-content-available-width)", ...etc);
+var popoverViewport = ({ constrainBlock, constrainInline }, ...etc) => mx("grid grid-rows-[1fr] min-h-0 min-w-popover-min-width", (constrainBlock || constrainInline) && "overflow-hidden", constrainBlock && "max-h-(--radix-popover-content-available-height)", constrainBlock && "max-h-[min(var(--radix-popover-content-available-height),calc(100dvh-var(--spacing-screen-border)*2))]", constrainInline && "max-w-(--radix-popover-content-available-width)", ...etc);
 var popoverArrow = (_props, ...etc) => mx("fill-separator", ...etc);
 var popoverTheme = {
   content: popoverContent,
@@ -903,14 +934,17 @@ var scrollAreaRoot = ({ orientation }, ...etc) => mx(
   orientation === "vertical" && "group/scroll-v flex flex-col",
   orientation === "horizontal" && "group/scroll-h flex",
   orientation === "all" && "group/scroll-all",
-  // Apply col-span-full only when inside a Column.Root grid (detected via dx-column marker).
-  "[.dx-column_&]:col-span-full",
+  // Apply col-span-full only when inside a Column.Root grid (detected via dx-column-root marker).
+  "[.dx-column-root_&]:col-span-full",
   ...etc
 );
-var scrollAreaViewport = ({ orientation, centered, padding, snap, thin, autoHide }, ...etc) => {
+var scrollAreaViewport = ({ orientation, centered, padding, snap, autoHide }, ...etc) => {
   return mx(
-    "h-full w-full",
-    orientation === "vertical" && "flex flex-col overflow-y-scroll",
+    "flex-1 min-h-0 w-full",
+    // Reset --dx-col so nested components don't try to grid-position themselves.
+    // ScrollArea has already consumed --gutter for padding.
+    withColumn.consumed(),
+    orientation === "vertical" && "overflow-y-scroll",
     orientation === "horizontal" && "flex overflow-x-scroll overscroll-x-contain",
     orientation === "all" && "overflow-scroll",
     "[&::-webkit-scrollbar-corner]:bg-transparent",
@@ -959,7 +993,7 @@ var selectContent = ({ elevation }, ...etc) => {
   }), ...etc);
 };
 var selectViewport = (_props, ...etc) => mx(...etc);
-var selectItem = (_props, ...etc) => mx("flex items-center min-h-[2rem] px-3 py-1 gap-2", "text-base-surface-text leading-none select-none outline-hidden", "[&>svg]:invisible [&[data-state=checked]>svg]:visible", "dx-highlighted", ...etc);
+var selectItem = (_props, ...etc) => mx("flex items-center min-h-[2rem] px-3 py-1 gap-2", "text-base-foreground leading-none select-none outline-hidden", "[&>svg]:invisible [&[data-state=checked]>svg]:visible", "dx-highlighted", ...etc);
 var selectItemIndicator = (_props, ...etc) => mx("items-center", ...etc);
 var selectArrow = (_props, ...etc) => mx("fill-separator", ...etc);
 var selectSeparator = (_props, ...etc) => mx("self-stretch border-b my-1 border-separator", ...etc);
@@ -1045,7 +1079,7 @@ var toolbarTheme = {
 };
 
 // src/theme/components/tooltip.ts
-var tooltipContent = ({ elevation }, ...etc) => mx("inline-flex items-center p-1 max-w-64 text-sm bg-inverse-surface text-inverse-surface-text rounded-sm", surfaceShadow({
+var tooltipContent = ({ elevation }, ...etc) => mx("inline-flex items-center p-1 max-w-64 text-sm bg-inverse-surface text-inverse-foreground rounded-sm", surfaceShadow({
   elevation: "positioned"
 }), surfaceZIndex({
   elevation,
@@ -1101,26 +1135,6 @@ var treegridTheme = {
   cell: treegridCell
 };
 
-// src/theme/primitives/column.ts
-var columnRoot = (_, ...etc) => {
-  return mx("dx-column grid", ...etc);
-};
-var columnContent = (_, ...etc) => {
-  return mx("col-span-full grid grid-cols-subgrid min-h-0 [&>:not(.dx-container)]:col-start-2", ...etc);
-};
-var columnViewport = (_, ...etc) => {
-  return mx(...etc);
-};
-var columnRow = ({ fullWidth, center }, ...etc) => {
-  return mx("col-span-3 grid grid-cols-subgrid", fullWidth ? "col-span-3" : center && "col-start-2 col-span-1", ...etc);
-};
-var columnTheme = {
-  root: columnRoot,
-  content: columnContent,
-  viewport: columnViewport,
-  row: columnRow
-};
-
 // src/theme/primitives/panel.ts
 var sizes = {
   lg: "h-(--dx-topbar-size)",
@@ -1217,8 +1231,6 @@ export {
   cardMinBlockSize,
   cardMinInlineSize,
   cardTheme,
-  coarseBlockSize,
-  coarseDimensions,
   columnTheme,
   composable,
   composableProps,
@@ -1227,8 +1239,8 @@ export {
   defaultTheme,
   defaultTx,
   densityBlockSize,
+  densityDimensions,
   descriptionMessage,
-  descriptionTextPrimary,
   dialogActionBar,
   dialogBody,
   dialogContent,
@@ -1237,8 +1249,6 @@ export {
   dialogOverlay,
   dialogTheme,
   dialogTitle,
-  fineBlockSize,
-  fineDimensions,
   focusTheme,
   getHashHue,
   getHashStyles,
@@ -1331,7 +1341,6 @@ export {
   statusBar,
   statusRoot,
   statusTheme,
-  subtleHover,
   surfaceShadow,
   surfaceZIndex,
   tagRoot,
@@ -1355,6 +1364,7 @@ export {
   treegridCell,
   treegridRoot,
   treegridRow,
-  treegridTheme
+  treegridTheme,
+  withColumn
 };
 //# sourceMappingURL=index.mjs.map