react-native-worklets 0.12.0 → 0.12.1

package/Common/cpp/worklets/Compat/StableApi.cpp

@@ -22,6 +22,10 @@ void scheduleOnUI(const std::shared_ptr<UIScheduler> &uiScheduler, const std::fu
   uiScheduler->scheduleOnUI(job);
 }
 
+bool isOnUIThread(const std::shared_ptr<UIScheduler> &uiScheduler) {
+  return uiScheduler->isOnUIThread();
+}
+
 facebook::jsi::Runtime &getJSIRuntimeFromWorkletRuntime(const std::shared_ptr<WorkletRuntime> &workletRuntime) {
   return workletRuntime->getJSIRuntime();
 }

package/Common/cpp/worklets/Compat/StableApi.h

@@ -5,7 +5,7 @@
  * It can be used by libraries to verify they use a compatible version
  * of `react-native-worklets` installed when integrating in C++.
  */
-#define WORKLETS_STABLE_API_VERSION "0.9.0"
+#define WORKLETS_STABLE_API_VERSION "0.12.1"
 
 #include <cstdint>
 #include <functional>
@@ -83,6 +83,8 @@ extern std::weak_ptr<WorkletRuntime> getWeakRuntimeFromJSIRuntime(facebook::jsi:
 
 extern void scheduleOnUI(const std::shared_ptr<UIScheduler> &uiScheduler, const std::function<void()> &job);
 
+extern bool isOnUIThread(const std::shared_ptr<UIScheduler> &uiScheduler);
+
 extern std::string JSIValueToStdString(facebook::jsi::Runtime &rt, const facebook::jsi::Value &value);
 
 extern std::shared_ptr<Serializable>

package/Common/cpp/worklets/Tools/UIScheduler.cpp

@@ -1,9 +1,12 @@
 #include <worklets/Tools/UIScheduler.h>
 
+#include <optional>
 #include <utility>
 
 namespace worklets {
 
+static thread_local std::optional<bool> tls_isOnUIThread;
+
 void UIScheduler::scheduleOnUI(std::function<void()> job) {
   uiJobs_.push(std::move(job));
 }
@@ -16,4 +19,11 @@ void UIScheduler::triggerUI() {
   }
 }
 
+bool UIScheduler::isOnUIThread() const {
+  if (!tls_isOnUIThread.has_value()) {
+    tls_isOnUIThread = queryIsOnUIThread();
+  }
+  return *tls_isOnUIThread;
+}
+
 } // namespace worklets

package/Common/cpp/worklets/Tools/UIScheduler.h

@@ -12,9 +12,12 @@ class UIScheduler {
  public:
   virtual void scheduleOnUI(std::function<void()> job);
   virtual void triggerUI();
+  bool isOnUIThread() const;
   virtual ~UIScheduler() = default;
 
  protected:
+  virtual bool queryIsOnUIThread() const = 0;
+
   std::atomic<bool> scheduledOnUI_{false};
   ThreadSafeQueue<std::function<void()>> uiJobs_;
 };

package/android/src/main/cpp/worklets/android/AndroidUIScheduler.cpp

@@ -7,18 +7,25 @@ namespace worklets {
 using namespace facebook;
 using namespace react;
 
-static thread_local bool tls_isOnUIThread = false;
-
 class UISchedulerWrapper : public UIScheduler {
  private:
   jni::global_ref<AndroidUIScheduler::javaobject> androidUiScheduler_;
 
+  bool queryIsOnUIThread() const override {
+    static const auto method = androidUiScheduler_->getClass()->getMethod<jboolean()>("isOnUIThread");
+    return method(androidUiScheduler_);
+  }
+
  public:
   explicit UISchedulerWrapper(jni::global_ref<AndroidUIScheduler::javaobject> androidUiScheduler)
       : androidUiScheduler_(std::move(androidUiScheduler)) {}
 
+  void triggerUI() override {
+    UIScheduler::triggerUI();
+  }
+
   void scheduleOnUI(std::function<void()> job) override {
-    if (tls_isOnUIThread) {
+    if (isOnUIThread()) {
       job();
       return;
     }
@@ -29,11 +36,6 @@ class UISchedulerWrapper : public UIScheduler {
       method(androidUiScheduler_);
     }
   }
-
-  void triggerUI() override {
-    tls_isOnUIThread = true;
-    UIScheduler::triggerUI();
-  }
 };
 
 AndroidUIScheduler::AndroidUIScheduler(const jni::alias_ref<AndroidUIScheduler::jhybridobject> &jThis)

package/android/src/main/java/com/swmansion/worklets/AndroidUIScheduler.kt

@@ -31,6 +31,9 @@ class AndroidUIScheduler(
 
     private external fun initHybrid(): HybridData
 
+    @DoNotStrip
+    private fun isOnUIThread(): Boolean = UiThreadUtil.isOnUiThread()
+
     external fun triggerUI()
 
     external fun invalidate()

package/apple/worklets/apple/IOSUIScheduler.h

@@ -9,6 +9,9 @@ using namespace worklets;
 class IOSUIScheduler : public UIScheduler, public std::enable_shared_from_this<IOSUIScheduler> {
  public:
   void scheduleOnUI(std::function<void()> job) override;
+
+ protected:
+  bool queryIsOnUIThread() const override;
 };
 
 } // namespace worklets

package/apple/worklets/apple/IOSUIScheduler.mm

@@ -5,9 +5,14 @@ namespace worklets {
 using namespace facebook;
 using namespace react;
 
+bool IOSUIScheduler::queryIsOnUIThread() const
+{
+  return [NSThread isMainThread];
+}
+
 void IOSUIScheduler::scheduleOnUI(std::function<void()> job)
 {
-  if ([NSThread isMainThread]) {
+  if (isOnUIThread()) {
     job();
     return;
   }

package/lib/module/debug/jsVersion.js

@@ -5,5 +5,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '0.12.0';
+export const jsVersion = '0.12.1';
 //# sourceMappingURL=jsVersion.js.map

package/lib/typescript/debug/jsVersion.d.ts

@@ -3,5 +3,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export declare const jsVersion = "0.12.0";
+export declare const jsVersion = "0.12.1";
 //# sourceMappingURL=jsVersion.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-worklets",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "The React Native multithreading library",
   "keywords": [
     "react-native",

package/src/debug/jsVersion.ts

@@ -5,4 +5,4 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '0.12.0';
+export const jsVersion = '0.12.1';