@effindomv2/fui-as 0.1.32 → 0.1.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-as",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 AssemblyScript frontend framework SDK and browser harness",
@@ -87,7 +87,7 @@
   "dependencies": {
     "@assemblyscript/loader": "^0.28.17",
     "@devcycle/assemblyscript-json": "^2.0.0",
-    "@effindomv2/runtime": "0.1.15"
+    "@effindomv2/runtime": "0.1.17"
   },
   "devDependencies": {
     "@as-pect/assembly": "8.1.0",

package/scripts/build-demo-as.sh

@@ -82,6 +82,7 @@ case "${BUILD_TARGET}" in
     build_demo_app "demo/src/routes/demo_home.ts" "${DEMO_OUT_DIR}/home.wasm"
     build_demo_app "demo/src/routes/demo_advanced_controls.ts" "${DEMO_OUT_DIR}/advanced-controls.wasm"
     build_demo_app "demo/src/routes/templated-controls.ts" "${DEMO_OUT_DIR}/templated-controls.wasm"
+    build_demo_app "demo/src/routes/demo_scrollbar_gutter.ts" "${DEMO_OUT_DIR}/scrollbar-gutter.wasm"
     ;;
   dashboard)
     build_demo_app "demo/src/dashboard.ts" "${DEMO_OUT_DIR}/demo.wasm"
@@ -95,6 +96,9 @@ case "${BUILD_TARGET}" in
   templated-controls|templated)
     build_demo_app "demo/src/routes/templated-controls.ts" "${DEMO_OUT_DIR}/templated-controls.wasm"
     ;;
+  scrollbar-gutter)
+    build_demo_app "demo/src/routes/demo_scrollbar_gutter.ts" "${DEMO_OUT_DIR}/scrollbar-gutter.wasm"
+    ;;
   *)
     echo "Unknown build target: ${BUILD_TARGET}" >&2
     echo "Usage: bash scripts/build-demo-as.sh [all|dashboard|home|advanced-controls|templated-controls]" >&2

package/scripts/build.sh

@@ -223,7 +223,8 @@ build_workers() {
 }
 
 write_worker_manifest() {
-  declare -A worker_entries=()
+  local tmp_entries
+  tmp_entries="$(mktemp)"
   local worker_entry=""
   while IFS= read -r worker_entry; do
     [ -n "${worker_entry}" ] || continue
@@ -232,28 +233,30 @@ write_worker_manifest() {
     local export_name=""
     while IFS= read -r export_name; do
       [ -n "${export_name}" ] || continue
-      if [ -n "${worker_entries[$export_name]:-}" ]; then
+      if grep -q "^${export_name} " "${tmp_entries}" 2>/dev/null; then
         echo "Duplicate worker export name: ${export_name}" >&2
+        rm -f "${tmp_entries}"
         exit 1
       fi
-      worker_entries["${export_name}"]="./workers/${worker_name}.wasm"
+      echo "${export_name} ./workers/${worker_name}.wasm" >> "${tmp_entries}"
     done < <(rg 'export function ([A-Za-z_][A-Za-z0-9_]*)\s*\(' "${worker_entry}" -or '$1')
   done < <(find_worker_entries)
 
   {
     printf '{\n  "version": 1,\n  "entries": {\n'
     local first=1
-    local entry_name=""
-    while IFS= read -r entry_name; do
+    local line=""
+    sort "${tmp_entries}" | while IFS=' ' read -r entry_name entry_path; do
       [ -n "${entry_name}" ] || continue
       if [ "${first}" -eq 0 ]; then
         printf ',\n'
       fi
       first=0
-      printf '    "%s": "%s"' "${entry_name}" "${worker_entries[$entry_name]}"
-    done < <(printf '%s\n' "${!worker_entries[@]}" | sort)
+      printf '    "%s": "%s"' "${entry_name}" "${entry_path}"
+    done
     printf '\n  }\n}\n'
   } > "${WORKER_MANIFEST_BUILD}"
+  rm -f "${tmp_entries}"
 }
 
 copy_worker_assets() {
@@ -283,6 +286,7 @@ build_app "demo/src/dashboard.ts" "${DEMO_OUT_DIR}/demo.wasm"
 build_app "demo/src/routes/demo_home.ts" "${DEMO_OUT_DIR}/home.wasm"
 build_app "demo/src/routes/demo_advanced_controls.ts" "${DEMO_OUT_DIR}/advanced-controls.wasm"
 build_app "demo/src/routes/templated-controls.ts" "${DEMO_OUT_DIR}/templated-controls.wasm"
+build_app "demo/src/routes/demo_scrollbar_gutter.ts" "${DEMO_OUT_DIR}/scrollbar-gutter.wasm"
 build_workers
 write_worker_manifest
 
@@ -342,9 +346,10 @@ cp "${PACKAGE_DIR}/browser/favicon.ico" "${REPO_ROOT}/public/favicon.ico"
 cp "${PACKAGE_DIR}/demo/demo-texture.png" "${DEMO_OUT_DIR}/demo-texture.png"
 cp "${PACKAGE_DIR}/demo/demo-secondary-texture.png" "${DEMO_OUT_DIR}/demo-secondary-texture.png"
 
-mkdir -p "${DEMO_OUT_DIR}/advanced-controls" "${DEMO_OUT_DIR}/templated-controls"
+mkdir -p "${DEMO_OUT_DIR}/advanced-controls" "${DEMO_OUT_DIR}/templated-controls" "${DEMO_OUT_DIR}/scrollbar-gutter"
 render_html_with_loading_overlay "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/advanced-controls/index.html"
 render_html_with_loading_overlay "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/templated-controls/index.html"
+render_html_with_loading_overlay "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/scrollbar-gutter/index.html"
 
 copy_runtime_assets "${OUT_DIR}"
 copy_runtime_assets "${DEMO_OUT_DIR}"
@@ -354,3 +359,4 @@ write_runtime_config "${OUT_DIR}" "${DEFAULT_MANIFEST_PATH}"
 write_runtime_config "${DEMO_OUT_DIR}" "${DEFAULT_MANIFEST_PATH}"
 write_runtime_config "${DEMO_OUT_DIR}/advanced-controls" "../runtime/dist/effindom.v2.manifest.json"
 write_runtime_config "${DEMO_OUT_DIR}/templated-controls" "../runtime/dist/effindom.v2.manifest.json"
+write_runtime_config "${DEMO_OUT_DIR}/scrollbar-gutter" "../runtime/dist/effindom.v2.manifest.json"

package/src/nodes/ScrollBox.ts

@@ -17,7 +17,7 @@ import { ScrollState } from "./ScrollState";
 import { ScrollView } from "./ScrollView";
 import { NodeTransitions } from "../core/Transitions";
 
-const DEFAULT_SCROLLBAR_GUTTER: f32 = 6.0;
+const DEFAULT_SCROLLBAR_GUTTER: f32 = 0.0;
 const OVERFLOW_TOLERANCE: f32 = 0.5;
 
 function noopPointerCallback(_x: f32, _y: f32): void {}
@@ -294,45 +294,35 @@ export class ScrollBox extends FlexBox {
   private refreshChrome(): void {
     const verticalRailThickness = this.scrollbarGutterValue + this.verticalScrollBarValue.thickness;
     const horizontalRailThickness = this.horizontalScrollBarValue.thickness;
-    const outerViewportWidth = this.scrollStateValue.viewportWidth.value + (this.verticalChromeVisibleValue ? verticalRailThickness : 0.0);
-    const outerViewportHeight = this.scrollStateValue.viewportHeight.value + (this.horizontalChromeVisibleValue ? horizontalRailThickness : 0.0);
-    let showVertical = this.verticalChromeVisibleValue;
-    let showHorizontal = this.horizontalChromeVisibleValue;
-    for (let pass = 0; pass < 3; pass += 1) {
-      const availableWidth = outerViewportWidth - (showVertical ? verticalRailThickness : 0.0);
-      const availableHeight = outerViewportHeight - (showHorizontal ? horizontalRailThickness : 0.0);
-      const nextVertical = this.shouldShow(
-        this.verticalVisibilityValue,
-        this.verticalScrollEnabledValue,
-        this.scrollStateValue.contentHeight.value,
-        availableHeight,
-      );
-      const nextHorizontal = this.shouldShow(
-        this.horizontalVisibilityValue,
-        this.horizontalScrollEnabledValue,
-        this.scrollStateValue.contentWidth.value,
-        availableWidth,
-      );
-      if (nextVertical == showVertical && nextHorizontal == showHorizontal) {
-        break;
-      }
-      showVertical = nextVertical;
-      showHorizontal = nextHorizontal;
-    }
+    // Use raw viewport dimensions — Yoga already accounts for applied rails.
+    // The decision is independent of the other axis since available space
+    // doesn't change with rail state, so no loop is needed.
+    const showVertical = this.shouldShow(
+      this.verticalVisibilityValue,
+      this.verticalScrollEnabledValue,
+      this.scrollStateValue.contentHeight.value,
+      this.scrollStateValue.viewportHeight.value,
+    );
+    const showHorizontal = this.shouldShow(
+      this.horizontalVisibilityValue,
+      this.horizontalScrollEnabledValue,
+      this.scrollStateValue.contentWidth.value,
+      this.scrollStateValue.viewportWidth.value,
+    );
     this.verticalChromeVisibleValue = showVertical;
     this.horizontalChromeVisibleValue = showHorizontal;
     this.verticalScrollBarValue.chromeVisible(showVertical);
     this.horizontalScrollBarValue.chromeVisible(showHorizontal);
-    const verticalRailWidth = showVertical ? verticalRailThickness : 0.0;
-    const horizontalRailHeight = showHorizontal ? horizontalRailThickness : 0.0;
 
     this.verticalGutterValue.width(showVertical ? this.scrollbarGutterValue : 0.0, Unit.Pixel);
     this.verticalScrollBarValue.render().width(
       showVertical ? this.verticalScrollBarValue.thickness : 0.0,
       Unit.Pixel,
     );
+    const horizontalRailHeight = showHorizontal ? horizontalRailThickness : 0.0;
     this.bottomRowValue.height(horizontalRailHeight, Unit.Pixel);
     this.horizontalScrollBarValue.render().height(showHorizontal ? this.horizontalScrollBarValue.thickness : 0.0, Unit.Pixel);
+    const verticalRailWidth = showVertical ? verticalRailThickness : 0.0;
     this.cornerValue.width(showVertical ? verticalRailWidth : 0.0, Unit.Pixel);
     this.cornerValue.height(showHorizontal ? horizontalRailHeight : 0.0, Unit.Pixel);
   }

package/src/nodes/ScrollView.ts

@@ -505,6 +505,7 @@ export class ScrollView extends Node {
     this._scrollState.contentHeight.value = contentHeight;
     this._scrollState.viewportWidth.value = viewportWidth;
     this._scrollState.viewportHeight.value = viewportHeight;
+
   }
 
   private updateRetainedScrollOffset(x: f32, y: f32): void {