diff --git a/packages/react-native-codegen/buck_tests/java/FloatPropsNativeComponentViewManager.java b/packages/react-native-codegen/buck_tests/java/FloatPropsNativeComponentViewManager.java index 0bdd5736d08..87d716f5a48 100644 --- a/packages/react-native-codegen/buck_tests/java/FloatPropsNativeComponentViewManager.java +++ b/packages/react-native-codegen/buck_tests/java/FloatPropsNativeComponentViewManager.java @@ -1,6 +1,7 @@ package com.facebook.react.uimanager; import android.view.ViewGroup; +import androidx.annotation.Nullable; import com.facebook.react.viewmanagers.FloatPropsNativeComponentViewManagerDelegate; import com.facebook.react.viewmanagers.FloatPropsNativeComponentViewManagerInterface; @@ -41,4 +42,7 @@ public class FloatPropsNativeComponentViewManager extends SimpleViewManager, blurRadius5?: WithDefault, blurRadius6?: WithDefault, + blurRadiusNullable?: WithDefault, |}>; export default (codegenNativeComponent( diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js index b6f2d355cfb..7c71f4c2511 100644 --- a/packages/react-native-codegen/src/CodegenSchema.js +++ b/packages/react-native-codegen/src/CodegenSchema.js @@ -103,7 +103,7 @@ type PropTypeTypeAnnotation = |}> | $ReadOnly<{| type: 'FloatTypeAnnotation', - default: number, + default: number | null, |}> | $ReadOnly<{| type: 'Int32TypeAnnotation', diff --git a/packages/react-native-codegen/src/generators/components/CppHelpers.js b/packages/react-native-codegen/src/generators/components/CppHelpers.js index 825d351fa90..2d2aac5458c 100644 --- a/packages/react-native-codegen/src/generators/components/CppHelpers.js +++ b/packages/react-native-codegen/src/generators/components/CppHelpers.js @@ -138,8 +138,11 @@ function convertDefaultTypeToString( : String(typeAnnotation.default); case 'FloatTypeAnnotation': const defaultFloatVal = typeAnnotation.default; + if (defaultFloatVal == null) { + return ''; + } return parseInt(defaultFloatVal, 10) === defaultFloatVal - ? typeAnnotation.default.toFixed(1) + ? defaultFloatVal.toFixed(1) : String(typeAnnotation.default); case 'NativePrimitiveTypeAnnotation': switch (typeAnnotation.name) { diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js index c7007f2f462..59bd6fce018 100644 --- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js +++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js @@ -94,7 +94,9 @@ function getJavaValueForProp( return 'value == null ? Double.NaN : ((Double) value).doubleValue()'; } case 'FloatTypeAnnotation': - if (prop.optional) { + if (typeAnnotation.default === null) { + return 'value == null ? null : ((Double) value).floatValue()'; + } else if (prop.optional) { return `value == null ? ${ typeAnnotation.default }f : ((Double) value).floatValue()`; diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js index 632d7756fef..a50796c7525 100644 --- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js +++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js @@ -66,7 +66,12 @@ function getJavaValueForProp(prop: PropTypeShape, imports): string { case 'DoubleTypeAnnotation': return 'double value'; case 'FloatTypeAnnotation': - return 'float value'; + if (typeAnnotation.default === null) { + addNullable(imports); + return '@Nullable Float value'; + } else { + return 'float value'; + } case 'NativePrimitiveTypeAnnotation': switch (typeAnnotation.name) { case 'ColorPrimitive': diff --git a/packages/react-native-codegen/src/generators/components/GenerateTests.js b/packages/react-native-codegen/src/generators/components/GenerateTests.js index 07c140745c3..213ee3ba4d2 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateTests.js +++ b/packages/react-native-codegen/src/generators/components/GenerateTests.js @@ -81,7 +81,7 @@ function getTestCasesForProp(propName, typeAnnotation) { } else if (typeAnnotation.type === 'FloatTypeAnnotation') { cases.push({ propName, - propValue: typeAnnotation.default || 0.1, + propValue: typeAnnotation.default != null ? typeAnnotation.default : 0.1, }); } else if (typeAnnotation.type === 'NativePrimitiveTypeAnnotation') { if (typeAnnotation.name === 'ColorPrimitive') { diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap index 13145efd27b..3dde0c3eba6 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap @@ -356,7 +356,7 @@ TEST(FloatPropNativeComponentProps_blurRadius, etc) { auto propParser = RawPropsParser(); propParser.prepare(); auto const &sourceProps = FloatPropNativeComponentProps(); - auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius\\", 0.1)); + auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius\\", 0)); rawProps.parse(propParser); FloatPropNativeComponentProps(sourceProps, rawProps); } @@ -383,7 +383,7 @@ TEST(FloatPropNativeComponentProps_blurRadius4, etc) { auto propParser = RawPropsParser(); propParser.prepare(); auto const &sourceProps = FloatPropNativeComponentProps(); - auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius4\\", 0.1)); + auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius4\\", 0)); rawProps.parse(propParser); FloatPropNativeComponentProps(sourceProps, rawProps); } @@ -401,7 +401,7 @@ TEST(FloatPropNativeComponentProps_blurRadius6, etc) { auto propParser = RawPropsParser(); propParser.prepare(); auto const &sourceProps = FloatPropNativeComponentProps(); - auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius6\\", 0.1)); + auto const &rawProps = RawProps(folly::dynamic::object(\\"blurRadius6\\", 0)); rawProps.parse(propParser); FloatPropNativeComponentProps(sourceProps, rawProps); }", diff --git a/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js index 2fffe662bd4..03bf58eeaaa 100644 --- a/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js +++ b/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js @@ -237,6 +237,10 @@ type ModuleProps = $ReadOnly<{| float_optional_key?: WithDefault, float_optional_both?: WithDefault, + // Float props, null default + float_null_optional_key?: WithDefault, + float_null_optional_both?: WithDefault, + // Int32 props int32_required: Int32, int32_optional_key?: WithDefault, diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap index bd8d1af326f..836afa2b970 100644 --- a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap +++ b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap @@ -217,6 +217,22 @@ Object { "type": "FloatTypeAnnotation", }, }, + Object { + "name": "float_null_optional_key", + "optional": true, + "typeAnnotation": Object { + "default": null, + "type": "FloatTypeAnnotation", + }, + }, + Object { + "name": "float_null_optional_both", + "optional": true, + "typeAnnotation": Object { + "default": null, + "type": "FloatTypeAnnotation", + }, + }, Object { "name": "int32_required", "optional": false, diff --git a/packages/react-native-codegen/src/parsers/flow/components/props.js b/packages/react-native-codegen/src/parsers/flow/components/props.js index 7a0c1bf64bb..ef8163f95a6 100644 --- a/packages/react-native-codegen/src/parsers/flow/components/props.js +++ b/packages/react-native-codegen/src/parsers/flow/components/props.js @@ -242,7 +242,9 @@ function getTypeAnnotation( case 'Float': return { type: 'FloatTypeAnnotation', - default: ((defaultValue ? defaultValue : 0): number), + default: withNullDefault + ? (defaultValue: number | null) + : ((defaultValue ? defaultValue : 0): number), }; case 'BooleanTypeAnnotation': return { @@ -378,16 +380,6 @@ function buildPropSchema(property, types: TypeMap): ?PropTypeShape { : typeAnnotation.type; if (defaultValueType === 'NullLiteralTypeAnnotation') { - if ( - type !== 'StringTypeAnnotation' && - type !== 'Stringish' && - type !== 'BooleanTypeAnnotation' - ) { - throw new Error( - `WithDefault can only provide a 'null' default value for string and boolean types (see ${name})`, - ); - } - defaultValue = null; withNullDefault = true; }