@effindomv2/fui-as 0.1.41 → 0.1.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-as",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 AssemblyScript frontend framework SDK and browser harness",
@@ -96,7 +96,7 @@
   },
   "dependencies": {
     "@assemblyscript/loader": "^0.28.19",
-    "@effindomv2/runtime": "0.1.22"
+    "@effindomv2/runtime": "0.1.23"
   },
   "devDependencies": {
     "@as-pect/assembly": "9.0.0",

package/scripts/build.sh

@@ -23,10 +23,18 @@ DEFAULT_MANIFEST_PATH="./runtime/dist/effindom.v2.manifest.json"
 LOADING_OVERLAY_STYLES_FILE="${PACKAGE_DIR}/browser/loading-overlay-styles.html"
 LOADING_OVERLAY_BODY_FILE="${PACKAGE_DIR}/browser/loading-overlay-body.html"
 RUNTIME_PACKAGE_DIR="${PACKAGE_DIR}/node_modules/@effindomv2/runtime"
+FILE_PROCESSING_WORKER_SOURCE="${REPO_ROOT}/v2/browser-bridge/src/managed-harness/file-processing-worker.ts"
+WORKER_BOOTSTRAP_SOURCE="${REPO_ROOT}/v2/browser-bridge/src/managed-harness/worker-bootstrap.ts"
 
 if [ ! -d "${RUNTIME_PACKAGE_DIR}" ]; then
   RUNTIME_PACKAGE_DIR="${REPO_ROOT}/node_modules/@effindomv2/runtime"
 fi
+if [ ! -f "${FILE_PROCESSING_WORKER_SOURCE}" ]; then
+  FILE_PROCESSING_WORKER_SOURCE="${RUNTIME_PACKAGE_DIR}/src/managed-harness/file-processing-worker.ts"
+fi
+if [ ! -f "${WORKER_BOOTSTRAP_SOURCE}" ]; then
+  WORKER_BOOTSTRAP_SOURCE="${RUNTIME_PACKAGE_DIR}/src/managed-harness/worker-bootstrap.ts"
+fi
 
 rm -rf "${OUT_DIR}"
 mkdir -p "${PACKAGE_DIR}/build" "${OUT_DIR}" "${DEMO_OUT_DIR}" "${WORKER_BUILD_DIR}"
@@ -331,7 +339,7 @@ npx esbuild "${PACKAGE_DIR}/demo/harness.ts" \
   --outfile="${DEMO_OUT_DIR}/harness.js" \
   --sourcemap
 
-npx esbuild "${RUNTIME_PACKAGE_DIR}/src/managed-harness/file-processing-worker.ts" \
+npx esbuild "${FILE_PROCESSING_WORKER_SOURCE}" \
   --bundle \
   --format=iife \
   --platform=browser \
@@ -346,7 +354,7 @@ cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${OUT_DIR}/file-processing-worker.js.m
 cp "${FILE_PROCESSING_WORKER_BUILD}" "${DEMO_OUT_DIR}/file-processing-worker.js"
 cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${DEMO_OUT_DIR}/file-processing-worker.js.map"
 
-npx esbuild "${RUNTIME_PACKAGE_DIR}/src/managed-harness/worker-bootstrap.ts" \
+npx esbuild "${WORKER_BOOTSTRAP_SOURCE}" \
   --bundle \
   --format=iife \
   --platform=browser \

package/scripts/hostgen/assemblyscript-host-events.ts

@@ -117,12 +117,17 @@ export async function generateAssemblyScriptHostEventsFile(
   const callbackImport =
     primitivesImportOverride ??
     relativeImport(outputPath, path.resolve(path.dirname(modulePath), "..", "..", "src/FuiPrimitives.ts"));
+  const callbackNames = ["Callback0", "Callback1", "Callback2"].filter((_name, arity) =>
+    methods.some((method) => method.args.length === arity),
+  );
   const blocks: string[] = [
     "// @ts-nocheck",
     `// Generated by hostgen from ${sourcePathForHeader(modulePath)}#${exportName}.`,
-    `import { Callback0, Callback1, Callback2 } from "${callbackImport}";`,
-    "",
   ];
+  if (callbackNames.length > 0) {
+    blocks.push(`import { ${callbackNames.join(", ")} } from "${callbackImport}";`);
+    blocks.push("");
+  }
   methods.forEach((method, index) => {
     const callbackType = callbackTypeFor(method.args);
     const exportArgs = emitExportArgs(method.args);

package/src/FuiExports.ts

@@ -29,6 +29,7 @@ export {
   __fui_get_gesture_intent,
   __fui_get_long_press_minimum_duration_ms,
   __fui_get_long_press_movement_tolerance,
+  __fui_long_press_continues_pointer_events,
   __fui_on_gesture_event,
   __fui_on_long_press_event,
   __fui_on_key_event,

package/src/core/DragGesture.ts

@@ -48,6 +48,8 @@ export class DragGesture {
   private thresholdValue: f32 = DEFAULT_DRAG_THRESHOLD;
   private pointerDownValue: bool = false;
   private dragStartedValue: bool = false;
+  private awaitingLongPressValue: bool = false;
+  private pointerCapturedValue: bool = false;
   private startX: f32 = 0.0;
   private startY: f32 = 0.0;
   private lastPointerX: f32 = 0.0;
@@ -67,12 +69,13 @@ export class DragGesture {
     return this;
   }
 
-  handlePointerDown(x: f32, y: f32, modifiers: KeyModifier = 0): void {
+  handlePointerDown(x: f32, y: f32, modifiers: KeyModifier = 0, waitForLongPress: bool = false): void {
     if (this.pointerDownValue) {
       this.cancel();
     }
     this.pointerDownValue = true;
     this.dragStartedValue = false;
+    this.awaitingLongPressValue = waitForLongPress;
     this.startX = x;
     this.startY = y;
     this.lastPointerX = x;
@@ -80,8 +83,10 @@ export class DragGesture {
     this.lastDispatchedX = x;
     this.lastDispatchedY = y;
     this.lastModifiers = modifiers;
-    this.host._captureDragPointer();
-    if (this.thresholdValue <= 0.0) {
+    if (!waitForLongPress) {
+      this.capturePointer();
+    }
+    if (!waitForLongPress && this.thresholdValue <= 0.0) {
       this.beginDrag(x, y, modifiers);
     }
   }
@@ -93,6 +98,9 @@ export class DragGesture {
     this.lastPointerX = x;
     this.lastPointerY = y;
     this.lastModifiers = modifiers;
+    if (this.awaitingLongPressValue) {
+      return;
+    }
     if (!this.dragStartedValue) {
       if (!this.hasExceededThreshold(x - this.startX, y - this.startY)) {
         return;
@@ -102,6 +110,24 @@ export class DragGesture {
     this.emitDelta(x, y, modifiers);
   }
 
+  handleLongPress(x: f32, y: f32, modifiers: KeyModifier = 0): bool {
+    if (!this.pointerDownValue) {
+      this.pointerDownValue = true;
+      this.dragStartedValue = false;
+      this.startX = x;
+      this.startY = y;
+      this.lastDispatchedX = x;
+      this.lastDispatchedY = y;
+    }
+    this.awaitingLongPressValue = false;
+    this.lastPointerX = x;
+    this.lastPointerY = y;
+    this.lastModifiers = modifiers;
+    this.capturePointer();
+    this.beginDrag(x, y, modifiers);
+    return true;
+  }
+
   handlePointerUp(x: f32, y: f32, modifiers: KeyModifier = 0): void {
     if (!this.pointerDownValue) {
       return;
@@ -123,7 +149,8 @@ export class DragGesture {
     }
     this.pointerDownValue = false;
     this.dragStartedValue = false;
-    this.host._releaseDragPointer();
+    this.awaitingLongPressValue = false;
+    this.releasePointer();
   }
 
   cancel(): void {
@@ -143,7 +170,8 @@ export class DragGesture {
     }
     this.pointerDownValue = false;
     this.dragStartedValue = false;
-    this.host._releaseDragPointer();
+    this.awaitingLongPressValue = false;
+    this.releasePointer();
   }
 
   private beginDrag(x: f32, y: f32, modifiers: u32): void {
@@ -182,4 +210,16 @@ export class DragGesture {
     }
     return ((totalDeltaX * totalDeltaX) + (totalDeltaY * totalDeltaY)) >= (this.thresholdValue * this.thresholdValue);
   }
+
+  private capturePointer(): void {
+    if (this.pointerCapturedValue) return;
+    this.pointerCapturedValue = true;
+    this.host._captureDragPointer();
+  }
+
+  private releasePointer(): void {
+    if (!this.pointerCapturedValue) return;
+    this.pointerCapturedValue = false;
+    this.host._releaseDragPointer();
+  }
 }

package/src/core/EventRouter.ts

@@ -290,6 +290,11 @@ export class EventRouter {
     return <u64>HandleValue.Invalid;
   }
 
+  static longPressContinuesPointerEvents(handle: u64): bool {
+    const node = this.resolveNode(handle);
+    return node !== null && changetype<Node>(node).longPressContinuesPointerEventsForRouting;
+  }
+
   private static hasImageContextMenuTargetDescendant(node: Node): bool {
     for (let index = 0; index < node.childCount; ++index) {
       const child = node.getChildAt(index);

package/src/core/Node.ts

@@ -843,7 +843,11 @@ export abstract class Node implements DragGestureHost, Disposable {
   }
 
   get hasLongPressGestureForRouting(): bool {
-    return this.longPressGestureCallback !== null || this.longPressGestureBinding !== null;
+    return this.longPressGestureCallback !== null || this.longPressGestureBinding !== null || this._hasDragSource();
+  }
+
+  get longPressContinuesPointerEventsForRouting(): bool {
+    return this._hasDragSource();
   }
 
   get longPressMinimumDurationMsForRouting(): i32 {
@@ -2253,7 +2257,8 @@ export abstract class Node implements DragGestureHost, Disposable {
       const dragGesture = this._hasDragSource() ? this.dragGestureValue : null;
       const isPrimaryButton = isPrimaryActivationPointer(event);
       if (dragGesture !== null && isPrimaryButton) {
-        dragGesture.handlePointerDown(nodeX, nodeY, _modifiers);
+        const waitForLongPress = event.pointerType == PointerType.Touch || event.pointerType == PointerType.Pen;
+        dragGesture.handlePointerDown(nodeX, nodeY, _modifiers, waitForLongPress);
         this.dragClickPending = this.pointerClickCallback !== null || this.pointerClickBinding !== null;
         this.dragClickPendingCount = event.clickCount;
         this.clickPending = false;
@@ -2479,6 +2484,12 @@ export abstract class Node implements DragGestureHost, Disposable {
     if (binding !== null) {
       binding.invoke(event);
     }
+    if (!event.handled && (event.pointerType == PointerType.Touch || event.pointerType == PointerType.Pen)) {
+      const dragGesture = this._hasDragSource() ? this.dragGestureValue : null;
+      if (dragGesture !== null) {
+        event.handled = dragGesture.handleLongPress(event.x, event.y, event.modifiers);
+      }
+    }
     return event.handled;
   }
 

package/src/core/event_exports.ts

@@ -150,6 +150,10 @@ export function __fui_get_long_press_movement_tolerance(handle: u64): f32 {
   return EventRouter.getLongPressMovementTolerance(handle);
 }
 
+export function __fui_long_press_continues_pointer_events(handle: u64): bool {
+  return EventRouter.longPressContinuesPointerEvents(handle);
+}
+
 export function __fui_on_gesture_event(
   handle: u64,
   phase: u32,