From 0cbd2a345d613b1b6e6a5b1c2965018adfb45f6f Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Wed, 22 Nov 2023 03:37:13 -0800 Subject: [PATCH] Update Element Inspector string to "Toggle" (#41595) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/41595 Instead of having to select between Enable/Hide the Element Inspector String, let's just use "Toggle". Changelog: [Internal] [Changed] - Update Element Inspector string to "Toggle" Reviewed By: cipolleschi Differential Revision: D51503403 fbshipit-source-id: 2ad24df8324eb789b0016fe7ac5d439cba6f5952 --- packages/react-native/React/CoreModules/RCTDevMenu.mm | 3 +-- .../com/facebook/react/devsupport/DevSupportManagerBase.java | 4 +--- .../ReactAndroid/src/main/res/devsupport/values/strings.xml | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/react-native/React/CoreModules/RCTDevMenu.mm b/packages/react-native/React/CoreModules/RCTDevMenu.mm index 10b218a3f63..1a970a7d086 100644 --- a/packages/react-native/React/CoreModules/RCTDevMenu.mm +++ b/packages/react-native/React/CoreModules/RCTDevMenu.mm @@ -283,8 +283,7 @@ RCT_EXPORT_MODULE() [items addObject:[RCTDevMenuItem buttonItemWithTitleBlock:^NSString * { - return devSettings.isElementInspectorShown ? @"Hide Element Inspector" - : @"Show Element Inspector"; + return @"Toggle Element Inspector"; } handler:^{ [devSettings toggleElementInspector]; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java index e242858a71b..b9ab16eb9f9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java @@ -414,9 +414,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager { }); options.put( - mDevSettings.isElementInspectorEnabled() - ? mApplicationContext.getString(R.string.catalyst_inspector_stop) - : mApplicationContext.getString(R.string.catalyst_inspector), + mApplicationContext.getString(R.string.catalyst_inspector_toggle), new DevOptionHandler() { @Override public void onOptionSelected() { diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/values/strings.xml b/packages/react-native/ReactAndroid/src/main/res/devsupport/values/strings.xml index 171c092546e..d562be6d686 100644 --- a/packages/react-native/ReactAndroid/src/main/res/devsupport/values/strings.xml +++ b/packages/react-native/ReactAndroid/src/main/res/devsupport/values/strings.xml @@ -11,8 +11,7 @@ Disable Fast Refresh Disabling Fast Refresh because it requires a development bundle. Switching to development bundle in order to enable Fast Refresh. - Show Element Inspector - Hide Element Inspector + Toggle Element Inspector Show Perf Monitor Hide Perf Monitor Settings