@react-native/codegen 0.74.82 → 0.74.83

package/lib/generators/components/CppHelpers.js

@@ -122,6 +122,10 @@ function generateStructName(componentName, parts = []) {
 function getEnumMaskName(enumName) {
   return `${enumName}Mask`;
 }
+function getDefaultInitializerString(componentName, prop) {
+  const defaultValue = convertDefaultTypeToString(componentName, prop);
+  return `{${defaultValue}}`;
+}
 function convertDefaultTypeToString(componentName, prop) {
   const typeAnnotation = prop.typeAnnotation;
   switch (typeAnnotation.type) {
@@ -215,6 +219,7 @@ const IncludeTemplate = ({headerPrefix, file}) => {
   return `#include <${headerPrefix}${file}>`;
 };
 module.exports = {
+  getDefaultInitializerString,
   convertDefaultTypeToString,
   getCppArrayTypeForAnnotation,
   getCppTypeForAnnotation,

package/lib/generators/components/CppHelpers.js.flow

@@ -166,6 +166,14 @@ function getEnumMaskName(enumName: string): string {
   return `${enumName}Mask`;
 }
 
+function getDefaultInitializerString(
+  componentName: string,
+  prop: NamedShape<PropTypeAnnotation>,
+): string {
+  const defaultValue = convertDefaultTypeToString(componentName, prop);
+  return `{${defaultValue}}`;
+}
+
 function convertDefaultTypeToString(
   componentName: string,
   prop: NamedShape<PropTypeAnnotation>,
@@ -270,6 +278,7 @@ const IncludeTemplate = ({
 };
 
 module.exports = {
+  getDefaultInitializerString,
   convertDefaultTypeToString,
   getCppArrayTypeForAnnotation,
   getCppTypeForAnnotation,

package/lib/generators/components/GeneratePropsH.js

@@ -17,8 +17,8 @@ const _require2 = require('./ComponentsGeneratorUtils.js'),
   getLocalImports = _require2.getLocalImports,
   getNativeTypeFromAnnotation = _require2.getNativeTypeFromAnnotation;
 const _require3 = require('./CppHelpers.js'),
-  convertDefaultTypeToString = _require3.convertDefaultTypeToString,
   generateStructName = _require3.generateStructName,
+  getDefaultInitializerString = _require3.getDefaultInitializerString,
   getEnumMaskName = _require3.getEnumMaskName,
   toIntEnumValueName = _require3.toIntEnumValueName;
 
@@ -335,12 +335,19 @@ function generateEnumString(componentName, component) {
     .filter(Boolean)
     .join('\n');
 }
-function generatePropsString(componentName, props) {
+function generatePropsString(componentName, props, nameParts) {
   return props
     .map(prop => {
-      const nativeType = getNativeTypeFromAnnotation(componentName, prop, []);
-      const defaultValue = convertDefaultTypeToString(componentName, prop);
-      return `${nativeType} ${prop.name}{${defaultValue}};`;
+      const nativeType = getNativeTypeFromAnnotation(
+        componentName,
+        prop,
+        nameParts,
+      );
+      const defaultInitializer = getDefaultInitializerString(
+        componentName,
+        prop,
+      );
+      return `${nativeType} ${prop.name}${defaultInitializer};`;
     })
     .join('\n' + '  ');
 }
@@ -483,15 +490,11 @@ function generateStructs(componentName, properties, nameParts) {
 function generateStruct(structs, componentName, nameParts, properties) {
   const structNameParts = nameParts;
   const structName = generateStructName(componentName, structNameParts);
-  const fields = properties
-    .map(property => {
-      return `${getNativeTypeFromAnnotation(
-        componentName,
-        property,
-        structNameParts,
-      )} ${property.name};`;
-    })
-    .join('\n' + '  ');
+  const fields = generatePropsString(
+    componentName,
+    properties,
+    structNameParts,
+  );
   properties.forEach(property => {
     const name = property.name;
     switch (property.typeAnnotation.type) {
@@ -582,6 +585,7 @@ module.exports = {
             const propsString = generatePropsString(
               componentName,
               component.props,
+              [],
             );
             const extendString = getClassExtendString(component);
             const extendsImports = getExtendsImports(component.extendsProps);

package/lib/generators/components/GeneratePropsH.js.flow

@@ -23,8 +23,8 @@ const {
   getNativeTypeFromAnnotation,
 } = require('./ComponentsGeneratorUtils.js');
 const {
-  convertDefaultTypeToString,
   generateStructName,
+  getDefaultInitializerString,
   getEnumMaskName,
   toIntEnumValueName,
 } = require('./CppHelpers.js');
@@ -456,13 +456,21 @@ function generateEnumString(
 function generatePropsString(
   componentName: string,
   props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
+  nameParts: $ReadOnlyArray<string>,
 ) {
   return props
     .map(prop => {
-      const nativeType = getNativeTypeFromAnnotation(componentName, prop, []);
-      const defaultValue = convertDefaultTypeToString(componentName, prop);
+      const nativeType = getNativeTypeFromAnnotation(
+        componentName,
+        prop,
+        nameParts,
+      );
+      const defaultInitializer = getDefaultInitializerString(
+        componentName,
+        prop,
+      );
 
-      return `${nativeType} ${prop.name}{${defaultValue}};`;
+      return `${nativeType} ${prop.name}${defaultInitializer};`;
     })
     .join('\n' + '  ');
 }
@@ -629,16 +637,11 @@ function generateStruct(
 ): void {
   const structNameParts = nameParts;
   const structName = generateStructName(componentName, structNameParts);
-
-  const fields = properties
-    .map(property => {
-      return `${getNativeTypeFromAnnotation(
-        componentName,
-        property,
-        structNameParts,
-      )} ${property.name};`;
-    })
-    .join('\n' + '  ');
+  const fields = generatePropsString(
+    componentName,
+    properties,
+    structNameParts,
+  );
 
   properties.forEach((property: NamedShape<PropTypeAnnotation>) => {
     const name = property.name;
@@ -738,6 +741,7 @@ module.exports = {
             const propsString = generatePropsString(
               componentName,
               component.props,
+              [],
             );
             const extendString = getClassExtendString(component);
             const extendsImports = getExtendsImports(component.extendsProps);

package/lib/generators/components/__test_fixtures__/fixtures.js

@@ -854,6 +854,38 @@ const OBJECT_PROPS = {
                       default: 0,
                     },
                   },
+                  {
+                    name: 'stringUserDefaultProp',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'StringTypeAnnotation',
+                      default: 'user_default',
+                    },
+                  },
+                  {
+                    name: 'booleanUserDefaultProp',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'BooleanTypeAnnotation',
+                      default: true,
+                    },
+                  },
+                  {
+                    name: 'floatUserDefaultProp',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'FloatTypeAnnotation',
+                      default: 3.14,
+                    },
+                  },
+                  {
+                    name: 'intUserDefaultProp',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'Int32TypeAnnotation',
+                      default: 9999,
+                    },
+                  },
                   {
                     name: 'stringEnumProp',
                     optional: true,

package/lib/generators/components/__test_fixtures__/fixtures.js.flow

@@ -871,6 +871,38 @@ const OBJECT_PROPS: SchemaType = {
                       default: 0,
                     },
                   },
+                  {
+                    name: 'stringUserDefaultProp',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'StringTypeAnnotation',
+                      default: 'user_default',
+                    },
+                  },
+                  {
+                    name: 'booleanUserDefaultProp',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'BooleanTypeAnnotation',
+                      default: true,
+                    },
+                  },
+                  {
+                    name: 'floatUserDefaultProp',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'FloatTypeAnnotation',
+                      default: 3.14,
+                    },
+                  },
+                  {
+                    name: 'intUserDefaultProp',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'Int32TypeAnnotation',
+                      default: 9999,
+                    },
+                  },
                   {
                     name: 'stringEnumProp',
                     optional: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.74.82",
+  "version": "0.74.83",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {