Skip to content

Commit 3c28824

Browse files
pull[bot]pull[bot]
committed
fix(devtools): remove duplicated "Display density" field in General settings (facebook#34792)
<!-- Thanks for submitting a pull request! We appreciate you spending the time to work on these changes. Please provide enough information so that others can review your pull request. The three fields below are mandatory. Before submitting a pull request, please make sure the following is done: 1. Fork [the repository](https://github.com/facebook/react) and create your branch from `main`. 2. Run `yarn` in the repository root. 3. If you've fixed a bug or added code that should be tested, add tests! 4. Ensure the test suite passes (`yarn test`). Tip: `yarn test --watch TestName` is helpful in development. 5. Run `yarn test --prod` to test in the production environment. It supports the same options as `yarn test`. 6. If you need a debugger, run `yarn test --debug --watch TestName`, open `chrome://inspect`, and press "Inspect". 7. Format your code with [prettier](https://github.com/prettier/prettier) (`yarn prettier`). 8. Make sure your code lints (`yarn lint`). Tip: `yarn linc` to only check changed files. 9. Run the [Flow](https://flowtype.org/) type checks (`yarn flow`). 10. If you haven't already, complete the CLA. Learn more about contributing: https://reactjs.org/docs/how-to-contribute.html --> ## Summary This pull request fixes a small UI issue in the React Developer Tools settings panel. The “Display density” field was appearing twice in the General tab. Fix : facebook#34791 DiffTrain build for [91e5c3d](facebook@91e5c3d)
1 parent 0badfe2 commit 3c28824

28 files changed

+270
-273
lines changed

‎compiled-rn/VERSION_NATIVE_FB‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.3.0-native-fb-848e0e3a-20251007
1+
19.3.0-native-fb-91e5c3da-20251009

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<9385e3d55b2db9e223335e9f4f00973e>>
10+
* @generated SignedSource<<e8222a8a62616af8c1e4e94e258bb119>>
1111
*/
1212

1313
"use strict";
@@ -404,5 +404,5 @@ __DEV__ &&
404404
exports.useFormStatus = function () {
405405
return resolveDispatcher().useHostTransitionStatus();
406406
};
407-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
407+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";
408408
})();

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-prod.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<e3b3d101c920494f8e6989d050e012b6>>
10+
* @generated SignedSource<<104000ac7795ac803d30215e7500070e>>
1111
*/
1212

1313
"use strict";
@@ -203,4 +203,4 @@ exports.useFormState = function (action, initialState, permalink) {
203203
exports.useFormStatus = function () {
204204
return ReactSharedInternals.H.useHostTransitionStatus();
205205
};
206-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
206+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-profiling.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<e3b3d101c920494f8e6989d050e012b6>>
10+
* @generated SignedSource<<104000ac7795ac803d30215e7500070e>>
1111
*/
1212

1313
"use strict";
@@ -203,4 +203,4 @@ exports.useFormState = function (action, initialState, permalink) {
203203
exports.useFormStatus = function () {
204204
return ReactSharedInternals.H.useHostTransitionStatus();
205205
};
206-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
206+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-dev.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<c9da4d048c811f906e4c3fd719c622c4>>
10+
* @generated SignedSource<<54120279670055f196cd0439505f094e>>
1111
*/
1212

1313
/*
@@ -30124,11 +30124,11 @@ __DEV__ &&
3012430124
};
3012530125
(function () {
3012630126
var isomorphicReactPackageVersion = React.version;
30127-
if ("19.3.0-native-fb-848e0e3a-20251007" !== isomorphicReactPackageVersion)
30127+
if ("19.3.0-native-fb-91e5c3da-20251009" !== isomorphicReactPackageVersion)
3012830128
throw Error(
3012930129
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
3013030130
(isomorphicReactPackageVersion +
30131-
"\n - react-dom: 19.3.0-native-fb-848e0e3a-20251007\nLearn more: https://react.dev/warnings/version-mismatch")
30131+
"\n - react-dom: 19.3.0-native-fb-91e5c3da-20251009\nLearn more: https://react.dev/warnings/version-mismatch")
3013230132
);
3013330133
})();
3013430134
("function" === typeof Map &&
@@ -30165,10 +30165,10 @@ __DEV__ &&
3016530165
!(function () {
3016630166
var internals = {
3016730167
bundleType: 1,
30168-
version: "19.3.0-native-fb-848e0e3a-20251007",
30168+
version: "19.3.0-native-fb-91e5c3da-20251009",
3016930169
rendererPackageName: "react-dom",
3017030170
currentDispatcherRef: ReactSharedInternals,
30171-
reconcilerVersion: "19.3.0-native-fb-848e0e3a-20251007"
30171+
reconcilerVersion: "19.3.0-native-fb-91e5c3da-20251009"
3017230172
};
3017330173
internals.overrideHookState = overrideHookState;
3017430174
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -30318,5 +30318,5 @@ __DEV__ &&
3031830318
listenToAllSupportedEvents(container);
3031930319
return new ReactDOMHydrationRoot(initialChildren);
3032030320
};
30321-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
30321+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";
3032230322
})();

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-prod.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<fe24d1d0404239568f9caf7ae60129ce>>
10+
* @generated SignedSource<<ff05d15372bd4b8c03d79787d61231f2>>
1111
*/
1212

1313
/*
@@ -17576,14 +17576,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1757617576
};
1757717577
var isomorphicReactPackageVersion$jscomp$inline_2059 = React.version;
1757817578
if (
17579-
"19.3.0-native-fb-848e0e3a-20251007" !==
17579+
"19.3.0-native-fb-91e5c3da-20251009" !==
1758017580
isomorphicReactPackageVersion$jscomp$inline_2059
1758117581
)
1758217582
throw Error(
1758317583
formatProdErrorMessage(
1758417584
527,
1758517585
isomorphicReactPackageVersion$jscomp$inline_2059,
17586-
"19.3.0-native-fb-848e0e3a-20251007"
17586+
"19.3.0-native-fb-91e5c3da-20251009"
1758717587
)
1758817588
);
1758917589
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17605,10 +17605,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1760517605
};
1760617606
var internals$jscomp$inline_2636 = {
1760717607
bundleType: 0,
17608-
version: "19.3.0-native-fb-848e0e3a-20251007",
17608+
version: "19.3.0-native-fb-91e5c3da-20251009",
1760917609
rendererPackageName: "react-dom",
1761017610
currentDispatcherRef: ReactSharedInternals,
17611-
reconcilerVersion: "19.3.0-native-fb-848e0e3a-20251007"
17611+
reconcilerVersion: "19.3.0-native-fb-91e5c3da-20251009"
1761217612
};
1761317613
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1761417614
var hook$jscomp$inline_2637 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17715,4 +17715,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1771517715
listenToAllSupportedEvents(container);
1771617716
return new ReactDOMHydrationRoot(initialChildren);
1771717717
};
17718-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
17718+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-profiling.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<ba53d5c21b15a68e553fae24f1ccc7da>>
10+
* @generated SignedSource<<2171cef8a0acc71074c1ba5beb762b72>>
1111
*/
1212

1313
/*
@@ -19714,14 +19714,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1971419714
};
1971519715
var isomorphicReactPackageVersion$jscomp$inline_2374 = React.version;
1971619716
if (
19717-
"19.3.0-native-fb-848e0e3a-20251007" !==
19717+
"19.3.0-native-fb-91e5c3da-20251009" !==
1971819718
isomorphicReactPackageVersion$jscomp$inline_2374
1971919719
)
1972019720
throw Error(
1972119721
formatProdErrorMessage(
1972219722
527,
1972319723
isomorphicReactPackageVersion$jscomp$inline_2374,
19724-
"19.3.0-native-fb-848e0e3a-20251007"
19724+
"19.3.0-native-fb-91e5c3da-20251009"
1972519725
)
1972619726
);
1972719727
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -19743,10 +19743,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1974319743
};
1974419744
var internals$jscomp$inline_2381 = {
1974519745
bundleType: 0,
19746-
version: "19.3.0-native-fb-848e0e3a-20251007",
19746+
version: "19.3.0-native-fb-91e5c3da-20251009",
1974719747
rendererPackageName: "react-dom",
1974819748
currentDispatcherRef: ReactSharedInternals,
19749-
reconcilerVersion: "19.3.0-native-fb-848e0e3a-20251007",
19749+
reconcilerVersion: "19.3.0-native-fb-91e5c3da-20251009",
1975019750
getLaneLabelMap: function () {
1975119751
for (
1975219752
var map = new Map(), lane = 1, index$331 = 0;
@@ -19869,4 +19869,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1986919869
listenToAllSupportedEvents(container);
1987019870
return new ReactDOMHydrationRoot(initialChildren);
1987119871
};
19872-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
19872+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMProfiling-dev.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<57d512b675e76abbc6083c82caf996d1>>
10+
* @generated SignedSource<<4a83a403956bbc8424fad957c860bbf5>>
1111
*/
1212

1313
/*
@@ -30180,11 +30180,11 @@ __DEV__ &&
3018030180
};
3018130181
(function () {
3018230182
var isomorphicReactPackageVersion = React.version;
30183-
if ("19.3.0-native-fb-848e0e3a-20251007" !== isomorphicReactPackageVersion)
30183+
if ("19.3.0-native-fb-91e5c3da-20251009" !== isomorphicReactPackageVersion)
3018430184
throw Error(
3018530185
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
3018630186
(isomorphicReactPackageVersion +
30187-
"\n - react-dom: 19.3.0-native-fb-848e0e3a-20251007\nLearn more: https://react.dev/warnings/version-mismatch")
30187+
"\n - react-dom: 19.3.0-native-fb-91e5c3da-20251009\nLearn more: https://react.dev/warnings/version-mismatch")
3018830188
);
3018930189
})();
3019030190
("function" === typeof Map &&
@@ -30221,10 +30221,10 @@ __DEV__ &&
3022130221
!(function () {
3022230222
var internals = {
3022330223
bundleType: 1,
30224-
version: "19.3.0-native-fb-848e0e3a-20251007",
30224+
version: "19.3.0-native-fb-91e5c3da-20251009",
3022530225
rendererPackageName: "react-dom",
3022630226
currentDispatcherRef: ReactSharedInternals,
30227-
reconcilerVersion: "19.3.0-native-fb-848e0e3a-20251007"
30227+
reconcilerVersion: "19.3.0-native-fb-91e5c3da-20251009"
3022830228
};
3022930229
internals.overrideHookState = overrideHookState;
3023030230
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -30690,7 +30690,7 @@ __DEV__ &&
3069030690
exports.useFormStatus = function () {
3069130691
return resolveDispatcher().useHostTransitionStatus();
3069230692
};
30693-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
30693+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";
3069430694
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
3069530695
"function" ===
3069630696
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMProfiling-prod.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<1c22276fa24da9955d62505f46eeab06>>
10+
* @generated SignedSource<<51d2b310256fac734f96b0afe30e4c86>>
1111
*/
1212

1313
/*
@@ -17587,14 +17587,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1758717587
};
1758817588
var isomorphicReactPackageVersion$jscomp$inline_2060 = React.version;
1758917589
if (
17590-
"19.3.0-native-fb-848e0e3a-20251007" !==
17590+
"19.3.0-native-fb-91e5c3da-20251009" !==
1759117591
isomorphicReactPackageVersion$jscomp$inline_2060
1759217592
)
1759317593
throw Error(
1759417594
formatProdErrorMessage(
1759517595
527,
1759617596
isomorphicReactPackageVersion$jscomp$inline_2060,
17597-
"19.3.0-native-fb-848e0e3a-20251007"
17597+
"19.3.0-native-fb-91e5c3da-20251009"
1759817598
)
1759917599
);
1760017600
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17616,10 +17616,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1761617616
};
1761717617
var internals$jscomp$inline_2639 = {
1761817618
bundleType: 0,
17619-
version: "19.3.0-native-fb-848e0e3a-20251007",
17619+
version: "19.3.0-native-fb-91e5c3da-20251009",
1762017620
rendererPackageName: "react-dom",
1762117621
currentDispatcherRef: ReactSharedInternals,
17622-
reconcilerVersion: "19.3.0-native-fb-848e0e3a-20251007"
17622+
reconcilerVersion: "19.3.0-native-fb-91e5c3da-20251009"
1762317623
};
1762417624
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1762517625
var hook$jscomp$inline_2640 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17879,4 +17879,4 @@ exports.useFormState = function (action, initialState, permalink) {
1787917879
exports.useFormStatus = function () {
1788017880
return ReactSharedInternals.H.useHostTransitionStatus();
1788117881
};
17882-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
17882+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMProfiling-profiling.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<3077b742d566e14c46181e378c2a63e9>>
10+
* @generated SignedSource<<f4bc00e46830b3eeea1b4f6859b03a68>>
1111
*/
1212

1313
/*
@@ -19729,14 +19729,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1972919729
};
1973019730
var isomorphicReactPackageVersion$jscomp$inline_2375 = React.version;
1973119731
if (
19732-
"19.3.0-native-fb-848e0e3a-20251007" !==
19732+
"19.3.0-native-fb-91e5c3da-20251009" !==
1973319733
isomorphicReactPackageVersion$jscomp$inline_2375
1973419734
)
1973519735
throw Error(
1973619736
formatProdErrorMessage(
1973719737
527,
1973819738
isomorphicReactPackageVersion$jscomp$inline_2375,
19739-
"19.3.0-native-fb-848e0e3a-20251007"
19739+
"19.3.0-native-fb-91e5c3da-20251009"
1974019740
)
1974119741
);
1974219742
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -19758,10 +19758,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1975819758
};
1975919759
var internals$jscomp$inline_2382 = {
1976019760
bundleType: 0,
19761-
version: "19.3.0-native-fb-848e0e3a-20251007",
19761+
version: "19.3.0-native-fb-91e5c3da-20251009",
1976219762
rendererPackageName: "react-dom",
1976319763
currentDispatcherRef: ReactSharedInternals,
19764-
reconcilerVersion: "19.3.0-native-fb-848e0e3a-20251007",
19764+
reconcilerVersion: "19.3.0-native-fb-91e5c3da-20251009",
1976519765
getLaneLabelMap: function () {
1976619766
for (
1976719767
var map = new Map(), lane = 1, index$331 = 0;
@@ -20037,7 +20037,7 @@ exports.useFormState = function (action, initialState, permalink) {
2003720037
exports.useFormStatus = function () {
2003820038
return ReactSharedInternals.H.useHostTransitionStatus();
2003920039
};
20040-
exports.version = "19.3.0-native-fb-848e0e3a-20251007";
20040+
exports.version = "19.3.0-native-fb-91e5c3da-20251009";
2004120041
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
2004220042
"function" ===
2004320043
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)