@rezi-ui/core 0.1.0-alpha.7 → 0.1.0-alpha.70

package/dist/renderer/renderToDrawlist/spacing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spacing.d.ts","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/spacing.ts"],"names":[],"mappings":"AAEA,KAAK,eAAe,GAAG,QAAQ,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAK9F,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAMvE;AAGD,eAAO,MAAM,kBAAkB,yBAAmB,CAAC;AACnD,eAAO,MAAM,0BAA0B,iCAA2B,CAAC;AAEnE,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAC7C,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;CACd,GAAG,eAAe,CA2BlB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;CACd,GAAG,eAAe,CAUlB"}
+{"version":3,"file":"spacing.d.ts","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/spacing.ts"],"names":[],"mappings":"AAGA,KAAK,eAAe,GAAG,QAAQ,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAK9F,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAOhE;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CASvE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE;IAC7C,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;CACd,GAAG,eAAe,CA2BlB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;CACd,GAAG,eAAe,CAUlB"}

package/dist/renderer/renderToDrawlist/spacing.js

@@ -1,3 +1,4 @@
+import { resolveResponsiveValue } from "../../layout/responsive.js";
 import { isSpacingKey, resolveSpacingValue } from "../../layout/spacing-scale.js";
 /** Shared constant for the common zero-padding case. */
 const ZERO_SPACING = Object.freeze({ top: 0, right: 0, bottom: 0, left: 0 });
@@ -8,27 +9,27 @@ export function clampNonNegative(n) {
  * Read a spacing value (number or scale key) and resolve to non-negative integer.
  */
 export function readSpacingValue(v, def) {
-    if (typeof v === "string" && isSpacingKey(v)) {
-        return resolveSpacingValue(v);
+    const resolved = resolveResponsiveValue(v);
+    if (typeof resolved === "string" && isSpacingKey(resolved)) {
+        return resolveSpacingValue(resolved);
     }
-    if (typeof v !== "number" || !Number.isInteger(v) || v < 0)
+    if (typeof resolved !== "number" || !Number.isInteger(resolved) || resolved < 0)
         return def;
-    return v;
+    return resolved;
 }
 /**
  * Read an optional spacing value.
  */
 export function readOptionalSpacingValue(v) {
-    if (typeof v === "string" && isSpacingKey(v)) {
-        return resolveSpacingValue(v);
+    const resolved = resolveResponsiveValue(v);
+    if (typeof resolved === "string" && isSpacingKey(resolved)) {
+        return resolveSpacingValue(resolved);
     }
-    if (typeof v !== "number" || !Number.isInteger(v) || v < 0)
+    if (typeof resolved !== "number" || !Number.isInteger(resolved) || resolved < 0) {
         return undefined;
-    return v;
+    }
+    return resolved;
 }
-// Legacy aliases for backwards compatibility
-export const readIntNonNegative = readSpacingValue;
-export const readOptionalIntNonNegative = readOptionalSpacingValue;
 export function resolveSpacingFromProps(props) {
     // Fast path: no padding props at all → return shared constant (avoids allocation).
     if (props.pad === undefined &&

package/dist/renderer/renderToDrawlist/spacing.js.map

@@ -1 +1 @@
-{"version":3,"file":"spacing.js","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/spacing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spacing.js","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/spacing.ts"],"names":[],"mappings":"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"}

package/dist/renderer/renderToDrawlist/textStyle.d.ts

@@ -1,9 +1,14 @@
-import type { TextStyle } from "../../index.js";
+import { type TextStyle } from "../../widgets/style.js";
 export type ResolvedTextStyle = Readonly<{
     fg: NonNullable<TextStyle["fg"]>;
     bg: NonNullable<TextStyle["bg"]>;
-} & Pick<TextStyle, "bold" | "dim" | "italic" | "underline" | "inverse">>;
+    attrs: number;
+} & Pick<TextStyle, "bold" | "dim" | "italic" | "underline" | "inverse" | "strikethrough" | "overline" | "blink" | "underlineStyle" | "underlineColor">>;
 export declare const DEFAULT_BASE_STYLE: ResolvedTextStyle;
 export declare function mergeTextStyle(base: ResolvedTextStyle, override: TextStyle | undefined): ResolvedTextStyle;
 export declare function shouldFillForStyleOverride(override: TextStyle | undefined): boolean;
+/**
+ * Apply opacity to a resolved style by blending fg/bg toward the provided backdrop color.
+ */
+export declare function applyOpacityToStyle(style: ResolvedTextStyle, opacity: number, backdrop?: ResolvedTextStyle["bg"]): ResolvedTextStyle;
 //# sourceMappingURL=textStyle.d.ts.map

package/dist/renderer/renderToDrawlist/textStyle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textStyle.d.ts","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/textStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CACtC;IACE,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACjC,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;CAClC,GAAG,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,CAAC,CACzE,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,iBAG/B,CAAC;AAaH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,iBAAiB,EACvB,QAAQ,EAAE,SAAS,GAAG,SAAS,GAC9B,iBAAiB,CAsFnB;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAGnF"}
+{"version":3,"file":"textStyle.d.ts","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/textStyle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,wBAAwB,CAAC;AAYvE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CACtC;IACE,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACjC,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;CACf,GAAG,IAAI,CACN,SAAS,EACP,MAAM,GACN,KAAK,GACL,QAAQ,GACR,WAAW,GACX,SAAS,GACT,eAAe,GACf,UAAU,GACV,OAAO,GACP,gBAAgB,GAChB,gBAAgB,CACnB,CACF,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,iBAI/B,CAAC;AA6DH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,iBAAiB,EACvB,QAAQ,EAAE,SAAS,GAAG,SAAS,GAC9B,iBAAiB,CA4JnB;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAGnF;AASD;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,iBAAiB,CAAC,IAAI,CAAyB,GACxD,iBAAiB,CAgBnB"}

package/dist/renderer/renderToDrawlist/textStyle.js

@@ -1,78 +1,152 @@
+import { perfCount } from "../../perf/perf.js";
+import { rgb, rgbBlend } from "../../widgets/style.js";
+import { sanitizeTextStyle } from "../../widgets/styleUtils.js";
+const ATTR_BOLD = 1 << 0;
+const ATTR_ITALIC = 1 << 1;
+const ATTR_UNDERLINE = 1 << 2;
+const ATTR_INVERSE = 1 << 3;
+const ATTR_DIM = 1 << 4;
+const ATTR_STRIKETHROUGH = 1 << 5;
+const ATTR_OVERLINE = 1 << 6;
+const ATTR_BLINK = 1 << 7;
 export const DEFAULT_BASE_STYLE = Object.freeze({
-    fg: Object.freeze({ r: 232, g: 238, b: 245 }),
-    bg: Object.freeze({ r: 7, g: 10, b: 12 }),
+    fg: rgb(232, 238, 245),
+    bg: rgb(7, 10, 12),
+    attrs: 0,
 });
 // Fast path cache for `mergeTextStyle(DEFAULT_BASE_STYLE, override)` when override only toggles
 // boolean attrs (no fg/bg). This is a hot path in large lists where style objects are frequently
 // recreated but only take on a few distinct shapes.
-const BASE_BOOL_STYLE_CACHE = new Array(1024).fill(null);
+const BASE_BOOL_STYLE_CACHE = new Array(65536).fill(null);
 function encTriBool(v) {
     // 0 = inherit (undefined), 1 = false, 2 = true
     if (v === undefined)
         return 0;
     return v ? 2 : 1;
 }
+function computeAttrs(bold, dim, italic, underline, inverse, strikethrough, overline, blink, underlineStyle) {
+    let attrs = 0;
+    if (bold)
+        attrs |= ATTR_BOLD;
+    if (italic)
+        attrs |= ATTR_ITALIC;
+    if (underline || (underlineStyle !== undefined && underlineStyle !== "none")) {
+        attrs |= ATTR_UNDERLINE;
+    }
+    if (inverse)
+        attrs |= ATTR_INVERSE;
+    if (dim)
+        attrs |= ATTR_DIM;
+    if (strikethrough)
+        attrs |= ATTR_STRIKETHROUGH;
+    if (overline)
+        attrs |= ATTR_OVERLINE;
+    if (blink)
+        attrs |= ATTR_BLINK;
+    return attrs >>> 0;
+}
+function freezeResolved(merged) {
+    const out = Object.freeze({
+        ...merged,
+        attrs: merged.attrs ??
+            computeAttrs(merged.bold, merged.dim, merged.italic, merged.underline, merged.inverse, merged.strikethrough, merged.overline, merged.blink, merged.underlineStyle),
+    });
+    perfCount("style_objects_created", 1);
+    return out;
+}
 export function mergeTextStyle(base, override) {
+    perfCount("style_merges_performed", 1);
+    perfCount("packRgb_calls", 0);
     if (!override)
         return base;
-    if (base === DEFAULT_BASE_STYLE && override.fg === undefined && override.bg === undefined) {
-        const b = encTriBool(override.bold);
-        const d = encTriBool(override.dim);
-        const i = encTriBool(override.italic);
-        const u = encTriBool(override.underline);
-        const inv = encTriBool(override.inverse);
-        const key = b | (d << 2) | (i << 4) | (u << 6) | (inv << 8);
+    const normalized = sanitizeTextStyle(override);
+    if (base === DEFAULT_BASE_STYLE &&
+        normalized.fg === undefined &&
+        normalized.bg === undefined &&
+        override.underlineStyle === undefined &&
+        override.underlineColor === undefined) {
+        const b = encTriBool(normalized.bold);
+        const d = encTriBool(normalized.dim);
+        const i = encTriBool(normalized.italic);
+        const u = encTriBool(normalized.underline);
+        const inv = encTriBool(normalized.inverse);
+        const s = encTriBool(normalized.strikethrough);
+        const o = encTriBool(normalized.overline);
+        const bl = encTriBool(normalized.blink);
+        const key = b | (d << 2) | (i << 4) | (u << 6) | (inv << 8) | (s << 10) | (o << 12) | (bl << 14);
         if (key === 0)
             return base;
         const cached = BASE_BOOL_STYLE_CACHE[key];
         if (cached)
             return cached;
         const merged = { fg: base.fg, bg: base.bg };
-        if (override.bold !== undefined)
-            merged.bold = override.bold;
-        if (override.dim !== undefined)
-            merged.dim = override.dim;
-        if (override.italic !== undefined)
-            merged.italic = override.italic;
-        if (override.underline !== undefined)
-            merged.underline = override.underline;
-        if (override.inverse !== undefined)
-            merged.inverse = override.inverse;
-        BASE_BOOL_STYLE_CACHE[key] = merged;
-        return merged;
+        if (normalized.bold !== undefined)
+            merged.bold = normalized.bold;
+        if (normalized.dim !== undefined)
+            merged.dim = normalized.dim;
+        if (normalized.italic !== undefined)
+            merged.italic = normalized.italic;
+        if (normalized.underline !== undefined)
+            merged.underline = normalized.underline;
+        if (normalized.inverse !== undefined)
+            merged.inverse = normalized.inverse;
+        if (normalized.strikethrough !== undefined)
+            merged.strikethrough = normalized.strikethrough;
+        if (normalized.overline !== undefined)
+            merged.overline = normalized.overline;
+        if (normalized.blink !== undefined)
+            merged.blink = normalized.blink;
+        merged.attrs = computeAttrs(merged.bold, merged.dim, merged.italic, merged.underline, merged.inverse, merged.strikethrough, merged.overline, merged.blink, undefined);
+        const frozenMerged = freezeResolved(merged);
+        BASE_BOOL_STYLE_CACHE[key] = frozenMerged;
+        return frozenMerged;
     }
-    if (override.fg === undefined &&
-        override.bg === undefined &&
-        override.bold === undefined &&
-        override.dim === undefined &&
-        override.italic === undefined &&
-        override.underline === undefined &&
-        override.inverse === undefined) {
+    if (normalized.fg === undefined &&
+        normalized.bg === undefined &&
+        normalized.bold === undefined &&
+        normalized.dim === undefined &&
+        normalized.italic === undefined &&
+        normalized.underline === undefined &&
+        normalized.inverse === undefined &&
+        normalized.strikethrough === undefined &&
+        normalized.overline === undefined &&
+        normalized.blink === undefined &&
+        override.underlineStyle === undefined &&
+        override.underlineColor === undefined) {
         return base;
     }
-    const fg = override.fg ?? base.fg;
-    const bg = override.bg ?? base.bg;
-    const bold = override.bold ?? base.bold;
-    const dim = override.dim ?? base.dim;
-    const italic = override.italic ?? base.italic;
-    const underline = override.underline ?? base.underline;
-    const inverse = override.inverse ?? base.inverse;
-    if (fg.r === base.fg.r &&
-        fg.g === base.fg.g &&
-        fg.b === base.fg.b &&
-        bg.r === base.bg.r &&
-        bg.g === base.bg.g &&
-        bg.b === base.bg.b &&
+    const fg = normalized.fg ?? base.fg;
+    const bg = normalized.bg ?? base.bg;
+    const bold = normalized.bold ?? base.bold;
+    const dim = normalized.dim ?? base.dim;
+    const italic = normalized.italic ?? base.italic;
+    const underline = normalized.underline ?? base.underline;
+    const inverse = normalized.inverse ?? base.inverse;
+    const strikethrough = normalized.strikethrough ?? base.strikethrough;
+    const overline = normalized.overline ?? base.overline;
+    const blink = normalized.blink ?? base.blink;
+    const underlineStyle = override.underlineStyle ?? base.underlineStyle;
+    const underlineColor = override.underlineColor ?? base.underlineColor;
+    const attrs = computeAttrs(bold, dim, italic, underline, inverse, strikethrough, overline, blink, underlineStyle);
+    if (fg === base.fg &&
+        bg === base.bg &&
         bold === base.bold &&
         dim === base.dim &&
         italic === base.italic &&
         underline === base.underline &&
-        inverse === base.inverse) {
+        inverse === base.inverse &&
+        strikethrough === base.strikethrough &&
+        overline === base.overline &&
+        blink === base.blink &&
+        underlineStyle === base.underlineStyle &&
+        underlineColor === base.underlineColor &&
+        attrs === base.attrs) {
         return base;
     }
     const merged = {
         fg,
         bg,
+        attrs,
     };
     if (bold !== undefined)
         merged.bold = bold;
@@ -84,11 +158,48 @@ export function mergeTextStyle(base, override) {
         merged.underline = underline;
     if (inverse !== undefined)
         merged.inverse = inverse;
-    return merged;
+    if (strikethrough !== undefined)
+        merged.strikethrough = strikethrough;
+    if (overline !== undefined)
+        merged.overline = overline;
+    if (blink !== undefined)
+        merged.blink = blink;
+    if (underlineStyle !== undefined)
+        merged.underlineStyle = underlineStyle;
+    if (underlineColor !== undefined)
+        merged.underlineColor = underlineColor;
+    return freezeResolved(merged);
 }
 export function shouldFillForStyleOverride(override) {
     if (!override)
         return false;
     return override.bg !== undefined;
 }
+function clampOpacity(opacity) {
+    if (!Number.isFinite(opacity))
+        return 1;
+    if (opacity <= 0)
+        return 0;
+    if (opacity >= 1)
+        return 1;
+    return opacity;
+}
+/**
+ * Apply opacity to a resolved style by blending fg/bg toward the provided backdrop color.
+ */
+export function applyOpacityToStyle(style, opacity, backdrop = DEFAULT_BASE_STYLE.bg) {
+    const clamped = clampOpacity(opacity);
+    if (clamped >= 1)
+        return style;
+    const fg = rgbBlend(backdrop, style.fg, clamped);
+    const bg = rgbBlend(backdrop, style.bg, clamped);
+    if (fg === style.fg && bg === style.bg) {
+        return style;
+    }
+    return freezeResolved({
+        ...style,
+        fg,
+        bg,
+    });
+}
 //# sourceMappingURL=textStyle.js.map

package/dist/renderer/renderToDrawlist/textStyle.js.map

@@ -1 +1 @@
-{"version":3,"file":"textStyle.js","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/textStyle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"textStyle.js","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/textStyle.ts"],"names":[],"mappings":"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"}

package/dist/renderer/renderToDrawlist/themeTokens.d.ts

@@ -0,0 +1,14 @@
+import { getColorTokens } from "../../theme/extract.js";
+import type { ColorTokens } from "../../theme/tokens.js";
+import type { WidgetSize, WidgetTone, WidgetVariant } from "../../ui/designTokens.js";
+import type { TextStyle } from "../../widgets/style.js";
+export { getColorTokens };
+export declare function readWidgetVariant(value: unknown): WidgetVariant | undefined;
+export declare function readWidgetTone(value: unknown): WidgetTone | undefined;
+export declare function readWidgetSize(value: unknown): WidgetSize | undefined;
+export declare function resolveWidgetFocusStyle(colorTokens: ColorTokens, focused: boolean, disabled: boolean, focusIndicator: Readonly<{
+    bold: boolean;
+    underline: boolean;
+    focusRingColor?: number;
+}>): TextStyle | undefined;
+//# sourceMappingURL=themeTokens.d.ts.map

package/dist/renderer/renderToDrawlist/themeTokens.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"themeTokens.d.ts","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/themeTokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,CAK3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAWrE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAKrE;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,QAAQ,CAAC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GACvF,SAAS,GAAG,SAAS,CAOvB"}

package/dist/renderer/renderToDrawlist/themeTokens.js

@@ -0,0 +1,34 @@
+import { getColorTokens } from "../../theme/extract.js";
+export { getColorTokens };
+export function readWidgetVariant(value) {
+    if (value === "solid" || value === "soft" || value === "outline" || value === "ghost") {
+        return value;
+    }
+    return undefined;
+}
+export function readWidgetTone(value) {
+    if (value === "default" ||
+        value === "primary" ||
+        value === "danger" ||
+        value === "success" ||
+        value === "warning") {
+        return value;
+    }
+    return undefined;
+}
+export function readWidgetSize(value) {
+    if (value === "sm" || value === "md" || value === "lg") {
+        return value;
+    }
+    return undefined;
+}
+export function resolveWidgetFocusStyle(colorTokens, focused, disabled, focusIndicator) {
+    if (!focused || disabled)
+        return undefined;
+    return {
+        ...(focusIndicator.underline ? { underline: true } : {}),
+        ...(focusIndicator.bold ? { bold: true } : {}),
+        fg: focusIndicator.focusRingColor ?? colorTokens.focus.ring,
+    };
+}
+//# sourceMappingURL=themeTokens.js.map

package/dist/renderer/renderToDrawlist/themeTokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"themeTokens.js","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/themeTokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAKxD,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;QACtF,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,IACE,KAAK,KAAK,SAAS;QACnB,KAAK,KAAK,SAAS;QACnB,KAAK,KAAK,QAAQ;QAClB,KAAK,KAAK,SAAS;QACnB,KAAK,KAAK,SAAS,EACnB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,WAAwB,EACxB,OAAgB,EAChB,QAAiB,EACjB,cAAwF;IAExF,IAAI,CAAC,OAAO,IAAI,QAAQ;QAAE,OAAO,SAAS,CAAC;IAC3C,OAAO;QACL,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,EAAE,EAAE,cAAc,CAAC,cAAc,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI;KAC5D,CAAC;AACJ,CAAC"}

package/dist/renderer/renderToDrawlist/types.d.ts

@@ -1,10 +1,12 @@
-import type { CursorShape, DrawlistBuilderV1 } from "../../index.js";
+import type { CursorShape } from "../../abi.js";
+import type { DrawlistBuilder } from "../../drawlist/types.js";
 import type { LayoutTree } from "../../layout/layout.js";
 import type { Rect } from "../../layout/types.js";
 import type { RuntimeInstance } from "../../runtime/commit.js";
 import type { FocusState } from "../../runtime/focus.js";
 import type { InstanceId } from "../../runtime/instance.js";
 import type { TableStateStore, TreeStateStore, VirtualListStateStore } from "../../runtime/localState.js";
+import type { TerminalProfile } from "../../terminalProfile.js";
 import type { Theme } from "../../theme/theme.js";
 import type { CommandItem } from "../../widgets/types.js";
 type LogsEntryMeta = Readonly<{
@@ -17,7 +19,7 @@ type LogsEntryMeta = Readonly<{
     lowerDetails: string | null;
 }>;
 /**
- * Cursor info for v2 cursor protocol integration.
+ * Cursor info for native cursor protocol integration.
  * Provides cursor offset per Input instance.
  */
 export type CursorInfo = Readonly<{
@@ -56,12 +58,16 @@ export type RenderToDrawlistParams = Readonly<{
         rows: number;
     }>;
     focusState: FocusState;
-    builder: DrawlistBuilderV1;
+    /** Optional currently pressed interactive widget id. */
+    pressedId?: string | null | undefined;
+    builder: DrawlistBuilder;
     /** Optional animation tick/frame index (used by spinners, etc.). */
     tick?: number | undefined;
     /** Optional app theme for themed widgets (e.g., divider). */
     theme?: Theme | undefined;
-    /** Optional v2 cursor info for native cursor support */
+    /** Optional terminal profile for capability-gated widget rendering decisions. */
+    terminalProfile?: TerminalProfile | undefined;
+    /** Optional cursor info for native cursor support */
     cursorInfo?: CursorInfo | undefined;
     /** Optional virtual list state store for virtualList widgets */
     virtualListStore?: VirtualListStateStore | undefined;
@@ -79,14 +85,22 @@ export type RenderToDrawlistParams = Readonly<{
     toolApprovalFocusedActionById?: ReadonlyMap<string, "allow" | "deny" | "allowSession"> | undefined;
     /** Optional Dropdown selected index (per dropdown id). */
     dropdownSelectedIndexById?: ReadonlyMap<string, number> | undefined;
+    /** Optional Dropdown visible window start index (per dropdown id). */
+    dropdownWindowStartById?: ReadonlyMap<string, number> | undefined;
     /** Optional DiffViewer focused hunk index (per viewer id). */
     diffViewerFocusedHunkById?: ReadonlyMap<string, number> | undefined;
     /** Optional DiffViewer expanded hunks (per viewer id). */
     diffViewerExpandedHunksById?: ReadonlyMap<string, ReadonlySet<number>> | undefined;
+    /** Optional focus announcement text for `ui.focusAnnouncer()`. */
+    focusAnnouncement?: string | null | undefined;
     /** Optional precomputed layout index (instanceId -> rect). */
     layoutIndex?: ReadonlyMap<InstanceId, Rect> | undefined;
     /** Optional precomputed id->rect index. */
     idRectIndex?: ReadonlyMap<string, Rect> | undefined;
+    /** Optional animated rect overrides (instanceId -> rect). */
+    animatedRectByInstanceId?: ReadonlyMap<InstanceId, Rect> | undefined;
+    /** Optional animated opacity overrides (instanceId -> opacity in [0..1]). */
+    animatedOpacityByInstanceId?: ReadonlyMap<InstanceId, number> | undefined;
     /** Optional table render caches (per table id). */
     tableRenderCacheById?: ReadonlyMap<string, TableRenderCache> | undefined;
     /** Optional logs console render caches (per console id). */

package/dist/renderer/renderToDrawlist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/renderer/renderToDrawlist/types.ts"],"names":[],"mappings":"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"}

package/dist/renderer/renderToDrawlist/widgets/basic.d.ts

@@ -1,17 +1,17 @@
-import type { DrawlistBuilderV1 } from "../../../index.js";
+import type { DrawlistBuilder } from "../../../drawlist/types.js";
 import type { LayoutTree } from "../../../layout/layout.js";
 import type { Rect } from "../../../layout/types.js";
 import type { RuntimeInstance } from "../../../runtime/commit.js";
 import type { FocusState } from "../../../runtime/focus.js";
+import type { TerminalProfile } from "../../../terminalProfile.js";
 import type { Theme } from "../../../theme/theme.js";
 import type { ResolvedTextStyle } from "../textStyle.js";
 import type { CursorInfo } from "../types.js";
-type ResolvedCursor = Readonly<{
+export type ResolvedCursor = Readonly<{
     x: number;
     y: number;
     shape: CursorInfo["shape"];
     blink: boolean;
 }>;
-export declare function renderBasicWidget(builder: DrawlistBuilderV1, focusState: FocusState, rect: Rect, theme: Theme, tick: number, parentStyle: ResolvedTextStyle, node: RuntimeInstance, layoutNode: LayoutTree, nodeStack: (RuntimeInstance | null)[], styleStack: ResolvedTextStyle[], layoutStack: LayoutTree[], clipStack: (Readonly<Rect> | undefined)[], currentClip: Readonly<Rect> | undefined, cursorInfo: CursorInfo | undefined): ResolvedCursor | null;
-export {};
+export declare function renderBasicWidget(builder: DrawlistBuilder, focusState: FocusState, pressedId: string | null, rect: Rect, theme: Theme, tick: number, parentStyle: ResolvedTextStyle, node: RuntimeInstance, layoutNode: LayoutTree, nodeStack: (RuntimeInstance | null)[], styleStack: ResolvedTextStyle[], layoutStack: LayoutTree[], clipStack: (Readonly<Rect> | undefined)[], currentClip: Readonly<Rect> | undefined, cursorInfo: CursorInfo | undefined, focusAnnouncement: string | null | undefined, terminalProfile: TerminalProfile | undefined): ResolvedCursor | null;
 //# sourceMappingURL=basic.d.ts.map

package/dist/renderer/renderToDrawlist/widgets/basic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../../../src/renderer/renderToDrawlist/widgets/basic.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAM5D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAOrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,cAAc,GAAG,QAAQ,CAAC;IAC7B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC,CAAC;AAwVH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,eAAe,EACrB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,CAAC,eAAe,GAAG,IAAI,CAAC,EAAE,EACrC,UAAU,EAAE,iBAAiB,EAAE,EAC/B,WAAW,EAAE,UAAU,EAAE,EACzB,SAAS,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,EAAE,EACzC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,EACvC,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC,cAAc,GAAG,IAAI,CAgiCvB"}
+{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../../../src/renderer/renderToDrawlist/widgets/basic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAKrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAOzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAO9C,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC,CAAC;AAkBH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,eAAe,EACrB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,CAAC,eAAe,GAAG,IAAI,CAAC,EAAE,EACrC,UAAU,EAAE,iBAAiB,EAAE,EAC/B,WAAW,EAAE,UAAU,EAAE,EACzB,SAAS,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,EAAE,EACzC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,EACvC,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC5C,eAAe,EAAE,eAAe,GAAG,SAAS,GAC3C,cAAc,GAAG,IAAI,CAqHvB"}