Skip to content

Inherit text's role and accessibilityRole together (#58022) #58022

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

Open
twasilczyk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Inherit text's role and accessibilityRole together (#58022) #58022

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
8 changes: 7 additions & 1 deletion ...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<eb0bafceba60cb439a4be3d68b890725>>
* @generated SignedSource<<c47196d81d6d7afd60456bf62a5a958c>>
*/

/**
Expand Down Expand Up @@ -114,6 +114,12 @@ public object ReactNativeFeatureFlags {
@JvmStatic
public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

/**
* When enabled, a text fragment that sets either `role` or `accessibilityRole` (the two are aliases) inherits neither.
*/
@JvmStatic
public fun enableAliasedTextRoleInheritance(): Boolean = accessor.enableAliasedTextRoleInheritance()

/**
* When enabled, a View with reduced opacity that contains an elevated descendant is composited offscreen so the elevation shadow fades uniformly instead of rendering as banded per-primitive alpha.
*/
Expand Down
12 changes: 11 additions & 1 deletion .../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<0107593110db613063b6f4ceb50d8e58>>
* @generated SignedSource<<9d33cd35fc1fad82ec29eebf410cb999>>
*/

/**
Expand Down Expand Up @@ -34,6 +34,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
private var disableViewPreallocationAndroidCache: Boolean? = null
private var enableAccessibilityOrderCache: Boolean? = null
private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
private var enableAliasedTextRoleInheritanceCache: Boolean? = null
private var enableAndroidAutoOffscreenCompositingForElevationCache: Boolean? = null
private var enableAndroidTextMeasurementOptimizationsCache: Boolean? = null
private var enableAsyncDiskCacheCheckInMultiSourceImageAndroidCache: Boolean? = null
Expand Down Expand Up @@ -240,6 +241,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
return cached
}

override fun enableAliasedTextRoleInheritance(): Boolean {
var cached = enableAliasedTextRoleInheritanceCache
if (cached == null) {
cached = ReactNativeFeatureFlagsCxxInterop.enableAliasedTextRoleInheritance()
enableAliasedTextRoleInheritanceCache = cached
}
return cached
}

override fun enableAndroidAutoOffscreenCompositingForElevation(): Boolean {
var cached = enableAndroidAutoOffscreenCompositingForElevationCache
if (cached == null) {
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<fa0374808e3cbe7122ca993780c0b627>>
* @generated SignedSource<<4b1c6e36a90327d1fdc4c47972a3bf1b>>
*/

/**
Expand Down Expand Up @@ -56,6 +56,8 @@ public object ReactNativeFeatureFlagsCxxInterop {

@DoNotStrip @JvmStatic public external fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

@DoNotStrip @JvmStatic public external fun enableAliasedTextRoleInheritance(): Boolean

@DoNotStrip @JvmStatic public external fun enableAndroidAutoOffscreenCompositingForElevation(): Boolean

@DoNotStrip @JvmStatic public external fun enableAndroidTextMeasurementOptimizations(): Boolean
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<768077a22c110aa98ab02bc96eec695b>>
* @generated SignedSource<<037d51466544717f0648b667bbeb48cd>>
*/

/**
Expand Down Expand Up @@ -51,6 +51,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi

override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

override fun enableAliasedTextRoleInheritance(): Boolean = true

override fun enableAndroidAutoOffscreenCompositingForElevation(): Boolean = false

override fun enableAndroidTextMeasurementOptimizations(): Boolean = false
Expand Down
13 changes: 12 additions & 1 deletion ...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<86ebc7307e7ebe2023e909a868ed3117>>
* @generated SignedSource<<c94e715560ce20c62811f420be80b716>>
*/

/**
Expand Down Expand Up @@ -38,6 +38,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
private var disableViewPreallocationAndroidCache: Boolean? = null
private var enableAccessibilityOrderCache: Boolean? = null
private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
private var enableAliasedTextRoleInheritanceCache: Boolean? = null
private var enableAndroidAutoOffscreenCompositingForElevationCache: Boolean? = null
private var enableAndroidTextMeasurementOptimizationsCache: Boolean? = null
private var enableAsyncDiskCacheCheckInMultiSourceImageAndroidCache: Boolean? = null
Expand Down Expand Up @@ -258,6 +259,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
return cached
}

override fun enableAliasedTextRoleInheritance(): Boolean {
var cached = enableAliasedTextRoleInheritanceCache
if (cached == null) {
cached = currentProvider.enableAliasedTextRoleInheritance()
accessedFeatureFlags.add("enableAliasedTextRoleInheritance")
enableAliasedTextRoleInheritanceCache = cached
}
return cached
}

override fun enableAndroidAutoOffscreenCompositingForElevation(): Boolean {
var cached = enableAndroidAutoOffscreenCompositingForElevationCache
if (cached == null) {
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<c83fba10dc6f7d596e3bcd9725c64e6e>>
* @generated SignedSource<<1e3f621bf5b2079f2923cc0fcce41fb7>>
*/

/**
Expand Down Expand Up @@ -51,6 +51,8 @@ public interface ReactNativeFeatureFlagsProvider {

@DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

@DoNotStrip public fun enableAliasedTextRoleInheritance(): Boolean

@DoNotStrip public fun enableAndroidAutoOffscreenCompositingForElevation(): Boolean

@DoNotStrip public fun enableAndroidTextMeasurementOptimizations(): Boolean
Expand Down
16 changes: 15 additions & 1 deletion ...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<200266835197634d13de07182d80a2c1>>
* @generated SignedSource<<eca2a21d7c3095d57896e1f690cd95ec>>
*/

/**
Expand Down Expand Up @@ -123,6 +123,12 @@ class ReactNativeFeatureFlagsJavaProvider
return method(javaProvider_);
}

bool enableAliasedTextRoleInheritance() override {
static const auto method =
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableAliasedTextRoleInheritance");
return method(javaProvider_);
}

bool enableAndroidAutoOffscreenCompositingForElevation() override {
static const auto method =
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableAndroidAutoOffscreenCompositingForElevation");
Expand Down Expand Up @@ -671,6 +677,11 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

bool JReactNativeFeatureFlagsCxxInterop::enableAliasedTextRoleInheritance(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
return ReactNativeFeatureFlags::enableAliasedTextRoleInheritance();
}

bool JReactNativeFeatureFlagsCxxInterop::enableAndroidAutoOffscreenCompositingForElevation(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
return ReactNativeFeatureFlags::enableAndroidAutoOffscreenCompositingForElevation();
Expand Down Expand Up @@ -1139,6 +1150,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
makeNativeMethod(
"enableAccumulatedUpdatesInRawPropsAndroid",
JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
makeNativeMethod(
"enableAliasedTextRoleInheritance",
JReactNativeFeatureFlagsCxxInterop::enableAliasedTextRoleInheritance),
makeNativeMethod(
"enableAndroidAutoOffscreenCompositingForElevation",
JReactNativeFeatureFlagsCxxInterop::enableAndroidAutoOffscreenCompositingForElevation),
Expand Down
5 changes: 4 additions & 1 deletion ...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<13aa248dae556b06b31c25a28e448460>>
* @generated SignedSource<<782efe2f12e008b34b15cf0e09776b78>>
*/

/**
Expand Down Expand Up @@ -72,6 +72,9 @@ class JReactNativeFeatureFlagsCxxInterop
static bool enableAccumulatedUpdatesInRawPropsAndroid(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

static bool enableAliasedTextRoleInheritance(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

static bool enableAndroidAutoOffscreenCompositingForElevation(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

Expand Down
6 changes: 5 additions & 1 deletion packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<fc4b67b43c846eac0085ed4a5528a170>>
* @generated SignedSource<<b01dac5241d3723788663265d459450b>>
*/

/**
Expand Down Expand Up @@ -82,6 +82,10 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

bool ReactNativeFeatureFlags::enableAliasedTextRoleInheritance() {
return getAccessor().enableAliasedTextRoleInheritance();
}

bool ReactNativeFeatureFlags::enableAndroidAutoOffscreenCompositingForElevation() {
return getAccessor().enableAndroidAutoOffscreenCompositingForElevation();
}
Expand Down
7 changes: 6 additions & 1 deletion packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<1a9a8a587b477b6aa0d3aa57e30272c2>>
* @generated SignedSource<<f54f9b6917ef84daa5beb19ff5aadbd8>>
*/

/**
Expand Down Expand Up @@ -111,6 +111,11 @@ class ReactNativeFeatureFlags {
*/
RN_EXPORT static bool enableAccumulatedUpdatesInRawPropsAndroid();

/**
* When enabled, a text fragment that sets either `role` or `accessibilityRole` (the two are aliases) inherits neither.
*/
RN_EXPORT static bool enableAliasedTextRoleInheritance();

/**
* When enabled, a View with reduced opacity that contains an elevated descendant is composited offscreen so the elevation shadow fades uniformly instead of rendering as banded per-primitive alpha.
*/
Expand Down
Loading
Loading