diff --git a/packages/react-native/React/Views/RCTViewManager.m b/packages/react-native/React/Views/RCTViewManager.m index 2409b105054..7de48d0b687 100644 --- a/packages/react-native/React/Views/RCTViewManager.m +++ b/packages/react-native/React/Views/RCTViewManager.m @@ -541,6 +541,48 @@ RCT_EXPORT_SHADOW_PROPERTY(marginVertical, YGValue) RCT_EXPORT_SHADOW_PROPERTY(marginHorizontal, YGValue) RCT_EXPORT_SHADOW_PROPERTY(margin, YGValue) +RCT_CUSTOM_SHADOW_PROPERTY(marginBlock, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(marginBlockEnd, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(marginBlockStart, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(marginInline, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(marginInlineEnd, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(marginInlineStart, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + RCT_EXPORT_SHADOW_PROPERTY(paddingTop, YGValue) RCT_EXPORT_SHADOW_PROPERTY(paddingRight, YGValue) RCT_EXPORT_SHADOW_PROPERTY(paddingBottom, YGValue) @@ -551,6 +593,48 @@ RCT_EXPORT_SHADOW_PROPERTY(paddingVertical, YGValue) RCT_EXPORT_SHADOW_PROPERTY(paddingHorizontal, YGValue) RCT_EXPORT_SHADOW_PROPERTY(padding, YGValue) +RCT_CUSTOM_SHADOW_PROPERTY(paddingBlock, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(paddingBlockEnd, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(paddingBlockStart, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(paddingInline, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(paddingInlineEnd, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + +RCT_CUSTOM_SHADOW_PROPERTY(paddingInlineStart, YGValue, RCTView) +{ + // Property is only to be used in the new renderer. + // It is necessary to add it here, otherwise it gets + // filtered by view configs. +} + RCT_EXPORT_SHADOW_PROPERTY(flex, float) RCT_EXPORT_SHADOW_PROPERTY(flexGrow, float) RCT_EXPORT_SHADOW_PROPERTY(flexShrink, float) diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index cac35c4f803..1a9012d3ae6 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -4150,12 +4150,16 @@ public class com/facebook/react/uimanager/LayoutShadowNode : com/facebook/react/ public fun setInsetInline (ILcom/facebook/react/bridge/Dynamic;)V public fun setJustifyContent (Ljava/lang/String;)V public fun setLayoutConformance (Ljava/lang/String;)V + public fun setMarginBlock (ILcom/facebook/react/bridge/Dynamic;)V + public fun setMarginInline (ILcom/facebook/react/bridge/Dynamic;)V public fun setMargins (ILcom/facebook/react/bridge/Dynamic;)V public fun setMaxHeight (Lcom/facebook/react/bridge/Dynamic;)V public fun setMaxWidth (Lcom/facebook/react/bridge/Dynamic;)V public fun setMinHeight (Lcom/facebook/react/bridge/Dynamic;)V public fun setMinWidth (Lcom/facebook/react/bridge/Dynamic;)V public fun setOverflow (Ljava/lang/String;)V + public fun setPaddingBlock (ILcom/facebook/react/bridge/Dynamic;)V + public fun setPaddingInline (ILcom/facebook/react/bridge/Dynamic;)V public fun setPaddings (ILcom/facebook/react/bridge/Dynamic;)V public fun setPosition (Ljava/lang/String;)V public fun setPositionValues (ILcom/facebook/react/bridge/Dynamic;)V diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java index d627a07dbb2..eca5c86f87b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java @@ -717,6 +717,46 @@ public class LayoutShadowNode extends ReactShadowNodeImpl { } } + @ReactPropGroup( + names = { + "marginBlock", + "marginBlockEnd", + "marginBlockStart", + }) + public void setMarginBlock(int index, Dynamic margin) { + // Do Nothing: Align with static ViewConfigs + } + + @ReactPropGroup( + names = { + "marginInline", + "marginInlineEnd", + "marginInlineStart", + }) + public void setMarginInline(int index, Dynamic margin) { + // Do Nothing: Align with static ViewConfigs + } + + @ReactPropGroup( + names = { + "paddingBlock", + "paddingBlockEnd", + "paddingBlockStart", + }) + public void setPaddingBlock(int index, Dynamic padding) { + // Do Nothing: Align with static ViewConfigs + } + + @ReactPropGroup( + names = { + "paddingInline", + "paddingInlineEnd", + "paddingInlineStart", + }) + public void setPaddingInline(int index, Dynamic padding) { + // Do Nothing: Align with static ViewConfigs + } + @ReactPropGroup( names = { "insetBlock",