@flighthq/scene2d-dom 0.3.0 → 0.3.1-next.1041.35b950c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/domNativeText.js +5 -2
- package/dist/domNativeText.js.map +1 -1
- package/dist/domRenderState.d.ts.map +1 -1
- package/dist/domRenderState.js +18 -1
- package/dist/domRenderState.js.map +1 -1
- package/dist/domRichText.d.ts.map +1 -1
- package/dist/domRichText.js +7 -3
- package/dist/domRichText.js.map +1 -1
- package/dist/domShapeRasterizer.d.ts.map +1 -1
- package/dist/domShapeRasterizer.js +9 -2
- package/dist/domShapeRasterizer.js.map +1 -1
- package/dist/domSprite.d.ts.map +1 -1
- package/dist/domSprite.js +8 -0
- package/dist/domSprite.js.map +1 -1
- package/dist/domTextLabel.js +2 -2
- package/dist/domTextLabel.js.map +1 -1
- package/dist/domTextureResolver.d.ts.map +1 -1
- package/dist/domTextureResolver.js +9 -7
- package/dist/domTextureResolver.js.map +1 -1
- package/dist/explainDomTextureResolution.d.ts.map +1 -1
- package/dist/explainDomTextureResolution.js +2 -1
- package/dist/explainDomTextureResolution.js.map +1 -1
- package/package.json +17 -17
- package/src/domCache.test.ts +4 -1
- package/src/domNativeText.test.ts +50 -1
- package/src/domRenderState.test.ts +13 -0
- package/src/domRichText.test.ts +62 -3
- package/src/domScale9Shape.test.ts +5 -0
- package/src/domShape.test.ts +24 -1
- package/src/domShapeRasterizer.test.ts +18 -2
- package/src/domSprite.test.ts +20 -1
- package/src/domTextLabel.test.ts +12 -0
- package/src/domTextureResolver.test.ts +34 -2
package/dist/domNativeText.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { computeRgbaCssString } from '@flighthq/color/contract';
|
|
2
2
|
import { getNativeTextRuntime } from '@flighthq/text/contract';
|
|
3
3
|
import { applyDomStyle, prepareDomElement, setDomRendererElement } from './domStyle';
|
|
4
4
|
// DOM is the backend for which a native text element makes sense; other backends either no-op or
|
|
@@ -79,7 +79,10 @@ function applyNativeTextStyle(element, style) {
|
|
|
79
79
|
const weight = style.bold ? 'bold ' : '';
|
|
80
80
|
const slant = style.italic ? 'italic ' : '';
|
|
81
81
|
element.style.font = `${slant}${weight}${size}px ${family}`;
|
|
82
|
-
|
|
82
|
+
// style.color is packed RGBA (`0xRRGGBBAA`), so it converts through the RGBA helper — the RGB one
|
|
83
|
+
// would silently keep `GGBBAA` and shift every channel. The default is opaque black, not 0: under RGBA
|
|
84
|
+
// a bare 0 is alpha 0, which draws nothing.
|
|
85
|
+
element.style.color = computeRgbaCssString(style.color ?? 0x000000ff);
|
|
83
86
|
if (style.align !== undefined)
|
|
84
87
|
element.style.textAlign = style.align;
|
|
85
88
|
if (style.leading !== undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domNativeText.js","sourceRoot":"","sources":["../src/domNativeText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"domNativeText.js","sourceRoot":"","sources":["../src/domNativeText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAc/D,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAErF,iGAAiG;AACjG,kFAAkF;AAClF,yEAAyE;AAEzE,sGAAsG;AACtG,iGAAiG;AACjG,SAAS,uBAAuB,CAAC,MAAmB,EAAE,OAAmB;IACvE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAqB,EAAE,WAA0B;IACjF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAoB,CAAC;IAChD,qGAAqG;IACrG,+DAA+D;IAC/D,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAsB,CAAC;IAClE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IAEzB,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QAC7B,iGAAiG;QACjG,iGAAiG;QACjG,qGAAqG;QACrG,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;QACpC,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC;QACxC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC;QAC1C,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAClC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,aAAa,GAAG,QAAQ,CAAC;QACvC,OAAO,CAAC,KAAK,CAAC,cAAc,GAAG,8BAA8B,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QACN,6FAA6F;QAC7F,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;QACpC,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC;QAC5B,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,aAAa,GAAG,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,CAAC,cAAc,GAAG,EAAE,CAAC;IACpC,CAAC;IACD,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;IAEhC,qGAAqG;IACrG,4FAA4F;IAC5F,MAAM,IAAI,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAC7C,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC;IACnC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC;IAErC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAC3C,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAqB,EAAE,WAA0B;IACrF,iBAAiB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAoB;IAC3D,UAAU,EAAE,uBAAuB;IACnC,MAAM,EAAE,iBAAiB;CAC1B,CAAC;AAEF,qGAAqG;AACrG,wGAAwG;AACxG,wEAAwE;AACxE,SAAS,8BAA8B,CAAC,aAAgC;IACtE,QAAQ,aAAa,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,OAAO,UAAU,CAAC;QACpB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB;YACE,OAAO,YAAY,CAAC;IACxB,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAoB,EAAE,KAAgC;IAClF,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,IAAI,YAAY,CAAC;IAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,KAAK,GAAG,MAAM,GAAG,IAAI,MAAM,MAAM,EAAE,CAAC;IAC5D,kGAAkG;IAClG,uGAAuG;IACvG,4CAA4C;IAC5C,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,IAAI,UAAU,CAAC,CAAC;IACtE,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;QAAE,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC;IACrE,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;QAAE,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,IAAI,GAAG,KAAK,CAAC,OAAO,IAAI,CAAC;AAC1F,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domRenderState.d.ts","sourceRoot":"","sources":["../src/domRenderState.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGxG,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAM,GAAG,cAAc,CA8BlH;AAMD,wBAAgB,2BAA2B,IAAI,qBAAqB,
|
|
1
|
+
{"version":3,"file":"domRenderState.d.ts","sourceRoot":"","sources":["../src/domRenderState.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGxG,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,CAAC,gBAAgB,CAAM,GAAG,cAAc,CA8BlH;AAMD,wBAAgB,2BAA2B,IAAI,qBAAqB,CAmBnE;AAID,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,cAAc,GAAG,qBAAqB,CAErF"}
|
package/dist/domRenderState.js
CHANGED
|
@@ -33,7 +33,24 @@ export function createDomRenderState(element, options = {}) {
|
|
|
33
33
|
// The render path writes the returned object every frame, so the return is intentionally mutable (not
|
|
34
34
|
// Readonly).
|
|
35
35
|
export function createDomRenderStateRuntime() {
|
|
36
|
-
|
|
36
|
+
const runtime = createRenderStateRuntime();
|
|
37
|
+
runtime.registries = {
|
|
38
|
+
renderers: runtime.registries.renderers,
|
|
39
|
+
shapeRasterizer: {
|
|
40
|
+
entry: null,
|
|
41
|
+
onMiss: 'Unregistered',
|
|
42
|
+
registry: 'DomShapeRasterizer',
|
|
43
|
+
shape: 'slot',
|
|
44
|
+
},
|
|
45
|
+
strokeTessellator: runtime.registries.strokeTessellator,
|
|
46
|
+
textureResolvers: {
|
|
47
|
+
entries: new Map(),
|
|
48
|
+
onMiss: 'Unregistered',
|
|
49
|
+
registry: 'DomTextureResolver',
|
|
50
|
+
shape: 'keyed',
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
return runtime;
|
|
37
54
|
}
|
|
38
55
|
// Resolves the package-private DOM runtime attached to a DomRenderState. Mutable by design: the render
|
|
39
56
|
// path writes its fields every frame.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domRenderState.js","sourceRoot":"","sources":["../src/domRenderState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,iBAAiB,IAAI,kBAAkB,EACvC,wBAAwB,EACxB,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,UAAU,oBAAoB,CAAC,OAAoB,EAAE,UAAqC,EAAE;IAChG,MAAM,KAAK,GAAG,kBAAkB,CAAC;QAC/B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,CAAC;QACnC,iBAAiB,EAAE,YAAY,EAAE;QACjC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,KAAK;QACzC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;KACnD,CAAmB,CAAC;IAErB,IAAI,OAAO,CAAC,eAAe,IAAI,IAAI;QAAE,6BAA6B,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAEnG,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC;IACjC,KAAkC,CAAC,OAAO,GAAG,OAAO,CAAC;IACtD,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,qBAAqB,IAAI,IAAI,CAAC;IAE7D,MAAM,OAAO,GAAG,2BAA2B,EAAE,CAAC;IAC9C,KAAK,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC;IAClC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAChC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,YAAY,GAAG,EAAE,CAAC;IAC1B,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IACjC,OAAO,CAAC,aAAa,GAAG,IAAI,OAAO,EAAE,CAAC;IACtC,OAAO,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC9B,OAAO,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,wDAAwD;IACrF,OAAO,CAAC,YAAY,GAAG,EAAE,CAAC;IAE1B,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;IACpC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAElC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,uGAAuG;AACvG,sGAAsG;AACtG,sGAAsG;AACtG,aAAa;AACb,MAAM,UAAU,2BAA2B;IACzC,OAAO,wBAAwB,EAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"domRenderState.js","sourceRoot":"","sources":["../src/domRenderState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,iBAAiB,IAAI,kBAAkB,EACvC,wBAAwB,EACxB,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,UAAU,oBAAoB,CAAC,OAAoB,EAAE,UAAqC,EAAE;IAChG,MAAM,KAAK,GAAG,kBAAkB,CAAC;QAC/B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,CAAC;QACnC,iBAAiB,EAAE,YAAY,EAAE;QACjC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,KAAK;QACzC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;KACnD,CAAmB,CAAC;IAErB,IAAI,OAAO,CAAC,eAAe,IAAI,IAAI;QAAE,6BAA6B,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAEnG,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC;IACjC,KAAkC,CAAC,OAAO,GAAG,OAAO,CAAC;IACtD,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,qBAAqB,IAAI,IAAI,CAAC;IAE7D,MAAM,OAAO,GAAG,2BAA2B,EAAE,CAAC;IAC9C,KAAK,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC;IAClC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAChC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,YAAY,GAAG,EAAE,CAAC;IAC1B,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IACjC,OAAO,CAAC,aAAa,GAAG,IAAI,OAAO,EAAE,CAAC;IACtC,OAAO,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC9B,OAAO,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,wDAAwD;IACrF,OAAO,CAAC,YAAY,GAAG,EAAE,CAAC;IAE1B,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;IACpC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAElC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,uGAAuG;AACvG,sGAAsG;AACtG,sGAAsG;AACtG,aAAa;AACb,MAAM,UAAU,2BAA2B;IACzC,MAAM,OAAO,GAAG,wBAAwB,EAA2B,CAAC;IACpE,OAAO,CAAC,UAAU,GAAG;QACnB,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS;QACvC,eAAe,EAAE;YACf,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,cAAc;YACtB,QAAQ,EAAE,oBAAoB;YAC9B,KAAK,EAAE,MAAM;SACd;QACD,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,iBAAiB;QACvD,gBAAgB,EAAE;YAChB,OAAO,EAAE,IAAI,GAAG,EAAE;YAClB,MAAM,EAAE,cAAc;YACtB,QAAQ,EAAE,oBAAoB;YAC9B,KAAK,EAAE,OAAO;SACf;KACF,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,uGAAuG;AACvG,sCAAsC;AACtC,MAAM,UAAU,wBAAwB,CAAC,KAAqB;IAC5D,OAAO,KAAK,CAAC,gBAAgB,CAA0B,CAAC;AAC1D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domRichText.d.ts","sourceRoot":"","sources":["../src/domRichText.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,mBAAmB,EAGnB,aAAa,EAMd,MAAM,0BAA0B,CAAC;AAuBlC,wBAAgB,eAAe,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAQvF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAE3F;
|
|
1
|
+
{"version":3,"file":"domRichText.d.ts","sourceRoot":"","sources":["../src/domRichText.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,mBAAmB,EAGnB,aAAa,EAMd,MAAM,0BAA0B,CAAC;AAuBlC,wBAAgB,eAAe,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAQvF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAE3F;AA4KD,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAE9E;AAED,eAAO,MAAM,0BAA0B,EAAE,eAGxC,CAAC"}
|
package/dist/domRichText.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { computeRgbHexString } from '@flighthq/color/contract';
|
|
1
|
+
import { computeRgbHexString, computeRgbaCssString } from '@flighthq/color/contract';
|
|
2
2
|
import { createEntity } from '@flighthq/entity/contract';
|
|
3
3
|
import { computeTextFormatFontString } from '@flighthq/text/contract';
|
|
4
4
|
import { getRichTextPasswordCharacter, getRichTextRuntime } from '@flighthq/text/contract';
|
|
@@ -101,11 +101,11 @@ function drawDomRichTextField(state, renderProxy) {
|
|
|
101
101
|
bulletLines.add(group.lineIndex);
|
|
102
102
|
const bulletSize = fmt.size ?? 12;
|
|
103
103
|
const bulletX = x - bulletSize * 0.7 - DOM_BULLET_GAP;
|
|
104
|
-
const bulletStyle = `position:absolute;left:${bulletX}px;top:${y}px;font:${fontStr};line-height:1;color:${
|
|
104
|
+
const bulletStyle = `position:absolute;left:${bulletX}px;top:${y}px;font:${fontStr};line-height:1;color:${computeRgbaCssString(fmt.color ?? source.data.textColor)};white-space:nowrap;`;
|
|
105
105
|
html += `<div style="${bulletStyle}">•</div>`;
|
|
106
106
|
}
|
|
107
107
|
let style = `position:absolute;left:${x}px;top:${y}px;font:${fontStr};line-height:1;`;
|
|
108
|
-
style += `color:${
|
|
108
|
+
style += `color:${computeRgbaCssString(fmt.color ?? source.data.textColor)};white-space:nowrap;`;
|
|
109
109
|
if (fmt.underline || fmt.strikethrough) {
|
|
110
110
|
const decorations = [];
|
|
111
111
|
if (fmt.underline)
|
|
@@ -113,6 +113,10 @@ function drawDomRichTextField(state, renderProxy) {
|
|
|
113
113
|
if (fmt.strikethrough)
|
|
114
114
|
decorations.push('line-through');
|
|
115
115
|
style += `text-decoration:${decorations.join(' ')};`;
|
|
116
|
+
// Flight's raster text backends draw one uninterrupted decoration stroke for the formatted run.
|
|
117
|
+
// Disable CSS's default skip-ink gaps so DOM has the same observable underline geometry.
|
|
118
|
+
if (fmt.underline)
|
|
119
|
+
style += 'text-decoration-skip-ink:none;';
|
|
116
120
|
}
|
|
117
121
|
switch (fmt.align) {
|
|
118
122
|
case 'center':
|
package/dist/domRichText.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domRichText.js","sourceRoot":"","sources":["../src/domRichText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"domRichText.js","sourceRoot":"","sources":["../src/domRichText.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domShapeRasterizer.d.ts","sourceRoot":"","sources":["../src/domShapeRasterizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"domShapeRasterizer.d.ts","sourceRoot":"","sources":["../src/domShapeRasterizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAKhF,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,eAAe,GAAG,IAAI,CAGnF;AAKD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,GAAG,IAAI,GAAG,IAAI,CAO1G"}
|
|
@@ -1,11 +1,18 @@
|
|
|
1
|
+
import { RegistryEntryState } from '@flighthq/types/contract';
|
|
1
2
|
import { getDomRenderStateRuntime } from './domRenderState';
|
|
2
3
|
export function getDomShapeRasterizer(state) {
|
|
3
|
-
|
|
4
|
+
const entry = getDomRenderStateRuntime(state).registries.shapeRasterizer.entry;
|
|
5
|
+
return entry?.state === RegistryEntryState.Bound ? entry.value : null;
|
|
4
6
|
}
|
|
5
7
|
// Installs the fallback that draws fills the mesh path cannot express. Registration is the opt-in: a
|
|
6
8
|
// state without one draws its solid shapes and reports the rest as a registry miss, and nothing here
|
|
7
9
|
// reaches for a rasterizer the caller did not name. Pass null to remove one.
|
|
8
10
|
export function registerDomShapeRasterizer(state, rasterizer) {
|
|
9
|
-
getDomRenderStateRuntime(state)
|
|
11
|
+
const runtime = getDomRenderStateRuntime(state);
|
|
12
|
+
const table = runtime.registries.shapeRasterizer;
|
|
13
|
+
runtime.registries.shapeRasterizer = {
|
|
14
|
+
...table,
|
|
15
|
+
entry: rasterizer === null ? null : { state: RegistryEntryState.Bound, value: rasterizer },
|
|
16
|
+
};
|
|
10
17
|
}
|
|
11
18
|
//# sourceMappingURL=domShapeRasterizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domShapeRasterizer.js","sourceRoot":"","sources":["../src/domShapeRasterizer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"domShapeRasterizer.js","sourceRoot":"","sources":["../src/domShapeRasterizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,MAAM,UAAU,qBAAqB,CAAC,KAAqB;IACzD,MAAM,KAAK,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC;IAC/E,OAAO,KAAK,EAAE,KAAK,KAAK,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AACxE,CAAC;AAED,qGAAqG;AACrG,qGAAqG;AACrG,6EAA6E;AAC7E,MAAM,UAAU,0BAA0B,CAAC,KAAqB,EAAE,UAAkC;IAClG,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;IACjD,OAAO,CAAC,UAAU,CAAC,eAAe,GAAG;QACnC,GAAG,KAAK;QACR,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE;KAC3F,CAAC;AACJ,CAAC"}
|
package/dist/domSprite.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domSprite.d.ts","sourceRoot":"","sources":["../src/domSprite.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EAGd,aAAa,EAEb,eAAe,EAEhB,MAAM,0BAA0B,CAAC;AAqBlC,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CA8BrF;
|
|
1
|
+
{"version":3,"file":"domSprite.d.ts","sourceRoot":"","sources":["../src/domSprite.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EAGd,aAAa,EAEb,eAAe,EAEhB,MAAM,0BAA0B,CAAC;AAqBlC,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CA8BrF;AAqFD,eAAO,MAAM,wBAAwB,EAAE,eAItC,CAAC"}
|
package/dist/domSprite.js
CHANGED
|
@@ -62,6 +62,7 @@ function renderSpriteAsCanvas(state, renderProxy, data, source, sourceRectangle)
|
|
|
62
62
|
context.imageSmoothingEnabled = state.allowSmoothing && !texture.sampler.magFilter.startsWith('nearest');
|
|
63
63
|
context.drawImage(source, sourceRectangle.x, sourceRectangle.y, sourceRectangle.width, sourceRectangle.height, 0, 0, sourceRectangle.width, sourceRectangle.height);
|
|
64
64
|
applyDomStyle(state, data.canvas, renderProxy);
|
|
65
|
+
applyDomSpriteSampling(state, data.canvas, renderProxy);
|
|
65
66
|
setDomRendererElement(state, data.canvas);
|
|
66
67
|
}
|
|
67
68
|
function renderSpriteAsImage(state, renderProxy, data, source) {
|
|
@@ -76,6 +77,7 @@ function renderSpriteAsImage(state, renderProxy, data, source) {
|
|
|
76
77
|
if (data.image.src !== source.src)
|
|
77
78
|
data.image.src = source.src;
|
|
78
79
|
applyDomStyle(state, data.image, renderProxy);
|
|
80
|
+
applyDomSpriteSampling(state, data.image, renderProxy);
|
|
79
81
|
setDomRendererElement(state, data.image);
|
|
80
82
|
}
|
|
81
83
|
function renderSpriteAsVideo(state, renderProxy, data, source) {
|
|
@@ -85,8 +87,14 @@ function renderSpriteAsVideo(state, renderProxy, data, source) {
|
|
|
85
87
|
data.video = source;
|
|
86
88
|
prepareDomElement(source);
|
|
87
89
|
applyDomStyle(state, source, renderProxy);
|
|
90
|
+
applyDomSpriteSampling(state, source, renderProxy);
|
|
88
91
|
setDomRendererElement(state, source);
|
|
89
92
|
}
|
|
93
|
+
function applyDomSpriteSampling(state, element, renderProxy) {
|
|
94
|
+
const texture = renderProxy.source.data.texture;
|
|
95
|
+
element.style.imageRendering =
|
|
96
|
+
state.allowSmoothing && !texture.sampler.magFilter.startsWith('nearest') ? '' : 'pixelated';
|
|
97
|
+
}
|
|
90
98
|
export const defaultDomSpriteRenderer = {
|
|
91
99
|
createData: createDomSpriteData,
|
|
92
100
|
isDirty: isSpriteRendererDirty,
|
package/dist/domSprite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domSprite.js","sourceRoot":"","sources":["../src/domSprite.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"domSprite.js","sourceRoot":"","sources":["../src/domSprite.ts"],"names":[],"mappings":"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"}
|
package/dist/domTextLabel.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { computeRgbaCssString } from '@flighthq/color/contract';
|
|
2
2
|
import { createEntity } from '@flighthq/entity/contract';
|
|
3
3
|
import { computeTextFormatFontString } from '@flighthq/text/contract';
|
|
4
4
|
import { getTextLabelRuntime } from '@flighthq/text/contract';
|
|
@@ -59,7 +59,7 @@ export function drawDomTextLabel(state, renderProxy) {
|
|
|
59
59
|
const x = group.offsetX;
|
|
60
60
|
const y = group.offsetY;
|
|
61
61
|
let style = `position:absolute;left:${x}px;top:${y}px;font:${computeTextFormatFontString(fmt)};`;
|
|
62
|
-
style += `color:${
|
|
62
|
+
style += `color:${computeRgbaCssString(fmt.color ?? 0x000000ff)};white-space:nowrap;`;
|
|
63
63
|
if (fmt.underline)
|
|
64
64
|
style += 'text-decoration:underline;';
|
|
65
65
|
html += `<div style="${style}">${slice}</div>`;
|
package/dist/domTextLabel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domTextLabel.js","sourceRoot":"","sources":["../src/domTextLabel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"domTextLabel.js","sourceRoot":"","sources":["../src/domTextLabel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domTextureResolver.d.ts","sourceRoot":"","sources":["../src/domTextureResolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK/G,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,cAAc,EACrB,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,kBAAkB,GAAG,IAAI,GAClC,IAAI,
|
|
1
|
+
{"version":3,"file":"domTextureResolver.d.ts","sourceRoot":"","sources":["../src/domTextureResolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAK/G,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,cAAc,EACrB,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,kBAAkB,GAAG,IAAI,GAClC,IAAI,CAON;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,IAAI,CAW7G"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { getTextureSourceKind } from '@flighthq/texture/contract';
|
|
2
|
-
import { RenderRegistry } from '@flighthq/types/contract';
|
|
2
|
+
import { RenderRegistry, RegistryEntryState } from '@flighthq/types/contract';
|
|
3
3
|
import { getDomRenderStateRuntime } from './domRenderState';
|
|
4
4
|
export function registerDomTextureResolver(state, sourceKind, resolver) {
|
|
5
5
|
const runtime = getDomRenderStateRuntime(state);
|
|
6
|
-
const
|
|
6
|
+
const table = runtime.registries.textureResolvers;
|
|
7
|
+
const entries = new Map(table.entries);
|
|
7
8
|
if (resolver === null)
|
|
8
|
-
|
|
9
|
+
entries.delete(sourceKind);
|
|
9
10
|
else
|
|
10
|
-
|
|
11
|
+
entries.set(sourceKind, { state: RegistryEntryState.Bound, value: resolver });
|
|
12
|
+
runtime.registries.textureResolvers = { ...table, entries };
|
|
11
13
|
}
|
|
12
14
|
export function resolveDomTexture(state, texture) {
|
|
13
15
|
if (texture.dimension !== '2d')
|
|
@@ -16,11 +18,11 @@ export function resolveDomTexture(state, texture) {
|
|
|
16
18
|
if (sourceKind === null)
|
|
17
19
|
return null;
|
|
18
20
|
const runtime = getDomRenderStateRuntime(state);
|
|
19
|
-
const
|
|
20
|
-
if (
|
|
21
|
+
const entry = runtime.registries.textureResolvers.entries.get(sourceKind);
|
|
22
|
+
if (entry?.state !== RegistryEntryState.Bound) {
|
|
21
23
|
runtime.registryMiss?.(RenderRegistry.TextureResolver, sourceKind);
|
|
22
24
|
return null;
|
|
23
25
|
}
|
|
24
|
-
return
|
|
26
|
+
return entry.value(state, texture);
|
|
25
27
|
}
|
|
26
28
|
//# sourceMappingURL=domTextureResolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domTextureResolver.js","sourceRoot":"","sources":["../src/domTextureResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"domTextureResolver.js","sourceRoot":"","sources":["../src/domTextureResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,MAAM,UAAU,0BAA0B,CACxC,KAAqB,EACrB,UAA6B,EAC7B,QAAmC;IAEnC,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;;QAC7C,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACnF,OAAO,CAAC,UAAU,CAAC,gBAAgB,GAAG,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAqB,EAAE,OAA0B;IACjF,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC5C,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,UAAU,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACrC,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1E,IAAI,KAAK,EAAE,KAAK,KAAK,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAC9C,OAAO,CAAC,YAAY,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explainDomTextureResolution.d.ts","sourceRoot":"","sources":["../src/explainDomTextureResolution.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"explainDomTextureResolution.d.ts","sourceRoot":"","sources":["../src/explainDomTextureResolution.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAKtG,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,GACzB,4BAA4B,CAU9B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getTextureSourceKind } from '@flighthq/texture/contract';
|
|
2
|
+
import { RegistryEntryState } from '@flighthq/types/contract';
|
|
2
3
|
import { getDomRenderStateRuntime } from './domRenderState';
|
|
3
4
|
export function explainDomTextureResolution(state, texture) {
|
|
4
5
|
const kind = getTextureSourceKind(texture);
|
|
@@ -6,7 +7,7 @@ export function explainDomTextureResolution(state, texture) {
|
|
|
6
7
|
return { kind, status: 'missing-kind' };
|
|
7
8
|
return {
|
|
8
9
|
kind,
|
|
9
|
-
status: getDomRenderStateRuntime(state).
|
|
10
|
+
status: getDomRenderStateRuntime(state).registries.textureResolvers.entries.get(kind)?.state === RegistryEntryState.Bound
|
|
10
11
|
? 'registered'
|
|
11
12
|
: 'missing-resolver',
|
|
12
13
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explainDomTextureResolution.js","sourceRoot":"","sources":["../src/explainDomTextureResolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"explainDomTextureResolution.js","sourceRoot":"","sources":["../src/explainDomTextureResolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D,MAAM,UAAU,2BAA2B,CACzC,KAAqB,EACrB,OAA0B;IAE1B,MAAM,IAAI,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;IAC3D,OAAO;QACL,IAAI;QACJ,MAAM,EACJ,wBAAwB,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,KAAK,kBAAkB,CAAC,KAAK;YAC/G,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,kBAAkB;KACzB,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/scene2d-dom",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.1-next.1041.35b950c",
|
|
4
4
|
"author": "Joshua Granick and other contributors",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -38,22 +38,22 @@
|
|
|
38
38
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@flighthq/color": "0.3.
|
|
42
|
-
"@flighthq/scene2d": "0.3.
|
|
43
|
-
"@flighthq/scene2d-canvas": "0.3.
|
|
44
|
-
"@flighthq/entity": "0.3.
|
|
45
|
-
"@flighthq/geometry": "0.3.
|
|
46
|
-
"@flighthq/image": "0.3.
|
|
47
|
-
"@flighthq/log": "0.3.
|
|
48
|
-
"@flighthq/node": "0.3.
|
|
49
|
-
"@flighthq/render": "0.3.
|
|
50
|
-
"@flighthq/signals": "0.3.
|
|
51
|
-
"@flighthq/shape": "0.3.
|
|
52
|
-
"@flighthq/text": "0.3.
|
|
53
|
-
"@flighthq/textinput": "0.3.
|
|
54
|
-
"@flighthq/textlayout": "0.3.
|
|
55
|
-
"@flighthq/texture": "0.3.
|
|
56
|
-
"@flighthq/types": "0.3.
|
|
41
|
+
"@flighthq/color": "0.3.1-next.1041.35b950c",
|
|
42
|
+
"@flighthq/scene2d": "0.3.1-next.1041.35b950c",
|
|
43
|
+
"@flighthq/scene2d-canvas": "0.3.1-next.1041.35b950c",
|
|
44
|
+
"@flighthq/entity": "0.3.1-next.1041.35b950c",
|
|
45
|
+
"@flighthq/geometry": "0.3.1-next.1041.35b950c",
|
|
46
|
+
"@flighthq/image": "0.3.1-next.1041.35b950c",
|
|
47
|
+
"@flighthq/log": "0.3.1-next.1041.35b950c",
|
|
48
|
+
"@flighthq/node": "0.3.1-next.1041.35b950c",
|
|
49
|
+
"@flighthq/render": "0.3.1-next.1041.35b950c",
|
|
50
|
+
"@flighthq/signals": "0.3.1-next.1041.35b950c",
|
|
51
|
+
"@flighthq/shape": "0.3.1-next.1041.35b950c",
|
|
52
|
+
"@flighthq/text": "0.3.1-next.1041.35b950c",
|
|
53
|
+
"@flighthq/textinput": "0.3.1-next.1041.35b950c",
|
|
54
|
+
"@flighthq/textlayout": "0.3.1-next.1041.35b950c",
|
|
55
|
+
"@flighthq/texture": "0.3.1-next.1041.35b950c",
|
|
56
|
+
"@flighthq/types": "0.3.1-next.1041.35b950c"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
59
|
"@flighthq/bitmap": "*",
|
package/src/domCache.test.ts
CHANGED
|
@@ -40,7 +40,10 @@ describe('enableDomRenderCache', () => {
|
|
|
40
40
|
it('registers the renderer for the render cache kind', () => {
|
|
41
41
|
const state = makeState();
|
|
42
42
|
enableDomRenderCache(state);
|
|
43
|
-
expect(getDomRenderStateRuntime(state).
|
|
43
|
+
expect(getDomRenderStateRuntime(state).registries.renderers.entries.get(RenderCacheKind)).toEqual({
|
|
44
|
+
state: 'bound',
|
|
45
|
+
value: defaultDomRenderCacheRenderer,
|
|
46
|
+
});
|
|
44
47
|
});
|
|
45
48
|
});
|
|
46
49
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getOrCreateRenderProxy2D, registerRenderer } from '@flighthq/render/contract';
|
|
2
|
-
import { createNativeText } from '@flighthq/text/contract';
|
|
2
|
+
import { createNativeText, getNativeTextRuntime } from '@flighthq/text/contract';
|
|
3
3
|
import { NativeTextKind } from '@flighthq/types/contract';
|
|
4
4
|
|
|
5
5
|
import { defaultDomNativeTextRenderer, drawDomNativeText, drawDomNativeTextMask } from './domNativeText';
|
|
@@ -60,6 +60,29 @@ describe('drawDomNativeText', () => {
|
|
|
60
60
|
expect(div.style.overflow).toBe('hidden');
|
|
61
61
|
});
|
|
62
62
|
|
|
63
|
+
it('publishes the dimensions laid out by the DOM element', () => {
|
|
64
|
+
const state = makeState();
|
|
65
|
+
const node = createNativeText({ data: { text: 'measured', width: 137, height: 41 } });
|
|
66
|
+
const renderProxy = getOrCreateRenderProxy2D(state, node);
|
|
67
|
+
const measure = vi
|
|
68
|
+
.spyOn(HTMLElement.prototype, 'getBoundingClientRect')
|
|
69
|
+
.mockImplementation(function (this: HTMLElement): DOMRect {
|
|
70
|
+
const width = Number.parseFloat(this.style.width) || 0;
|
|
71
|
+
const height = Number.parseFloat(this.style.height) || 0;
|
|
72
|
+
return new DOMRect(0, 0, width, height);
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
try {
|
|
76
|
+
drawDomNativeText(state, renderProxy);
|
|
77
|
+
|
|
78
|
+
const runtime = getNativeTextRuntime(node);
|
|
79
|
+
expect(runtime.measuredWidth).toBe(node.data.width);
|
|
80
|
+
expect(runtime.measuredHeight).toBe(node.data.height);
|
|
81
|
+
} finally {
|
|
82
|
+
measure.mockRestore();
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
|
|
63
86
|
it('positions the block vertically via the flexbox on a fixed box', () => {
|
|
64
87
|
const state = makeState();
|
|
65
88
|
const node = createNativeText({ data: { text: 'hi', verticalAlign: 'middle' } });
|
|
@@ -81,6 +104,32 @@ describe('drawDomNativeText', () => {
|
|
|
81
104
|
expect(bottomDiv.style.justifyContent).toBe('flex-end');
|
|
82
105
|
});
|
|
83
106
|
|
|
107
|
+
// The channel order is the whole assertion. Under the 24-bit reading this file used to carry, the
|
|
108
|
+
// packed value below keeps its low three bytes and comes out `#44ffee` — a plausible-looking cyan that
|
|
109
|
+
// is wrong in every channel. The named case is the one that failed in the field: a cyan authored as
|
|
110
|
+
// `0x44ffee` under an RGBA field means r=0x00, and nothing draws where the scene expects ink.
|
|
111
|
+
it('converts the packed RGBA style color channel-correctly, alpha included', () => {
|
|
112
|
+
const state = makeState();
|
|
113
|
+
const node = createNativeText({ data: { text: 'hi', style: { color: 0x44ffee80 } } });
|
|
114
|
+
const renderProxy = getOrCreateRenderProxy2D(state, node);
|
|
115
|
+
|
|
116
|
+
// The expected strings are what the CSS engine serializes back, not what the renderer wrote: alpha
|
|
117
|
+
// is rounded and a fully opaque color drops to `rgb()`. The channel triple is the load-bearing part.
|
|
118
|
+
const div = drawGetEl(state, () => drawDomNativeText(state, renderProxy))!;
|
|
119
|
+
expect(div.style.color).toBe('rgba(68, 255, 238, 0.502)');
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
it('defaults an unset style color to opaque black rather than transparent', () => {
|
|
123
|
+
const state = makeState();
|
|
124
|
+
const node = createNativeText({ data: { text: 'hi' } });
|
|
125
|
+
const renderProxy = getOrCreateRenderProxy2D(state, node);
|
|
126
|
+
|
|
127
|
+
const div = drawGetEl(state, () => drawDomNativeText(state, renderProxy))!;
|
|
128
|
+
// A bare 0 default would be alpha 0 under RGBA — `rgba(0, 0, 0, 0)`, a field that renders nothing.
|
|
129
|
+
// Opaque black serializes back without the alpha component.
|
|
130
|
+
expect(div.style.color).toBe('rgb(0, 0, 0)');
|
|
131
|
+
});
|
|
132
|
+
|
|
84
133
|
it('drops the flexbox framing under autoSize (no slack to align within)', () => {
|
|
85
134
|
const state = makeState();
|
|
86
135
|
const node = createNativeText({ data: { text: 'hi', autoSize: 'left', verticalAlign: 'middle' } });
|
|
@@ -75,6 +75,19 @@ describe('createDomRenderStateRuntime', () => {
|
|
|
75
75
|
it('allocates an entity runtime with a null binding', () => {
|
|
76
76
|
const runtime = createDomRenderStateRuntime();
|
|
77
77
|
expect(runtime.binding).toBeNull();
|
|
78
|
+
expect(runtime.registries.colorAdjustments).toBeUndefined();
|
|
79
|
+
expect(runtime.registries.shapeRasterizer).toMatchObject({
|
|
80
|
+
entry: null,
|
|
81
|
+
onMiss: 'Unregistered',
|
|
82
|
+
registry: 'DomShapeRasterizer',
|
|
83
|
+
shape: 'slot',
|
|
84
|
+
});
|
|
85
|
+
expect(runtime.registries.textureResolvers).toMatchObject({
|
|
86
|
+
onMiss: 'Unregistered',
|
|
87
|
+
registry: 'DomTextureResolver',
|
|
88
|
+
shape: 'keyed',
|
|
89
|
+
});
|
|
90
|
+
expect(runtime.registries.textureResolvers.entries.size).toBe(0);
|
|
78
91
|
});
|
|
79
92
|
});
|
|
80
93
|
|
package/src/domRichText.test.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { registerRenderer } from '@flighthq/render/contract';
|
|
2
2
|
import { getOrCreateRenderProxy2D } from '@flighthq/render/contract';
|
|
3
|
-
import { createRichText } from '@flighthq/text/contract';
|
|
3
|
+
import { createRichText, getRichTextRuntime } from '@flighthq/text/contract';
|
|
4
4
|
import { enableTextInput } from '@flighthq/textinput/contract';
|
|
5
|
+
import { getTextLayoutResult } from '@flighthq/textlayout/contract';
|
|
5
6
|
import { RichTextKind } from '@flighthq/types/contract';
|
|
6
7
|
|
|
7
8
|
import { createDomRenderState, getDomRenderStateRuntime } from './domRenderState';
|
|
@@ -106,7 +107,7 @@ describe('drawDomRichText', () => {
|
|
|
106
107
|
node.data.text = 'BoldGreen';
|
|
107
108
|
node.data.textFormatRanges = [
|
|
108
109
|
{ start: 0, end: 4, format: { bold: true } },
|
|
109
|
-
{ start: 4, end: 9, format: { color:
|
|
110
|
+
{ start: 4, end: 9, format: { color: 0x00ff00ff } },
|
|
110
111
|
];
|
|
111
112
|
const renderProxy = getOrCreateRenderProxy2D(state, node);
|
|
112
113
|
|
|
@@ -114,7 +115,65 @@ describe('drawDomRichText', () => {
|
|
|
114
115
|
expect(div.innerHTML).toContain('Bold');
|
|
115
116
|
expect(div.innerHTML).toContain('Green');
|
|
116
117
|
expect(div.innerHTML).toContain('bold');
|
|
117
|
-
expect(div.innerHTML).toContain('
|
|
118
|
+
expect(div.innerHTML).toContain('rgba(0,255,0,1)');
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
it('emits packed run alpha in the CSS color', () => {
|
|
122
|
+
const state = makeState();
|
|
123
|
+
const node = createRichText();
|
|
124
|
+
node.data.text = 'alpha';
|
|
125
|
+
node.data.textFormatRanges = [{ start: 0, end: 5, format: { color: 0x00ff0080 } }];
|
|
126
|
+
const renderProxy = getOrCreateRenderProxy2D(state, node);
|
|
127
|
+
|
|
128
|
+
const div = drawGetEl(state, () => drawDomRichText(state, renderProxy))!;
|
|
129
|
+
|
|
130
|
+
expect(div.innerHTML).toContain('rgba(0,255,0,0.5019607843137255)');
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
it('renders an uninterrupted underline like the raster text backends', () => {
|
|
134
|
+
const state = makeState();
|
|
135
|
+
const node = createRichText({
|
|
136
|
+
data: {
|
|
137
|
+
text: 'underlined',
|
|
138
|
+
textFormatRanges: [{ end: 10, format: { underline: true }, start: 0 }],
|
|
139
|
+
},
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
const div = drawGetEl(state, () => drawDomRichText(state, getOrCreateRenderProxy2D(state, node)))!;
|
|
143
|
+
|
|
144
|
+
expect(div.innerHTML).toContain('text-decoration:underline');
|
|
145
|
+
expect(div.innerHTML).toContain('text-decoration-skip-ink:none');
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
it('positions a text run from the CSS baseline measured for its emitted font', () => {
|
|
149
|
+
const state = makeState();
|
|
150
|
+
const fontSize = 37;
|
|
151
|
+
const cssAscentRatio = 0.75;
|
|
152
|
+
const node = createRichText({
|
|
153
|
+
data: {
|
|
154
|
+
defaultTextFormat: { font: 'flight-baseline-probe', size: fontSize },
|
|
155
|
+
text: 'baseline',
|
|
156
|
+
},
|
|
157
|
+
});
|
|
158
|
+
const measure = vi
|
|
159
|
+
.spyOn(HTMLElement.prototype, 'getBoundingClientRect')
|
|
160
|
+
.mockImplementation(function (this: HTMLElement): DOMRect {
|
|
161
|
+
const parentFont = this.parentElement?.style.font ?? '';
|
|
162
|
+
const measuredFontSize = Number.parseFloat(/([\d.]+)px/.exec(parentFont)?.[1] ?? '0');
|
|
163
|
+
const top = this.style.verticalAlign === 'baseline' ? measuredFontSize * cssAscentRatio : 0;
|
|
164
|
+
return new DOMRect(0, top, 0, 0);
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
try {
|
|
168
|
+
const div = drawGetEl(state, () => drawDomRichText(state, getOrCreateRenderProxy2D(state, node)))!;
|
|
169
|
+
const run = div.firstElementChild as HTMLElement;
|
|
170
|
+
const group = getTextLayoutResult(getRichTextRuntime(node)).groups[0];
|
|
171
|
+
const expectedTop = group.offsetY + group.ascent - fontSize * cssAscentRatio;
|
|
172
|
+
|
|
173
|
+
expect(Number.parseFloat(run.style.top)).toBeCloseTo(expectedTop);
|
|
174
|
+
} finally {
|
|
175
|
+
measure.mockRestore();
|
|
176
|
+
}
|
|
118
177
|
});
|
|
119
178
|
|
|
120
179
|
it('sets backgroundColor when background is enabled', () => {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getOrCreateRenderProxy2D } from '@flighthq/render/contract';
|
|
2
|
+
import { defaultCanvasShapeCommands, registerCanvasShapeCommands } from '@flighthq/scene2d-canvas/contract';
|
|
2
3
|
import { appendShapeBeginFill, appendShapeRectangle, createScale9Shape } from '@flighthq/shape/contract';
|
|
3
4
|
|
|
4
5
|
import { createDomRenderState, getDomRenderStateRuntime } from './domRenderState';
|
|
@@ -34,6 +35,10 @@ describe('defaultDomScale9ShapeRenderer', () => {
|
|
|
34
35
|
});
|
|
35
36
|
|
|
36
37
|
describe('drawDomScale9Shape', () => {
|
|
38
|
+
beforeAll(() => {
|
|
39
|
+
registerCanvasShapeCommands(createDomRenderState(document.createElement('div')), defaultCanvasShapeCommands);
|
|
40
|
+
});
|
|
41
|
+
|
|
37
42
|
it('returns early when commands are empty', () => {
|
|
38
43
|
const state = createDomRenderState(document.createElement('div'));
|
|
39
44
|
registerDomShapeRasterizer(state, noopRasterizer);
|
package/src/domShape.test.ts
CHANGED
|
@@ -1,7 +1,15 @@
|
|
|
1
1
|
import { registerRenderer } from '@flighthq/render/contract';
|
|
2
2
|
import { getOrCreateRenderProxy2D } from '@flighthq/render/contract';
|
|
3
3
|
import { defaultCanvasShapeCommands, registerCanvasShapeCommands } from '@flighthq/scene2d-canvas/contract';
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
appendShapeBeginFill,
|
|
6
|
+
appendShapeEndFill,
|
|
7
|
+
appendShapeLineStyle,
|
|
8
|
+
appendShapeLineTo,
|
|
9
|
+
appendShapeMoveTo,
|
|
10
|
+
appendShapeRectangle,
|
|
11
|
+
createShape,
|
|
12
|
+
} from '@flighthq/shape/contract';
|
|
5
13
|
import { ShapeKind } from '@flighthq/types/contract';
|
|
6
14
|
|
|
7
15
|
import { createDomRenderState, getDomRenderStateRuntime } from './domRenderState';
|
|
@@ -59,6 +67,21 @@ describe('drawDomShape', () => {
|
|
|
59
67
|
|
|
60
68
|
expect(el).not.toBeNull();
|
|
61
69
|
expect(el!.tagName).toBe('CANVAS');
|
|
70
|
+
expect((el as HTMLCanvasElement).width).toBe(50);
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
it('sizes its production canvas from the paired stroke contribution', () => {
|
|
74
|
+
const state = makeState();
|
|
75
|
+
const shape = createShape();
|
|
76
|
+
appendShapeLineStyle(shape, 30, 0xffffff, 1, false, 'normal', 'none', 'miter', 6);
|
|
77
|
+
appendShapeMoveTo(shape, -110, -110);
|
|
78
|
+
appendShapeLineTo(shape, 0, 0);
|
|
79
|
+
appendShapeLineTo(shape, 110, -110);
|
|
80
|
+
const renderProxy = getOrCreateRenderProxy2D(state, shape);
|
|
81
|
+
|
|
82
|
+
const canvas = drawGetEl(state, () => drawDomShape(state, renderProxy)) as HTMLCanvasElement;
|
|
83
|
+
|
|
84
|
+
expect(canvas.height).toBeGreaterThan(143);
|
|
62
85
|
});
|
|
63
86
|
|
|
64
87
|
it('sets canvas size to at least 1x1 for zero-size shapes', () => {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createRenderState, enableRenderRegistryGuards, explainRenderRegistryMisses } from '@flighthq/render/contract';
|
|
2
2
|
import { RenderRegistry } from '@flighthq/types/contract';
|
|
3
3
|
|
|
4
|
-
import { createDomRenderState } from './domRenderState';
|
|
4
|
+
import { createDomRenderState, getDomRenderStateRuntime } from './domRenderState';
|
|
5
5
|
import { getDomShapeRasterizer, registerDomShapeRasterizer } from './domShapeRasterizer';
|
|
6
6
|
|
|
7
7
|
describe('getDomShapeRasterizer', () => {
|
|
@@ -21,12 +21,28 @@ describe('registerDomShapeRasterizer', () => {
|
|
|
21
21
|
expect(getDomShapeRasterizer(state)).toBe(rasterizer);
|
|
22
22
|
});
|
|
23
23
|
|
|
24
|
+
it('replaces the persistent slot without mutating an earlier snapshot', () => {
|
|
25
|
+
const state = createDomRenderState(document.createElement('div'));
|
|
26
|
+
const rasterizer = (): void => {};
|
|
27
|
+
const before = getDomRenderStateRuntime(state).registries.shapeRasterizer;
|
|
28
|
+
|
|
29
|
+
registerDomShapeRasterizer(state, rasterizer);
|
|
30
|
+
|
|
31
|
+
const after = getDomRenderStateRuntime(state).registries.shapeRasterizer;
|
|
32
|
+
expect(after).not.toBe(before);
|
|
33
|
+
expect(before.entry).toBeNull();
|
|
34
|
+
expect(after.entry).toEqual({ state: 'bound', value: rasterizer });
|
|
35
|
+
});
|
|
36
|
+
|
|
24
37
|
it('removes one again, so a state can drop back to tessellation only', () => {
|
|
25
38
|
const state = createDomRenderState(document.createElement('div'));
|
|
26
|
-
|
|
39
|
+
const rasterizer = (): void => {};
|
|
40
|
+
registerDomShapeRasterizer(state, rasterizer);
|
|
41
|
+
const before = getDomRenderStateRuntime(state).registries.shapeRasterizer;
|
|
27
42
|
|
|
28
43
|
registerDomShapeRasterizer(state, null);
|
|
29
44
|
|
|
30
45
|
expect(getDomShapeRasterizer(state)).toBeNull();
|
|
46
|
+
expect(before.entry).toEqual({ state: 'bound', value: rasterizer });
|
|
31
47
|
});
|
|
32
48
|
});
|
package/src/domSprite.test.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createImageResource, createImageResourceFromCanvas } from '@flighthq/image/contract';
|
|
2
2
|
import { getOrCreateRenderProxy2D, registerRenderer } from '@flighthq/render/contract';
|
|
3
3
|
import { createSprite } from '@flighthq/scene2d/contract';
|
|
4
|
-
import { createTexture } from '@flighthq/texture/contract';
|
|
4
|
+
import { createPixelArtSampler, createTexture } from '@flighthq/texture/contract';
|
|
5
5
|
import { SpriteKind } from '@flighthq/types/contract';
|
|
6
6
|
|
|
7
7
|
import { registerDomImageTextureResolver } from './domImageTextureResolver';
|
|
@@ -52,6 +52,25 @@ describe('drawDomSprite', () => {
|
|
|
52
52
|
expect(getDomRenderStateRuntime(state).domCurrentElement?.tagName).toBe('CANVAS');
|
|
53
53
|
});
|
|
54
54
|
|
|
55
|
+
it('applies pixelated CSS sampling to a nearest-neighbor texture', () => {
|
|
56
|
+
const canvas = document.createElement('canvas');
|
|
57
|
+
canvas.width = 64;
|
|
58
|
+
canvas.height = 64;
|
|
59
|
+
const image = createImageResourceFromCanvas(canvas);
|
|
60
|
+
const state = createDomRenderState(document.createElement('div'));
|
|
61
|
+
registerDomImageTextureResolver(state);
|
|
62
|
+
registerRenderer(state, SpriteKind, defaultDomSpriteRenderer);
|
|
63
|
+
const sprite = createSprite({
|
|
64
|
+
data: {
|
|
65
|
+
texture: createTexture({ dimension: '2d', sampler: createPixelArtSampler(), source: image }),
|
|
66
|
+
},
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
drawDomSprite(state, getOrCreateRenderProxy2D(state, sprite));
|
|
70
|
+
|
|
71
|
+
expect(getDomRenderStateRuntime(state).domCurrentElement?.style.imageRendering).toBe('pixelated');
|
|
72
|
+
});
|
|
73
|
+
|
|
55
74
|
it('uses the source video element directly', () => {
|
|
56
75
|
expect(drawElement(document.createElement('video'))?.tagName).toBe('VIDEO');
|
|
57
76
|
});
|
package/src/domTextLabel.test.ts
CHANGED
|
@@ -78,6 +78,18 @@ describe('drawDomTextLabel', () => {
|
|
|
78
78
|
expect(div.innerHTML).toContain('world');
|
|
79
79
|
});
|
|
80
80
|
|
|
81
|
+
it('emits packed run alpha in the CSS color', () => {
|
|
82
|
+
const state = makeState();
|
|
83
|
+
const node = createTextLabel();
|
|
84
|
+
node.data.text = 'alpha';
|
|
85
|
+
node.data.textFormat = { color: 0xff000080 };
|
|
86
|
+
const renderProxy = getOrCreateRenderProxy2D(state, node);
|
|
87
|
+
|
|
88
|
+
const div = drawGetEl(state, () => drawDomTextLabel(state, renderProxy))!;
|
|
89
|
+
|
|
90
|
+
expect(div.innerHTML).toContain('rgba(255,0,0,0.5019607843137255)');
|
|
91
|
+
});
|
|
92
|
+
|
|
81
93
|
it('reuses the same div across multiple draws', () => {
|
|
82
94
|
const state = makeState();
|
|
83
95
|
const node = createTextLabel();
|
|
@@ -3,7 +3,7 @@ import { createImageResource } from '@flighthq/image/contract';
|
|
|
3
3
|
import { createTexture } from '@flighthq/texture/contract';
|
|
4
4
|
import type { TextureSource } from '@flighthq/types/contract';
|
|
5
5
|
|
|
6
|
-
import { createDomRenderState } from './domRenderState';
|
|
6
|
+
import { createDomRenderState, getDomRenderStateRuntime } from './domRenderState';
|
|
7
7
|
import { registerDomTextureResolver, resolveDomTexture } from './domTextureResolver';
|
|
8
8
|
|
|
9
9
|
describe('registerDomTextureResolver', () => {
|
|
@@ -12,10 +12,42 @@ describe('registerDomTextureResolver', () => {
|
|
|
12
12
|
const textureSource = createEntity({ height: 1, kind: 'acme.test', version: 0, width: 1 }) as TextureSource;
|
|
13
13
|
const texture = createTexture({ dimension: '2d', source: textureSource });
|
|
14
14
|
const canvas = document.createElement('canvas');
|
|
15
|
-
|
|
15
|
+
const resolver = (): HTMLCanvasElement => canvas;
|
|
16
|
+
registerDomTextureResolver(state, 'acme.test', resolver);
|
|
16
17
|
expect(resolveDomTexture(state, texture)).toBe(canvas);
|
|
18
|
+
const beforeRemoval = getDomRenderStateRuntime(state).registries.textureResolvers;
|
|
17
19
|
registerDomTextureResolver(state, 'acme.test', null);
|
|
18
20
|
expect(resolveDomTexture(state, texture)).toBeNull();
|
|
21
|
+
expect(beforeRemoval.entries.get('acme.test')).toEqual({ state: 'bound', value: resolver });
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
it('replaces the persistent table without mutating an earlier snapshot', () => {
|
|
25
|
+
const state = createDomRenderState(document.createElement('div'));
|
|
26
|
+
const before = getDomRenderStateRuntime(state).registries.textureResolvers;
|
|
27
|
+
const resolver = (): null => null;
|
|
28
|
+
|
|
29
|
+
registerDomTextureResolver(state, 'acme.persistent', resolver);
|
|
30
|
+
|
|
31
|
+
const after = getDomRenderStateRuntime(state).registries.textureResolvers;
|
|
32
|
+
expect(after).not.toBe(before);
|
|
33
|
+
expect(before.entries.size).toBe(0);
|
|
34
|
+
expect(after.entries.get('acme.persistent')).toEqual({ state: 'bound', value: resolver });
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it('is last-write-wins without mutating the registered snapshot', () => {
|
|
38
|
+
const state = createDomRenderState(document.createElement('div'));
|
|
39
|
+
const first = (): null => null;
|
|
40
|
+
const second = (): null => null;
|
|
41
|
+
registerDomTextureResolver(state, 'acme.replace', first);
|
|
42
|
+
const before = getDomRenderStateRuntime(state).registries.textureResolvers;
|
|
43
|
+
|
|
44
|
+
registerDomTextureResolver(state, 'acme.replace', second);
|
|
45
|
+
|
|
46
|
+
expect(before.entries.get('acme.replace')).toEqual({ state: 'bound', value: first });
|
|
47
|
+
expect(getDomRenderStateRuntime(state).registries.textureResolvers.entries.get('acme.replace')).toEqual({
|
|
48
|
+
state: 'bound',
|
|
49
|
+
value: second,
|
|
50
|
+
});
|
|
19
51
|
});
|
|
20
52
|
});
|
|
21
53
|
|