@swf2es/player-hosts 0.1.7 → 0.1.8

package/dist/thread/player/display/textobjects.js

@@ -65,9 +65,10 @@ export class TextObject extends DisplayObject {
     embedFonts = false;
     autoSize = "none";
     /**
-     * A script set the size of a field that fits itself: as in Flash, the fit
-     * waits for its size to be asked, its transform to change or the frame to
-     * be drawn, and a wordWrap set meanwhile wraps at the size set (adl).
+     * A script set the size or the autoSize of a field that fits itself: as
+     * in Flash, the fit waits for its size to be asked, its transform to
+     * change or the frame to be drawn, and a wordWrap set meanwhile wraps at
+     * the size the field has (adl).
      */
     fitPending = false;
     selectable = true;
@@ -201,24 +202,24 @@ export class TextObject extends DisplayObject {
         this.height = height;
         this.invalidate(CONTENT);
     }
-    /** A script set its size: under autoSize, the fit waits (fitPending). */
-    sizeSet() {
-        if (this.autoSize !== "none") {
+    /** A script set its size or its autoSize: under autoSize, the fit waits (fitPending). */
+    deferFit() {
+        if (this.autoSize !== "none" && !this.fitPending) {
             this.fitPending = true;
             pendingFits.add(this);
         }
     }
-    /** The fit a set size left pending, applied: its size asked, its transform changed, the frame drawn. */
+    /**
+     * The fit left pending, applied: as its position, size or bounds are
+     * asked, its transform is set, or the frame is drawn; not as its scale,
+     * its rotation or its text metrics are asked, or its alpha set (adl).
+     */
     settle() {
         if (this.fitPending) {
             this.fitPending = false;
             this.fit();
         }
     }
-    touch() {
-        super.touch();
-        this.settle();
-    }
     /** The text, \r between its lines. */
     get text() {
         return this.model.text;

package/dist/thread/player/playerglobal/flash/display/DisplayObject.js

@@ -144,6 +144,10 @@ function spriteOnly(traits) {
 }
 /** Move a display object, by a copy of its matrix, and have it drawn again. */
 function transform(d, change) {
+    // A field's pending fit first, so that what is set is where it stays.
+    if (d instanceof TextObject) {
+        d.settle();
+    }
     const m = { ...d.matrix };
     change(m);
     d.matrix = m;
@@ -191,6 +195,10 @@ export function displayObjectNatives(s) {
             }
         }
         get x() {
+            // A field's pending fit moves a centred or right-aligned one (adl).
+            if (this.$display instanceof TextObject) {
+                this.$display.settle();
+            }
             return withOffset(this.$display.matrix.tx, fieldOffset(this.$display)[0]);
         }
         // A NaN position is 0, as Flash has it (the corpus's `displayobject_invalid_floats`), and
@@ -207,6 +215,9 @@ export function displayObjectNatives(s) {
             });
         }
         get y() {
+            if (this.$display instanceof TextObject) {
+                this.$display.settle();
+            }
             return withOffset(this.$display.matrix.ty, fieldOffset(this.$display)[1]);
         }
         set y(v) {
@@ -340,7 +351,7 @@ export function displayObjectNatives(s) {
             if (d instanceof TextObject) {
                 d.width = value / (Math.abs(d.scaleX) || 1);
                 d.invalidate(CONTENT);
-                d.sizeSet();
+                d.deferFit();
                 return;
             }
             const r = bounds(d, true);
@@ -375,7 +386,7 @@ export function displayObjectNatives(s) {
             if (d instanceof TextObject) {
                 d.height = value / (Math.abs(d.scaleY) || 1);
                 d.invalidate(CONTENT);
-                d.sizeSet();
+                d.deferFit();
                 return;
             }
             const r = bounds(d, true);

package/dist/thread/player/playerglobal/flash/text/TextField.js

@@ -342,7 +342,8 @@ export function textFieldNatives(s) {
         }
         set autoSize(v) {
             this.$display.autoSize = choice(v, ["none", "left", "right", "center"], "autoSize");
-            this.$display.fit();
+            // Its fit waits for its size to be asked, or the frame, as one a set width leaves (adl).
+            this.$display.deferFit();
         }
         get antiAliasType() {
             return this.$display.antiAliasType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swf2es/player-hosts",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Optional Node and WebSocket transports, worker threads, an IndexedDB module cache and precompiled modules for the swf2es player",
   "keywords": [
     "swf",
@@ -60,6 +60,6 @@
     "LICENSE.third-party"
   ],
   "dependencies": {
-    "@swf2es/player": "0.1.7"
+    "@swf2es/player": "0.1.8"
   }
 }