@vectojs/core 1.28.0 → 1.28.1

package/dist/index.js

@@ -2002,10 +2002,20 @@ var Scene = (_class7 = class _Scene {
   __init82() {this.activeIds = /* @__PURE__ */ new Set()}
   /** Per-parent insertion cursor, reused by `enforceA11yDomOrder`. */
   __init83() {this.a11yOrderCursors = /* @__PURE__ */ new Map()}
-  __init84() {this.activePortalsThisFrame = /* @__PURE__ */ new Set()}
-  __init85() {this.activePortalsPrevFrame = /* @__PURE__ */ new Set()}
-  __init86() {this.portalEntities = /* @__PURE__ */ new Map()}
-  __init87() {this.renderOrderCounter = 0}
+  /** Membership set for the elements being ordered, reused per reorder pass. */
+  __init84() {this.a11yOrderMembers = /* @__PURE__ */ new Set()}
+  /**
+   * Elements that are an *ancestor* of another ordered element, reused per pass.
+   *
+   * A composite widget's container (a `grid` around its rows, a `tree` around its
+   * items) spans every descendant row, so it must not extend a visual row band —
+   * see {@link sortNormalElementsVisually}.
+   */
+  __init85() {this.a11yOrderContainers = /* @__PURE__ */ new Set()}
+  __init86() {this.activePortalsThisFrame = /* @__PURE__ */ new Set()}
+  __init87() {this.activePortalsPrevFrame = /* @__PURE__ */ new Set()}
+  __init88() {this.portalEntities = /* @__PURE__ */ new Map()}
+  __init89() {this.renderOrderCounter = 0}
   /**
    * Monotonic render-frame counter, bumped once per authoritative `render()`
    * pass. Entities stamp their per-frame world-matrix cache with this value and
@@ -2014,7 +2024,7 @@ var Scene = (_class7 = class _Scene {
    * back to the ancestor walk. Public for the same reason `Entity._getTrig`/
    * `_setWorldCache` are: it is a cross-class render-internal contract.
    */
-  __init88() {this.currentFrame = 0}
+  __init90() {this.currentFrame = 0}
   // ── WASM transform backend (invisible accelerator) ──────────────────────────
   // When `_transformBackend === 'wasm'`, the main render walk sources each
   // entity's world matrix from an SoA store composed by `_wasm` (see
@@ -2022,24 +2032,24 @@ var Scene = (_class7 = class _Scene {
   // fallback and the default: a null backend, a non-main renderer, or any entity
   // absent from the store all fall back to the JS composition, so WASM can only
   // ever change *how fast* a world matrix is produced, never *what* it is.
-  __init89() {this._wasm = null}
-  __init90() {this._transformBackend = "js"}
+  __init91() {this._wasm = null}
+  __init92() {this._transformBackend = "js"}
   // Resident store state (Stage 3). The store layout — slot assignment + sibling
   // runs — depends only on tree TOPOLOGY, so it is rebuilt only when the
   // structure changes (add/remove/reparent bump `_structureVersion`). Between
   // rebuilds the per-frame cost is: gather each entity's transform into the
   // resident wasm input view + run the kernel — no reallocation, no readback.
-  __init91() {this._treeStore = null}
-  __init92() {this._slotEntity = []}
+  __init93() {this._treeStore = null}
+  __init94() {this._slotEntity = []}
   // store slot -> entity (also validates slots)
-  __init93() {this._wasmInputs = null}
-  __init94() {this._wasmWorld = null}
-  __init95() {this._structureVersion = 0}
-  __init96() {this._storeStructureVersion = -1}
+  __init95() {this._wasmInputs = null}
+  __init96() {this._wasmWorld = null}
+  __init97() {this._structureVersion = 0}
+  __init98() {this._storeStructureVersion = -1}
   // Cached list of ComputeParticleEntity instances in the tree, keyed by the
   // structure version it was gathered at. Rebuilt only on a topology change.
-  __init97() {this._computeEntities = []}
-  __init98() {this._computeEntitiesVersion = -1}
+  __init99() {this._computeEntities = []}
+  __init100() {this._computeEntitiesVersion = -1}
   /** Invalidate the resident WASM store layout; the next wasm-mode frame rebuilds
    *  it. Called by `Entity.add`/`remove` (topology changes only). */
   markStructureChanged() {
@@ -2124,7 +2134,7 @@ var Scene = (_class7 = class _Scene {
    * cached globally; the instance is per-Scene, which is the isolation that
    * actually matters.
    */
-  __init99() {this._wasmRuntime = null}
+  __init101() {this._wasmRuntime = null}
   /**
    * Load (or reuse) this Scene's shared WASM runtime.
    *
@@ -2152,30 +2162,30 @@ var Scene = (_class7 = class _Scene {
   get wasmRuntime() {
     return this._wasmRuntime;
   }
-  __init100() {this._hitWasm = null}
+  __init102() {this._hitWasm = null}
   // Cache key: which frame + structure version the grid was last (successfully,
   // non-overflowing) built for. findEntityAt is called ad-hoc (pointer
   // hover/click), not every frame, so the grid is refreshed lazily on demand
   // rather than proactively every render() — unlike the transform store, which
   // every frame's draw depends on.
-  __init101() {this._hitGridFrame = -1}
-  __init102() {this._hitGridOk = false}
-  __init103() {this._hitSlotEntity = []}
-  __init104() {this._hitBoundless = []}
+  __init103() {this._hitGridFrame = -1}
+  __init104() {this._hitGridOk = false}
+  __init105() {this._hitSlotEntity = []}
+  __init106() {this._hitBoundless = []}
   /** Reused buffer for the fused gather, so a pointer query allocates nothing. */
-  __init105() {this._hitGatherBuffer = null}
+  __init107() {this._hitGatherBuffer = null}
   /**
    * Whether the last grid build sourced its AABBs from the WASM transform store
    * rather than recomputing them in JS. Diagnostic only — both paths must
    * produce the same entity for a given point.
    */
-  __init106() {this._hitFusedGather = false}
+  __init108() {this._hitFusedGather = false}
   /**
    * Whether `compute_aabbs` has run against the current frame's world matrices.
    * The AABB pass is only meaningful after a `compose_*`, so the fused gather
    * must not read the views before then.
    */
-  __init107() {this._wasmAabbsFresh = false}
+  __init109() {this._wasmAabbsFresh = false}
   /** Did the last hit-grid build use the fused (WASM-store) gather? */
   get hitGatherPath() {
     return this._hitFusedGather ? "fused" : "js";
@@ -2184,9 +2194,9 @@ var Scene = (_class7 = class _Scene {
    * Why the transform accelerator did or did not run on the most recent frame.
    * Written by the render walk and `_syncWasmStore`.
    */
-  __init108() {this._transformReason = "not-installed"}
+  __init110() {this._transformReason = "not-installed"}
   /** Why the batched-driver accelerator did or did not run. */
-  __init109() {this._animReason = "not-installed"}
+  __init111() {this._animReason = "not-installed"}
   /**
    * Why the hit-test accelerator did or did not serve the last pointer query.
    * The grid is built lazily on demand, not every frame, so this describes the
@@ -2194,11 +2204,11 @@ var Scene = (_class7 = class _Scene {
    * before a backend exists; `_ensureHitGrid` moves it to `'not-applicable'`
    * once one is installed but nothing has queried yet.
    */
-  __init110() {this._hitReason = "not-installed"}
+  __init112() {this._hitReason = "not-installed"}
   /** Why the particle accelerator did or did not run. */
-  __init111() {this._particleReason = "not-applicable"}
+  __init113() {this._particleReason = "not-applicable"}
   /** Which particle implementation actually simulated the most recent frame. */
-  __init112() {this._particlePath = "none"}
+  __init114() {this._particlePath = "none"}
   /**
    * Per-frame status of every invisible accelerator: whether each is installed,
    * whether it actually ran on the most recent frame, and why.
@@ -2358,25 +2368,25 @@ var Scene = (_class7 = class _Scene {
   // EasingFn (which cannot cross into WASM) all fall through to it — WASM can
   // only ever change *how* a driver is advanced, never *what* value it lands
   // on.
-  __init113() {this._animWasm = null}
+  __init115() {this._animWasm = null}
   // Entities with at least one active driver, added by Entity._spawnDriver.
   // Self-pruning: _tickBatchedDrivers drops an entry the first time it visits
   // an entity whose drivers have since all completed or been removed. This is
   // what lets the batch pass find its candidates in O(active drivers), not
   // O(tree size) — the exact mistake G3's first integrated benchmark made.
-  __init114() {this._activeDriverEntities = /* @__PURE__ */ new Set()}
+  __init116() {this._activeDriverEntities = /* @__PURE__ */ new Set()}
   // Reused across frames instead of allocating a fresh array + N {entity,prop,
   // driver} objects every call — the integrated benchmark
   // (benchmarks/anim-wasm-scene) found that allocation churn was the
   // dominant integrated cost, not the wasm kernel itself. Parallel arrays,
   // truncated to the live count after each use so a stale tail slot never
   // pins a no-longer-active entity/driver in memory.
-  __init115() {this._springEntities = []}
-  __init116() {this._springProps = []}
-  __init117() {this._springDrivers = []}
-  __init118() {this._tweenEntities = []}
-  __init119() {this._tweenProps = []}
-  __init120() {this._tweenDrivers = []}
+  __init117() {this._springEntities = []}
+  __init118() {this._springProps = []}
+  __init119() {this._springDrivers = []}
+  __init120() {this._tweenEntities = []}
+  __init121() {this._tweenProps = []}
+  __init122() {this._tweenDrivers = []}
   /**
    * Minimum number of batchable (spring, or named-easing tween) active drivers
    * before a frame engages the WASM batch path at all; below it, every driver
@@ -2448,7 +2458,7 @@ var Scene = (_class7 = class _Scene {
    * Setting {@link animDriverGateCount} overwrites all three, so existing code
    * that tuned the single knob keeps working unchanged.
    */
-  __init121() {this._animBatchedLastFrame = false}
+  __init123() {this._animBatchedLastFrame = false}
   /**
    * Whether the WASM batch path actually ran on the most recent frame.
    *
@@ -2460,7 +2470,7 @@ var Scene = (_class7 = class _Scene {
   get animBatchedLastFrame() {
     return this._animBatchedLastFrame;
   }
-  __init122() {this.animGate = {
+  __init124() {this.animGate = {
     spring: 128,
     tween: 256,
     mixed: 128
@@ -2498,7 +2508,7 @@ var Scene = (_class7 = class _Scene {
   // (benchmarks/particle-wasm). f32 (matches the WGSL shader), bit-identical to
   // a JS f32 reference oracle; updateCPU (f64) stays the permanent fallback when
   // no backend is installed or a scene runs on WebGPU.
-  __init123() {this._particleWasm = null}
+  __init125() {this._particleWasm = null}
   /** Which backend runs the CPU particle simulation. Reflects only whether a
    *  backend is installed (the WebGPU compute path, when active, is used first
    *  regardless). */
@@ -2775,24 +2785,24 @@ var Scene = (_class7 = class _Scene {
    * sync, so retaining the order prevents a newly opened overlay from spending
    * its first frame below previously projected controls.
    */
-  __init124() {this.a11yRenderOrders = /* @__PURE__ */ new Map()}
+  __init126() {this.a11yRenderOrders = /* @__PURE__ */ new Map()}
   // Optional WebGL point-cloud layer (see SceneOptions.pointBackend).
-  __init125() {this.pointRenderer = null}
-  __init126() {this.glCanvas = null}
-  __init127() {this.glContextLostHandler = null}
-  __init128() {this.glContextRestoredHandler = null}
+  __init127() {this.pointRenderer = null}
+  __init128() {this.glCanvas = null}
+  __init129() {this.glContextLostHandler = null}
+  __init130() {this.glContextRestoredHandler = null}
   
   
   
-  __init129() {this.disableWindowResize = false}
+  __init131() {this.disableWindowResize = false}
   /** See {@link SceneOptions.maxDPR}. `undefined` = uncapped (real DPR). */
   
   // WebGPU properties
-  __init130() {this.destroyed = false}
-  __init131() {this.device = null}
-  __init132() {this.deviceLost = false}
-  __init133() {this.particleBackend = "auto"}
-  __init134() {this._webgpuDisabled = false}
+  __init132() {this.destroyed = false}
+  __init133() {this.device = null}
+  __init134() {this.deviceLost = false}
+  __init135() {this.particleBackend = "auto"}
+  __init136() {this._webgpuDisabled = false}
   get webgpuDisabled() {
     return this._webgpuDisabled || this.particleBackend === "cpu";
   }
@@ -2820,22 +2830,22 @@ var Scene = (_class7 = class _Scene {
   set webgpuDisabled(value) {
     this._webgpuDisabled = value;
   }
-  __init135() {this.recoveryTimerId = null}
-  __init136() {this.manager = null}
-  __init137() {this.initializingWebGPU = false}
-  __init138() {this.gpuCanvas = null}
-  __init139() {this.gpuContext = null}
+  __init137() {this.recoveryTimerId = null}
+  __init138() {this.manager = null}
+  __init139() {this.initializingWebGPU = false}
+  __init140() {this.gpuCanvas = null}
+  __init141() {this.gpuContext = null}
   /** True while the GPU canvas holds a presented particle frame (needs clearing when they leave). */
-  __init140() {this.gpuHasContent = false}
-  __init141() {this.mouseX = -9999}
-  __init142() {this.mouseY = -9999}
-  __init143() {this.pointerMoveListener = null}
-  __init144() {this.pointerLeaveListener = null}
+  __init142() {this.gpuHasContent = false}
+  __init143() {this.mouseX = -9999}
+  __init144() {this.mouseY = -9999}
+  __init145() {this.pointerMoveListener = null}
+  __init146() {this.pointerLeaveListener = null}
   /** Element the pointer listeners are bound to (parent container if present,
    *  else the canvas). Stored so `destroy()` detaches from the same element. */
-  __init145() {this.pointerEventTarget = null}
-  __init146() {this.hasWarnedZeroSize = false}
-  __init147() {this.fontLoadHandler = null}
+  __init147() {this.pointerEventTarget = null}
+  __init148() {this.hasWarnedZeroSize = false}
+  __init149() {this.fontLoadHandler = null}
   // ── Dev-mode warning infrastructure ──────────────────────────────
   //
   // Enable with `Scene.devMode = true` or by setting `globalThis.__DEV__`.
@@ -2869,7 +2879,7 @@ var Scene = (_class7 = class _Scene {
     return false;
   }
   
-  __init148() {this._devFrameCount = 0}
+  __init150() {this._devFrameCount = 0}
   _devWarn(message) {
     if (!this._devActive) return;
     console.warn(`[vectojs/dev] ${message}`);
@@ -2944,7 +2954,7 @@ var Scene = (_class7 = class _Scene {
     };
     walkProjections(this.root);
   }
-  constructor(canvas, options = {}) {;_class7.prototype.__init27.call(this);_class7.prototype.__init28.call(this);_class7.prototype.__init29.call(this);_class7.prototype.__init30.call(this);_class7.prototype.__init31.call(this);_class7.prototype.__init32.call(this);_class7.prototype.__init33.call(this);_class7.prototype.__init34.call(this);_class7.prototype.__init35.call(this);_class7.prototype.__init36.call(this);_class7.prototype.__init37.call(this);_class7.prototype.__init38.call(this);_class7.prototype.__init39.call(this);_class7.prototype.__init40.call(this);_class7.prototype.__init41.call(this);_class7.prototype.__init42.call(this);_class7.prototype.__init43.call(this);_class7.prototype.__init44.call(this);_class7.prototype.__init45.call(this);_class7.prototype.__init46.call(this);_class7.prototype.__init47.call(this);_class7.prototype.__init48.call(this);_class7.prototype.__init49.call(this);_class7.prototype.__init50.call(this);_class7.prototype.__init51.call(this);_class7.prototype.__init52.call(this);_class7.prototype.__init53.call(this);_class7.prototype.__init54.call(this);_class7.prototype.__init55.call(this);_class7.prototype.__init56.call(this);_class7.prototype.__init57.call(this);_class7.prototype.__init58.call(this);_class7.prototype.__init59.call(this);_class7.prototype.__init60.call(this);_class7.prototype.__init61.call(this);_class7.prototype.__init62.call(this);_class7.prototype.__init63.call(this);_class7.prototype.__init64.call(this);_class7.prototype.__init65.call(this);_class7.prototype.__init66.call(this);_class7.prototype.__init67.call(this);_class7.prototype.__init68.call(this);_class7.prototype.__init69.call(this);_class7.prototype.__init70.call(this);_class7.prototype.__init71.call(this);_class7.prototype.__init72.call(this);_class7.prototype.__init73.call(this);_class7.prototype.__init74.call(this);_class7.prototype.__init75.call(this);_class7.prototype.__init76.call(this);_class7.prototype.__init77.call(this);_class7.prototype.__init78.call(this);_class7.prototype.__init79.call(this);_class7.prototype.__init80.call(this);_class7.prototype.__init81.call(this);_class7.prototype.__init82.call(this);_class7.prototype.__init83.call(this);_class7.prototype.__init84.call(this);_class7.prototype.__init85.call(this);_class7.prototype.__init86.call(this);_class7.prototype.__init87.call(this);_class7.prototype.__init88.call(this);_class7.prototype.__init89.call(this);_class7.prototype.__init90.call(this);_class7.prototype.__init91.call(this);_class7.prototype.__init92.call(this);_class7.prototype.__init93.call(this);_class7.prototype.__init94.call(this);_class7.prototype.__init95.call(this);_class7.prototype.__init96.call(this);_class7.prototype.__init97.call(this);_class7.prototype.__init98.call(this);_class7.prototype.__init99.call(this);_class7.prototype.__init100.call(this);_class7.prototype.__init101.call(this);_class7.prototype.__init102.call(this);_class7.prototype.__init103.call(this);_class7.prototype.__init104.call(this);_class7.prototype.__init105.call(this);_class7.prototype.__init106.call(this);_class7.prototype.__init107.call(this);_class7.prototype.__init108.call(this);_class7.prototype.__init109.call(this);_class7.prototype.__init110.call(this);_class7.prototype.__init111.call(this);_class7.prototype.__init112.call(this);_class7.prototype.__init113.call(this);_class7.prototype.__init114.call(this);_class7.prototype.__init115.call(this);_class7.prototype.__init116.call(this);_class7.prototype.__init117.call(this);_class7.prototype.__init118.call(this);_class7.prototype.__init119.call(this);_class7.prototype.__init120.call(this);_class7.prototype.__init121.call(this);_class7.prototype.__init122.call(this);_class7.prototype.__init123.call(this);_class7.prototype.__init124.call(this);_class7.prototype.__init125.call(this);_class7.prototype.__init126.call(this);_class7.prototype.__init127.call(this);_class7.prototype.__init128.call(this);_class7.prototype.__init129.call(this);_class7.prototype.__init130.call(this);_class7.prototype.__init131.call(this);_class7.prototype.__init132.call(this);_class7.prototype.__init133.call(this);_class7.prototype.__init134.call(this);_class7.prototype.__init135.call(this);_class7.prototype.__init136.call(this);_class7.prototype.__init137.call(this);_class7.prototype.__init138.call(this);_class7.prototype.__init139.call(this);_class7.prototype.__init140.call(this);_class7.prototype.__init141.call(this);_class7.prototype.__init142.call(this);_class7.prototype.__init143.call(this);_class7.prototype.__init144.call(this);_class7.prototype.__init145.call(this);_class7.prototype.__init146.call(this);_class7.prototype.__init147.call(this);_class7.prototype.__init148.call(this);
+  constructor(canvas, options = {}) {;_class7.prototype.__init27.call(this);_class7.prototype.__init28.call(this);_class7.prototype.__init29.call(this);_class7.prototype.__init30.call(this);_class7.prototype.__init31.call(this);_class7.prototype.__init32.call(this);_class7.prototype.__init33.call(this);_class7.prototype.__init34.call(this);_class7.prototype.__init35.call(this);_class7.prototype.__init36.call(this);_class7.prototype.__init37.call(this);_class7.prototype.__init38.call(this);_class7.prototype.__init39.call(this);_class7.prototype.__init40.call(this);_class7.prototype.__init41.call(this);_class7.prototype.__init42.call(this);_class7.prototype.__init43.call(this);_class7.prototype.__init44.call(this);_class7.prototype.__init45.call(this);_class7.prototype.__init46.call(this);_class7.prototype.__init47.call(this);_class7.prototype.__init48.call(this);_class7.prototype.__init49.call(this);_class7.prototype.__init50.call(this);_class7.prototype.__init51.call(this);_class7.prototype.__init52.call(this);_class7.prototype.__init53.call(this);_class7.prototype.__init54.call(this);_class7.prototype.__init55.call(this);_class7.prototype.__init56.call(this);_class7.prototype.__init57.call(this);_class7.prototype.__init58.call(this);_class7.prototype.__init59.call(this);_class7.prototype.__init60.call(this);_class7.prototype.__init61.call(this);_class7.prototype.__init62.call(this);_class7.prototype.__init63.call(this);_class7.prototype.__init64.call(this);_class7.prototype.__init65.call(this);_class7.prototype.__init66.call(this);_class7.prototype.__init67.call(this);_class7.prototype.__init68.call(this);_class7.prototype.__init69.call(this);_class7.prototype.__init70.call(this);_class7.prototype.__init71.call(this);_class7.prototype.__init72.call(this);_class7.prototype.__init73.call(this);_class7.prototype.__init74.call(this);_class7.prototype.__init75.call(this);_class7.prototype.__init76.call(this);_class7.prototype.__init77.call(this);_class7.prototype.__init78.call(this);_class7.prototype.__init79.call(this);_class7.prototype.__init80.call(this);_class7.prototype.__init81.call(this);_class7.prototype.__init82.call(this);_class7.prototype.__init83.call(this);_class7.prototype.__init84.call(this);_class7.prototype.__init85.call(this);_class7.prototype.__init86.call(this);_class7.prototype.__init87.call(this);_class7.prototype.__init88.call(this);_class7.prototype.__init89.call(this);_class7.prototype.__init90.call(this);_class7.prototype.__init91.call(this);_class7.prototype.__init92.call(this);_class7.prototype.__init93.call(this);_class7.prototype.__init94.call(this);_class7.prototype.__init95.call(this);_class7.prototype.__init96.call(this);_class7.prototype.__init97.call(this);_class7.prototype.__init98.call(this);_class7.prototype.__init99.call(this);_class7.prototype.__init100.call(this);_class7.prototype.__init101.call(this);_class7.prototype.__init102.call(this);_class7.prototype.__init103.call(this);_class7.prototype.__init104.call(this);_class7.prototype.__init105.call(this);_class7.prototype.__init106.call(this);_class7.prototype.__init107.call(this);_class7.prototype.__init108.call(this);_class7.prototype.__init109.call(this);_class7.prototype.__init110.call(this);_class7.prototype.__init111.call(this);_class7.prototype.__init112.call(this);_class7.prototype.__init113.call(this);_class7.prototype.__init114.call(this);_class7.prototype.__init115.call(this);_class7.prototype.__init116.call(this);_class7.prototype.__init117.call(this);_class7.prototype.__init118.call(this);_class7.prototype.__init119.call(this);_class7.prototype.__init120.call(this);_class7.prototype.__init121.call(this);_class7.prototype.__init122.call(this);_class7.prototype.__init123.call(this);_class7.prototype.__init124.call(this);_class7.prototype.__init125.call(this);_class7.prototype.__init126.call(this);_class7.prototype.__init127.call(this);_class7.prototype.__init128.call(this);_class7.prototype.__init129.call(this);_class7.prototype.__init130.call(this);_class7.prototype.__init131.call(this);_class7.prototype.__init132.call(this);_class7.prototype.__init133.call(this);_class7.prototype.__init134.call(this);_class7.prototype.__init135.call(this);_class7.prototype.__init136.call(this);_class7.prototype.__init137.call(this);_class7.prototype.__init138.call(this);_class7.prototype.__init139.call(this);_class7.prototype.__init140.call(this);_class7.prototype.__init141.call(this);_class7.prototype.__init142.call(this);_class7.prototype.__init143.call(this);_class7.prototype.__init144.call(this);_class7.prototype.__init145.call(this);_class7.prototype.__init146.call(this);_class7.prototype.__init147.call(this);_class7.prototype.__init148.call(this);_class7.prototype.__init149.call(this);_class7.prototype.__init150.call(this);
     this.canvas = canvas;
     this.debugA11y = _nullishCoalesce(options.debugA11y, () => ( false));
     this.disableWindowResize = _nullishCoalesce(options.disableWindowResize, () => ( false));
@@ -4872,7 +4882,9 @@ var Scene = (_class7 = class _Scene {
       this.a11yOrderCursors.set(parent, at + 1);
       const current = parent.childNodes[at];
       if (current !== expected) {
+        const refocus = document.activeElement === expected;
         parent.insertBefore(expected, current || null);
+        if (refocus) expected.focus({ preventScroll: true });
       }
     }
     this.a11yNeedsReorder = false;
@@ -4901,19 +4913,37 @@ var Scene = (_class7 = class _Scene {
     const els = this.normalElements;
     if (els.length < 2) return;
     const rtl = this._readingDirection === "rtl";
-    const topOf = (el) => Number.parseFloat(el.style.top) || 0;
-    const leftOf = (el) => Number.parseFloat(el.style.left) || 0;
     const heightOf = (el) => Math.max(Number.parseFloat(el.style.height) || 0, 4);
-    const order = els.map((el, i) => ({
-      el,
-      i,
-      top: topOf(el),
-      left: leftOf(el)
-    }));
+    const members = this.a11yOrderMembers;
+    const containers = this.a11yOrderContainers;
+    members.clear();
+    containers.clear();
+    for (const el of els) members.add(el);
+    for (const el of els) {
+      for (let p = el.parentElement; p; p = p.parentElement) {
+        if (members.has(p)) containers.add(p);
+      }
+    }
+    const absolute = (el) => {
+      let top = 0;
+      let left = 0;
+      for (let node = el; node; node = node.parentElement) {
+        top += Number.parseFloat(node.style.top) || 0;
+        left += Number.parseFloat(node.style.left) || 0;
+        const parent = node.parentElement;
+        if (!parent || !members.has(parent)) break;
+      }
+      return { top, left };
+    };
+    const order = els.map((el, i) => {
+      const { top, left } = absolute(el);
+      return { el, i, top, left, container: containers.has(el) };
+    });
     order.sort((p, q) => p.top - q.top || p.i - q.i);
+    const bandBottom = (r) => r.top + (r.container ? 4 : heightOf(r.el));
     const sorted = [];
     let rowStart = 0;
-    let rowBottom = order.length ? order[0].top + heightOf(order[0].el) : 0;
+    let rowBottom = order.length ? bandBottom(order[0]) : 0;
     const flushRow = (end) => {
       const row = order.slice(rowStart, end);
       row.sort((p, q) => (rtl ? q.left - p.left : p.left - q.left) || p.i - q.i);
@@ -4921,11 +4951,11 @@ var Scene = (_class7 = class _Scene {
     };
     for (let k = 1; k < order.length; k++) {
       if (order[k].top < rowBottom) {
-        rowBottom = Math.max(rowBottom, order[k].top + heightOf(order[k].el));
+        rowBottom = Math.max(rowBottom, bandBottom(order[k]));
       } else {
         flushRow(k);
         rowStart = k;
-        rowBottom = order[k].top + heightOf(order[k].el);
+        rowBottom = bandBottom(order[k]);
       }
     }
     flushRow(order.length);
@@ -5863,15 +5893,15 @@ var TextEntity = (_class8 = class extends _chunkZ3HFY75Rjs.Entity {
   
   
   
-  __init149() {this.nodes = []}
+  __init151() {this.nodes = []}
   
-  __init150() {this.fillStyle = "#94a3b8"}
-  __init151() {this.strokeStyle = null}
-  __init152() {this.hoveredFillStyle = "#ffffff"}
-  __init153() {this.lineWidth = 1}
-  __init154() {this.isHovered = false}
+  __init152() {this.fillStyle = "#94a3b8"}
+  __init153() {this.strokeStyle = null}
+  __init154() {this.hoveredFillStyle = "#ffffff"}
+  __init155() {this.lineWidth = 1}
+  __init156() {this.isHovered = false}
   constructor(text, atlas, maxWidth, fontSize = 24) {
-    super();_class8.prototype.__init149.call(this);_class8.prototype.__init150.call(this);_class8.prototype.__init151.call(this);_class8.prototype.__init152.call(this);_class8.prototype.__init153.call(this);_class8.prototype.__init154.call(this);;
+    super();_class8.prototype.__init151.call(this);_class8.prototype.__init152.call(this);_class8.prototype.__init153.call(this);_class8.prototype.__init154.call(this);_class8.prototype.__init155.call(this);_class8.prototype.__init156.call(this);;
     this.text = text;
     this.atlas = atlas;
     this.fontSize = fontSize;
@@ -5986,15 +6016,15 @@ var TextEntity = (_class8 = class extends _chunkZ3HFY75Rjs.Entity {
 // src/components/GridTextEntity.ts
 var GridTextEntity = (_class9 = class extends _chunkZ3HFY75Rjs.Entity {
   
-  __init155() {this.fillStyle = "#ffffff"}
-  __init156() {this.grid = []}
+  __init157() {this.fillStyle = "#ffffff"}
+  __init158() {this.grid = []}
   // Array of rows
-  __init157() {this.cols = 0}
-  __init158() {this.rows = 0}
+  __init159() {this.cols = 0}
+  __init160() {this.rows = 0}
   
   
   constructor(_atlas, fontSize = 10) {
-    super();_class9.prototype.__init155.call(this);_class9.prototype.__init156.call(this);_class9.prototype.__init157.call(this);_class9.prototype.__init158.call(this);;
+    super();_class9.prototype.__init157.call(this);_class9.prototype.__init158.call(this);_class9.prototype.__init159.call(this);_class9.prototype.__init160.call(this);;
     this.fontSize = fontSize;
     this.charWidth = fontSize * 1;
     this.charHeight = fontSize * 1.1;
@@ -6086,23 +6116,23 @@ var SplineEntity = (_class10 = class extends _chunkZ3HFY75Rjs.Entity {
   
   
   
-  __init159() {this.offscreen = null}
-  __init160() {this.baked = false}
+  __init161() {this.offscreen = null}
+  __init162() {this.baked = false}
   /** Logical (CSS-pixel) size of the baked bitmap — the blit destination size. */
-  __init161() {this.bakedWidth = 0}
-  __init162() {this.bakedHeight = 0}
+  __init163() {this.bakedWidth = 0}
+  __init164() {this.bakedHeight = 0}
   /** Gradient strokes can't be baked to a solid-color bitmap; they render per-frame. */
   
   /** Lazily-flattened polylines (one Float32Array of [x,y,...] per segment) for hit-testing. */
-  __init163() {this.polylines = null}
+  __init165() {this.polylines = null}
   /**
    * When `true`, the renderer draws a rounded-rect outline of the entity's
    * local bounds after painting the curves. Useful for drag feedback and
    * debugging hit areas. Defaults to `false`.
    */
-  __init164() {this.showBounds = false}
+  __init166() {this.showBounds = false}
   constructor(doc, opts = {}) {
-    super();_class10.prototype.__init159.call(this);_class10.prototype.__init160.call(this);_class10.prototype.__init161.call(this);_class10.prototype.__init162.call(this);_class10.prototype.__init163.call(this);_class10.prototype.__init164.call(this);;
+    super();_class10.prototype.__init161.call(this);_class10.prototype.__init162.call(this);_class10.prototype.__init163.call(this);_class10.prototype.__init164.call(this);_class10.prototype.__init165.call(this);_class10.prototype.__init166.call(this);;
     this.doc = doc;
     this.lineWidth = _nullishCoalesce(opts.lineWidth, () => ( 2));
     this.cache = _nullishCoalesce(opts.cache, () => ( true));
@@ -6483,19 +6513,19 @@ var _math = require('@vectojs/math'); _createStarExport(_math);
 // src/tree/DOMPortalEntity.ts
 var DOMPortalEntity = (_class11 = class extends _chunkZ3HFY75Rjs.Entity {
   
-  __init165() {this.isDOMPortal = true}
-  __init166() {this.domListeners = []}
-  __init167() {this.resizeObserver = null}
-  __init168() {this.domBound = false}
-  __init169() {this.cachedWidth = 100}
-  __init170() {this.cachedHeight = 100}
-  __init171() {this.lastWidth = ""}
-  __init172() {this.lastHeight = ""}
-  __init173() {this.lastTransform = ""}
-  __init174() {this.lastZIndex = ""}
-  __init175() {this.lastOpacity = ""}
+  __init167() {this.isDOMPortal = true}
+  __init168() {this.domListeners = []}
+  __init169() {this.resizeObserver = null}
+  __init170() {this.domBound = false}
+  __init171() {this.cachedWidth = 100}
+  __init172() {this.cachedHeight = 100}
+  __init173() {this.lastWidth = ""}
+  __init174() {this.lastHeight = ""}
+  __init175() {this.lastTransform = ""}
+  __init176() {this.lastZIndex = ""}
+  __init177() {this.lastOpacity = ""}
   constructor(domElement, width, height, id) {
-    super(id);_class11.prototype.__init165.call(this);_class11.prototype.__init166.call(this);_class11.prototype.__init167.call(this);_class11.prototype.__init168.call(this);_class11.prototype.__init169.call(this);_class11.prototype.__init170.call(this);_class11.prototype.__init171.call(this);_class11.prototype.__init172.call(this);_class11.prototype.__init173.call(this);_class11.prototype.__init174.call(this);_class11.prototype.__init175.call(this);;
+    super(id);_class11.prototype.__init167.call(this);_class11.prototype.__init168.call(this);_class11.prototype.__init169.call(this);_class11.prototype.__init170.call(this);_class11.prototype.__init171.call(this);_class11.prototype.__init172.call(this);_class11.prototype.__init173.call(this);_class11.prototype.__init174.call(this);_class11.prototype.__init175.call(this);_class11.prototype.__init176.call(this);_class11.prototype.__init177.call(this);;
     this.domElement = domElement;
     this.width = _nullishCoalesce(width, () => ( 0));
     this.height = _nullishCoalesce(height, () => ( 0));

package/dist/index.mjs

@@ -2001,6 +2001,16 @@ var Scene = class _Scene {
   activeIds = /* @__PURE__ */ new Set();
   /** Per-parent insertion cursor, reused by `enforceA11yDomOrder`. */
   a11yOrderCursors = /* @__PURE__ */ new Map();
+  /** Membership set for the elements being ordered, reused per reorder pass. */
+  a11yOrderMembers = /* @__PURE__ */ new Set();
+  /**
+   * Elements that are an *ancestor* of another ordered element, reused per pass.
+   *
+   * A composite widget's container (a `grid` around its rows, a `tree` around its
+   * items) spans every descendant row, so it must not extend a visual row band —
+   * see {@link sortNormalElementsVisually}.
+   */
+  a11yOrderContainers = /* @__PURE__ */ new Set();
   activePortalsThisFrame = /* @__PURE__ */ new Set();
   activePortalsPrevFrame = /* @__PURE__ */ new Set();
   portalEntities = /* @__PURE__ */ new Map();
@@ -4871,7 +4881,9 @@ var Scene = class _Scene {
       this.a11yOrderCursors.set(parent, at + 1);
       const current = parent.childNodes[at];
       if (current !== expected) {
+        const refocus = document.activeElement === expected;
         parent.insertBefore(expected, current || null);
+        if (refocus) expected.focus({ preventScroll: true });
       }
     }
     this.a11yNeedsReorder = false;
@@ -4900,19 +4912,37 @@ var Scene = class _Scene {
     const els = this.normalElements;
     if (els.length < 2) return;
     const rtl = this._readingDirection === "rtl";
-    const topOf = (el) => Number.parseFloat(el.style.top) || 0;
-    const leftOf = (el) => Number.parseFloat(el.style.left) || 0;
     const heightOf = (el) => Math.max(Number.parseFloat(el.style.height) || 0, 4);
-    const order = els.map((el, i) => ({
-      el,
-      i,
-      top: topOf(el),
-      left: leftOf(el)
-    }));
+    const members = this.a11yOrderMembers;
+    const containers = this.a11yOrderContainers;
+    members.clear();
+    containers.clear();
+    for (const el of els) members.add(el);
+    for (const el of els) {
+      for (let p = el.parentElement; p; p = p.parentElement) {
+        if (members.has(p)) containers.add(p);
+      }
+    }
+    const absolute = (el) => {
+      let top = 0;
+      let left = 0;
+      for (let node = el; node; node = node.parentElement) {
+        top += Number.parseFloat(node.style.top) || 0;
+        left += Number.parseFloat(node.style.left) || 0;
+        const parent = node.parentElement;
+        if (!parent || !members.has(parent)) break;
+      }
+      return { top, left };
+    };
+    const order = els.map((el, i) => {
+      const { top, left } = absolute(el);
+      return { el, i, top, left, container: containers.has(el) };
+    });
     order.sort((p, q) => p.top - q.top || p.i - q.i);
+    const bandBottom = (r) => r.top + (r.container ? 4 : heightOf(r.el));
     const sorted = [];
     let rowStart = 0;
-    let rowBottom = order.length ? order[0].top + heightOf(order[0].el) : 0;
+    let rowBottom = order.length ? bandBottom(order[0]) : 0;
     const flushRow = (end) => {
       const row = order.slice(rowStart, end);
       row.sort((p, q) => (rtl ? q.left - p.left : p.left - q.left) || p.i - q.i);
@@ -4920,11 +4950,11 @@ var Scene = class _Scene {
     };
     for (let k = 1; k < order.length; k++) {
       if (order[k].top < rowBottom) {
-        rowBottom = Math.max(rowBottom, order[k].top + heightOf(order[k].el));
+        rowBottom = Math.max(rowBottom, bandBottom(order[k]));
       } else {
         flushRow(k);
         rowStart = k;
-        rowBottom = order[k].top + heightOf(order[k].el);
+        rowBottom = bandBottom(order[k]);
       }
     }
     flushRow(order.length);

package/dist/tree/Scene.d.ts

@@ -568,6 +568,16 @@ export declare class Scene {
     private activeIds;
     /** Per-parent insertion cursor, reused by `enforceA11yDomOrder`. */
     private a11yOrderCursors;
+    /** Membership set for the elements being ordered, reused per reorder pass. */
+    private a11yOrderMembers;
+    /**
+     * Elements that are an *ancestor* of another ordered element, reused per pass.
+     *
+     * A composite widget's container (a `grid` around its rows, a `tree` around its
+     * items) spans every descendant row, so it must not extend a visual row band —
+     * see {@link sortNormalElementsVisually}.
+     */
+    private a11yOrderContainers;
     private activePortalsThisFrame;
     private activePortalsPrevFrame;
     private portalEntities;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vectojs/core",
-  "version": "1.28.0",
+  "version": "1.28.1",
   "publishConfig": {
     "access": "public"
   },