react-native-unistyles 2.7.2 → 2.8.0-beta.2

package/ios/UnistylesModule.mm

@@ -1,5 +1,4 @@
 #import "UnistylesModule.h"
-#import "UnistylesHelpers.h"
 #import "UnistylesRuntime.h"
 
 #import <React/RCTBridge+Private.h>
@@ -47,106 +46,30 @@ RCT_EXPORT_MODULE(Unistyles)
 #pragma mark - Core
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
-    RCTBridge* bridge = [RCTBridge currentBridge];
-    RCTCxxBridge* cxxBridge = (RCTCxxBridge*)bridge;
-
-    if (cxxBridge == nil) {
-        return @false;
-    }
-
-    auto jsiRuntime = (jsi::Runtime*)cxxBridge.runtime;
-
-    if (jsiRuntime == nil) {
+    UnistylesModule *__weak weakSelf = self;
+    RCTBridge *bridge = self.bridge;
+    
+    if (bridge == nullptr) {
         return @false;
     }
 
-    auto& runtime = *jsiRuntime;
-    UnistylesModule *__weak weakSelf = self;
-
-    registerUnistylesHostObject(runtime, weakSelf);
+    registerUnistylesHostObject(bridge, weakSelf);
 
     NSLog(@"Installed Unistyles 🦄!");
 
     return @true;
 }
 
-void registerUnistylesHostObject(jsi::Runtime &runtime, UnistylesModule* weakSelf) {
-    auto unistylesRuntime = std::make_shared<UnistylesRuntime>(
-        weakSelf.platform.initialScreen,
-        weakSelf.platform.initialColorScheme,
-        weakSelf.platform.initialContentSizeCategory,
-        weakSelf.platform.initialInsets,
-        weakSelf.platform.initialStatusBar,
-        weakSelf.platform.initialNavigationBar
-    );
-
-    unistylesRuntime.get()->onThemeChange([=](std::string theme) {
-        NSDictionary *body = @{
-            @"type": @"theme",
-            @"payload": @{
-                @"themeName": cxxStringToNSString(theme)
-            }
-        };
-
-        [weakSelf emitEvent:@"__unistylesOnChange" withBody:body];
-    });
-
-    unistylesRuntime.get()->onLayoutChange([=](std::string breakpoint, std::string orientation, Dimensions& screen, Dimensions& statusBar, Insets& insets, Dimensions& navigationBar) {
-        NSDictionary *body = @{
-            @"type": @"layout",
-            @"payload": @{
-                @"breakpoint": cxxStringToNSString(breakpoint),
-                @"orientation": cxxStringToNSString(orientation),
-                @"screen": @{
-                    @"width": @(screen.width),
-                    @"height": @(screen.height)
-                },
-                @"statusBar": @{
-                    @"width": @(statusBar.width),
-                    @"height": @(statusBar.height)
-                },
-                @"navigationBar": @{
-                    @"width": @(navigationBar.width),
-                    @"height": @(navigationBar.height)
-                },
-                @"insets": @{
-                    @"top": @(insets.top),
-                    @"bottom": @(insets.bottom),
-                    @"left": @(insets.left),
-                    @"right": @(insets.right)
-                }
-            }
-        };
-
-        [weakSelf emitEvent:@"__unistylesOnChange" withBody:body];
-    });
-    
-    unistylesRuntime.get()->onPluginChange([=]() {
-        NSDictionary *body = @{
-            @"type": @"plugin"
-        };
-
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [weakSelf emitEvent:@"__unistylesOnChange" withBody:body];
-        });
-    });
-    
-    unistylesRuntime.get()->onContentSizeCategoryChange([=](std::string contentSizeCategory) {
-        NSDictionary *body = @{
-            @"type": @"dynamicTypeSize",
-            @"payload": @{
-                @"contentSizeCategory": cxxStringToNSString(contentSizeCategory)
-            }
-        };
-
-        [weakSelf emitEvent:@"__unistylesOnChange" withBody:body];
-    });
+void registerUnistylesHostObject(RCTBridge* bridge, UnistylesModule* weakSelf) {
+    std::shared_ptr<react::CallInvoker> callInvoker = bridge.jsCallInvoker;
+    jsi::Runtime* runtime = reinterpret_cast<jsi::Runtime*>(bridge.runtime);
+    auto unistylesRuntime = std::make_shared<UnistylesRuntime>(*runtime, callInvoker);
 
-    weakSelf.platform.unistylesRuntime = unistylesRuntime.get();
+    [weakSelf.platform makeShared:unistylesRuntime.get()];
 
-    auto hostObject = jsi::Object::createFromHostObject(runtime, unistylesRuntime);
+    auto hostObject = jsi::Object::createFromHostObject(*runtime, unistylesRuntime);
 
-    runtime.global().setProperty(runtime, "__UNISTYLES__", std::move(hostObject));
+    runtime->global().setProperty(*runtime, "__UNISTYLES__", std::move(hostObject));
 }
 
 @end

package/ios/platform/Platform_Shared.h

@@ -0,0 +1,5 @@
+#import "UnistylesRuntime.h"
+#include <string>
+
+std::string getContentSizeCategory();
+std::string getColorScheme();

package/ios/platform/Platform_Shared.mm

@@ -0,0 +1,69 @@
+#include "Platform_Shared.h"
+
+std::string getContentSizeCategory() {
+    UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraExtraLarge]) {
+        return std::string([@"xxxLarge" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraLarge]) {
+        return std::string([@"xxLarge" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraLarge]) {
+        return std::string([@"xLarge" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryLarge]) {
+        return std::string([@"Large" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryMedium]) {
+        return std::string([@"Medium" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategorySmall]) {
+        return std::string([@"Small" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraSmall]) {
+        return std::string([@"xSmall" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityMedium]) {
+        return std::string([@"accessibilityMedium" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityLarge]) {
+        return std::string([@"accessibilityLarge" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraLarge]) {
+        return std::string([@"accessibilityExtraLarge" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraLarge]) {
+        return std::string([@"accessibilityExtraExtraLarge" UTF8String]);
+    }
+
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraExtraLarge]) {
+        return std::string([@"accessibilityExtraExtraExtraLarge" UTF8String]);
+    }
+
+    return std::string([@"unspecified" UTF8String]);
+}
+
+std::string getColorScheme() {
+    UIUserInterfaceStyle colorScheme = [UIScreen mainScreen].traitCollection.userInterfaceStyle;
+
+    switch (colorScheme) {
+        case UIUserInterfaceStyleLight:
+            return UnistylesLightScheme;
+        case UIUserInterfaceStyleDark:
+            return UnistylesDarkScheme;
+        case UIUserInterfaceStyleUnspecified:
+        default:
+            return UnistylesUnspecifiedScheme;
+    }
+}

package/ios/platform/Platform_iOS.h

@@ -1,25 +1,18 @@
 #include <string>
 #include <map>
 #include <UnistylesRuntime.h>
+#include "Platform_Shared.h"
 
 @interface Platform : NSObject
 
-@property (nonatomic, assign) Dimensions initialScreen;
-@property (nonatomic, assign) std::string initialColorScheme;
-@property (nonatomic, assign) std::string initialContentSizeCategory;
-@property (nonatomic, assign) Insets initialInsets;
-@property (nonatomic, assign) Dimensions initialStatusBar;
-@property (nonatomic, assign) Dimensions initialNavigationBar;
 @property (nonatomic, assign) void* unistylesRuntime;
 
 - (instancetype)init;
 
 - (void)setupListeners;
-- (void)onOrientationChange:(NSNotification *)notification;
+- (void)makeShared:(void*)runtime;
+- (void)onWindowChange:(NSNotification *)notification;
 - (void)onAppearanceChange:(NSNotification *)notification;
 - (void)onContentSizeCategoryChange:(NSNotification *)notification;
 
-- (std::string)getColorScheme;
-- (std::string)getContentSizeCategory:(UIContentSizeCategory)contentSizeCategory;
-
 @end

package/ios/platform/Platform_iOS.mm

@@ -1,7 +1,6 @@
 #if TARGET_OS_IOS
 
 #import "Platform_iOS.h"
-#import "UnistylesRuntime.h"
 #import <React/RCTAppearance.h>
 
 @implementation Platform
@@ -9,15 +8,6 @@
 - (instancetype)init {
     self = [super init];
     if (self) {
-        UIScreen *screen = [UIScreen mainScreen];
-        UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
-        self.initialScreen = {(int)screen.bounds.size.width, (int)screen.bounds.size.height};
-        self.initialColorScheme = [self getColorScheme];
-        self.initialContentSizeCategory = [self getContentSizeCategory:contentSizeCategory];
-        self.initialStatusBar = [self getStatusBarDimensions];
-        self.initialInsets = [self getInsets];
-        
         [self setupListeners];
     }
     return self;
@@ -32,17 +22,17 @@
                                           name: UIContentSizeCategoryDidChangeNotification
                                           object: nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self
-                                          name: RCTUserInterfaceStyleDidChangeNotification
-                                          object: nil];
+                                          name:RCTWindowFrameDidChangeNotification
+                                          object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self
-                                          name: UIDeviceOrientationDidChangeNotification
+                                          name: RCTUserInterfaceStyleDidChangeNotification
                                           object: nil];
 }
 
 - (void)setupListeners {
     [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(onOrientationChange:)
-                                                 name:UIDeviceOrientationDidChangeNotification
+                                             selector:@selector(onWindowChange:)
+                                                 name:RCTWindowFrameDidChangeNotification
                                                object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onAppearanceChange:)
@@ -54,117 +44,84 @@
                                                object:nil];
 }
 
-- (void)onAppearanceChange:(NSNotification *)notification {
-    std::string colorScheme = [self getColorScheme];
+- (void)makeShared:(void*)runtime {
+    self.unistylesRuntime = runtime;
+    
+    auto unistylesRuntime = ((UnistylesRuntime*)self.unistylesRuntime);
+    
+    unistylesRuntime->setScreenDimensionsCallback([self](){
+        return [self getScreenDimensions];
+    });
+    
+    unistylesRuntime->setContentSizeCategoryCallback([](){
+        return getContentSizeCategory();
+    });
+    
+    unistylesRuntime->setColorSchemeCallback([self](){
+        return getColorScheme();
+    });
+    
+    unistylesRuntime->setStatusBarDimensionsCallback([self](){
+        return [self getStatusBarDimensions];
+    });
+    
+    unistylesRuntime->setInsetsCallback([self](){
+        return [self getInsets];
+    });
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        unistylesRuntime->screen = [self getScreenDimensions];
+        unistylesRuntime->contentSizeCategory = getContentSizeCategory();
+        unistylesRuntime->colorScheme = getColorScheme();
+        unistylesRuntime->statusBar = [self getStatusBarDimensions];
+        unistylesRuntime->insets = [self getInsets];
+    });
+}
 
+- (void)onAppearanceChange:(NSNotification *)notification {
     if (self.unistylesRuntime != nullptr) {
-        ((UnistylesRuntime*)self.unistylesRuntime)->handleAppearanceChange(colorScheme);
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleAppearanceChange(getColorScheme());
     }
 }
 
 - (void)onContentSizeCategoryChange:(NSNotification *)notification {
-    UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
     if (self.unistylesRuntime != nullptr) {
-        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange([self getContentSizeCategory:contentSizeCategory]);
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange(getContentSizeCategory());
     }
 }
 
-- (void)onOrientationChange:(NSNotification *)notification {
+- (void)onWindowChange:(NSNotification *)notification {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        UIScreen *mainScreen = [UIScreen mainScreen];
-        Dimensions screen = {(int)mainScreen.bounds.size.width, (int)mainScreen.bounds.size.height};
+        Dimensions screen = [self getScreenDimensions];
         Insets insets = [self getInsets];
         Dimensions statusBar = [self getStatusBarDimensions];
-        Dimensions navigationBar = [self getNavigationBarDimensions];
 
         if (self.unistylesRuntime != nullptr) {
-            ((UnistylesRuntime*)self.unistylesRuntime)->handleScreenSizeChange(screen, insets, statusBar, navigationBar);
+            ((UnistylesRuntime*)self.unistylesRuntime)->handleScreenSizeChange(screen, insets, statusBar, std::nullopt);
         }
     });
 }
 
-- (std::string)getColorScheme {
-    UIUserInterfaceStyle colorScheme = [UIScreen mainScreen].traitCollection.userInterfaceStyle;
-
-    switch (colorScheme) {
-        case UIUserInterfaceStyleLight:
-            return UnistylesLightScheme;
-        case UIUserInterfaceStyleDark:
-            return UnistylesDarkScheme;
-        case UIUserInterfaceStyleUnspecified:
-        default:
-            return UnistylesUnspecifiedScheme;
-    }
-}
-
 - (Insets)getInsets {
     UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
     UIEdgeInsets safeArea = window.safeAreaInsets;
-    
+
     return {(int)safeArea.top, (int)safeArea.bottom, (int)safeArea.left, (int)safeArea.right};
 }
 
 - (Dimensions)getStatusBarDimensions {
-    CGRect statusBarFrame = UIApplication.sharedApplication.statusBarFrame;
-    
+    UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
+    CGRect statusBarFrame = window.windowScene.statusBarManager.statusBarFrame;
+ 
     return {(int)statusBarFrame.size.width, (int)statusBarFrame.size.height};
 }
 
-- (Dimensions)getNavigationBarDimensions {
-    return {0, 0};
-}
-
-- (std::string)getContentSizeCategory:(UIContentSizeCategory)contentSizeCategory {
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraExtraLarge]) {
-        return std::string([@"xxxLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraLarge]) {
-        return std::string([@"xxLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraLarge]) {
-        return std::string([@"xLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryLarge]) {
-        return std::string([@"Large" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryMedium]) {
-        return std::string([@"Medium" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategorySmall]) {
-        return std::string([@"Small" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraSmall]) {
-        return std::string([@"xSmall" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityMedium]) {
-        return std::string([@"accessibilityMedium" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityLarge]) {
-        return std::string([@"accessibilityLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraLarge]) {
-        return std::string([@"accessibilityExtraLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraLarge]) {
-        return std::string([@"accessibilityExtraExtraLarge" UTF8String]);
-    }
-    
-    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraExtraLarge]) {
-        return std::string([@"accessibilityExtraExtraExtraLarge" UTF8String]);
-    }
+- (Dimensions)getScreenDimensions {
+    UIViewController *presentedViewController = RCTPresentedViewController();
+    CGRect windowFrame = presentedViewController.view.window.frame;
+    Dimensions screenDimension = {(int)windowFrame.size.width, (int)windowFrame.size.height};
     
-    return std::string([@"unspecified" UTF8String]);
+    return screenDimension;
 }
 
 @end

package/ios/platform/Platform_macOS.h

@@ -4,18 +4,13 @@
 
 @interface Platform : NSObject
 
-@property (nonatomic, assign) Dimensions initialScreen;
-@property (nonatomic, assign) std::string initialColorScheme;
-@property (nonatomic, assign) std::string initialContentSizeCategory;
-@property (nonatomic, assign) Insets initialInsets;
-@property (nonatomic, assign) Dimensions initialStatusBar;
-@property (nonatomic, assign) Dimensions initialNavigationBar;
 @property (nonatomic, assign) void* unistylesRuntime;
 
 - (instancetype)init;
 
 - (void)setupListeners;
-- (void)onWindowResize;
+- (void)makeShared:(void*)runtime;
+- (void)onWindowChange;
 - (void)onAppearanceChange;
 
 - (std::string)getColorScheme;

package/ios/platform/Platform_macOS.mm

@@ -1,7 +1,6 @@
 #if TARGET_OS_OSX
 
 #import "Platform_macOS.h"
-#import "UnistylesRuntime.h"
 #import <React/RCTUtils.h>
 
 @implementation Platform
@@ -9,15 +8,6 @@
 - (instancetype)init {
     self = [super init];
     if (self) {
-        NSWindow *window = RCTSharedApplication().mainWindow;
-        
-        self.initialScreen = {(int)window.frame.size.width, (int)window.frame.size.height};
-        self.initialContentSizeCategory = std::string([@"unspecified" UTF8String]);
-        self.initialColorScheme = [self getColorScheme];
-        self.initialStatusBar = [self getStatusBarDimensions];
-        self.initialNavigationBar = [self getNavigationBarDimensions];
-        self.initialInsets = [self getInsets];
-        
         [self setupListeners];
     }
     return self;
@@ -27,27 +17,46 @@
     if (self.unistylesRuntime != nullptr) {
         self.unistylesRuntime = nullptr;
     }
-    
+
     NSWindow *window = RCTSharedApplication().mainWindow;
-    
+
     [window removeObserver:self forKeyPath:@"effectiveAppearance"];
     [window removeObserver:self forKeyPath:@"frame"];
 }
 
 - (void)setupListeners {
     NSWindow *window = RCTSharedApplication().mainWindow;
-    
+
     [window addObserver:self forKeyPath:@"effectiveAppearance" options:NSKeyValueObservingOptionNew context:nil];
     [window addObserver:self forKeyPath:@"frame" options:NSKeyValueObservingOptionNew context:nil];
 }
 
+- (void)makeShared:(void*)runtime {
+    self.unistylesRuntime = runtime;
+    
+    auto unistylesRuntime = ((UnistylesRuntime*)self.unistylesRuntime);
+    
+    unistylesRuntime->setScreenDimensionsCallback([self](){
+        return [self getScreenDimensions];
+    });
+    
+    unistylesRuntime->setColorSchemeCallback([self](){
+        return [self getColorScheme];
+    });
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        unistylesRuntime->screen = [self getScreenDimensions];
+        unistylesRuntime->colorScheme = [self getColorScheme];
+    });
+}
+
 - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
     if ([keyPath isEqualToString:@"effectiveAppearance"]) {
         return [self onAppearanceChange];
     }
-    
+
     if ([keyPath isEqualToString:@"frame"]) {
-        return [self onWindowResize];
+        return [self onWindowChange];
     }
 }
 
@@ -59,19 +68,15 @@
     }
 }
 
-- (void)onWindowResize {
-    NSWindow *window = RCTSharedApplication().mainWindow;
-    Dimensions screen = {(int)window.frame.size.width, (int)window.frame.size.height};
-    Insets insets = [self getInsets];
-    Dimensions statusBar = [self getStatusBarDimensions];
-    Dimensions navigationBar = [self getNavigationBarDimensions];
-
+- (void)onWindowChange {
+    Dimensions screen = [self getScreenDimensions];
+    
     if (self.unistylesRuntime != nullptr) {
         ((UnistylesRuntime*)self.unistylesRuntime)->handleScreenSizeChange(
            screen,
-           insets,
-           statusBar,
-           navigationBar
+           std::nullopt,
+           std::nullopt,
+           std::nullopt
         );
     }
 }
@@ -82,20 +87,15 @@
     if (appearance.name == NSAppearanceNameDarkAqua) {
         return UnistylesDarkScheme;
     }
-    
-    return UnistylesLightScheme;
-}
-
-- (Insets)getInsets {
-    return {0, 0, 0, 0};
-}
 
-- (Dimensions)getStatusBarDimensions {
-    return {0, 0};
+    return UnistylesLightScheme;
 }
 
-- (Dimensions)getNavigationBarDimensions {
-    return {0, 0};
+- (Dimensions)getScreenDimensions {
+    NSWindow *window = RCTSharedApplication().mainWindow;
+    Dimensions screenDimension = {(int)window.frame.size.width, (int)window.frame.size.height};
+    
+    return screenDimension;
 }
 
 @end

package/ios/platform/Platform_tvOS.h

@@ -1,23 +1,16 @@
 #include <string>
 #include <map>
-#include <UnistylesRuntime.h>
+#include "Platform_Shared.h"
 
 @interface Platform : NSObject
 
-@property (nonatomic, assign) Dimensions initialScreen;
-@property (nonatomic, assign) std::string initialColorScheme;
-@property (nonatomic, assign) std::string initialContentSizeCategory;
-@property (nonatomic, assign) Insets initialInsets;
-@property (nonatomic, assign) Dimensions initialStatusBar;
-@property (nonatomic, assign) Dimensions initialNavigationBar;
 @property (nonatomic, assign) void* unistylesRuntime;
 
 - (instancetype)init;
 
+- (void)makeShared:(void*)runtime;
 - (void)onAppearanceChange:(NSNotification *)notification;
 - (void)onContentSizeCategoryChange:(NSNotification *)notification;
 
-- (std::string)getColorScheme;
-
 @end