react-native-unistyles 3.0.0-alpha.4 → 3.0.0-alpha.40

package/README.md

@@ -28,6 +28,7 @@ Install CocoaPods dependencies / generate native folders with Expo:
 
 ```shell
 pod install
+or
 npx expo prebuild
 ```
 
@@ -68,6 +69,12 @@ npx expo prebuild
 <a href="https://github.com/mwarger">
      <img src="https://avatars.githubusercontent.com/u/686823?v=4" height="70px" width="70px" alt="mwarger" />
 </a>
+<a href="https://github.com/biw">
+     <img src="https://avatars.githubusercontent.com/u/6139501?v=4" height="70px" width="70px" alt="biw" />
+</a>
+<a href="https://github.com/happyfloat">
+     <img src="https://avatars.githubusercontent.com/u/186333704?s=200&v=4" height="70px" width="70px" alt="happyfloat" />
+</a>
 
 ## Past sponsors
 

package/Unistyles.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   ]
   s.pod_target_xcconfig = {
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-    "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES"
+    "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES FOLLY_MOBILE"
   }
 
   s.public_header_files = [

package/android/CMakeLists.txt

@@ -2,28 +2,28 @@ cmake_minimum_required(VERSION 3.9.0)
 
 project(unistyles)
 
+file(GLOB_RECURSE CORE_SRC RELATIVE ${CMAKE_SOURCE_DIR} "../cxx/**/*.cpp")
+file(GLOB_RECURSE PLATFORM_SRC RELATIVE ${CMAKE_SOURCE_DIR} "./src/main/cxx/*.cpp")
+
 add_library(unistyles
     SHARED
-    ../cxx/HostStyle.cpp
-    ../cxx/HybridUnistylesRuntime.cpp
-    ../cxx/HybridStatusBar.cpp
-    ../cxx/HybridNavigationBar.cpp
-    ../cxx/ShadowTreeTraverser.cpp
-    ../cxx/StyleSheet.cpp
-    ../cxx/StyleSheetImpl.cpp
-    ../cxx/StyleSheetRegistry.cpp
-    ../cxx/UnistylesImpl.cpp
-    ../cxx/UnistylesModel.cpp
-    ../cxx/UnistylesRuntime.cpp
-    ./src/main/cxx/cpp-adapter.cpp
-    ./src/main/cxx/helpers.cpp
-    ./src/main/cxx/platform.cpp
+    ${CORE_SRC}
+    ${PLATFORM_SRC}
 )
 
-include_directories(../cxx)
-include("${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/Unistyles+autolinking.cmake")
+include("${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/unistyles+autolinking.cmake")
+
+include_directories(
+    ./src/main/cxx
+    ../cxx
+    ../cxx/common
+    ../cxx/core
+    ../cxx/hybridObjects
+    ../cxx/parser
+    ../cxx/shadowTree
+)
 
-string(APPEND CMAKE_CXX_FLAGS " -DFOLLY_NO_CONFIG")
+string(APPEND CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
 
 set_target_properties(unistyles PROPERTIES
     CXX_STANDARD 20
@@ -32,31 +32,5 @@ set_target_properties(unistyles PROPERTIES
     POSITION_INDEPENDENT_CODE ON
 )
 
-find_package(ReactAndroid REQUIRED CONFIG)
-find_package(fbjni REQUIRED CONFIG)
-
-target_include_directories(
-    unistyles
-    PRIVATE
-    "../node_modules/react-native/ReactCommon"
-    "../node_modules/react-native/ReactAndroid/src/main/jni/react/turbomodule"
-    "../node_modules/react-native/ReactCommon/callinvoker"
-    "../node_modules/react-native/ReactCommon/runtimeexecutor"
-    "../node_modules/react-native/ReactCommon/yoga"
-    "../node_modules/react-native/ReactCommon/react/renderer/graphics/platform/cxx"
-)
-
-target_link_libraries(unistyles
-    ReactAndroid::jsi
-    ReactAndroid::turbomodulejsijni
-    ReactAndroid::react_nativemodule_core
-    android
-    ReactAndroid::react_render_core
-    ReactAndroid::runtimeexecutor
-    ReactAndroid::fabricjni
-    ReactAndroid::react_debug
-    ReactAndroid::react_render_core
-    ReactAndroid::react_render_componentregistry
-    ReactAndroid::rrc_view
-    ReactAndroid::folly_runtime
-)
+# For React Native 0.76 and above, we don't need to link anything
+# as NitroModules will automatically add ReactAndroid::reactnative prefab

package/android/build.gradle

@@ -7,14 +7,14 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22")
+        classpath("com.android.tools.build:gradle:8.2.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
-apply from: '../nitrogen/generated/android/Unistyles+autolinking.gradle'
+apply from: '../nitrogen/generated/android/unistyles+autolinking.gradle'
 
 def resolveBuildType() {
     Gradle gradle = getGradle()
@@ -32,12 +32,12 @@ if (isNewArchitectureEnabled()) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 34)
+    compileSdkVersion safeExtGet('compileSdkVersion', 35)
     namespace "com.unistyles"
 
     defaultConfig {
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-        minSdkVersion safeExtGet('minSdkVersion', 23)
+        minSdkVersion safeExtGet('minSdkVersion', 24)
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_STL=c++_shared"
@@ -62,6 +62,7 @@ android {
             "META-INF/**",
             "**/libjsi.so",
             "**/libc++_shared.so",
+            "**/libreactnative.so",
             "**/libreact_nativemodule_core.so",
             "**/libturbomodulejsijni.so",
             "**/libfbjni.so"

package/android/src/main/cxx/NativeUnistylesModule.cpp

@@ -0,0 +1,71 @@
+#include "NativeUnistylesModule.h"
+#import <NitroModules/HybridObjectRegistry.hpp>
+#import "HybridUnistylesRuntime.h"
+#import "HybridStyleSheet.h"
+#import "HybridShadowRegistry.h"
+
+using namespace margelo::nitro::unistyles;
+using namespace facebook::react;
+
+UnistylesModule::UnistylesModule(
+    jni::alias_ref<UnistylesModule::jhybridobject> jThis,
+    jni::alias_ref<react::JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+    jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
+    jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
+):  _runtimeExecutor(runtimeExecutorHolder->cthis()->get()),
+    _uiManager(fabricUIManager->getBinding()->getScheduler()->getUIManager()),
+    _nativePlatform(nativePlatform->cthis()) {}
+
+jni::local_ref<UnistylesModule::jhybriddata> UnistylesModule::initHybrid(
+    jni::alias_ref<UnistylesModule::jhybridobject> jThis,
+    jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+    jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
+    jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
+) {
+    return makeCxxInstance(jThis, runtimeExecutorHolder, fabricUIManager, nativePlatform);
+}
+
+void UnistylesModule::registerNatives() {
+    javaClassStatic()->registerNatives({
+        makeNativeMethod("getBindingsInstaller", UnistylesModule::getBindingsInstaller),
+        makeNativeMethod("initHybrid", UnistylesModule::initHybrid)
+    });
+}
+
+jni::local_ref<BindingsInstallerHolder::javaobject> UnistylesModule::getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jobj) {
+    auto& runtimeExecutor = jobj->cthis()->_runtimeExecutor;
+    auto& uiManager = jobj->cthis()->_uiManager;
+    auto& nativePlatform = *jobj->cthis()->_nativePlatform;
+
+    return BindingsInstallerHolder::newObjectCxxArgs([&runtimeExecutor, uiManager, nativePlatform](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
+        auto hasUnistylesRuntime = HybridObjectRegistry::hasHybridObject("UnistylesRuntime");
+
+        if (hasUnistylesRuntime) {
+            HybridObjectRegistry::unregisterHybridObjectConstructor("UnistylesRuntime");
+            HybridObjectRegistry::unregisterHybridObjectConstructor("UnistylesStyleSheet");
+            HybridObjectRegistry::unregisterHybridObjectConstructor("UnistylesShadowRegistry");
+        }
+
+        auto runOnJSThread = [&runtimeExecutor](std::function<void(jsi::Runtime&)>&& callback) {
+            runtimeExecutor([callback = std::move(callback)](jsi::Runtime &rt) {
+                callback(rt);
+            });
+        };
+
+        // init hybrids
+        auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);
+        auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime, uiManager);
+
+        HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", [unistylesRuntime]() -> std::shared_ptr<HybridObject>{
+            return unistylesRuntime;
+        });
+        HybridObjectRegistry::registerHybridObjectConstructor("UnistylesStyleSheet", [styleSheet]() -> std::shared_ptr<HybridObject>{
+            return styleSheet;
+        });
+        HybridObjectRegistry::registerHybridObjectConstructor("UnistylesShadowRegistry", []() -> std::shared_ptr<HybridObject>{
+            return std::make_shared<HybridShadowRegistry>();
+        });
+    });
+}

package/android/src/main/cxx/NativeUnistylesModule.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <ReactCommon/BindingsInstallerHolder.h>
+#include <react/fabric/JFabricUIManager.h>
+#include <react/jni/JRuntimeExecutor.h>
+#include <react/renderer/scheduler/Scheduler.h>
+#include <fbjni/fbjni.h>
+#include <react/fabric/Binding.h>
+#include "NativePlatform.h"
+
+namespace margelo::nitro::unistyles {
+
+using namespace facebook;
+using namespace facebook::react;
+
+struct UnistylesModule : public jni::HybridClass<UnistylesModule> {
+    static constexpr auto kJavaDescriptor = "Lcom/unistyles/UnistylesModule;";
+
+    explicit UnistylesModule(
+        jni::alias_ref<jhybridobject> jThis,
+        jni::alias_ref<react::JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+        jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
+        jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
+    );
+
+    static void registerNatives();
+    static jni::local_ref<jhybriddata> initHybrid(
+        jni::alias_ref<jhybridobject> jThis,
+        jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+        jni::alias_ref<JFabricUIManager::javaobject>,
+        jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
+    );
+
+    static jni::local_ref<BindingsInstallerHolder::javaobject> getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jThis);
+
+private:
+    std::shared_ptr<UIManager> _uiManager;
+    RuntimeExecutor _runtimeExecutor;
+    Unistyles::HybridNativePlatformSpecCxx* _nativePlatform;
+};
+
+}

package/android/src/main/cxx/cpp-adapter.cpp

@@ -1,88 +1,10 @@
-#include <jni.h>
-
-#include <NitroModules/HybridObjectRegistry.hpp>
-#include <HybridUnistylesRuntime.h>
-#include <HybridStatusBar.h>
-#include <HybridNavigationBar.h>
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-    HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", []() -> std::shared_ptr<HybridObject>{
-        return std::make_shared<HybridUnistylesRuntime>();
-    });
-    HybridObjectRegistry::registerHybridObjectConstructor("StatusBar", []() -> std::shared_ptr<HybridObject>{
-        return std::make_shared<HybridStatusBar>();
+#include <fbjni/fbjni.h>
+#include "unistylesOnLoad.hpp"
+#include "NativeUnistylesModule.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+    return facebook::jni::initialize(vm, [=] {
+        margelo::nitro::unistyles::UnistylesModule::registerNatives();
+        margelo::nitro::unistyles::initialize(vm);
     });
-    HybridObjectRegistry::registerHybridObjectConstructor("NavigationBar", []() -> std::shared_ptr<HybridObject>{
-        return std::make_shared<HybridNavigationBar>();
-    });
-
-    return JNI_VERSION_1_2;
 }
-
-//using namespace facebook;
-//
-//static jobject unistylesModule = nullptr;
-//std::shared_ptr<UnistylesRuntime> unistylesRuntime = nullptr;
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeInstall(JNIEnv *env, jobject thiz, jlong jsi, jobject callInvokerHolder) {
-//    auto runtime = reinterpret_cast<jsi::Runtime *>(jsi);
-//    auto callInvoker{
-//        jni::alias_ref<react::CallInvokerHolder::javaobject>{ reinterpret_cast<react::CallInvokerHolder::javaobject>(callInvokerHolder)} -> cthis() ->getCallInvoker()
-//    };
-//
-//    if (unistylesModule == nullptr) {
-//        unistylesModule = env->NewGlobalRef(thiz);
-//    }
-//
-//    if (unistylesModule == nullptr) {
-//        return throwKotlinException(env, "Something went wrong while initializing UnistylesModule");
-//    }
-//
-//    unistylesRuntime = std::make_shared<UnistylesRuntime>(*runtime, callInvoker);
-//    auto styleSheet = std::make_shared<StyleSheet>(*runtime, unistylesRuntime);
-//
-//    makeShared(env, unistylesModule, unistylesRuntime);
-//
-//    jsi::Object hostObject = jsi::Object::createFromHostObject(*runtime, unistylesRuntime);
-//    jsi::Object styleSheetHostObject = jsi::Object::createFromHostObject(*runtime, styleSheet);
-//    runtime->global().setProperty(*runtime, "__UNISTYLES__", std::move(hostObject));
-//    runtime->global().setProperty(*runtime, "__UNISTYLES__STYLESHEET__", std::move(styleSheetHostObject));
-//}
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeDestroy(JNIEnv *env, jobject thiz) {
-//    unistylesRuntime.reset();
-//    unistylesModule = nullptr;
-//}
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeOnOrientationChange(JNIEnv *env, jobject thiz, jobject screen, jobject insets, jobject statusBar, jobject navigationBar) {
-//    if (unistylesRuntime != nullptr) {
-//        Screen screenDimensions = jobjectToScreen(env, screen);
-//        Dimensions statusBarDimensions = jobjectToDimensions(env, statusBar);
-//        Insets screenInsets = jobjectToInsets(env, insets);
-//        Dimensions navigationBarDimensions = jobjectToDimensions(env, navigationBar);
-//
-//        unistylesRuntime->handleScreenSizeChange(screenDimensions, screenInsets, statusBarDimensions, navigationBarDimensions);
-//    }
-//}
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeOnAppearanceChange(JNIEnv *env, jobject thiz, jstring colorScheme) {
-//    if (unistylesRuntime != nullptr) {
-//        unistylesRuntime->handleAppearanceChange(env->GetStringUTFChars(colorScheme, nullptr));
-//    }
-//}
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeOnContentSizeCategoryChange(JNIEnv *env, jobject thiz, jstring contentSizeCategory) {
-//    if (unistylesRuntime != nullptr) {
-//        unistylesRuntime->handleContentSizeCategoryChange(env->GetStringUTFChars(contentSizeCategory, nullptr));
-//    }
-//}

package/android/src/main/java/com/unistyles/Equatable.kt

@@ -0,0 +1,61 @@
+package com.unistyles
+
+import com.margelo.nitro.unistyles.Dimensions
+import com.margelo.nitro.unistyles.Insets
+import com.margelo.nitro.unistyles.UnistyleDependency
+import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
+
+fun Dimensions.isEqualTo(other: Dimensions): Boolean {
+    return this.width == other.width && this.height == other.height
+}
+
+fun Insets.isEqualTo(other: Insets): Boolean {
+    return this.top == other.top && this.bottom == other.bottom &&
+        this.left == other.left && this.right == other.right &&
+        this.ime == other.ime
+}
+
+fun NativePlatformAndroid.diffMiniRuntimes(lhs: UnistylesNativeMiniRuntime, rhs: UnistylesNativeMiniRuntime): Array<UnistyleDependency> {
+    val dependencies: MutableList<UnistyleDependency> = mutableListOf()
+
+    if (lhs.colorScheme != rhs.colorScheme) {
+        dependencies.add(UnistyleDependency.COLORSCHEME)
+    }
+
+    if (!lhs.screen.isEqualTo(rhs.screen)) {
+        dependencies.add(UnistyleDependency.DIMENSIONS)
+    }
+
+    if (lhs.screen.width != rhs.screen.width) {
+        dependencies.add(UnistyleDependency.BREAKPOINTS)
+    }
+
+    // no need to check isLandscape, as it's always opposite
+    if (lhs.isPortrait != rhs.isPortrait) {
+        dependencies.add(UnistyleDependency.ORIENTATION)
+    }
+
+    if (lhs.contentSizeCategory != rhs.contentSizeCategory) {
+        dependencies.add(UnistyleDependency.CONTENTSIZECATEGORY)
+    }
+
+    if (!lhs.insets.isEqualTo(rhs.insets)) {
+        dependencies.add(UnistyleDependency.INSETS)
+    }
+
+    if (lhs.fontScale != rhs.fontScale) {
+        dependencies.add(UnistyleDependency.FONTSCALE)
+    }
+
+    if (!lhs.statusBar.isEqualTo(rhs.statusBar)) {
+        dependencies.add(UnistyleDependency.STATUSBAR)
+    }
+
+    if (!lhs.navigationBar.isEqualTo(rhs.navigationBar)) {
+        dependencies.add(UnistyleDependency.NAVIGATIONBAR)
+    }
+
+    // rtl and pixel ratio are not dynamic
+
+    return dependencies.toTypedArray()
+}