diff --git a/packages/react-native/React/Tests/Text/RCTTextInputPropsTests.mm b/packages/react-native/React/Tests/Text/RCTTextInputPropsTests.mm new file mode 100644 index 000000000000..d8ec79366081 --- /dev/null +++ b/packages/react-native/React/Tests/Text/RCTTextInputPropsTests.mm @@ -0,0 +1,118 @@ +/* + * Copyright (c) Microsoft Corporation. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +// [macOS] + +#import + +#if TARGET_OS_OSX +#import + +#include +#include + +using namespace facebook::react; + +static TextInputProps textInputPropsFromDynamic(const folly::dynamic &value, const TextInputProps &sourceProps = {}) +{ + ContextContainer contextContainer; + PropsParserContext context{-1, contextContainer}; + RawPropsParser parser; + parser.prepare(); + RawProps rawProps{value}; + rawProps.parse(parser); + return TextInputProps{context, sourceProps, rawProps}; +} + +@interface RCTTextInputPropsTests : XCTestCase +@end + +@implementation RCTTextInputPropsTests + +- (void)testSubmitKeyModifiersAndClearText +{ + const auto props = textInputPropsFromDynamic( + folly::dynamic::object("clearTextOnSubmit", true)( + "submitKeyEvents", + folly::dynamic::array( + folly::dynamic::object("key", "Enter")("metaKey", true), + folly::dynamic::object("key", "F1")("altKey", true)("shiftKey", true)("ctrlKey", true)( + "functionKey", true)))); + + XCTAssertTrue(props.traits.clearTextOnSubmit); + XCTAssertEqual(props.traits.submitKeyEvents.size(), 2u); + if (props.traits.submitKeyEvents.size() != 2) { + return; + } + const auto &commandEnter = props.traits.submitKeyEvents[0]; + XCTAssertTrue(commandEnter.key == "Enter"); + XCTAssertTrue(commandEnter.metaKey); + XCTAssertFalse(commandEnter.altKey || commandEnter.shiftKey || commandEnter.ctrlKey || commandEnter.functionKey); + const auto &functionKey = props.traits.submitKeyEvents[1]; + XCTAssertTrue(functionKey.key == "F1"); + XCTAssertTrue(functionKey.altKey && functionKey.shiftKey && functionKey.ctrlKey && functionKey.functionKey); + XCTAssertFalse(functionKey.metaKey); +} + +- (void)testSubmitTraitsUpdatesAndRemoval +{ + const auto initial = textInputPropsFromDynamic( + folly::dynamic::object("clearTextOnSubmit", true)( + "submitKeyEvents", folly::dynamic::array(folly::dynamic::object("key", "Enter")("metaKey", true)))); + const auto unchanged = textInputPropsFromDynamic(folly::dynamic::object(), initial); + XCTAssertTrue(unchanged.traits.clearTextOnSubmit); + XCTAssertEqual(unchanged.traits.submitKeyEvents.size(), 1u); + + const auto updated = textInputPropsFromDynamic( + folly::dynamic::object("clearTextOnSubmit", false)( + "submitKeyEvents", folly::dynamic::array(folly::dynamic::object("key", "Enter")("shiftKey", true))), + initial); + XCTAssertFalse(updated.traits.clearTextOnSubmit); + XCTAssertEqual(updated.traits.submitKeyEvents.size(), 1u); + if (updated.traits.submitKeyEvents.size() == 1) { + XCTAssertTrue(updated.traits.submitKeyEvents[0].shiftKey); + XCTAssertFalse(updated.traits.submitKeyEvents[0].metaKey); + } + + const auto removed = textInputPropsFromDynamic( + folly::dynamic::object("clearTextOnSubmit", nullptr)("submitKeyEvents", nullptr), initial); + XCTAssertFalse(removed.traits.clearTextOnSubmit); + XCTAssertTrue(removed.traits.submitKeyEvents.empty()); + + const auto emptyKeys = + textInputPropsFromDynamic(folly::dynamic::object("submitKeyEvents", folly::dynamic::array()), initial); + XCTAssertTrue(emptyKeys.traits.clearTextOnSubmit); + XCTAssertTrue(emptyKeys.traits.submitKeyEvents.empty()); +} + +- (void)testPastedTypesSupportsStringsAndArrays +{ + const auto scalar = textInputPropsFromDynamic(folly::dynamic::object("pastedTypes", "string")); + XCTAssertTrue(scalar.traits.pastedTypes == std::vector{PastedTypesType::String}); + + const auto array = textInputPropsFromDynamic( + folly::dynamic::object("pastedTypes", folly::dynamic::array("fileUrl", "image", "string"))); + const std::vector expected{ + PastedTypesType::FileUrl, PastedTypesType::Image, PastedTypesType::String}; + XCTAssertTrue(array.traits.pastedTypes == expected); +} + +- (void)testInvalidPastedTypesUseDefault +{ + const auto initial = textInputPropsFromDynamic(folly::dynamic::object("pastedTypes", "image")); + for (const auto &invalid : + {folly::dynamic("unsupported"), + folly::dynamic::array("string", "unsupported"), + folly::dynamic(42), + folly::dynamic::array("string", 42)}) { + const auto props = textInputPropsFromDynamic(folly::dynamic::object("pastedTypes", invalid), initial); + XCTAssertTrue(props.traits.pastedTypes.empty()); + } +} + +@end +#endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/conversions.h index 1bf70009edca..dfbcda96a4f0 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/conversions.h @@ -11,6 +11,10 @@ #include #include +#if TARGET_OS_OSX // [macOS +#include +#endif // macOS] + namespace facebook::react { inline void fromRawValue(const PropsParserContext &context, const RawValue &value, AutocapitalizationType &result) @@ -213,6 +217,9 @@ inline void fromRawValue( const PropsParserContext &context, const RawValue &value, PastedTypesType &result) { + if (!value.hasType()) { + throw std::invalid_argument("Expected a string for pastedTypes"); + } auto string = (std::string)value; if (string == "fileUrl") { result = PastedTypesType::FileUrl; @@ -226,7 +233,7 @@ inline void fromRawValue( result = PastedTypesType::String; return; } - abort(); + throw std::invalid_argument("Unsupported pastedTypes value: " + string); } #endif // macOS] diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/propsConversions.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/propsConversions.h index dd85b06ea43c..bd744b0871da 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/propsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/propsConversions.h @@ -14,6 +14,13 @@ namespace facebook::react { +#if TARGET_OS_OSX // [macOS +inline void fromRawValue( + const PropsParserContext& context, + const RawValue& value, + std::vector& result); +#endif // macOS] + static TextInputTraits convertRawProp( const PropsParserContext &context, const RawProps &rawProps, @@ -77,6 +84,18 @@ static TextInputTraits convertRawProp( "pastedTypes", sourceTraits.pastedTypes, defaultTraits.pastedTypes); + traits.submitKeyEvents = convertRawProp( + context, + rawProps, + "submitKeyEvents", + sourceTraits.submitKeyEvents, + defaultTraits.submitKeyEvents); + traits.clearTextOnSubmit = convertRawProp( + context, + rawProps, + "clearTextOnSubmit", + sourceTraits.clearTextOnSubmit, + defaultTraits.clearTextOnSubmit); #endif // macOS] traits.dataDetectorTypes = convertRawProp(