fix(core): fix jscore promise & execute queue

Tencent · Jul 8, 2021 · 65fabb1 · 65fabb1
1 parent b49cf4b
commit 65fabb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/core/js/global/ios/global.js b/core/js/global/ios/global.js
@@ -81,8 +81,9 @@ __GLOBAL__.enqueueNativeCall = (moduleID, methodID, params, onFail, onSucc) => {
   __GLOBAL__._queue[2].push(params);
 
   if (typeof nativeFlushQueueImmediate !== 'undefined') {
-    nativeFlushQueueImmediate(__GLOBAL__._queue);
+    const originalQueue = [...__GLOBAL__._queue];
     __GLOBAL__._queue = [[], [], [], __GLOBAL__._callID];
+    nativeFlushQueueImmediate(originalQueue);
   }
 };
 

diff --git a/core/js/global/ios/promise.js b/core/js/global/ios/promise.js
@@ -312,6 +312,6 @@ Promise.prototype['catch'] = function (onRejected) {
   return this.then(null, onRejected);
 };
 
-global.Promise = global.Promise || Promise;
+global.Promise = Promise;
 
 /* eslint-disable */
diff --git a/core/src/napi/jsc/native_source_code_ios.cc b/core/src/napi/jsc/native_source_code_ios.cc