@vosjs/studio-core 0.40.0 → 0.40.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { RichText, LayoutRun } from '@vosjs/elements/text';
-export { CaretStop, DECORATION_THICKNESS_EM, Fragment, HIGHLIGHT_HALF_EM, LayoutInput, LayoutLine, LayoutRun, LayoutUnit, Unit as LayoutUnitBox, MIXED, RUN_STYLE_KEYS, RichText, RunStyle, RunStyleKey, STRIKE_OFFSET_EM, TextLayout, Measure as TextMeasure, TextRun, TextRunStyle, UNDERLINE_OFFSET_EM, caretAt, caretStops, clearStyle, commonStyle, decorationRect, diffInput, layoutText, lineOfOffset, normalizeRuns, offsetAtX, plainText, rangeRects, replaceRange, runsOf, setStyle, sliceRuns, snapOffset, styleAt, styleOf, toggleStyle, tokenRanges } from '@vosjs/elements/text';
+export { CaretStop, DECORATION_THICKNESS_EM, DataRef, Fragment, HIGHLIGHT_HALF_EM, LayoutInput, LayoutLine, LayoutRun, LayoutUnit, Unit as LayoutUnitBox, MIXED, RUN_STYLE_KEYS, RichText, RunColor, RunStyle, RunStyleKey, STRIKE_OFFSET_EM, TextLayout, Measure as TextMeasure, TextRun, TextRunStyle, UNDERLINE_OFFSET_EM, caretAt, caretStops, clearStyle, commonStyle, decorationRect, diffInput, isDataRef, layoutText, lineOfOffset, normalizeRuns, offsetAtX, plainText, rangeRects, replaceRange, resolveRunColors, runsOf, setStyle, sliceRuns, snapOffset, styleAt, styleOf, toggleStyle, tokenRanges } from '@vosjs/elements/text';
 import { Segment, KeyframeTrack } from '@vosjs/timeline';
 export { Segment } from '@vosjs/timeline';
 import { TimelineEdit } from '@vosjs/shared/timelineEdits';

package/dist/index.js

@@ -2213,7 +2213,7 @@ function htmlLayerPayload(clip) {
   };
 }
 
-// ../elements/dist/chunk-GYJBPCR2.js
+// ../elements/dist/chunk-ZHIPLA3M.js
 var sameStyle = (a, b) => (a.f || 0) === (b.f || 0) && a.c === b.c && a.u === b.u && a.s === b.s && a.h === b.h;
 function graphemesOf(text) {
   if (typeof Intl !== "undefined" && typeof Intl.Segmenter === "function") {
@@ -2375,6 +2375,9 @@ function decorationRect(kind, x, w, y, px) {
   );
   return { x: x0, y: top, w: x1 - x0, h: t };
 }
+function isDataRef(value) {
+  return typeof value === "object" && value !== null && typeof value.$data === "string" && value.$data.length > 0;
+}
 var RUN_STYLE_KEYS = [
   "weight",
   "italic",
@@ -2393,17 +2396,24 @@ function plainText(text) {
 function runsOf(text) {
   return typeof text === "string" ? text ? [{ text }] : [] : text;
 }
+function colorOf(value) {
+  if (typeof value === "string") return value || void 0;
+  return isDataRef(value) ? { $data: value.$data } : void 0;
+}
+var sameValue = (a, b) => a === b || isDataRef(a) && isDataRef(b) && a.$data === b.$data;
 function styleOf(run) {
   const out = {};
   if (typeof run.weight === "number") out.weight = run.weight;
   if (typeof run.italic === "boolean") out.italic = run.italic;
-  if (run.color) out.color = run.color;
+  const color = colorOf(run.color);
+  if (color) out.color = color;
   if (run.underline) out.underline = true;
   if (run.strike) out.strike = true;
-  if (run.highlight) out.highlight = run.highlight;
+  const highlight = colorOf(run.highlight);
+  if (highlight) out.highlight = highlight;
   return out;
 }
-var sameStyle2 = (a, b) => RUN_STYLE_KEYS.every((k) => a[k] === b[k]);
+var sameStyle2 = (a, b) => RUN_STYLE_KEYS.every((k) => sameValue(a[k], b[k]));
 var isStyled = (s) => RUN_STYLE_KEYS.some((k) => s[k] !== void 0);
 function normalizeRuns(text) {
   if (typeof text === "string") return text;
@@ -2419,16 +2429,36 @@ function normalizeRuns(text) {
   if (out.length === 1 && !isStyled(out[0])) return out[0].text;
   return out;
 }
+function resolveRunColors(text, data) {
+  if (typeof text === "string") return text;
+  const read = (value) => {
+    if (!isDataRef(value)) return value;
+    const v = data?.[value.$data];
+    return typeof v === "string" && v ? v : void 0;
+  };
+  return normalizeRuns(
+    text.map((run) => {
+      const { color, highlight, ...rest } = run;
+      const c = read(color);
+      const h = read(highlight);
+      return {
+        ...rest,
+        ...c ? { color: c } : {},
+        ...h ? { highlight: h } : {}
+      };
+    })
+  );
+}
 function layoutLines(text, fontOf) {
   const lines = [[]];
   for (const run of runsOf(text)) {
     const f = fontOf(run);
     const set = {
       ...f ? { f } : {},
-      ...run.color ? { c: run.color } : {},
+      ...typeof run.color === "string" && run.color ? { c: run.color } : {},
       ...run.underline ? { u: 1 } : {},
       ...run.strike ? { s: 1 } : {},
-      ...run.highlight ? { h: run.highlight } : {}
+      ...typeof run.highlight === "string" && run.highlight ? { h: run.highlight } : {}
     };
     run.text.split("\n").forEach((part, i) => {
       if (i > 0) lines.push([]);
@@ -2520,7 +2550,7 @@ function commonStyle(text, start, end) {
   if (!runs.length) return styleAt(text, start);
   for (const k of RUN_STYLE_KEYS) {
     const first = styleOf(runs[0])[k];
-    const agree = runs.every((run) => styleOf(run)[k] === first);
+    const agree = runs.every((run) => sameValue(styleOf(run)[k], first));
     if (!agree) out[k] = MIXED;
     else if (first !== void 0) out[k] = first;
   }
@@ -12489,6 +12519,7 @@ export {
   htmlStarterClip,
   idleGaps,
   idleKey,
+  isDataRef,
   isKeyedOverlay,
   isLookKind,
   isMusicBed,
@@ -12587,6 +12618,7 @@ export {
   resolveOverlayBox,
   resolveOverlayStyle,
   resolvePins,
+  resolveRunColors,
   resolveText3dAsset,
   resolveZoomStyle,
   restLeanOf,