@lynx-js/react 0.108.0 → 0.109.0

package/runtime/src/worklet/runOnBackground.ts

@@ -2,8 +2,13 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 
-import type { JsFnHandle, RunWorkletCtxRetData, Worklet } from '@lynx-js/react/worklet-runtime/bindings';
-import { WorkletEvents } from '@lynx-js/react/worklet-runtime/bindings';
+import type {
+  ClosureValueType,
+  JsFnHandle,
+  RunWorkletCtxRetData,
+  Worklet,
+} from '@lynx-js/react/worklet-runtime/bindings';
+import { WorkletEvents, delayRunOnBackground } from '@lynx-js/react/worklet-runtime/bindings';
 
 import { destroyTasks } from './destroy.js';
 import { WorkletExecIdMap } from './execMap.js';
@@ -44,7 +49,7 @@ function init() {
 function runJSFunction(event: RuntimeProxy.Event): void {
   'background only';
   const data = JSON.parse(event.data as string) as RunOnBackgroundData;
-  const obj = execIdMap!.findJsFnHandle(data.obj._execId!, data.obj._jsFnId);
+  const obj = execIdMap!.findJsFnHandle(data.obj._execId!, data.obj._jsFnId!);
   const f = obj?._fn;
   if (!f) {
     throw new Error('runOnBackground: JS function not found: ' + JSON.stringify(data.obj));
@@ -104,22 +109,39 @@ function runOnBackground<R, Fn extends (...args: any[]) => R>(f: Fn): (...args:
   if (obj._error) {
     throw new Error(obj._error);
   }
-  return async (...params: any[]): Promise<R> => {
+  return async (...params: ClosureValueType[]): Promise<R> => {
     return new Promise((resolve) => {
       const resolveId = onFunctionCall(resolve);
-      lynx.getJSContext!().dispatchEvent({
-        type: WorkletEvents.runOnBackground,
-        data: JSON.stringify({
-          obj: {
-            _jsFnId: obj._jsFnId,
-            _execId: obj._execId!,
-          },
-          params,
-          resolveId,
-        } as RunOnBackgroundData),
-      });
+
+      if (obj._isFirstScreen) {
+        delayRunOnBackground(obj, (fnId: number, execId: number) => {
+          dispatchRunBackgroundFunctionEvent(fnId, params, execId, resolveId);
+        });
+        return;
+      }
+
+      dispatchRunBackgroundFunctionEvent(obj._jsFnId!, params, obj._execId!, resolveId);
     });
   };
 }
 
+function dispatchRunBackgroundFunctionEvent(
+  fnId: number,
+  params: ClosureValueType[],
+  execId: number,
+  resolveId: number,
+): void {
+  lynx.getJSContext!().dispatchEvent({
+    type: WorkletEvents.runOnBackground,
+    data: JSON.stringify({
+      obj: {
+        _jsFnId: fnId,
+        _execId: execId,
+      },
+      params,
+      resolveId,
+    } as RunOnBackgroundData),
+  });
+}
+
 export { registerWorkletCtx, runJSFunction, runOnBackground };

package/runtime/src/worklet/workletRef.ts

@@ -9,13 +9,19 @@ import { WorkletEvents } from '@lynx-js/react/worklet-runtime/bindings';
 import { addWorkletRefInitValue } from './workletRefPool.js';
 import { useMemo } from '../hooks/react.js';
 
-let lastId = 0;
+// Split into two variables for testing purposes
+let lastIdBG = 0;
+let lastIdMT = 0;
+
+export function clearWorkletRefLastIdForTesting(): void {
+  lastIdBG = lastIdMT = 0;
+}
 
 abstract class WorkletRef<T> {
   /**
    * @internal
    */
-  protected _id: number;
+  protected _wvid: number;
   /**
    * @internal
    */
@@ -33,16 +39,13 @@ abstract class WorkletRef<T> {
    * @internal
    */
   protected constructor(initValue: T, type: string) {
+    this._initValue = initValue;
+    this._type = type;
     if (__JS__) {
-      this._id = ++lastId;
-      this._initValue = initValue;
-      this._type = type;
-      addWorkletRefInitValue(this._id, initValue);
+      this._wvid = ++lastIdBG;
+      addWorkletRefInitValue(this._wvid, initValue);
     } else {
-      // Out of the js thread, the `WorkletRef` class here is just a placeholder and should not be accessed directly.
-      // The real WorkletRef will be generated by the worklet runtime.
-      this._id = -1;
-      this._type = '__LEPUS__';
+      this._wvid = --lastIdMT;
     }
   }
 
@@ -72,7 +75,7 @@ abstract class WorkletRef<T> {
    */
   toJSON(): { _wvid: WorkletRefImpl<T>['_wvid'] } {
     return {
-      _wvid: this._id,
+      _wvid: this._wvid,
     };
   }
 }
@@ -88,7 +91,7 @@ export class MainThreadRef<T> extends WorkletRef<T> {
   constructor(initValue: T) {
     super(initValue, 'main-thread');
     if (__JS__) {
-      const id = this._id;
+      const id = this._wvid;
       this._lifecycleObserver = lynx.getNativeApp().createJSObjectDestructionObserver?.(() => {
         lynx.getCoreContext?.().dispatchEvent({
           type: WorkletEvents.releaseWorkletRef,

package/testing-library/dist/vitest-global-setup.js

@@ -86,6 +86,13 @@ globalThis.onInjectBackgroundThreadGlobals = (target)=>{
     globalThis.lynxCoreInject = target.lynxCoreInject;
     (0, __WEBPACK_EXTERNAL_MODULE__runtime_lib_lynx_tt_js_37d9bcb1__.injectTt)();
     globalThis.lynxCoreInject = oldLynxCoreInject;
+    target.lynx.requireModuleAsync = async (url, callback)=>{
+        try {
+            callback(null, await __vite_ssr_dynamic_import__(url));
+        } catch (err) {
+            callback(err, null);
+        }
+    };
     (0, __WEBPACK_EXTERNAL_MODULE__runtime_lib_lifecycle_patch_snapshotPatch_js_c1ebb33c__.deinitGlobalSnapshotPatch)();
     (0, __WEBPACK_EXTERNAL_MODULE__runtime_lib_lifecycle_patch_commit_js_9adc7328__.clearCommitTaskId)();
 };