@lynx-js/react 0.108.1 → 0.109.0

package/runtime/src/snapshot/gesture.ts

@@ -1,10 +1,12 @@
-import { SnapshotInstance } from '../snapshot.js';
 import { processGesture } from '../gesture/processGesture.js';
+import type { GestureKind } from '../gesture/types.js';
+import { isMainThreadHydrationFinished } from '../lifecycle/patch/isMainThreadHydrationFinished.js';
+import { SnapshotInstance } from '../snapshot.js';
 
 export function updateGesture(
   snapshot: SnapshotInstance,
   expIndex: number,
-  _oldValue: any,
+  oldValue: any,
   elementIndex: number,
   workletType: string,
 ): void {
@@ -14,10 +16,10 @@ export function updateGesture(
   if (__PROFILE__) {
     console.profile('updateGesture');
   }
-  const value = snapshot.__values![expIndex];
+  const value = snapshot.__values![expIndex] as GestureKind;
 
   if (workletType === 'main-thread') {
-    processGesture(snapshot.__elements[elementIndex]!, value);
+    processGesture(snapshot.__elements[elementIndex]!, value, oldValue as GestureKind, !isMainThreadHydrationFinished);
   }
   if (__PROFILE__) {
     console.profileEnd();

package/runtime/src/snapshot/workletEvent.ts

@@ -5,11 +5,12 @@ import { onWorkletCtxUpdate } from '@lynx-js/react/worklet-runtime/bindings';
 import type { Worklet } from '@lynx-js/react/worklet-runtime/bindings';
 
 import { SnapshotInstance } from '../snapshot.js';
+import { isMainThreadHydrationFinished } from '../lifecycle/patch/isMainThreadHydrationFinished.js';
 
 function updateWorkletEvent(
   snapshot: SnapshotInstance,
   expIndex: number,
-  _oldValue: Worklet,
+  oldValue: Worklet,
   elementIndex: number,
   workletType: string,
   eventType: string,
@@ -22,7 +23,7 @@ function updateWorkletEvent(
   value._workletType = workletType;
 
   if (workletType === 'main-thread') {
-    onWorkletCtxUpdate(value, snapshot.__elements[elementIndex]!);
+    onWorkletCtxUpdate(value, oldValue, !isMainThreadHydrationFinished, snapshot.__elements[elementIndex]!);
     const event = {
       type: 'worklet',
       value,

package/runtime/src/snapshot/workletRef.ts

@@ -2,12 +2,12 @@
 // 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 { runWorkletCtx, updateWorkletRef as update } from '@lynx-js/react/worklet-runtime/bindings';
-import type { Element, Worklet, WorkletRefId, WorkletRefImpl } from '@lynx-js/react/worklet-runtime/bindings';
+import type { Element, Worklet, WorkletRefImpl } from '@lynx-js/react/worklet-runtime/bindings';
 
 import type { SnapshotInstance } from '../snapshot.js';
 
 function workletUnRef(value: Worklet | WorkletRefImpl<Element>): void {
-  if ('_wvid' in value && (value._wvid as WorkletRefId) > 0) {
+  if ('_wvid' in value) {
     update(value as WorkletRefImpl<Element>, null);
   } else if ('_wkltId' in value) {
     if (typeof value._unmount == 'function') {
@@ -38,14 +38,14 @@ function updateWorkletRef(
   if (value === null || value === undefined) {
     // do nothing
   } else if (value._wvid) {
-    if ((value._wvid as WorkletRefId) > 0) {
-      update(value as WorkletRefImpl<Element>, snapshot.__elements[elementIndex]!);
-    }
+    update(value as WorkletRefImpl<Element>, snapshot.__elements[elementIndex]!);
   } else if ((value as Worklet)._wkltId) {
     (value as Worklet)._unmount = runWorkletCtx(value as Worklet, [{
       elementRefptr: (snapshot.__elements[elementIndex]!) as any,
     }]) as () => void;
+    /* v8 ignore next 3 */
   } else if (value._type === '__LEPUS__' || (value as Worklet)._lepusWorkletHash) {
+    // for pre-0.99 compatibility
     // During the initial render, we will not update the WorkletRef because the background thread is not ready yet.
   } else {
     throw new Error('MainThreadRef: main-thread:ref must be of type MainThreadRef or main-thread function.');

package/runtime/src/snapshot.ts

@@ -181,6 +181,10 @@ export const backgroundSnapshotInstanceManager: {
   },
 };
 
+export function entryUniqID(uniqID: string, entryName?: string): string {
+  return entryName ? `${entryName}:${uniqID}` : uniqID;
+}
+
 export function createSnapshot(
   uniqID: string,
   create: Snapshot['create'] | null,
@@ -194,7 +198,7 @@ export function createSnapshot(
     // `__globalSnapshotPatch` does not exist before hydration,
     // so the snapshot of the first screen will not be sent to the main thread.
     && __globalSnapshotPatch
-    && !snapshotManager.values.has(uniqID)
+    && !snapshotManager.values.has(entryUniqID(uniqID, entryName))
     // `create` may be `null` when loading a lazy bundle after hydration.
     && create !== null
   ) {
@@ -215,9 +219,7 @@ export function createSnapshot(
     );
   }
 
-  if (entryName) {
-    uniqID = `${entryName}:${uniqID}`;
-  }
+  uniqID = entryUniqID(uniqID, entryName);
 
   const s: Snapshot = { create, update, slot, cssId, entryName };
   snapshotManager.values.set(uniqID, s);

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/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)();
 };