Merge branch 'master' into release

Author: M-i-k-e-l

demo/package.json

@@ -18,7 +18,7 @@
     "light-date": "^1.2.0"
   },
   "devDependencies": {
-    "react-native-ui-lib": "7.46.3-snapshot.7426",
+    "react-native-ui-lib": "8.0.0",
     "shell-utils": "^1.0.10"
   },
   "peerDependencies": {

docuilib/package.json

@@ -48,7 +48,7 @@
     "react-dom": "18.3.1",
     "react-native-linear-gradient": "2.6.2",
     "react-native-shimmer-placeholder": "^2.0.9",
-    "react-native-ui-lib": "7.46.3-snapshot.7426",
+    "react-native-ui-lib": "8.0.0",
     "shell-utils": "^1.0.10",
     "typescript": "~5.2.2"
   },

docuilib/yarn.lock

@@ -11293,9 +11293,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-ui-lib@npm:7.46.3-snapshot.7426":
-  version: 7.46.3-snapshot.7426
-  resolution: "react-native-ui-lib@npm:7.46.3-snapshot.7426"
+"react-native-ui-lib@npm:8.0.0":
+  version: 8.0.0
+  resolution: "react-native-ui-lib@npm:8.0.0"
   dependencies:
     babel-plugin-transform-inline-environment-variables: ^0.0.2
     color: ^3.1.0
@@ -11318,8 +11318,8 @@ __metadata:
     react-native-gesture-handler: ">=2.24.0"
     react-native-reanimated: ">=3.17.5"
     react-native-ui-lib: "*"
-    uilib-native: 5.0.0-snapshot.7390
-  checksum: 3505464044b97fa9c35525fa54063e6a4f9ad116baa4e7a50718e6bb468eaf2b318fb1dbbe8a715859da0a1249f8b3f0c0211e192676e8c61eac7ff4f4f84726
+    uilib-native: 5.0.0
+  checksum: fbed64ac48b08ecd79f5c45f0ab4fd4faaf276ea6ede3860c5694a3ee3f5f29c3e93eb949e200957f6cfdea2e9bffee61bfc5b2a485f78cbaf86ed38a5763e08
   languageName: node
   linkType: hard
 
@@ -13187,7 +13187,7 @@ __metadata:
     react-html-parser: ^2.0.2
     react-native-linear-gradient: 2.6.2
     react-native-shimmer-placeholder: ^2.0.9
-    react-native-ui-lib: 7.46.3-snapshot.7426
+    react-native-ui-lib: 8.0.0
     react-native-web: ^0.19.12
     sass: ^1.39.0
     shell-utils: ^1.0.10

expoDemo/package.json

@@ -27,9 +27,9 @@
     "react-native-screens": "~3.20.0",
     "react-native-svg": "15.11.2",
     "react-native-svg-transformer": "1.5.0",
-    "react-native-ui-lib": "7.46.3-snapshot.7426",
+    "react-native-ui-lib": "8.0.0",
     "react-native-web": "~0.18.12",
-    "unicorn-demo-app": "7.46.3-snapshot.7426"
+    "unicorn-demo-app": "8.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m

@@ -207,7 +207,9 @@ - (void)initializeAccessoryViewsAndHandleInsets
         {
             if(_scrollViewToManage == nil)
             {
-                if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"]) {
+                if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"] &&
+                    subview.superview != self) {
+                    
                     UIScrollView *scrollView = [self extractUIScrollView:subview];
 
                     if ([scrollView isKindOfClass:[UIScrollView class]])
@@ -434,9 +436,7 @@ - (NSArray*)getAllReactSubviewsForView:(UIView*)view
 
 - (void)_updateScrollViewInsets
 {
-    // Because our view is now being transformed inside it's superview (from RN77 it inherited a RCTLegacyViewManagerInteropComponentView as superview) we no longer need the scrollview to also update because it's inside our view
-    return;
-    /*if(self.scrollViewToManage != nil)
+    if(self.scrollViewToManage != nil)
     {
         UIEdgeInsets insets = self.scrollViewToManage.contentInset;
         CGFloat bottomSafeArea = [self getBottomSafeArea];
@@ -483,7 +483,7 @@ - (void)_updateScrollViewInsets
             insets.bottom = bottomInset;
         }
         self.scrollViewToManage.scrollIndicatorInsets = insets;
-    }*/
+    }
 }
 
 #pragma mark - bottom view

lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "homepage": "https://github.com/wix/react-native-ui-lib",
   "description": "uilib native components (separated from js components)",
   "main": "components/index",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ui-lib",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "main": "src/index.ts",
   "types": "src/index.d.ts",
   "author": "Ethan Sharabi <[email protected]>",
@@ -129,15 +129,15 @@
     "setimmediate": "^1.0.5",
     "shell-utils": "^1.0.10",
     "typescript": "5.0.4",
-    "uilib-native": "5.0.0"
+    "uilib-native": "5.0.1"
   },
   "peerDependencies": {
     "react": ">=18.3.1",
     "react-native": ">=0.77.3",
     "react-native-gesture-handler": ">=2.24.0",
     "react-native-reanimated": ">=3.17.5",
     "react-native-ui-lib": "*",
-    "uilib-native": "5.0.0"
+    "uilib-native": "^5.0.1"
   },
   "jest": {
     "preset": "react-native",

src/incubator/toast/index.tsx

@@ -29,7 +29,7 @@ const Toast = (props: PropsWithChildren<ToastProps>) => {
     icon,
     iconColor,
     preset,
-    zIndex = Constants.isAndroid ? 100 : undefined,
+    zIndex = 100,
     elevation,
     style,
     containerStyle,

webDemo/package.json

@@ -28,7 +28,7 @@
     "react-native-shimmer-placeholder": "^2.0.8",
     "react-native-svg": "15.11.2",
     "react-native-svg-transformer": "1.5.0",
-    "react-native-ui-lib": "7.46.3-snapshot.7426",
+    "react-native-ui-lib": "8.0.0",
     "react-native-web": "^0.18.6",
     "typescript": "^4.4.2"
   },

yarn.lock

@@ -9777,7 +9777,7 @@ __metadata:
     shell-utils: ^1.0.10
     tinycolor2: ^1.4.2
     typescript: 5.0.4
-    uilib-native: 5.0.0
+    uilib-native: 5.0.1
     url-parse: ^1.2.0
     wix-react-native-text-size: 1.0.9
   peerDependencies:
@@ -9786,7 +9786,7 @@ __metadata:
     react-native-gesture-handler: ">=2.24.0"
     react-native-reanimated: ">=3.17.5"
     react-native-ui-lib: "*"
-    uilib-native: 5.0.0
+    uilib-native: ^5.0.1
   languageName: unknown
   linkType: soft
 
@@ -11344,16 +11344,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uilib-native@npm:5.0.0":
-  version: 5.0.0
-  resolution: "uilib-native@npm:5.0.0"
+"uilib-native@npm:5.0.1":
+  version: 5.0.1
+  resolution: "uilib-native@npm:5.0.1"
   dependencies:
     lodash: ^4.17.21
     prop-types: ^15.5.10
   peerDependencies:
     react: ">=18.3.1"
     react-native: ">=0.77.3"
-  checksum: 2f8c8eec6957c21be3c67f83bb8e73b6d4e6fd94afb066c3ae28a38c7c46930f24783922d1ea53f090e810eeea31337b21b7fddf4a84b3d853ca936c498dc570
+  checksum: d8b063c9915208dc0230dc3708c65095b3eef0ad4bf3ee41606814ee005e03fcc98f988a0ddbc400fe8f12a218bbfcb119d10bba6aa5e851c219729cd401e940
   languageName: node
   linkType: hard