modern-canvas 0.27.8 → 0.27.10

package/dist/index.js

@@ -7580,18 +7580,25 @@ var X = class extends w {
 	_resolveThemeColor(e) {
 		return this._parent.tree?.resolveThemeColor(e) ?? e;
 	}
+	_themeColorOrigins = /* @__PURE__ */ new WeakMap();
 	_resolveBaseThemeColors() {
 		if (!this._parent.tree) return;
 		let e = (e, t) => {
 			if (e) for (let n of t) {
-				let t = e[n];
-				typeof t == "string" && t.charCodeAt(0) === 64 && (e[n] = this._resolveThemeColor(t));
+				let t = this._themeColorOrigins.get(e), r = t?.[n] ?? e[n];
+				if (!(typeof r != "string" || r.charCodeAt(0) !== 64)) {
+					if (!t?.[n]) {
+						let i = t ?? {};
+						i[n] = r, this._themeColorOrigins.set(e, i);
+					}
+					e[n] = this._resolveThemeColor(r);
+				}
 			}
-		};
-		e(this.base.computedStyle, ["backgroundColor", "color"]);
-		for (let t of this.base.paragraphs) {
-			e(t.style, ["backgroundColor"]), e(t.computedStyle, ["backgroundColor", "color"]);
-			for (let n of t.fragments) e(n.style, ["backgroundColor"]), e(n.computedStyle, ["backgroundColor", "color"]);
+		}, t = (t) => e(t, ["color"]);
+		e(this.base.computedStyle, ["backgroundColor", "color"]), t(this.base.computedFill), t(this.base.computedOutline);
+		for (let n of this.base.paragraphs) {
+			e(n.style, ["backgroundColor"]), e(n.computedStyle, ["backgroundColor", "color"]), t(n.computedFill), t(n.computedOutline);
+			for (let r of n.fragments) e(r.style, ["backgroundColor"]), e(r.computedStyle, ["backgroundColor", "color"]), t(r.computedFill), t(r.computedOutline);
 		}
 	}
 	_rasterTexture() {
@@ -10002,7 +10009,10 @@ var co = class extends nr {
 	}
 }, mo = class extends nr {
 	install(e) {
-		return this.load = (t) => e.awaitBy(() => new wr(t).load()), e.video = this, this;
+		return this.load = (t) => e.awaitBy(async () => {
+			let n = await new wr(t).load();
+			return e.emit("loaded", t, n), n;
+		}), e.video = this, this;
 	}
 }, ho = Object.entries({
 	"font/woff": ["woff"],

package/dist/scene/2d/element/Element2DText.d.ts

@@ -48,6 +48,14 @@ export declare class Element2DText extends CoreObject implements NormalizedText
     update(): void;
     /** fragment 颜色的语义色 token（`@token`）→ 当前主题实际色；非 token 原样返回。 */
     protected _resolveThemeColor<T = any>(value: T): T | string;
+    /**
+     * 派生结构上已就地解析过的 token 原值：key = 派生对象，value = { 属性名: '@token' }。
+     *
+     * 就地写入实际色会丢掉 token 本身，而布局可复用时（内容没变）这些派生对象**不会重建**，
+     * 于是主题切换后再跑本方法只看到实际色、认不出是 token，颜色就永远停在首次解析的那套主题
+     * （暗色下栅格过的文字，切回亮色仍是白字）。故记下原值，每次栅格都按当前主题重新解析。
+     */
+    protected _themeColorOrigins: WeakMap<object, Record<string, string>>;
     protected _resolveBaseThemeColors(): void;
     protected _rasterTexture(): void;
     protected _renderTiles(width: number, height: number, pixelRatio: number, maxTile: number): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.27.8",
+  "version": "0.27.10",
   "packageManager": "pnpm@10.19.0",
   "description": "A JavaScript WebGL rendering engine. only the ESM.",
   "author": "wxm",