diff --git a/FlipperKit.podspec b/FlipperKit.podspec index 73d869c2f..ee46dc047 100644 --- a/FlipperKit.podspec +++ b/FlipperKit.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |spec| spec.source = { :git => 'https://github.com/facebook/Sonar.git', :tag=> "v"+flipperkit_version } spec.module_name = 'FlipperKit' - spec.platforms = { :ios => "10.0" } + spec.platforms = { :ios => "9.0" } spec.default_subspecs = "Core" # This subspec is necessary since FBDefines.h is imported as diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm index 7ad170dbd..0a6bc759e 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm @@ -225,7 +225,7 @@ static NSDictionary* YGUnitEnumMap = nil; - (NSDictionary*)dataMutationsForNode: (UIView*)node { - return @{ + NSDictionary* dataMutations = @{ // UIView @"UIView.alpha" : ^(NSNumber* value){ node.alpha = [value floatValue]; @@ -453,9 +453,6 @@ static NSDictionary* YGUnitEnumMap = nil; @"Accessibility.accessibilityTraits.UIAccessibilityTraitCausesPageTurn": ^(NSNumber *value) { node.accessibilityTraits = AccessibilityTraitsToggle(node.accessibilityTraits, UIAccessibilityTraitCausesPageTurn, [value boolValue]); }, - @"Accessibility.accessibilityTraits.UIAccessibilityTraitTabBar": ^(NSNumber *value) { - node.accessibilityTraits = AccessibilityTraitsToggle(node.accessibilityTraits, UIAccessibilityTraitTabBar, [value boolValue]); - }, @"Accessibility.accessibilityViewIsModal": ^(NSNumber *value) { node.accessibilityViewIsModal = [value boolValue]; }, @@ -464,6 +461,20 @@ static NSDictionary* YGUnitEnumMap = nil; }, } ; +if (@available(iOS 10.0, *)) { + NSMutableDictionary* latestDataMutations = + [dataMutations mutableCopy]; + latestDataMutations + [@"Accessibility.accessibilityTraits.UIAccessibilityTraitTabBar"] = + ^(NSNumber* value) { + node.accessibilityTraits = AccessibilityTraitsToggle( + node.accessibilityTraits, + UIAccessibilityTraitTabBar, + [value boolValue]); + }; + dataMutations = latestDataMutations; +} +return dataMutations; } - (NSArray*>*)attributesForNode:(UIView*)node { diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index 29d2762f3..a49cd424f 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -3,7 +3,7 @@ source 'https://github.com/facebook/Sonar.git' source 'https://github.com/CocoaPods/Specs' target 'Sample' do - platform :ios, '10.0' + platform :ios, '9.0' pod 'FlipperKit', :path => '../../FlipperKit.podspec' pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', :path => '../../FlipperKit.podspec' pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec'