diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm index d53eee5271d..95142a605c0 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm @@ -216,7 +216,7 @@ UITextContentType RCTUITextContentTypeFromString(const std::string &contentType) @"oneTimeCode" : UITextContentTypeOneTimeCode, }]; - if (@available(iOS 15.0, *)) { + if (@available(iOS 15.0, tvOS 15.0, *)) { [mutableContentTypeMap addEntriesFromDictionary:@{ @"dateTime" : UITextContentTypeDateTime, @"flightNumber" : UITextContentTypeFlightNumber, diff --git a/packages/react-native/React/Fabric/RCTSurfacePointerHandler.mm b/packages/react-native/React/Fabric/RCTSurfacePointerHandler.mm index fe00a0b3e95..e0078c094a3 100644 --- a/packages/react-native/React/Fabric/RCTSurfacePointerHandler.mm +++ b/packages/react-native/React/Fabric/RCTSurfacePointerHandler.mm @@ -301,17 +301,21 @@ static PointerEvent CreatePointerEventFromActivePointer( event.pressure = activePointer.force; - if (activePointer.touchType == UITouchTypeIndirectPointer) { - // pointer events with a mouse button pressed should report a pressure of 0.5 - // when the touch is down and 0.0 when it is lifted regardless of how it is reported by the OS - event.pressure = eventType != RCTPointerEventTypeEnd ? 0.5 : 0.0; + if (@available(iOS 13.4, tvOS 13.4, *)) { + if (activePointer.touchType == UITouchTypeIndirectPointer) { + // pointer events with a mouse button pressed should report a pressure of 0.5 + // when the touch is down and 0.0 when it is lifted regardless of how it is reported by the OS + event.pressure = eventType != RCTPointerEventTypeEnd ? 0.5 : 0.0; + } } CGFloat pointerSize = activePointer.majorRadius * 2.0; - if (activePointer.touchType == UITouchTypeIndirectPointer) { - // mouse type pointers should always report a size of 1 - pointerSize = 1.0; + if (@available(iOS 13.4, tvOS 13.4, *)) { + if (activePointer.touchType == UITouchTypeIndirectPointer) { + // mouse type pointers should always report a size of 1 + pointerSize = 1.0; + } } event.width = pointerSize; diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h index d35201e352a..1687206f1c2 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h @@ -49,13 +49,13 @@ inline static NSLineBreakStrategy RCTNSLineBreakStrategyFromLineBreakStrategy( case facebook::react::LineBreakStrategy::PushOut: return NSLineBreakStrategyPushOut; case facebook::react::LineBreakStrategy::HangulWordPriority: - if (@available(iOS 14.0, *)) { + if (@available(iOS 14.0, tvOS 14.0, *)) { return NSLineBreakStrategyHangulWordPriority; } else { return NSLineBreakStrategyNone; } case facebook::react::LineBreakStrategy::Standard: - if (@available(iOS 14.0, *)) { + if (@available(iOS 14.0, tvOS 14.0, *)) { return NSLineBreakStrategyStandard; } else { return NSLineBreakStrategyNone;