diff --git a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsJavaDelegate-test.js.snap b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsJavaDelegate-test.js.snap index ebc5a9b1494..9364845137c 100644 --- a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsJavaDelegate-test.js.snap +++ b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsJavaDelegate-test.js.snap @@ -16,10 +16,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ArrayPropsNativeComponentViewManagerDelegate & ArrayPropsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class ArrayPropsNativeComponentViewManagerDelegate & ArrayPropsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public ArrayPropsNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -86,10 +87,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class BooleanPropNativeComponentViewManagerDelegate & BooleanPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class BooleanPropNativeComponentViewManagerDelegate & BooleanPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public BooleanPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -127,10 +129,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ColorPropConverter; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ColorPropNativeComponentViewManagerDelegate & ColorPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class ColorPropNativeComponentViewManagerDelegate & ColorPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public ColorPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -165,10 +168,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.DimensionPropConverter; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class DimensionPropNativeComponentViewManagerDelegate & DimensionPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class DimensionPropNativeComponentViewManagerDelegate & DimensionPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public DimensionPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -202,10 +206,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class EdgeInsetsPropNativeComponentViewManagerDelegate & EdgeInsetsPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class EdgeInsetsPropNativeComponentViewManagerDelegate & EdgeInsetsPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public EdgeInsetsPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -233,10 +238,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class EnumPropNativeComponentViewManagerDelegate & EnumPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class EnumPropNativeComponentViewManagerDelegate & EnumPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public EnumPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -273,10 +279,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class EventNestedObjectPropsNativeComponentViewManagerDelegate & EventNestedObjectPropsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class EventNestedObjectPropsNativeComponentViewManagerDelegate & EventNestedObjectPropsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public EventNestedObjectPropsNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -310,10 +317,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class EventPropsNativeComponentViewManagerDelegate & EventPropsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class EventPropsNativeComponentViewManagerDelegate & EventPropsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public EventPropsNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -347,10 +355,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class FloatPropsNativeComponentViewManagerDelegate & FloatPropsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class FloatPropsNativeComponentViewManagerDelegate & FloatPropsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public FloatPropsNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -403,10 +412,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ImagePropNativeComponentViewManagerDelegate & ImagePropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class ImagePropNativeComponentViewManagerDelegate & ImagePropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public ImagePropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -440,10 +450,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class IntegerPropNativeComponentViewManagerDelegate & IntegerPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class IntegerPropNativeComponentViewManagerDelegate & IntegerPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public IntegerPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -483,10 +494,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class InterfaceOnlyNativeComponentViewManagerDelegate & InterfaceOnlyNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class InterfaceOnlyNativeComponentViewManagerDelegate & InterfaceOnlyNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public InterfaceOnlyNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -521,10 +533,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.DynamicFromObject; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class MixedPropNativeComponentViewManagerDelegate & MixedPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class MixedPropNativeComponentViewManagerDelegate & MixedPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public MixedPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -560,10 +573,11 @@ import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ColorPropConverter; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class MultiNativePropNativeComponentViewManagerDelegate & MultiNativePropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class MultiNativePropNativeComponentViewManagerDelegate & MultiNativePropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public MultiNativePropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -606,10 +620,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class NoPropsNoEventsNativeComponentViewManagerDelegate & NoPropsNoEventsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class NoPropsNoEventsNativeComponentViewManagerDelegate & NoPropsNoEventsNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public NoPropsNoEventsNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -638,10 +653,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ObjectPropsNativeComponentManagerDelegate & ObjectPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class ObjectPropsNativeComponentManagerDelegate & ObjectPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { public ObjectPropsNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -682,10 +698,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class PointPropNativeComponentViewManagerDelegate & PointPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class PointPropNativeComponentViewManagerDelegate & PointPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public PointPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } @@ -719,10 +736,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class StringPropNativeComponentViewManagerDelegate & StringPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { +public class StringPropNativeComponentViewManagerDelegate & StringPropNativeComponentViewManagerInterface> extends BaseViewManagerDelegate { public StringPropNativeComponentViewManagerDelegate(U viewManager) { super(viewManager); } diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js index a758d69ecc3..b49330a46be 100644 --- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js +++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js @@ -55,7 +55,7 @@ package ${packageName}; ${imports} -public class ${className} & ${interfaceClassName}> extends BaseViewManagerDelegate { +public class ${className} & ${interfaceClassName}> extends BaseViewManagerDelegate { public ${className}(U viewManager) { super(viewManager); } @@ -272,7 +272,8 @@ function getDelegateImports(component: ComponentShape) { } imports.add('import androidx.annotation.Nullable;'); imports.add('import com.facebook.react.uimanager.BaseViewManagerDelegate;'); - imports.add('import com.facebook.react.uimanager.BaseViewManagerInterface;'); + imports.add('import com.facebook.react.uimanager.BaseViewManager;'); + imports.add('import com.facebook.react.uimanager.LayoutShadowNode;'); return imports; } diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap index 681a198f252..597fd594783 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap @@ -16,10 +16,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ArrayPropsNativeComponentManagerDelegate & ArrayPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class ArrayPropsNativeComponentManagerDelegate & ArrayPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { public ArrayPropsNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -87,10 +88,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ArrayPropsNativeComponentManagerDelegate & ArrayPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class ArrayPropsNativeComponentManagerDelegate & ArrayPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { public ArrayPropsNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -124,10 +126,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class BooleanPropNativeComponentManagerDelegate & BooleanPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class BooleanPropNativeComponentManagerDelegate & BooleanPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public BooleanPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -162,10 +165,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ColorPropConverter; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ColorPropNativeComponentManagerDelegate & ColorPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class ColorPropNativeComponentManagerDelegate & ColorPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public ColorPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -200,10 +204,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class CommandNativeComponentManagerDelegate & CommandNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class CommandNativeComponentManagerDelegate & CommandNativeComponentManagerInterface> extends BaseViewManagerDelegate { public CommandNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -244,10 +249,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class CommandNativeComponentManagerDelegate & CommandNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class CommandNativeComponentManagerDelegate & CommandNativeComponentManagerInterface> extends BaseViewManagerDelegate { public CommandNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -297,10 +303,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.DimensionPropConverter; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class DimensionPropNativeComponentManagerDelegate & DimensionPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class DimensionPropNativeComponentManagerDelegate & DimensionPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public DimensionPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -334,10 +341,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class DoublePropNativeComponentManagerDelegate & DoublePropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class DoublePropNativeComponentManagerDelegate & DoublePropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public DoublePropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -386,10 +394,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class EventsNestedObjectNativeComponentManagerDelegate & EventsNestedObjectNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class EventsNestedObjectNativeComponentManagerDelegate & EventsNestedObjectNativeComponentManagerInterface> extends BaseViewManagerDelegate { public EventsNestedObjectNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -423,10 +432,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class EventsNativeComponentManagerDelegate & EventsNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class EventsNativeComponentManagerDelegate & EventsNativeComponentManagerInterface> extends BaseViewManagerDelegate { public EventsNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -460,10 +470,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class InterfaceOnlyComponentManagerDelegate & InterfaceOnlyComponentManagerInterface> extends BaseViewManagerDelegate { +public class InterfaceOnlyComponentManagerDelegate & InterfaceOnlyComponentManagerInterface> extends BaseViewManagerDelegate { public InterfaceOnlyComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -495,10 +506,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ExcludedIosComponentManagerDelegate & ExcludedIosComponentManagerInterface> extends BaseViewManagerDelegate { +public class ExcludedIosComponentManagerDelegate & ExcludedIosComponentManagerInterface> extends BaseViewManagerDelegate { public ExcludedIosComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -521,10 +533,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class MultiFileIncludedNativeComponentManagerDelegate & MultiFileIncludedNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class MultiFileIncludedNativeComponentManagerDelegate & MultiFileIncludedNativeComponentManagerInterface> extends BaseViewManagerDelegate { public MultiFileIncludedNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -558,10 +571,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class FloatPropNativeComponentManagerDelegate & FloatPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class FloatPropNativeComponentManagerDelegate & FloatPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public FloatPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -611,10 +625,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ImagePropNativeComponentManagerDelegate & ImagePropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class ImagePropNativeComponentManagerDelegate & ImagePropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public ImagePropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -649,10 +664,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class InsetsPropNativeComponentManagerDelegate & InsetsPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class InsetsPropNativeComponentManagerDelegate & InsetsPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public InsetsPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -686,10 +702,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class Int32EnumPropsNativeComponentManagerDelegate & Int32EnumPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class Int32EnumPropsNativeComponentManagerDelegate & Int32EnumPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { public Int32EnumPropsNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -723,10 +740,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class IntegerPropNativeComponentManagerDelegate & IntegerPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class IntegerPropNativeComponentManagerDelegate & IntegerPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public IntegerPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -766,10 +784,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class InterfaceOnlyComponentManagerDelegate & InterfaceOnlyComponentManagerInterface> extends BaseViewManagerDelegate { +public class InterfaceOnlyComponentManagerDelegate & InterfaceOnlyComponentManagerInterface> extends BaseViewManagerDelegate { public InterfaceOnlyComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -804,10 +823,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.DynamicFromObject; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class MixedPropNativeComponentManagerDelegate & MixedPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class MixedPropNativeComponentManagerDelegate & MixedPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public MixedPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -843,10 +863,11 @@ import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ColorPropConverter; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ImageColorPropNativeComponentManagerDelegate & ImageColorPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class ImageColorPropNativeComponentManagerDelegate & ImageColorPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public ImageColorPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -889,10 +910,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class NoPropsNoEventsComponentManagerDelegate & NoPropsNoEventsComponentManagerInterface> extends BaseViewManagerDelegate { +public class NoPropsNoEventsComponentManagerDelegate & NoPropsNoEventsComponentManagerInterface> extends BaseViewManagerDelegate { public NoPropsNoEventsComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -921,10 +943,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class ObjectPropsManagerDelegate & ObjectPropsManagerInterface> extends BaseViewManagerDelegate { +public class ObjectPropsManagerDelegate & ObjectPropsManagerInterface> extends BaseViewManagerDelegate { public ObjectPropsManagerDelegate(U viewManager) { super(viewManager); } @@ -959,10 +982,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class PointPropNativeComponentManagerDelegate & PointPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class PointPropNativeComponentManagerDelegate & PointPropNativeComponentManagerInterface> extends BaseViewManagerDelegate { public PointPropNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -996,10 +1020,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class StringEnumPropsNativeComponentManagerDelegate & StringEnumPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class StringEnumPropsNativeComponentManagerDelegate & StringEnumPropsNativeComponentManagerInterface> extends BaseViewManagerDelegate { public StringEnumPropsNativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -1033,10 +1058,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class StringPropComponentManagerDelegate & StringPropComponentManagerInterface> extends BaseViewManagerDelegate { +public class StringPropComponentManagerDelegate & StringPropComponentManagerInterface> extends BaseViewManagerDelegate { public StringPropComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -1073,10 +1099,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class MultiFile1NativeComponentManagerDelegate & MultiFile1NativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class MultiFile1NativeComponentManagerDelegate & MultiFile1NativeComponentManagerInterface> extends BaseViewManagerDelegate { public MultiFile1NativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -1105,10 +1132,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class MultiFile2NativeComponentManagerDelegate & MultiFile2NativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class MultiFile2NativeComponentManagerDelegate & MultiFile2NativeComponentManagerInterface> extends BaseViewManagerDelegate { public MultiFile2NativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -1142,10 +1170,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class MultiComponent1NativeComponentManagerDelegate & MultiComponent1NativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class MultiComponent1NativeComponentManagerDelegate & MultiComponent1NativeComponentManagerInterface> extends BaseViewManagerDelegate { public MultiComponent1NativeComponentManagerDelegate(U viewManager) { super(viewManager); } @@ -1174,10 +1203,11 @@ package com.facebook.react.viewmanagers; import android.view.View; import androidx.annotation.Nullable; +import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.LayoutShadowNode; -public class MultiComponent2NativeComponentManagerDelegate & MultiComponent2NativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class MultiComponent2NativeComponentManagerDelegate & MultiComponent2NativeComponentManagerInterface> extends BaseViewManagerDelegate { public MultiComponent2NativeComponentManagerDelegate(U viewManager) { super(viewManager); } diff --git a/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/viewmanagers/AndroidPopupMenuManagerDelegate.java b/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/viewmanagers/AndroidPopupMenuManagerDelegate.java index 736b778e594..f79c0c1a6ec 100644 --- a/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/viewmanagers/AndroidPopupMenuManagerDelegate.java +++ b/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/viewmanagers/AndroidPopupMenuManagerDelegate.java @@ -13,9 +13,10 @@ import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.BaseViewManager; +import com.facebook.react.uimanager.LayoutShadowNode; -public class AndroidPopupMenuManagerDelegate & AndroidPopupMenuManagerInterface> extends BaseViewManagerDelegate { +public class AndroidPopupMenuManagerDelegate & AndroidPopupMenuManagerInterface> extends BaseViewManagerDelegate { public AndroidPopupMenuManagerDelegate(U viewManager) { super(viewManager); } diff --git a/packages/react-native-test-library/android/src/main/java/com/facebook/react/viewmanagers/SampleNativeComponentManagerDelegate.java b/packages/react-native-test-library/android/src/main/java/com/facebook/react/viewmanagers/SampleNativeComponentManagerDelegate.java index 4883fd3ed9d..bb5b9b52736 100644 --- a/packages/react-native-test-library/android/src/main/java/com/facebook/react/viewmanagers/SampleNativeComponentManagerDelegate.java +++ b/packages/react-native-test-library/android/src/main/java/com/facebook/react/viewmanagers/SampleNativeComponentManagerDelegate.java @@ -13,9 +13,10 @@ import android.view.View; import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.uimanager.BaseViewManagerDelegate; -import com.facebook.react.uimanager.BaseViewManagerInterface; +import com.facebook.react.uimanager.BaseViewManager; +import com.facebook.react.uimanager.LayoutShadowNode; -public class SampleNativeComponentManagerDelegate & SampleNativeComponentManagerInterface> extends BaseViewManagerDelegate { +public class SampleNativeComponentManagerDelegate & SampleNativeComponentManagerInterface> extends BaseViewManagerDelegate { public SampleNativeComponentManagerDelegate(U viewManager) { super(viewManager); } diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 57530f10487..631ecd84111 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -4118,7 +4118,7 @@ public final class com/facebook/react/uimanager/BackgroundStyleApplicator { public static final fun setOutlineWidth (Landroid/view/View;F)V } -public abstract class com/facebook/react/uimanager/BaseViewManager : com/facebook/react/uimanager/ViewManager, android/view/View$OnLayoutChangeListener, com/facebook/react/uimanager/BaseViewManagerInterface { +public abstract class com/facebook/react/uimanager/BaseViewManager : com/facebook/react/uimanager/ViewManager, android/view/View$OnLayoutChangeListener { public fun ()V public fun (Lcom/facebook/react/bridge/ReactApplicationContext;)V public fun getExportedCustomBubblingEventTypeConstants ()Ljava/util/Map; @@ -4197,48 +4197,12 @@ public abstract class com/facebook/react/uimanager/BaseViewManager : com/faceboo } public abstract class com/facebook/react/uimanager/BaseViewManagerDelegate : com/facebook/react/uimanager/ViewManagerDelegate { - protected final field mViewManager Lcom/facebook/react/uimanager/BaseViewManagerInterface; - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + protected final field mViewManager Lcom/facebook/react/uimanager/BaseViewManager; + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun receiveCommand (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } -public abstract interface class com/facebook/react/uimanager/BaseViewManagerInterface { - public abstract fun setAccessibilityActions (Landroid/view/View;Lcom/facebook/react/bridge/ReadableArray;)V - public abstract fun setAccessibilityCollection (Landroid/view/View;Lcom/facebook/react/bridge/ReadableMap;)V - public abstract fun setAccessibilityCollectionItem (Landroid/view/View;Lcom/facebook/react/bridge/ReadableMap;)V - public abstract fun setAccessibilityHint (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setAccessibilityLabel (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setAccessibilityLabelledBy (Landroid/view/View;Lcom/facebook/react/bridge/Dynamic;)V - public abstract fun setAccessibilityLiveRegion (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setAccessibilityRole (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setBackgroundColor (Landroid/view/View;I)V - public abstract fun setBorderBottomLeftRadius (Landroid/view/View;F)V - public abstract fun setBorderBottomRightRadius (Landroid/view/View;F)V - public abstract fun setBorderRadius (Landroid/view/View;F)V - public abstract fun setBorderTopLeftRadius (Landroid/view/View;F)V - public abstract fun setBorderTopRightRadius (Landroid/view/View;F)V - public abstract fun setElevation (Landroid/view/View;F)V - public abstract fun setFilter (Landroid/view/View;Lcom/facebook/react/bridge/ReadableArray;)V - public abstract fun setImportantForAccessibility (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setMixBlendMode (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setNativeId (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setOpacity (Landroid/view/View;F)V - public abstract fun setRenderToHardwareTexture (Landroid/view/View;Z)V - public abstract fun setRole (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setRotation (Landroid/view/View;F)V - public abstract fun setScaleX (Landroid/view/View;F)V - public abstract fun setScaleY (Landroid/view/View;F)V - public abstract fun setShadowColor (Landroid/view/View;I)V - public abstract fun setTestId (Landroid/view/View;Ljava/lang/String;)V - public abstract fun setTransform (Landroid/view/View;Lcom/facebook/react/bridge/ReadableArray;)V - public abstract fun setTransformOrigin (Landroid/view/View;Lcom/facebook/react/bridge/ReadableArray;)V - public abstract fun setTranslateX (Landroid/view/View;F)V - public abstract fun setTranslateY (Landroid/view/View;F)V - public abstract fun setViewState (Landroid/view/View;Lcom/facebook/react/bridge/ReadableMap;)V - public abstract fun setZIndex (Landroid/view/View;F)V -} - public abstract interface class com/facebook/react/uimanager/ComponentNameResolver { public abstract fun getComponentNames ()[Ljava/lang/String; } @@ -6307,7 +6271,7 @@ public final class com/facebook/react/util/RNLog { } public class com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6319,7 +6283,7 @@ public abstract interface class com/facebook/react/viewmanagers/ActivityIndicato } public class com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun receiveCommand (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6336,7 +6300,7 @@ public abstract interface class com/facebook/react/viewmanagers/AndroidDrawerLay } public class com/facebook/react/viewmanagers/AndroidHorizontalScrollContentViewManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6345,7 +6309,7 @@ public abstract interface class com/facebook/react/viewmanagers/AndroidHorizonta } public class com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6360,7 +6324,7 @@ public abstract interface class com/facebook/react/viewmanagers/AndroidProgressB } public class com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun receiveCommand (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6376,7 +6340,7 @@ public abstract interface class com/facebook/react/viewmanagers/AndroidSwipeRefr } public class com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun receiveCommand (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6395,7 +6359,7 @@ public abstract interface class com/facebook/react/viewmanagers/AndroidSwitchMan } public class com/facebook/react/viewmanagers/DebuggingOverlayManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun receiveCommand (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6407,7 +6371,7 @@ public abstract interface class com/facebook/react/viewmanagers/DebuggingOverlay } public class com/facebook/react/viewmanagers/ModalHostViewManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6424,7 +6388,7 @@ public abstract interface class com/facebook/react/viewmanagers/ModalHostViewMan } public class com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } @@ -6432,7 +6396,7 @@ public abstract interface class com/facebook/react/viewmanagers/SafeAreaViewMana } public class com/facebook/react/viewmanagers/UnimplementedNativeViewManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate { - public fun (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V + public fun (Lcom/facebook/react/uimanager/BaseViewManager;)V public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java index 6b2d334835b..12dc3ee8200 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java @@ -47,7 +47,7 @@ import java.util.Objects; * provides support for base view properties such as backgroundColor, opacity, etc. */ public abstract class BaseViewManager - extends ViewManager implements BaseViewManagerInterface, View.OnLayoutChangeListener { + extends ViewManager implements View.OnLayoutChangeListener { private static final int PERSPECTIVE_ARRAY_INVERTED_CAMERA_DISTANCE_INDEX = 2; private static final float CAMERA_DISTANCE_NORMALIZATION_MULTIPLIER = (float) Math.sqrt(5); @@ -191,7 +191,6 @@ public abstract class BaseViewManager= Build.VERSION_CODES.P) { @@ -263,7 +255,6 @@ public abstract class BaseViewManager>( +public abstract class BaseViewManagerDelegate< + T : View, U : BaseViewManager>( @Suppress("NoHungarianNotation") @JvmField protected val mViewManager: U ) : ViewManagerDelegate { + @Suppress("DEPRECATION") override public fun setProperty(view: T, propName: String, value: Any?) { when (propName) { ViewProps.ACCESSIBILITY_ACTIONS -> diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerInterface.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerInterface.kt deleted file mode 100644 index 8e3619e900c..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerInterface.kt +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.uimanager - -import android.view.View -import com.facebook.react.bridge.Dynamic -import com.facebook.react.bridge.ReadableArray -import com.facebook.react.bridge.ReadableMap - -/** - * This is an interface that should be implemented by view managers supporting the base view - * properties such as backgroundColor, opacity, etc. - */ -public interface BaseViewManagerInterface { - public fun setAccessibilityActions(view: T, accessibilityActions: ReadableArray?) - - public fun setAccessibilityHint(view: T, accessibilityHint: String?) - - public fun setAccessibilityLabel(view: T, accessibilityLabel: String?) - - public fun setAccessibilityLiveRegion(view: T, liveRegion: String?) - - public fun setAccessibilityRole(view: T, accessibilityRole: String?) - - public fun setAccessibilityCollection(view: T, accessibilityCollection: ReadableMap?) - - public fun setAccessibilityCollectionItem(view: T, accessibilityCollectionItem: ReadableMap?) - - public fun setViewState(view: T, accessibilityState: ReadableMap?) - - public fun setBackgroundColor(view: T, backgroundColor: Int) - - public fun setBorderRadius(view: T, borderRadius: Float) - - public fun setBorderBottomLeftRadius(view: T, borderRadius: Float) - - public fun setBorderBottomRightRadius(view: T, borderRadius: Float) - - public fun setBorderTopLeftRadius(view: T, borderRadius: Float) - - public fun setBorderTopRightRadius(view: T, borderRadius: Float) - - public fun setElevation(view: T, elevation: Float) - - public fun setFilter(view: T, filter: ReadableArray) - - public fun setMixBlendMode(view: T, setMixBlendMode: String) - - public fun setShadowColor(view: T, shadowColor: Int) - - public fun setImportantForAccessibility(view: T, importantForAccessibility: String?) - - public fun setRole(view: T, role: String?) - - public fun setNativeId(view: T, nativeId: String?) - - public fun setAccessibilityLabelledBy(view: T, nativeId: Dynamic?) - - public fun setOpacity(view: T, opacity: Float) - - public fun setRenderToHardwareTexture(view: T, useHWTexture: Boolean) - - public fun setRotation(view: T, rotation: Float) - - public fun setScaleX(view: T, scaleX: Float) - - public fun setScaleY(view: T, scaleY: Float) - - public fun setTestId(view: T, testId: String?) - - public fun setTransform(view: T, matrix: ReadableArray?) - - public fun setTransformOrigin(view: T, transformOrigin: ReadableArray?) - - public fun setTranslateX(view: T, translateX: Float) - - public fun setTranslateY(view: T, translateY: Float) - - public fun setZIndex(view: T, zIndex: Float) -}