paper support

Author: kligarski

ios/bottom-tabs/RCTConvert+RNSBottomTabs.h

@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (RNSBottomTabsIconType)RNSBottomTabsIconType:(nonnull id)json;
 
++ (RNSOrientation)RNSOrientation:(nonnull id)json;
+
 @end
 
 NS_ASSUME_NONNULL_END

ios/bottom-tabs/RCTConvert+RNSBottomTabs.mm

@@ -12,13 +12,27 @@ + (UIOffset)UIOffset:(id)json;
 RCT_ENUM_CONVERTER(
   RNSBottomTabsIconType,
   (@{
-    @"image": @(RNSBottomTabsIconTypeImage),
-    @"template": @(RNSBottomTabsIconTypeTemplate),
-    @"sfSymbol": @(RNSBottomTabsIconTypeSfSymbol),
+    @"image" : @(RNSBottomTabsIconTypeImage),
+    @"template" : @(RNSBottomTabsIconTypeTemplate),
+    @"sfSymbol" : @(RNSBottomTabsIconTypeSfSymbol),
   }),
   RNSBottomTabsIconTypeSfSymbol,
-  integerValue
-)
+  integerValue)
+
+RCT_ENUM_CONVERTER(
+  RNSOrientation,
+  (@{
+    @"inherit" : @(RNSOrientationInherit),
+    @"all" : @(RNSOrientationAll),
+    @"allButUpsideDown" : @(RNSOrientationAllButUpsideDown),
+    @"portrait" : @(RNSOrientationPortrait),
+    @"portraitUpsideDown" : @(RNSOrientationPortraitUpsideDown),
+    @"landscape" : @(RNSOrientationLandscape),
+    @"landscapeLeft" : @(RNSOrientationLandscapeLeft),
+    @"landscapeRight" : @(RNSOrientationLandscapeRight),
+  }),
+  RNSOrientationInherit,
+  integerValue)
 
 @end
 

ios/bottom-tabs/RNSBottomTabsScreenComponentView.mm

@@ -30,6 +30,7 @@ @implementation RNSBottomTabsScreenComponentView {
   BOOL _isOverrideScrollViewContentInsetAdjustmentBehaviorSet;
 #if !RCT_NEW_ARCH_ENABLED
   BOOL _tabItemNeedsAppearanceUpdate;
+  BOOL _tabScreenOrientationNeedsUpdate;
 #endif // !RCT_NEW_ARCH_ENABLED
 }
 
@@ -56,6 +57,7 @@ - (void)initState
 
 #if !RCT_NEW_ARCH_ENABLED
   _tabItemNeedsAppearanceUpdate = NO;
+  _tabScreenOrientationNeedsUpdate = NO;
 #endif
   [self resetProps];
 }
@@ -85,7 +87,7 @@ - (void)resetProps
 
   _overrideScrollViewContentInsetAdjustmentBehavior = YES;
   _isOverrideScrollViewContentInsetAdjustmentBehaviorSet = NO;
-  
+
   _iconType = RNSBottomTabsIconTypeSfSymbol;
 
   _iconImageSource = nil;
@@ -145,7 +147,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     _title = RCTNSStringFromStringNilIfEmpty(newComponentProps.title);
     _controller.title = _title;
   }
-  
+
   if (newComponentProps.orientation != oldComponentProps.orientation) {
     _orientation = rnscreens::conversion::RNSOrientationFromRNSBottomTabsScreenOrientation(newComponentProps.orientation);
     tabScreenOrientationNeedsUpdate = YES;
@@ -235,7 +237,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
         rnscreens::conversion::RCTImageSourceFromImageSourceAndIconType(&newComponentProps.iconImageSource, _iconType);
     tabItemNeedsAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.iconSfSymbolName != oldComponentProps.iconSfSymbolName) {
     _iconSfSymbolName = RCTNSStringFromStringNilIfEmpty(newComponentProps.iconSfSymbolName);
     tabItemNeedsAppearanceUpdate = YES;
@@ -246,7 +248,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
         rnscreens::conversion::RCTImageSourceFromImageSourceAndIconType(&newComponentProps.selectedIconImageSource, _iconType);
     tabItemNeedsAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.selectedIconSfSymbolName != oldComponentProps.selectedIconSfSymbolName) {
     _selectedIconSfSymbolName = RCTNSStringFromStringNilIfEmpty(newComponentProps.selectedIconSfSymbolName);
     tabItemNeedsAppearanceUpdate = YES;
@@ -283,7 +285,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
   if (tabItemNeedsAppearanceUpdate) {
     [_controller tabItemAppearanceHasChanged];
   }
-  
+
   if (tabScreenOrientationNeedsUpdate) {
     [_controller tabScreenOrientationHasChanged];
   }
@@ -342,6 +344,11 @@ - (void)didSetProps:(NSArray<NSString *> *)changedProps
     [_controller tabItemAppearanceHasChanged];
     _tabItemNeedsAppearanceUpdate = NO;
   }
+
+  if (_tabScreenOrientationNeedsUpdate) {
+    [_controller tabScreenOrientationHasChanged];
+    _tabScreenOrientationNeedsUpdate = NO;
+  }
 }
 
 #pragma mark - LEGACY prop setters
@@ -455,6 +462,12 @@ - (void)setSelectedIconSfSymbolName:(NSString *)selectedIconSfSymbolName
   _tabItemNeedsAppearanceUpdate = YES;
 }
 
+- (void)setOrientation:(RNSOrientation)orientation
+{
+  _orientation = orientation;
+  _tabScreenOrientationNeedsUpdate = YES;
+}
+
 - (void)setOnWillAppear:(RCTDirectEventBlock)onWillAppear
 {
   [self.reactEventEmitter setOnWillAppear:onWillAppear];

ios/bottom-tabs/RNSBottomTabsScreenComponentViewManager.mm

@@ -21,6 +21,7 @@ - (UIView *)view
 
 RCT_REMAP_VIEW_PROPERTY(isFocused, isSelectedScreen, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(title, NSString);
+RCT_EXPORT_VIEW_PROPERTY(orientation, RNSOrientation);
 RCT_EXPORT_VIEW_PROPERTY(badgeValue, NSString);
 RCT_EXPORT_VIEW_PROPERTY(tabBarBackgroundColor, UIColor);
 RCT_EXPORT_VIEW_PROPERTY(tabBarBlurEffect, UIBlurEffect); // needs custom conversion, cause it has `none`

ios/bottom-tabs/RNSTabBarController.mm

@@ -74,6 +74,10 @@ - (void)setNeedsUpdateOfTabBarAppearance:(bool)needsUpdateOfTabBarAppearance
 - (void)setNeedsOrientationUpdate:(bool)needsOrientationUpdate
 {
   _needsOrientationUpdate = needsOrientationUpdate;
+#if !RCT_NEW_ARCH_ENABLED
+  [self scheduleControllerUpdateIfNeeded];
+#endif // !RCT_NEW_ARCH_ENABLED
+
 }
 
 #pragma mark-- RNSReactTransactionObserving