Skip to content

Commit fa65896

Browse files
sebmarkbagesebmarkbage
committed
Remove initOption special case (#26595)
This traces back to #6449 and then another before that. I think that back then we favored the property over the attribute, and setting the property wouldn't be enough. However, the default path for these are now using attributes if we don't special case it. So we don't need it. The only difference is that we currently have a divergence for symbol/function behavior between controlled values that use the getToStringValue helpers which treat them as empty string, where as everywhere else they're treated as null/missing. Since this comes with a warning and is a weird error case, it's probably fine to change. DiffTrain build for [343a45f](343a45f)
1 parent e2c8a46 commit fa65896

15 files changed

+111
-151
lines changed

‎compiled/facebook-www/REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
58742c21b8c3237e8b66c7df4e200504846a01ae
1+
343a45ffa48065e60699bbe68f82d7b62fa02840

‎compiled/facebook-www/React-dev.modern.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if (
2727
}
2828
"use strict";
2929

30-
var ReactVersion = "18.3.0-www-modern-c910362f";
30+
var ReactVersion = "18.3.0-www-modern-6befcd4c";
3131

3232
// ATTENTION
3333
// When adding new symbols to this file,

‎compiled/facebook-www/ReactART-dev.classic.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
6969
return self;
7070
}
7171

72-
var ReactVersion = "18.3.0-www-classic-e55ff31a";
72+
var ReactVersion = "18.3.0-www-classic-23097578";
7373

7474
var LegacyRoot = 0;
7575
var ConcurrentRoot = 1;

‎compiled/facebook-www/ReactART-prod.modern.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9675,7 +9675,7 @@ var slice = Array.prototype.slice,
96759675
return null;
96769676
},
96779677
bundleType: 0,
9678-
version: "18.3.0-www-modern-6d893aea",
9678+
version: "18.3.0-www-modern-a2dd0337",
96799679
rendererPackageName: "react-art"
96809680
};
96819681
var internals$jscomp$inline_1309 = {
@@ -9706,7 +9706,7 @@ var internals$jscomp$inline_1309 = {
97069706
scheduleRoot: null,
97079707
setRefreshHandler: null,
97089708
getCurrentFiber: null,
9709-
reconcilerVersion: "18.3.0-www-modern-6d893aea"
9709+
reconcilerVersion: "18.3.0-www-modern-a2dd0337"
97109710
};
97119711
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
97129712
var hook$jscomp$inline_1310 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled/facebook-www/ReactDOM-dev.classic.js‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4098,12 +4098,6 @@ function validateOptionProps(element, props) {
40984098
}
40994099
}
41004100
}
4101-
function initOption(element, props) {
4102-
// value="" should make a value attribute (#6219)
4103-
if (props.value != null) {
4104-
element.setAttribute("value", toString(getToStringValue(props.value)));
4105-
}
4106-
}
41074101

41084102
var isArrayImpl = Array.isArray; // eslint-disable-next-line no-redeclare
41094103

@@ -33779,7 +33773,7 @@ function createFiberRoot(
3377933773
return root;
3378033774
}
3378133775

33782-
var ReactVersion = "18.3.0-www-classic-e3eacb5a";
33776+
var ReactVersion = "18.3.0-www-classic-911d0261";
3378333777

3378433778
function createPortal$1(
3378533779
children,
@@ -39063,7 +39057,6 @@ function setInitialProperties(domElement, tag, props) {
3906339057
}
3906439058
}
3906539059

39066-
initOption(domElement, props);
3906739060
return;
3906839061
}
3906939062

‎compiled/facebook-www/ReactDOM-dev.modern.js‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3932,12 +3932,6 @@ function validateOptionProps(element, props) {
39323932
}
39333933
}
39343934
}
3935-
function initOption(element, props) {
3936-
// value="" should make a value attribute (#6219)
3937-
if (props.value != null) {
3938-
element.setAttribute("value", toString(getToStringValue(props.value)));
3939-
}
3940-
}
39413935

39423936
var isArrayImpl = Array.isArray; // eslint-disable-next-line no-redeclare
39433937

@@ -33615,7 +33609,7 @@ function createFiberRoot(
3361533609
return root;
3361633610
}
3361733611

33618-
var ReactVersion = "18.3.0-www-modern-6d893aea";
33612+
var ReactVersion = "18.3.0-www-modern-a2dd0337";
3361933613

3362033614
function createPortal$1(
3362133615
children,
@@ -39565,7 +39559,6 @@ function setInitialProperties(domElement, tag, props) {
3956539559
}
3956639560
}
3956739561

39568-
initOption(domElement, props);
3956939562
return;
3957039563
}
3957139564

‎compiled/facebook-www/ReactDOM-prod.classic.js‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14143,8 +14143,6 @@ function setInitialProperties(domElement, tag, props) {
1414314143
default:
1414414144
setProp(domElement, tag, propKey$201, propKey, props);
1414514145
}
14146-
null != props.value &&
14147-
domElement.setAttribute("value", "" + getToStringValue(props.value));
1414814146
return;
1414914147
case "dialog":
1415014148
listenToNonDelegatedEvent("cancel", domElement);
@@ -16329,17 +16327,17 @@ Internals.Events = [
1632916327
restoreStateIfNeeded,
1633016328
batchedUpdates$1
1633116329
];
16332-
var devToolsConfig$jscomp$inline_1841 = {
16330+
var devToolsConfig$jscomp$inline_1838 = {
1633316331
findFiberByHostInstance: getClosestInstanceFromNode,
1633416332
bundleType: 0,
16335-
version: "18.3.0-www-classic-ded49a3c",
16333+
version: "18.3.0-www-classic-3325ddf4",
1633616334
rendererPackageName: "react-dom"
1633716335
};
16338-
var internals$jscomp$inline_2201 = {
16339-
bundleType: devToolsConfig$jscomp$inline_1841.bundleType,
16340-
version: devToolsConfig$jscomp$inline_1841.version,
16341-
rendererPackageName: devToolsConfig$jscomp$inline_1841.rendererPackageName,
16342-
rendererConfig: devToolsConfig$jscomp$inline_1841.rendererConfig,
16336+
var internals$jscomp$inline_2198 = {
16337+
bundleType: devToolsConfig$jscomp$inline_1838.bundleType,
16338+
version: devToolsConfig$jscomp$inline_1838.version,
16339+
rendererPackageName: devToolsConfig$jscomp$inline_1838.rendererPackageName,
16340+
rendererConfig: devToolsConfig$jscomp$inline_1838.rendererConfig,
1634316341
overrideHookState: null,
1634416342
overrideHookStateDeletePath: null,
1634516343
overrideHookStateRenamePath: null,
@@ -16355,26 +16353,26 @@ var internals$jscomp$inline_2201 = {
1635516353
return null === fiber ? null : fiber.stateNode;
1635616354
},
1635716355
findFiberByHostInstance:
16358-
devToolsConfig$jscomp$inline_1841.findFiberByHostInstance ||
16356+
devToolsConfig$jscomp$inline_1838.findFiberByHostInstance ||
1635916357
emptyFindFiberByHostInstance,
1636016358
findHostInstancesForRefresh: null,
1636116359
scheduleRefresh: null,
1636216360
scheduleRoot: null,
1636316361
setRefreshHandler: null,
1636416362
getCurrentFiber: null,
16365-
reconcilerVersion: "18.3.0-www-classic-ded49a3c"
16363+
reconcilerVersion: "18.3.0-www-classic-3325ddf4"
1636616364
};
1636716365
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
16368-
var hook$jscomp$inline_2202 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
16366+
var hook$jscomp$inline_2199 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
1636916367
if (
16370-
!hook$jscomp$inline_2202.isDisabled &&
16371-
hook$jscomp$inline_2202.supportsFiber
16368+
!hook$jscomp$inline_2199.isDisabled &&
16369+
hook$jscomp$inline_2199.supportsFiber
1637216370
)
1637316371
try {
16374-
(rendererID = hook$jscomp$inline_2202.inject(
16375-
internals$jscomp$inline_2201
16372+
(rendererID = hook$jscomp$inline_2199.inject(
16373+
internals$jscomp$inline_2198
1637616374
)),
16377-
(injectedHook = hook$jscomp$inline_2202);
16375+
(injectedHook = hook$jscomp$inline_2199);
1637816376
} catch (err) {}
1637916377
}
1638016378
assign(Internals, {
@@ -16602,4 +16600,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
1660216600
);
1660316601
};
1660416602
exports.unstable_runWithPriority = runWithPriority;
16605-
exports.version = "18.3.0-www-classic-ded49a3c";
16603+
exports.version = "18.3.0-www-classic-3325ddf4";

‎compiled/facebook-www/ReactDOM-prod.modern.js‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14375,8 +14375,6 @@ function setInitialProperties(domElement, tag, props) {
1437514375
default:
1437614376
setProp(domElement, tag, propKey$205, propKey, props);
1437714377
}
14378-
null != props.value &&
14379-
domElement.setAttribute("value", "" + getToStringValue(props.value));
1438014378
return;
1438114379
case "dialog":
1438214380
listenToNonDelegatedEvent("cancel", domElement);
@@ -15857,17 +15855,17 @@ Internals.Events = [
1585715855
restoreStateIfNeeded,
1585815856
batchedUpdates$1
1585915857
];
15860-
var devToolsConfig$jscomp$inline_1800 = {
15858+
var devToolsConfig$jscomp$inline_1797 = {
1586115859
findFiberByHostInstance: getClosestInstanceFromNode,
1586215860
bundleType: 0,
15863-
version: "18.3.0-www-modern-b596b6b5",
15861+
version: "18.3.0-www-modern-dc667d26",
1586415862
rendererPackageName: "react-dom"
1586515863
};
15866-
var internals$jscomp$inline_2165 = {
15867-
bundleType: devToolsConfig$jscomp$inline_1800.bundleType,
15868-
version: devToolsConfig$jscomp$inline_1800.version,
15869-
rendererPackageName: devToolsConfig$jscomp$inline_1800.rendererPackageName,
15870-
rendererConfig: devToolsConfig$jscomp$inline_1800.rendererConfig,
15864+
var internals$jscomp$inline_2162 = {
15865+
bundleType: devToolsConfig$jscomp$inline_1797.bundleType,
15866+
version: devToolsConfig$jscomp$inline_1797.version,
15867+
rendererPackageName: devToolsConfig$jscomp$inline_1797.rendererPackageName,
15868+
rendererConfig: devToolsConfig$jscomp$inline_1797.rendererConfig,
1587115869
overrideHookState: null,
1587215870
overrideHookStateDeletePath: null,
1587315871
overrideHookStateRenamePath: null,
@@ -15884,26 +15882,26 @@ var internals$jscomp$inline_2165 = {
1588415882
return null === fiber ? null : fiber.stateNode;
1588515883
},
1588615884
findFiberByHostInstance:
15887-
devToolsConfig$jscomp$inline_1800.findFiberByHostInstance ||
15885+
devToolsConfig$jscomp$inline_1797.findFiberByHostInstance ||
1588815886
emptyFindFiberByHostInstance,
1588915887
findHostInstancesForRefresh: null,
1589015888
scheduleRefresh: null,
1589115889
scheduleRoot: null,
1589215890
setRefreshHandler: null,
1589315891
getCurrentFiber: null,
15894-
reconcilerVersion: "18.3.0-www-modern-b596b6b5"
15892+
reconcilerVersion: "18.3.0-www-modern-dc667d26"
1589515893
};
1589615894
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
15897-
var hook$jscomp$inline_2166 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
15895+
var hook$jscomp$inline_2163 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
1589815896
if (
15899-
!hook$jscomp$inline_2166.isDisabled &&
15900-
hook$jscomp$inline_2166.supportsFiber
15897+
!hook$jscomp$inline_2163.isDisabled &&
15898+
hook$jscomp$inline_2163.supportsFiber
1590115899
)
1590215900
try {
15903-
(rendererID = hook$jscomp$inline_2166.inject(
15904-
internals$jscomp$inline_2165
15901+
(rendererID = hook$jscomp$inline_2163.inject(
15902+
internals$jscomp$inline_2162
1590515903
)),
15906-
(injectedHook = hook$jscomp$inline_2166);
15904+
(injectedHook = hook$jscomp$inline_2163);
1590715905
} catch (err) {}
1590815906
}
1590915907
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals;
@@ -16059,4 +16057,4 @@ exports.unstable_createEventHandle = function (type, options) {
1605916057
return eventHandle;
1606016058
};
1606116059
exports.unstable_runWithPriority = runWithPriority;
16062-
exports.version = "18.3.0-www-modern-b596b6b5";
16060+
exports.version = "18.3.0-www-modern-dc667d26";

‎compiled/facebook-www/ReactDOM-profiling.classic.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14917,8 +14917,6 @@ function setInitialProperties(domElement, tag, props) {
1491714917
default:
1491814918
setProp(domElement, tag, propKey$222, propKey, props);
1491914919
}
14920-
null != props.value &&
14921-
domElement.setAttribute("value", "" + getToStringValue(props.value));
1492214920
return;
1492314921
case "dialog":
1492414922
listenToNonDelegatedEvent("cancel", domElement);
@@ -17103,10 +17101,10 @@ Internals.Events = [
1710317101
restoreStateIfNeeded,
1710417102
batchedUpdates$1
1710517103
];
17106-
var devToolsConfig$jscomp$inline_1920 = {
17104+
var devToolsConfig$jscomp$inline_1917 = {
1710717105
findFiberByHostInstance: getClosestInstanceFromNode,
1710817106
bundleType: 0,
17109-
version: "18.3.0-www-classic-c5e22311",
17107+
version: "18.3.0-www-classic-dfa170b8",
1711017108
rendererPackageName: "react-dom"
1711117109
};
1711217110
(function (internals) {
@@ -17124,10 +17122,10 @@ var devToolsConfig$jscomp$inline_1920 = {
1712417122
} catch (err) {}
1712517123
return hook.checkDCE ? !0 : !1;
1712617124
})({
17127-
bundleType: devToolsConfig$jscomp$inline_1920.bundleType,
17128-
version: devToolsConfig$jscomp$inline_1920.version,
17129-
rendererPackageName: devToolsConfig$jscomp$inline_1920.rendererPackageName,
17130-
rendererConfig: devToolsConfig$jscomp$inline_1920.rendererConfig,
17125+
bundleType: devToolsConfig$jscomp$inline_1917.bundleType,
17126+
version: devToolsConfig$jscomp$inline_1917.version,
17127+
rendererPackageName: devToolsConfig$jscomp$inline_1917.rendererPackageName,
17128+
rendererConfig: devToolsConfig$jscomp$inline_1917.rendererConfig,
1713117129
overrideHookState: null,
1713217130
overrideHookStateDeletePath: null,
1713317131
overrideHookStateRenamePath: null,
@@ -17143,14 +17141,14 @@ var devToolsConfig$jscomp$inline_1920 = {
1714317141
return null === fiber ? null : fiber.stateNode;
1714417142
},
1714517143
findFiberByHostInstance:
17146-
devToolsConfig$jscomp$inline_1920.findFiberByHostInstance ||
17144+
devToolsConfig$jscomp$inline_1917.findFiberByHostInstance ||
1714717145
emptyFindFiberByHostInstance,
1714817146
findHostInstancesForRefresh: null,
1714917147
scheduleRefresh: null,
1715017148
scheduleRoot: null,
1715117149
setRefreshHandler: null,
1715217150
getCurrentFiber: null,
17153-
reconcilerVersion: "18.3.0-www-classic-c5e22311"
17151+
reconcilerVersion: "18.3.0-www-classic-dfa170b8"
1715417152
});
1715517153
assign(Internals, {
1715617154
ReactBrowserEventEmitter: {
@@ -17377,7 +17375,7 @@ exports.unstable_renderSubtreeIntoContainer = function (
1737717375
);
1737817376
};
1737917377
exports.unstable_runWithPriority = runWithPriority;
17380-
exports.version = "18.3.0-www-classic-c5e22311";
17378+
exports.version = "18.3.0-www-classic-dfa170b8";
1738117379

1738217380
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
1738317381
if (

‎compiled/facebook-www/ReactDOM-profiling.modern.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15143,8 +15143,6 @@ function setInitialProperties(domElement, tag, props) {
1514315143
default:
1514415144
setProp(domElement, tag, propKey$226, propKey, props);
1514515145
}
15146-
null != props.value &&
15147-
domElement.setAttribute("value", "" + getToStringValue(props.value));
1514815146
return;
1514915147
case "dialog":
1515015148
listenToNonDelegatedEvent("cancel", domElement);
@@ -16625,10 +16623,10 @@ Internals.Events = [
1662516623
restoreStateIfNeeded,
1662616624
batchedUpdates$1
1662716625
];
16628-
var devToolsConfig$jscomp$inline_1879 = {
16626+
var devToolsConfig$jscomp$inline_1876 = {
1662916627
findFiberByHostInstance: getClosestInstanceFromNode,
1663016628
bundleType: 0,
16631-
version: "18.3.0-www-modern-f255a7e3",
16629+
version: "18.3.0-www-modern-e043269d",
1663216630
rendererPackageName: "react-dom"
1663316631
};
1663416632
(function (internals) {
@@ -16646,10 +16644,10 @@ var devToolsConfig$jscomp$inline_1879 = {
1664616644
} catch (err) {}
1664716645
return hook.checkDCE ? !0 : !1;
1664816646
})({
16649-
bundleType: devToolsConfig$jscomp$inline_1879.bundleType,
16650-
version: devToolsConfig$jscomp$inline_1879.version,
16651-
rendererPackageName: devToolsConfig$jscomp$inline_1879.rendererPackageName,
16652-
rendererConfig: devToolsConfig$jscomp$inline_1879.rendererConfig,
16647+
bundleType: devToolsConfig$jscomp$inline_1876.bundleType,
16648+
version: devToolsConfig$jscomp$inline_1876.version,
16649+
rendererPackageName: devToolsConfig$jscomp$inline_1876.rendererPackageName,
16650+
rendererConfig: devToolsConfig$jscomp$inline_1876.rendererConfig,
1665316651
overrideHookState: null,
1665416652
overrideHookStateDeletePath: null,
1665516653
overrideHookStateRenamePath: null,
@@ -16666,14 +16664,14 @@ var devToolsConfig$jscomp$inline_1879 = {
1666616664
return null === fiber ? null : fiber.stateNode;
1666716665
},
1666816666
findFiberByHostInstance:
16669-
devToolsConfig$jscomp$inline_1879.findFiberByHostInstance ||
16667+
devToolsConfig$jscomp$inline_1876.findFiberByHostInstance ||
1667016668
emptyFindFiberByHostInstance,
1667116669
findHostInstancesForRefresh: null,
1667216670
scheduleRefresh: null,
1667316671
scheduleRoot: null,
1667416672
setRefreshHandler: null,
1667516673
getCurrentFiber: null,
16676-
reconcilerVersion: "18.3.0-www-modern-f255a7e3"
16674+
reconcilerVersion: "18.3.0-www-modern-e043269d"
1667716675
});
1667816676
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals;
1667916677
exports.createPortal = function (children, container) {
@@ -16828,7 +16826,7 @@ exports.unstable_createEventHandle = function (type, options) {
1682816826
return eventHandle;
1682916827
};
1683016828
exports.unstable_runWithPriority = runWithPriority;
16831-
exports.version = "18.3.0-www-modern-f255a7e3";
16829+
exports.version = "18.3.0-www-modern-e043269d";
1683216830

1683316831
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
1683416832
if (

0 commit comments

Comments
 (0)