From 7826dc379d103d06b9e3f53ce6efdcdc533f9f51 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 3 Apr 2025 13:03:01 -0700 Subject: [PATCH] Mark concrete classes of shadow node as @LegacyArchitecture Summary: Mark concrete classes of shadow node as LegacyArchitecture These classes won't be included in legacy architecture apks changelog: [internal] internal Reviewed By: joevilches, mlord93, Abbondanzo Differential Revision: D72351188 fbshipit-source-id: 4727cdd1486b2fafb87fe3b512440af3264ad189 --- .../java/com/facebook/react/views/modal/ModalHostShadowNode.kt | 2 ++ .../facebook/react/views/progressbar/ProgressBarShadowNode.kt | 2 ++ .../react/views/safeareaview/ReactSafeAreaViewShadowNode.kt | 3 ++- .../facebook/react/views/switchview/ReactSwitchShadowNode.kt | 2 ++ .../com/facebook/react/views/text/ReactBaseTextShadowNode.java | 2 ++ .../com/facebook/react/views/text/ReactRawTextShadowNode.kt | 2 ++ .../com/facebook/react/views/text/ReactTextShadowNode.java | 2 ++ .../facebook/react/views/text/ReactVirtualTextShadowNode.kt | 3 +++ .../FrescoBasedReactTextInlineImageShadowNode.java | 2 ++ .../react/views/textinput/ReactTextInputShadowNode.java | 2 ++ 10 files changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.kt index adc9c52320b..44db11d05a2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.kt @@ -7,6 +7,7 @@ package com.facebook.react.views.modal +import com.facebook.react.common.annotations.internal.LegacyArchitecture import com.facebook.react.uimanager.LayoutShadowNode import com.facebook.react.uimanager.ReactShadowNodeImpl @@ -18,6 +19,7 @@ import com.facebook.react.uimanager.ReactShadowNodeImpl * to be the window size. This will then cause the children of the Modal to layout as if they can * fill the window. */ +@LegacyArchitecture @Deprecated("This class is no longer used and will be removed soon.") internal class ModalHostShadowNode : LayoutShadowNode() { /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt index 8f35b5cbc4f..8239de3a34a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt @@ -10,6 +10,7 @@ package com.facebook.react.views.progressbar import android.util.SparseIntArray import android.view.View import android.view.ViewGroup +import com.facebook.react.common.annotations.internal.LegacyArchitecture import com.facebook.react.uimanager.LayoutShadowNode import com.facebook.react.uimanager.annotations.ReactProp import com.facebook.yoga.YogaMeasureFunction @@ -21,6 +22,7 @@ import com.facebook.yoga.YogaNode * Node responsible for holding the style of the ProgressBar, see under [ ] for possible styles. * ReactProgressBarViewManager manages how this style is applied to the ProgressBar. */ +@LegacyArchitecture internal class ProgressBarShadowNode : LayoutShadowNode(), YogaMeasureFunction { private val height: SparseIntArray = SparseIntArray() private val width: SparseIntArray = SparseIntArray() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt index 811ae46e9b2..7ce771889e7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt @@ -7,6 +7,7 @@ package com.facebook.react.views.safeareaview +import com.facebook.react.common.annotations.internal.LegacyArchitecture import com.facebook.react.uimanager.LayoutShadowNode -internal class ReactSafeAreaViewShadowNode() : LayoutShadowNode() {} +@LegacyArchitecture internal class ReactSafeAreaViewShadowNode() : LayoutShadowNode() {} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt index 86008e8ecc0..4739a9b7707 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt @@ -8,12 +8,14 @@ package com.facebook.react.views.switchview import android.view.View +import com.facebook.react.common.annotations.internal.LegacyArchitecture import com.facebook.react.uimanager.LayoutShadowNode import com.facebook.yoga.YogaMeasureFunction import com.facebook.yoga.YogaMeasureMode import com.facebook.yoga.YogaMeasureOutput import com.facebook.yoga.YogaNode +@LegacyArchitecture internal class ReactSwitchShadowNode : LayoutShadowNode(), YogaMeasureFunction { private var width = 0 private var height = 0 diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java index 6cb16d00028..b2dd8501c97 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java @@ -21,6 +21,7 @@ import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.common.ReactConstants; +import com.facebook.react.common.annotations.internal.LegacyArchitecture; import com.facebook.react.uimanager.IllegalViewOperationException; import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.NativeViewHierarchyOptimizer; @@ -64,6 +65,7 @@ import java.util.Map; *

This also node calculates {@link Spannable} object based on subnodes of the same type, which * can be used in concrete classes to feed native views and compute layout. */ +@LegacyArchitecture public abstract class ReactBaseTextShadowNode extends LayoutShadowNode { // Use a direction weak character so the placeholder doesn't change the direction of the previous diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt index 442b70d4706..b7797c8e985 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt @@ -7,6 +7,7 @@ package com.facebook.react.views.text +import com.facebook.react.common.annotations.internal.LegacyArchitecture import com.facebook.react.uimanager.ReactShadowNodeImpl import com.facebook.react.uimanager.annotations.ReactProp @@ -14,6 +15,7 @@ import com.facebook.react.uimanager.annotations.ReactProp * [ReactShadowNode] class for pure raw text node (aka `textContent` in terms of DOM). Raw text node * can only have simple string value without any attributes, properties or state. */ +@LegacyArchitecture public class ReactRawTextShadowNode : ReactShadowNodeImpl() { @set:ReactProp(name = "text") public var text: String? = null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java index 91871667023..a3819065d8b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java @@ -24,6 +24,7 @@ import com.facebook.react.bridge.ReactSoftExceptionLogger; import com.facebook.react.bridge.WritableArray; import com.facebook.react.bridge.WritableMap; import com.facebook.react.common.ReactConstants; +import com.facebook.react.common.annotations.internal.LegacyArchitecture; import com.facebook.react.uimanager.NativeViewHierarchyOptimizer; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.ReactShadowNode; @@ -49,6 +50,7 @@ import java.util.ArrayList; *

The class measures text in {@code } view and feeds native {@link TextView} using {@code * Spannable} object constructed in superclass. */ +@LegacyArchitecture public class ReactTextShadowNode extends ReactBaseTextShadowNode { // It's important to pass the ANTI_ALIAS_FLAG flag to the constructor rather than setting it diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt index bb98579ccf8..e8a8672e8a6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt @@ -7,7 +7,10 @@ package com.facebook.react.views.text +import com.facebook.react.common.annotations.internal.LegacyArchitecture + /** A virtual text node. */ +@LegacyArchitecture internal class ReactVirtualTextShadowNode : ReactBaseTextShadowNode() { override fun isVirtual(): Boolean = true diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java index aea8f6067dd..2f8a3138440 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java @@ -21,6 +21,7 @@ import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableType; import com.facebook.react.common.ReactConstants; +import com.facebook.react.common.annotations.internal.LegacyArchitecture; import com.facebook.react.uimanager.ViewProps; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.views.text.internal.ReactTextInlineImageShadowNode; @@ -30,6 +31,7 @@ import java.util.Locale; /** Shadow node that represents an inline image. Loading is done using Fresco. */ @Nullsafe(Nullsafe.Mode.LOCAL) +@LegacyArchitecture class FrescoBasedReactTextInlineImageShadowNode extends ReactTextInlineImageShadowNode { private @Nullable Uri mUri; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java index 9935359203a..4f2704732df 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java @@ -19,6 +19,7 @@ import com.facebook.infer.annotation.Assertions; import com.facebook.react.R; import com.facebook.react.common.ReactConstants; import com.facebook.react.common.annotations.VisibleForTesting; +import com.facebook.react.common.annotations.internal.LegacyArchitecture; import com.facebook.react.uimanager.Spacing; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.UIViewOperationQueue; @@ -33,6 +34,7 @@ import com.facebook.yoga.YogaMeasureOutput; import com.facebook.yoga.YogaNode; @VisibleForTesting +@LegacyArchitecture public class ReactTextInputShadowNode extends ReactBaseTextShadowNode implements YogaMeasureFunction {