react-native-unistyles 3.0.0-alpha.2 → 3.0.0-alpha.3

package/Unistyles.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported, :osx => "10.14", :tvos => "9.0", :visionos => "1.0" }
+  s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => package["repository"], :tag => "#{s.version}" }
 
   s.source_files = [
@@ -18,7 +18,8 @@ Pod::Spec.new do |s|
     "cxx/**/*.{h,cpp,hpp}"
   ]
   s.pod_target_xcconfig = {
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20"
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+    "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES"
   }
 
   s.public_header_files = [

package/cxx/core/HostStyle.cpp

@@ -7,10 +7,12 @@ using namespace facebook;
 std::vector<jsi::PropNameID> HostStyle::getPropertyNames(jsi::Runtime& rt) {
     auto propertyNames = std::vector<jsi::PropNameID> {};
 
+    propertyNames.reserve(8);
+
     for (const auto& pair : this->_styleSheet->unistyles) {
         propertyNames.emplace_back(jsi::PropNameID::forUtf8(rt, pair.first));
     }
-    
+
     return propertyNames;
 }
 
@@ -20,7 +22,7 @@ jsi::Value HostStyle::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId) {
     if (propertyName == helpers::UNISTYLES_ID) {
         return jsi::Value(this->_styleSheet->tag);
     }
-    
+
     if (propertyName == helpers::ADD_VARIANTS_FN) {
         return this->createAddVariantsProxyFunction(rt);
     }
@@ -28,7 +30,7 @@ jsi::Value HostStyle::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId) {
     if (this->_styleSheet->unistyles.contains(propertyName)) {
         return valueFromUnistyle(rt, this->_styleSheet->unistyles[propertyName]);
     }
-    
+
     return jsi::Value::undefined();
 }
 
@@ -41,15 +43,15 @@ jsi::Function HostStyle::createAddVariantsProxyFunction(jsi::Runtime& rt) {
 
         auto parser = parser::Parser(this->_unistylesRuntime);
         auto pairs = parser.variantsToPairs(rt, arguments[0].asObject(rt));
-        
+
         if (pairs == this->_styleSheet->variants) {
             return jsi::Value::undefined();
         }
-        
+
         this->_styleSheet->variants = pairs;
-        
+
         parser.rebuildUnistylesWithVariants(rt, this->_styleSheet);
-        
+
         return jsi::Value::undefined();
     });
 }

package/cxx/core/UnistylesCommitHook.cpp

@@ -3,12 +3,9 @@
 using namespace margelo::nitro::unistyles;
 using namespace facebook::react;
 
-core::UnistylesCommitHook::UnistylesCommitHook(UIManager& uiManager, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime)
-    : _unistylesRuntime{unistylesRuntime} {
-        uiManager.registerCommitHook(*this);
-    };
-
-core::UnistylesCommitHook::~UnistylesCommitHook() noexcept {}
+core::UnistylesCommitHook::~UnistylesCommitHook() noexcept {
+    _uiManager->unregisterCommitHook(*this);
+}
 
 void core::UnistylesCommitHook::commitHookWasRegistered(const UIManager &uiManager) noexcept {}
 void core::UnistylesCommitHook::commitHookWasUnregistered(const UIManager &uiManager) noexcept {}

package/cxx/core/UnistylesCommitHook.h

@@ -11,7 +11,11 @@ namespace margelo::nitro::unistyles::core {
 using namespace facebook::react;
 
 struct UnistylesCommitHook : public UIManagerCommitHook {
-    UnistylesCommitHook(UIManager& uiManager, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime);
+    UnistylesCommitHook(std::shared_ptr<UIManager> uiManager, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime)
+        : _unistylesRuntime{unistylesRuntime}, _uiManager{uiManager} {
+            _uiManager->registerCommitHook(*this);
+        }
+    
     ~UnistylesCommitHook() noexcept override;
 
     void commitHookWasRegistered(const UIManager &uiManager) noexcept override;
@@ -22,6 +26,7 @@ struct UnistylesCommitHook : public UIManagerCommitHook {
     
 private:
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
+    std::shared_ptr<UIManager> _uiManager;
 };
 
 }

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -4,6 +4,8 @@ using namespace margelo::nitro::unistyles;
 using namespace facebook::react;
 
 jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
+    helpers::assertThat(rt, count == 2, "Invalid babel transform. ShadowRegistry link expected two arguments.");
+    
     ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
     core::Unistyle::Shared unistyleWrapper = core::unistyleFromValue(rt, args[1]);
     
@@ -15,6 +17,8 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
 }
 
 jsi::Value HybridShadowRegistry::unlink(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
+    helpers::assertThat(rt, count == 2, "Invalid babel transform. ShadowRegistry unlink expected two arguments.");
+    
     ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
     core::Unistyle::Shared unistyleWrapper = core::unistyleFromValue(rt, args[1]);
     

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -14,7 +14,8 @@ double HybridStyleSheet::get___unid() {
 }
 
 jsi::Value HybridStyleSheet::create(jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) {
-    helpers::assertThat(rt, arguments[0].isObject(), "expected to be called with object or function.");
+    helpers::assertThat(rt, count == 1, "StyleSheet.create expected to be called with one argument.");
+    helpers::assertThat(rt, arguments[0].isObject(), "StyleSheet.create expected to be called with object or function.");
 
     auto thisStyleSheet = thisVal.asObject(rt);
     auto& registry = core::UnistylesRegistry::get();
@@ -45,7 +46,8 @@ jsi::Value HybridStyleSheet::create(jsi::Runtime &rt, const jsi::Value &thisVal,
 }
 
 jsi::Value HybridStyleSheet::configure(jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) {
-    helpers::assertThat(rt, arguments[0].isObject(), "expected to be called with object.");
+    helpers::assertThat(rt, count == 1, "StyleSheet.configure expected to be called with one argument.");
+    helpers::assertThat(rt, arguments[0].isObject(), "StyleSheet.configure expected to be called with object.");
 
     // create new state
     auto config = arguments[0].asObject(rt);
@@ -77,7 +79,6 @@ jsi::Value HybridStyleSheet::configure(jsi::Runtime &rt, const jsi::Value &thisV
 
     verifyAndSelectTheme(rt);
     loadExternalMethods(thisVal, rt);
-    registerCommitHook(rt);
 
     return jsi::Value::undefined();
 }
@@ -237,9 +238,3 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
 
     shadow::ShadowTreeManager::updateShadowTree(rt, shadowLeafUpdates);
 }
-
-void HybridStyleSheet::registerCommitHook(jsi::Runtime &rt) {
-    UIManager& uiManager = const_cast<UIManager&>(UIManagerBinding::getBinding(rt)->getUIManager());
-
-    this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(uiManager, this->_unistylesRuntime);
-}

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -16,11 +16,12 @@ using namespace margelo::nitro::unistyles;
 using namespace facebook::react;
 
 struct HybridStyleSheet: public HybridUnistylesStyleSheetSpec {
-    HybridStyleSheet(std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime)
-      : HybridObject(TAG), _unistylesRuntime{unistylesRuntime} {
-          this->_unistylesRuntime->registerPlatformListener(
-              std::bind(&HybridStyleSheet::onPlatformDependenciesChange, this, std::placeholders::_1)
-          );
+    HybridStyleSheet(std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, std::shared_ptr<UIManager> uiManager)
+        : HybridObject(TAG), _unistylesRuntime{unistylesRuntime} {
+            this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(uiManager, unistylesRuntime);
+            this->_unistylesRuntime->registerPlatformListener(
+                  std::bind(&HybridStyleSheet::onPlatformDependenciesChange, this, std::placeholders::_1)
+            );
       }
 
     jsi::Value create(jsi::Runtime& rt,
@@ -52,7 +53,6 @@ private:
     void setThemeFromColorScheme(jsi::Runtime& rt);
     void loadExternalMethods(const jsi::Value& thisValue, jsi::Runtime& rt);
     void onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies);
-    void registerCommitHook(jsi::Runtime& rt);
 
     double __unid = -1;
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -45,7 +45,7 @@ Insets HybridUnistylesRuntime::getInsets() {
 
 Orientation HybridUnistylesRuntime::getOrientation() {
     int orientation = this->_nativePlatform.getOrientation();
-    
+
     return static_cast<Orientation>(orientation);
 };
 
@@ -68,14 +68,17 @@ void HybridUnistylesRuntime::setTheme(const std::string &themeName) {
 
 void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {
     auto& registry = core::UnistylesRegistry::get();
-    
+
     std::vector<UnistyleDependency> changedDependencies{};
+
+    changedDependencies.reserve(5);
+
     bool hadAdaptiveThemes = this->getHasAdaptiveThemes();
 
     registry.setPrefersAdaptiveThemes(*_rt, isEnabled);
-    
+
     bool haveAdaptiveThemes = this->getHasAdaptiveThemes();
-    
+
     if (hadAdaptiveThemes != haveAdaptiveThemes) {
         changedDependencies.push_back(UnistyleDependency::ADAPTIVETHEMES);
     }
@@ -83,7 +86,7 @@ void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {
     // if user disabled it, or can't have adaptive themes, do nothing
     if (!this->getHasAdaptiveThemes()) {
         this->_onDependenciesChange(changedDependencies);
-        
+
         return;
     }
 
@@ -99,16 +102,17 @@ void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {
     if (!currentThemeName.has_value() || nextTheme != currentThemeName.value()) {
         changedDependencies.push_back(UnistyleDependency::THEME);
         changedDependencies.push_back(UnistyleDependency::THEMENAME);
-        
+
         state.setTheme(nextTheme);
     }
-    
+
     this->_onDependenciesChange(changedDependencies);
 };
 
 jsi::Value HybridUnistylesRuntime::updateTheme(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
-    helpers::assertThat(rt, args[0].isString(), "first argument expected to be a string.");
-    helpers::assertThat(rt, args[1].isObject(), "second argument expected to be a function.");
+    helpers::assertThat(rt, count == 2, "UnistylesRuntime.updateTheme expected to be called with 2 arguments.");
+    helpers::assertThat(rt, args[0].isString(), "UnistylesRuntime.updateTheme expected first argument to be a string.");
+    helpers::assertThat(rt, args[1].isObject(), "UnistylesRuntime.updateTheme expected first argument to be a function.");
 
     auto& registry = core::UnistylesRegistry::get();
     auto themeName = args[0].asString(rt).utf8(rt);
@@ -116,7 +120,7 @@ jsi::Value HybridUnistylesRuntime::updateTheme(jsi::Runtime &rt, const jsi::Valu
     helpers::assertThat(rt, args[1].asObject(rt).isFunction(rt), "second argument expected to be a function.");
 
     registry.updateTheme(rt, themeName, args[1].asObject(rt).asFunction(rt));
-    
+
     this->_onDependenciesChange({UnistyleDependency::THEME});
 
     return jsi::Value::undefined();
@@ -163,7 +167,7 @@ UnistylesCxxMiniRuntime HybridUnistylesRuntime::getMiniRuntime() {
         nativeMiniRuntime.statusBar,
         nativeMiniRuntime.navigationBar
     };
-    
+
     return cxxMiniRuntime;
 }
 

package/cxx/parser/Parser.cpp

@@ -133,6 +133,8 @@ void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleShee
         // convert arguments to jsi::Value
         auto metadata = unistyleFn->dynamicFunctionMetadata.value();
         std::vector<jsi::Value> args{};
+        
+        args.reserve(3);
 
         for (int i = 0; i < metadata.count; i++) {
             folly::dynamic& arg = metadata.arguments.at(i);
@@ -177,6 +179,8 @@ shadow::ShadowLeafUpdates parser::Parser::dependencyMapToShadowLeafUpdates(Depen
 // convert jsi::Value arguments to folly::dynamic
 std::vector<folly::dynamic> parser::Parser::parseDynamicFunctionArguments(jsi::Runtime& rt, size_t count, const jsi::Value* arguments) {
     std::vector<folly::dynamic> parsedArgument{};
+    
+    parsedArgument.reserve(3);
 
     for (size_t i = 0; i < count; i++) {
         auto& arg = arguments[i];
@@ -369,7 +373,9 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
 std::vector<UnistyleDependency> parser::Parser::parseDependencies(jsi::Runtime &rt, jsi::Object&& dependencies) {
     helpers::assertThat(rt, dependencies.isArray(rt), "babel transform is invalid. Unexpected type for dependencies. Please report new Github issue.");
 
-    std::vector<UnistyleDependency> parsedDependencies;
+    std::vector<UnistyleDependency> parsedDependencies{};
+    
+    parsedDependencies.reserve(5);
 
     helpers::iterateJSIArray(rt, dependencies.asArray(rt), [&](size_t i, jsi::Value& value){
         auto dependency = static_cast<UnistyleDependency>(value.asNumber());
@@ -387,6 +393,8 @@ jsi::Value parser::Parser::parseTransforms(jsi::Runtime& rt, Unistyle::Shared un
     }
 
     std::vector<jsi::Value> parsedTransforms{};
+    
+    parsedTransforms.reserve(2);
 
     helpers::iterateJSIArray(rt, obj.asArray(rt), [&](size_t i, jsi::Value& value){
         if (!value.isObject()) {

package/ios/UnistylesModuleOnLoad.h

@@ -3,6 +3,8 @@
 #import <React/RCTEventEmitter.h>
 #import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
 #import "TurboUnistyles/TurboUnistyles.h"
+#import <React/RCTSurfacePresenter.h>
+#import <React/RCTScheduler.h>
 
 @interface UnistylesModule: RCTEventEmitter<NativeTurboUnistylesSpec>
 @end

package/ios/UnistylesModuleOnLoad.mm

@@ -10,10 +10,16 @@ using namespace margelo::nitro;
 
 RCT_EXPORT_MODULE(Unistyles)
 
+__weak RCTSurfacePresenter* _surfacePresenter;
+
 + (BOOL)requiresMainQueueSetup {
     return YES;
 }
 
+- (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter {
+    _surfacePresenter = surfacePresenter;
+}
+
 - (void)installJSIBindingsWithRuntime:(jsi::Runtime&)rt {
     // function is called on: first init and every live reload
     // check if this is live reload, if so let's replace UnistylesRuntime with new runtime
@@ -31,7 +37,8 @@ RCT_EXPORT_MODULE(Unistyles)
 - (void)createHybrids:(jsi::Runtime&)rt {
     auto nativePlatform = Unistyles::NativePlatform::create();
     auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt);
-    auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime);
+    auto uiManager = [_surfacePresenter scheduler].uiManager;
+    auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime, uiManager);
 
     HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", [unistylesRuntime]() -> std::shared_ptr<HybridObject>{
         return unistylesRuntime;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",