@lynx-js/react 0.108.0 → 0.108.1

package/runtime/src/snapshot/workletRef.ts

@@ -1,23 +1,19 @@
 // Copyright 2024 The Lynx Authors. All rights reserved.
 // 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 Worklet,
-  type WorkletRef,
-  runWorkletCtx,
-  updateWorkletRef as update,
-} from '@lynx-js/react/worklet-runtime/bindings';
+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 { SnapshotInstance } from '../snapshot.js';
+import type { SnapshotInstance } from '../snapshot.js';
 
-function workletUnRef(value: Worklet | WorkletRef<unknown>): void {
-  if ('_wvid' in value) {
-    update(value as any, null);
+function workletUnRef(value: Worklet | WorkletRefImpl<Element>): void {
+  if ('_wvid' in value && (value._wvid as WorkletRefId) > 0) {
+    update(value as WorkletRefImpl<Element>, null);
   } else if ('_wkltId' in value) {
     if (typeof value._unmount == 'function') {
-      value._unmount();
+      (value._unmount as () => void)();
     } else {
-      runWorkletCtx(value as any, [null]);
+      runWorkletCtx(value, [null]);
     }
   }
 }
@@ -25,7 +21,7 @@ function workletUnRef(value: Worklet | WorkletRef<unknown>): void {
 function updateWorkletRef(
   snapshot: SnapshotInstance,
   expIndex: number,
-  oldValue: any,
+  oldValue: WorkletRefImpl<Element> | Worklet | undefined,
   elementIndex: number,
   _workletType: string,
 ): void {
@@ -38,15 +34,18 @@ function updateWorkletRef(
     snapshot.__worklet_ref_set?.delete(oldValue);
   }
 
-  const value = snapshot.__values![expIndex];
+  const value = snapshot.__values![expIndex] as (WorkletRefImpl<Element> | Worklet | undefined);
   if (value === null || value === undefined) {
     // do nothing
   } else if (value._wvid) {
-    update(value as any, snapshot.__elements[elementIndex]!);
-  } else if (value._wkltId) {
-    // @ts-ignore
-    value._unmount = runWorkletCtx(value as any, [{ elementRefptr: snapshot.__elements[elementIndex]! }]);
-  } else if (value._type === '__LEPUS__' || value._lepusWorkletHash) {
+    if ((value._wvid as WorkletRefId) > 0) {
+      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;
+  } else if (value._type === '__LEPUS__' || (value as Worklet)._lepusWorkletHash) {
     // 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/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,