Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing C++ include for prop conversion of complex array type #35984

Closed
wants to merge 1 commit into from
Closed

Add missing C++ include for prop conversion of complex array type #35984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type NativeProps = $ReadOnly<{|
edgeInsets?: $ReadOnlyArray<EdgeInsetsValue>,
sizes?: WithDefault<$ReadOnlyArray<'small' | 'large'>, 'small'>,
object?: $ReadOnlyArray<$ReadOnly<{|prop: string|}>>,
arrayOfObjects?: $ReadOnlyArray<$ReadOnly<{|prop1: Float, prop2: Int32|}>>,
|}>;

export default (codegenNativeComponent<NativeProps>(
Expand Down
3 changes: 2 additions & 1 deletion ...react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ ArrayPropsNativeComponentViewProps::ArrayPropsNativeComponentViewProps(
points(convertRawProp(context, rawProps, \\"points\\", sourceProps.points, {})),
edgeInsets(convertRawProp(context, rawProps, \\"edgeInsets\\", sourceProps.edgeInsets, {})),
sizes(convertRawProp(context, rawProps, \\"sizes\\", sourceProps.sizes, {static_cast<ArrayPropsNativeComponentViewSizesMask>(ArrayPropsNativeComponentViewSizes::Small)})),
object(convertRawProp(context, rawProps, \\"object\\", sourceProps.object, {}))
object(convertRawProp(context, rawProps, \\"object\\", sourceProps.object, {})),
arrayOfObjects(convertRawProp(context, rawProps, \\"arrayOfObjects\\", sourceProps.arrayOfObjects, {}))
{}

} // namespace react
Expand Down
34 changes: 34 additions & 0 deletions ...s/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Object {
#include <jsi/jsi.h>
#include <react/renderer/components/view/ViewProps.h>
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/core/propsConversions.h>
#include <react/renderer/graphics/Color.h>
#include <react/renderer/graphics/Point.h>
#include <react/renderer/graphics/RectangleEdges.h>
Expand Down Expand Up @@ -107,6 +108,38 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
}
}


struct ArrayPropsNativeComponentViewArrayOfObjectsStruct {
Float prop1;
int prop2;
};

static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentViewArrayOfObjectsStruct &result) {
auto map = (butter::map<std::string, RawValue>)value;

auto tmp_prop1 = map.find(\\"prop1\\");
if (tmp_prop1 != map.end()) {
fromRawValue(context, tmp_prop1->second, result.prop1);
}
auto tmp_prop2 = map.find(\\"prop2\\");
if (tmp_prop2 != map.end()) {
fromRawValue(context, tmp_prop2->second, result.prop2);
}
}

static inline std::string toString(const ArrayPropsNativeComponentViewArrayOfObjectsStruct &value) {
return \\"[Object ArrayPropsNativeComponentViewArrayOfObjectsStruct]\\";
}

static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, std::vector<ArrayPropsNativeComponentViewArrayOfObjectsStruct> &result) {
auto items = (std::vector<RawValue>)value;
for (const auto &item : items) {
ArrayPropsNativeComponentViewArrayOfObjectsStruct newItem;
fromRawValue(context, item, newItem);
result.emplace_back(newItem);
}
}

class JSI_EXPORT ArrayPropsNativeComponentViewProps final : public ViewProps {
public:
ArrayPropsNativeComponentViewProps() = default;
Expand All @@ -124,6 +157,7 @@ class JSI_EXPORT ArrayPropsNativeComponentViewProps final : public ViewProps {
std::vector<EdgeInsets> edgeInsets{};
ArrayPropsNativeComponentViewSizesMask sizes{static_cast<ArrayPropsNativeComponentViewSizesMask>(ArrayPropsNativeComponentViewSizes::Small)};
std::vector<ArrayPropsNativeComponentViewObjectStruct> object{};
std::vector<ArrayPropsNativeComponentViewArrayOfObjectsStruct> arrayOfObjects{};
};

} // namespace react
Expand Down
3 changes: 3 additions & 0 deletions ...ive-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ public class ArrayPropsNativeComponentViewManagerDelegate<T extends View, U exte
case \\"object\\":
mViewManager.setObject(view, (ReadableArray) value);
break;
case \\"arrayOfObjects\\":
mViewManager.setArrayOfObjects(view, (ReadableArray) value);
break;
default:
super.setProperty(view, propName, value);
}
Expand Down
1 change: 1 addition & 0 deletions ...ve-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsJavaInterface-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public interface ArrayPropsNativeComponentViewManagerInterface<T extends View> {
void setEdgeInsets(T view, @Nullable ReadableArray value);
void setSizes(T view, @Nullable ReadableArray value);
void setObject(T view, @Nullable ReadableArray value);
void setArrayOfObjects(T view, @Nullable ReadableArray value);
}
",
}
Expand Down
1 change: 1 addition & 0 deletions ...t-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const __INTERNAL_VIEW_CONFIG = {
edgeInsets: true,
sizes: true,
object: true,
arrayOfObjects: true,
},
};

Expand Down
3 changes: 3 additions & 0 deletions packages/react-native-codegen/src/generators/components/ComponentsGeneratorUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,11 @@ function getLocalImports(
typeAnnotation.type === 'ArrayTypeAnnotation' &&
typeAnnotation.elementType.type === 'ObjectTypeAnnotation'
) {
imports.add('#include <react/renderer/core/propsConversions.h>');
const objectProps = typeAnnotation.elementType.properties;
// $FlowFixMe[incompatible-call] the type is guaranteed to be ObjectTypeAnnotation<PropTypeAnnotation>
const objectImports = getImports(objectProps);
// $FlowFixMe[incompatible-call] the type is guaranteed to be ObjectTypeAnnotation<PropTypeAnnotation>
const localImports = getLocalImports(objectProps);
// $FlowFixMe[method-unbinding] added when improving typing for this parameters
objectImports.forEach(imports.add, imports);
Expand Down
2 changes: 2 additions & 0 deletions ...ive-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Map {
#include <jsi/jsi.h>
#include <react/renderer/components/view/ViewProps.h>
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/core/propsConversions.h>
#include <react/renderer/graphics/Color.h>
#include <react/renderer/graphics/Point.h>
#include <react/renderer/imagemanager/primitives.h>
Expand Down Expand Up @@ -234,6 +235,7 @@ Map {
#include <react/renderer/components/image/conversions.h>
#include <react/renderer/components/view/ViewProps.h>
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/core/propsConversions.h>
#include <react/renderer/graphics/Color.h>
#include <react/renderer/graphics/Point.h>
#include <react/renderer/imagemanager/primitives.h>
Expand Down