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

Breaking: Remove BaseViewManagerInterface #46809

Closed
wants to merge 1 commit into from
+172 −271
Closed

Breaking: Remove BaseViewManagerInterface #46809

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
90 changes: 54 additions & 36 deletions ...ive-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ package ${packageName};
${imports}
public class ${className}<T extends ${extendClasses}, U extends BaseViewManagerInterface<T> & ${interfaceClassName}<T>> extends BaseViewManagerDelegate<T, U> {
public class ${className}<T extends ${extendClasses}, U extends BaseViewManager<T, ? extends LayoutShadowNode> & ${interfaceClassName}<T>> extends BaseViewManagerDelegate<T, U> {
public ${className}(U viewManager) {
super(viewManager);
}
Expand Down Expand Up @@ -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;
}
Expand Down
150 changes: 90 additions & 60 deletions .../src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions ...ndroid/src/main/java/com/facebook/react/viewmanagers/AndroidPopupMenuManagerDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
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<T extends View, U extends BaseViewManagerInterface<T> & AndroidPopupMenuManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public class AndroidPopupMenuManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & AndroidPopupMenuManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public AndroidPopupMenuManagerDelegate(U viewManager) {
super(viewManager);
}
Expand Down
5 changes: 3 additions & 2 deletions ...d/src/main/java/com/facebook/react/viewmanagers/SampleNativeComponentManagerDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
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<T extends View, U extends BaseViewManagerInterface<T> & SampleNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public class SampleNativeComponentManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & SampleNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public SampleNativeComponentManagerDelegate(U viewManager) {
super(viewManager);
}
Expand Down
62 changes: 13 additions & 49 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init> ()V
public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;)V
public fun getExportedCustomBubblingEventTypeConstants ()Ljava/util/Map;
Expand Down Expand Up @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
protected final field mViewManager Lcom/facebook/react/uimanager/BaseViewManager;
public fun <init> (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;
}
Expand Down Expand Up @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (Lcom/facebook/react/uimanager/BaseViewManager;)V
public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V
}

Expand All @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (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
}
Expand All @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (Lcom/facebook/react/uimanager/BaseViewManager;)V
public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V
}

Expand All @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (Lcom/facebook/react/uimanager/BaseViewManager;)V
public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V
}

Expand All @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (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
}
Expand All @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (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
}
Expand All @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (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
}
Expand All @@ -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 <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (Lcom/facebook/react/uimanager/BaseViewManager;)V
public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V
}

Expand All @@ -6424,15 +6388,15 @@ public abstract interface class com/facebook/react/viewmanagers/ModalHostViewMan
}

public class com/facebook/react/viewmanagers/SafeAreaViewManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate {
public fun <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (Lcom/facebook/react/uimanager/BaseViewManager;)V
public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V
}

public abstract interface class com/facebook/react/viewmanagers/SafeAreaViewManagerInterface {
}

public class com/facebook/react/viewmanagers/UnimplementedNativeViewManagerDelegate : com/facebook/react/uimanager/BaseViewManagerDelegate {
public fun <init> (Lcom/facebook/react/uimanager/BaseViewManagerInterface;)V
public fun <init> (Lcom/facebook/react/uimanager/BaseViewManager;)V
public fun setProperty (Landroid/view/View;Ljava/lang/String;Ljava/lang/Object;)V
}

Expand Down
Loading
Loading