react-native-unistyles 2.8.0-rc.2 → 2.8.0-rc.4

package/ios/platform/Platform_Shared.h

@@ -1,3 +1,4 @@
+#import <UIKit/UIKit.h>
 #import "UnistylesRuntime.h"
 #include <string>
 

package/ios/platform/Platform_Shared.mm

@@ -112,17 +112,21 @@ float getFontScale() {
 }
 
 std::string getColorScheme() {
-    UIUserInterfaceStyle colorScheme = [UIScreen mainScreen].traitCollection.userInterfaceStyle;
-
-    switch (colorScheme) {
-        case UIUserInterfaceStyleLight:
-            return UnistylesLightScheme;
-        case UIUserInterfaceStyleDark:
-            return UnistylesDarkScheme;
-        case UIUserInterfaceStyleUnspecified:
-        default:
-            return UnistylesUnspecifiedScheme;
-    }
+    #if !TARGET_OS_VISION
+        UIUserInterfaceStyle colorScheme = [UIScreen mainScreen].traitCollection.userInterfaceStyle;
+
+        switch (colorScheme) {
+            case UIUserInterfaceStyleLight:
+                return UnistylesLightScheme;
+            case UIUserInterfaceStyleDark:
+                return UnistylesDarkScheme;
+            case UIUserInterfaceStyleUnspecified:
+            default:
+                return UnistylesUnspecifiedScheme;
+        }
+    #endif
+    
+    return UnistylesUnspecifiedScheme;
 }
 
 UIColor* colorFromHexString(NSString* hexString, float alpha) {

package/ios/platform/Platform_tvOS.mm

@@ -39,9 +39,9 @@
 
 - (void)makeShared:(void*)runtime {
     self.unistylesRuntime = runtime;
-    
+
     auto unistylesRuntime = ((UnistylesRuntime*)self.unistylesRuntime);
-    
+
     unistylesRuntime->setScreenDimensionsCallback([self](){
         return [self getScreenDimensions];
     });
@@ -49,15 +49,19 @@
     unistylesRuntime->setColorSchemeCallback([](){
         return getColorScheme();
     });
-    
+
     unistylesRuntime->setContentSizeCategoryCallback([](){
         return getContentSizeCategory();
     });
-    
+
     dispatch_async(dispatch_get_main_queue(), ^{
-        unistylesRuntime->screen = [self getScreenDimensions];
+        Screen screen = [self getScreenDimensions];
+
+        unistylesRuntime->screen = Dimensions({screen.width, screen.height});
         unistylesRuntime->contentSizeCategory = getContentSizeCategory();
         unistylesRuntime->colorScheme = getColorScheme();
+        unistylesRuntime->pixelRatio = screen.pixelRatio;
+        unistylesRuntime->fontScale = screen.fontScale;
     });
 }
 
@@ -73,11 +77,14 @@
     }
 }
 
-- (Dimensions)getScreenDimensions {
+- (Screen)getScreenDimensions {
     UIScreen *screen = [UIScreen mainScreen];
-    Dimensions screenDimension = {(int)screen.bounds.size.width, (int)screen.bounds.size.height};
-    
-    return screenDimension;
+    int width = (int)screen.bounds.size.width;
+    int height = (int)screen.bounds.size.height;
+    float pixelRatio = screen.scale;
+    float fontScale = getFontScale();
+
+    return Screen({width, height, pixelRatio, fontScale});
 }
 
 @end

package/ios/platform/Platform_visionOS.mm

@@ -73,13 +73,17 @@
     });
     
     dispatch_async(dispatch_get_main_queue(), ^{
-        unistylesRuntime->screen = [self getScreenDimensions];
+        Screen screen = [self getScreenDimensions];
+        
+        unistylesRuntime->screen = Dimensions({screen.width, screen.height});
         unistylesRuntime->contentSizeCategory = getContentSizeCategory();
+        unistylesRuntime->pixelRatio = screen.pixelRatio;
+        unistylesRuntime->fontScale = screen.fontScale;
     });
 }
 
 - (void)onWindowChange:(NSNotification *)notification {
-    Dimensions screen = [self getScreenDimensions];
+    Screen screen = [self getScreenDimensions];
 
     if (self.unistylesRuntime != nullptr) {
         ((UnistylesRuntime*)self.unistylesRuntime)->handleScreenSizeChange(
@@ -97,11 +101,14 @@
     }
 }
 
-- (Dimensions)getScreenDimensions {
+- (Screen)getScreenDimensions {
     UIWindow* mainWindow = [self getMainWindow];
-    Dimensions screenDimension = {(int)mainWindow.frame.size.width, (int)mainWindow.frame.size.height};
+    int width = (int)mainWindow.frame.size.width;
+    int height = (int)mainWindow.frame.size.height;
+    float pixelRatio = 1.0;
+    float fontScale = getFontScale();
     
-    return screenDimension;
+    return Screen({width, height, pixelRatio, fontScale});
 }
 
 @end

package/lib/typescript/src/types/core.d.ts

@@ -1,11 +1,11 @@
-import type { MatrixTransform, PerpectiveTransform, RotateTransform, RotateXTransform, RotateYTransform, RotateZTransform, ScaleTransform, ScaleXTransform, ScaleYTransform, SkewXTransform, SkewYTransform, TranslateXTransform, TranslateYTransform } from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
+import type { MatrixTransform, PerspectiveTransform, RotateTransform, RotateXTransform, RotateYTransform, RotateZTransform, ScaleTransform, ScaleXTransform, ScaleYTransform, SkewXTransform, SkewYTransform, TranslateXTransform, TranslateYTransform } from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
 import type { ImageStyle, TextStyle, ViewStyle } from 'react-native';
 import type { UnistylesBreakpoints, UnistylesThemes } from '../global';
 export type ShadowOffset = {
     width: number;
     height: number;
 };
-export type TransformStyles = PerpectiveTransform & RotateTransform & RotateXTransform & RotateYTransform & RotateZTransform & ScaleTransform & ScaleXTransform & ScaleYTransform & TranslateXTransform & TranslateYTransform & SkewXTransform & SkewYTransform & MatrixTransform;
+export type TransformStyles = PerspectiveTransform & RotateTransform & RotateXTransform & RotateYTransform & RotateZTransform & ScaleTransform & ScaleXTransform & ScaleYTransform & TranslateXTransform & TranslateYTransform & SkewXTransform & SkewYTransform & MatrixTransform;
 export type ScreenSize = {
     width: number;
     height: number;

package/lib/typescript/src/types/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../../src/types/core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,eAAe,EACf,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACtB,MAAM,mDAAmD,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAEtE,MAAM,MAAM,YAAY,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,eAAe,GACrB,mBAAmB,GACnB,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,gBAAgB,GAChB,cAAc,GACd,eAAe,GACf,eAAe,GACf,mBAAmB,GACnB,mBAAmB,GACnB,cAAc,GACd,cAAc,GACd,eAAe,CAAA;AAErB,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,SAAS,CAAC,GAAG,SAAS,CAAC,MAAM,SAAS,CAAC,GAAG,UAAU,CAAC,MAAM,UAAU,CAAC,CAAA;AAC5G,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,EAAE,OAAO,CAAC,CAAA;AAC9E,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,MAAM,oBAAoB,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;AACpF,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,eAAe,CAAC,CAAA"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../../src/types/core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,eAAe,EACf,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACtB,MAAM,mDAAmD,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAEtE,MAAM,MAAM,YAAY,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,eAAe,GACrB,oBAAoB,GACpB,eAAe,GACf,gBAAgB,GAChB,gBAAgB,GAChB,gBAAgB,GAChB,cAAc,GACd,eAAe,GACf,eAAe,GACf,mBAAmB,GACnB,mBAAmB,GACnB,cAAc,GACd,cAAc,GACd,eAAe,CAAA;AAErB,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,SAAS,CAAC,GAAG,SAAS,CAAC,MAAM,SAAS,CAAC,GAAG,UAAU,CAAC,MAAM,UAAU,CAAC,CAAA;AAC5G,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,EAAE,OAAO,CAAC,CAAA;AAC9E,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,MAAM,oBAAoB,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;AACpF,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,eAAe,CAAC,CAAA"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "react-native-unistyles",
-  "version": "2.8.0-rc.2",
+  "version": "2.8.0-rc.4",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
     "test:coverage": "jest --coverage",
     "tsc": "node_modules/typescript/bin/tsc --noEmit",
     "lint": "eslint . --ext .ts,.tsx",
-    "prepare": "husky install && bob build",
+    "prepare": "husky && bob build",
     "precommit": "concurrently 'yarn tsc' 'yarn lint' 'yarn test'",
     "release": "release-it"
   },
@@ -58,39 +58,39 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "18.4.3",
-    "@react-native/eslint-config": "0.74.0",
-    "@react-native/normalize-colors": "0.74.1",
+    "@commitlint/config-conventional": "19.2.2",
+    "@react-native/eslint-config": "0.74.84",
+    "@react-native/normalize-colors": "0.74.84",
     "@release-it/conventional-changelog": "8.0.1",
     "@testing-library/react-hooks": "8.0.1",
-    "@types/jest": "29.5.11",
-    "@types/react": "18.2.71",
-    "@typescript-eslint/eslint-plugin": "6.16.0",
-    "@typescript-eslint/eslint-plugin-tslint": "6.16.0",
-    "@typescript-eslint/parser": "6.16.0",
-    "commitlint": "18.4.3",
+    "@types/jest": "29.5.12",
+    "@types/react": "18.3.3",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/eslint-plugin-tslint": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
+    "commitlint": "19.3.0",
     "concurrently": "8.2.2",
-    "eslint": "8.56.0",
+    "eslint": "8.57.0",
     "eslint-config-codemask": "1.1.7",
-    "eslint-plugin-functional": "6.0.0",
+    "eslint-plugin-functional": "6.6.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsdoc": "46.10.1",
-    "eslint-plugin-jsx-a11y": "6.8.0",
+    "eslint-plugin-jsx-a11y": "6.9.0",
     "eslint-plugin-nested-if": "1.0.0",
     "eslint-plugin-no-else": "0.2.2",
-    "eslint-plugin-no-loops": "0.3.0",
+    "eslint-plugin-no-loops": "0.4.0",
     "eslint-plugin-prefer-arrow": "1.2.3",
-    "eslint-plugin-react": "7.33.2",
-    "eslint-plugin-react-hooks": "4.6.0",
-    "husky": "8.0.3",
+    "eslint-plugin-react": "7.34.3",
+    "eslint-plugin-react-hooks": "4.6.2",
+    "husky": "9.0.11",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "react": "18.2.0",
-    "react-native": "0.72.7",
+    "react": "18.3.1",
+    "react-native": "0.74.2",
     "react-native-builder-bob": "0.23.2",
-    "react-native-web": "0.19.9",
-    "react-test-renderer": "18.2.0",
-    "release-it": "17.0.1",
+    "react-native-web": "0.19.12",
+    "react-test-renderer": "18.3.1",
+    "release-it": "17.4.0",
     "typescript": "5.3.3"
   },
   "peerDependencies": {

package/src/types/core.ts

@@ -1,6 +1,6 @@
 import type {
     MatrixTransform,
-    PerpectiveTransform,
+    PerspectiveTransform,
     RotateTransform,
     RotateXTransform,
     RotateYTransform,
@@ -22,7 +22,7 @@ export type ShadowOffset = {
 }
 
 export type TransformStyles =
-    & PerpectiveTransform
+    & PerspectiveTransform
     & RotateTransform
     & RotateXTransform
     & RotateYTransform