Commit dcab44d

Browse files
authored
[react-dom] Fire onReset when automatically resetting forms (#35176)
1 parent b8a6bfa commit dcab44d

4 files changed

Lines changed: 167 additions & 0 deletions

File tree

‎fixtures/dom/src/components/Header.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class Header extends React.Component {
8888
<optionvalue="/mouse-events">Mouse Events</option>
8989
<optionvalue="/selection-events">Selection Events</option>
9090
<optionvalue="/suspense">Suspense</option>
91+
<optionvalue="/form-actions">Form Actions</option>
9192
<optionvalue="/form-state">Form State</option>
9293
<optionvalue="/fragment-refs">Fragment Refs</option>
9394
</select>
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
constReact=window.React;
2+
3+
const{useState}=React;
4+
5+
asyncfunctiondefer(timeoutMS){
6+
returnnewPromise(resolve=>{
7+
setTimeout(resolve,timeoutMS);
8+
});
9+
}
10+
11+
exportdefaultfunctionFormActions(){
12+
const[textValue,setTextValue]=useState('0');
13+
const[radioValue,setRadioValue]=useState('two');
14+
const[checkboxValue,setCheckboxValue]=useState([false,true,true]);
15+
const[selectValue,setSelectValue]=useState('three');
16+
17+
return(
18+
<form
19+
action={async()=>{
20+
awaitdefer(500);
21+
}}
22+
onReset={()=>{
23+
setTextValue('0');
24+
setRadioValue('two');
25+
setCheckboxValue([false,true,true]);
26+
setSelectValue('three');
27+
}}>
28+
<divstyle={{display: 'flex'}}>
29+
<fieldsetstyle={{flexBasis: 0}}>
30+
<legend>type="text"</legend>
31+
<input
32+
type="text"
33+
name="text"
34+
value={textValue}
35+
onChange={event=>setTextValue(event.currentTarget.value)}
36+
/>
37+
</fieldset>
38+
<fieldsetstyle={{flexBasis: 0}}>
39+
<legend>type="radio"</legend>
40+
<input
41+
type="radio"
42+
name="radio"
43+
value="one"
44+
checked={radioValue==='one'}
45+
onChange={()=>setRadioValue('one')}
46+
/>
47+
<input
48+
type="radio"
49+
name="radio"
50+
value="two"
51+
checked={radioValue==='two'}
52+
onChange={()=>setRadioValue('two')}
53+
/>
54+
<input
55+
type="radio"
56+
name="radio"
57+
value="three"
58+
checked={radioValue==='three'}
59+
onChange={()=>setRadioValue('three')}
60+
/>
61+
</fieldset>
62+
<fieldsetstyle={{flexBasis: 0}}>
63+
<legend>type="checkbox"</legend>
64+
<input
65+
type="checkbox"
66+
name="checkbox"
67+
value="one"
68+
checked={checkboxValue[0]}
69+
onChange={event=>{
70+
constchecked=event.currentTarget.checked;
71+
setCheckboxValue(pending=>[checked,pending[1],pending[2]]);
72+
}}
73+
/>
74+
<input
75+
type="checkbox"
76+
name="checkbox"
77+
value="two"
78+
checked={checkboxValue[1]}
79+
onChange={event=>{
80+
constchecked=event.currentTarget.checked;
81+
setCheckboxValue(pending=>[pending[0],checked,pending[2]]);
82+
}}
83+
/>
84+
<input
85+
type="checkbox"
86+
name="checkbox"
87+
value="three"
88+
checked={checkboxValue[2]}
89+
onChange={event=>{
90+
constchecked=event.currentTarget.checked;
91+
setCheckboxValue(pending=>[pending[0],pending[1],checked]);
92+
}}
93+
/>
94+
</fieldset>
95+
<fieldsetstyle={{flexBasis: 0}}>
96+
<legend>select</legend>
97+
<select
98+
name="select"
99+
value={selectValue}
100+
onChange={event=>setSelectValue(event.currentTarget.value)}>
101+
<optionvalue="one">one</option>
102+
<optionvalue="two">two</option>
103+
<optionvalue="three">three</option>
104+
</select>
105+
</fieldset>
106+
</div>
107+
<div>
108+
<inputtype="reset"/>
109+
<inputtype="submit"/>
110+
</div>
111+
</form>
112+
);
113+
}

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,5 +6562,7 @@ export const HostTransitionContext: ReactContext<TransitionStatus> = {
65626562

65636563
exporttypeFormInstance=HTMLFormElement;
65646564
exportfunctionresetFormInstance(form: FormInstance): void{
6565+
ReactBrowserEventEmitterSetEnabled(true);
65656566
form.reset();
6567+
ReactBrowserEventEmitterSetEnabled(false);
65666568
}

‎packages/react-dom/src/__tests__/ReactDOMForm-test.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,57 @@ describe('ReactDOMForm', () => {
15961596
expect(divRef.current.textContent).toEqual('Current username: acdlite');
15971597
});
15981598

1599+
it('should fire onReset on automatic form reset',async()=>{
1600+
constformRef=React.createRef();
1601+
constinputRef=React.createRef();
1602+
1603+
letsetValue;
1604+
constdefaultValue=0;
1605+
functionApp({promiseForUsername}){
1606+
const[value,_setValue]=useState(defaultValue);
1607+
setValue=_setValue;
1608+
1609+
return(
1610+
<form
1611+
ref={formRef}
1612+
action={asyncformData=>{
1613+
Scheduler.log(`Async action started`);
1614+
awaitgetText('Wait');
1615+
}}
1616+
onReset={()=>{
1617+
setValue(defaultValue);
1618+
}}>
1619+
<input
1620+
ref={inputRef}
1621+
text="text"
1622+
name="amount"
1623+
value={value}
1624+
onChange={event=>setValue(event.currentTarget.value)}
1625+
/>
1626+
</form>
1627+
);
1628+
}
1629+
1630+
constroot=ReactDOMClient.createRoot(container);
1631+
awaitact(()=>root.render(<App/>));
1632+
1633+
// Dirty the controlled input
1634+
awaitact(()=>setValue('3'));
1635+
expect(inputRef.current.value).toEqual('3');
1636+
1637+
// Submit the form. This will trigger an async action.
1638+
awaitsubmit(formRef.current);
1639+
assertLog(['Async action started']);
1640+
1641+
// We haven't reset yet.
1642+
expect(inputRef.current.value).toEqual('3');
1643+
1644+
// Action completes. onReset has been fired and values reset manually.
1645+
awaitact(()=>resolveText('Wait'));
1646+
assertLog([]);
1647+
expect(inputRef.current.value).toEqual('0');
1648+
});
1649+
15991650
it('requestFormReset schedules a form reset after transition completes',async()=>{
16001651
// This is the same as the previous test, except the form is updated with
16011652
// a userspace action instead of a built-in form action.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit dcab44d

Browse files
authored
[react-dom] Fire onReset when automatically resetting forms (#35176)
1 parent b8a6bfa commit dcab44d

4 files changed

Lines changed: 167 additions & 0 deletions

File tree

‎fixtures/dom/src/components/Header.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class Header extends React.Component {
8888
<optionvalue="/mouse-events">Mouse Events</option>
8989
<optionvalue="/selection-events">Selection Events</option>
9090
<optionvalue="/suspense">Suspense</option>
91+
<optionvalue="/form-actions">Form Actions</option>
9192
<optionvalue="/form-state">Form State</option>
9293
<optionvalue="/fragment-refs">Fragment Refs</option>
9394
</select>
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
constReact=window.React;
2+
3+
const{useState}=React;
4+
5+
asyncfunctiondefer(timeoutMS){
6+
returnnewPromise(resolve=>{
7+
setTimeout(resolve,timeoutMS);
8+
});
9+
}
10+
11+
exportdefaultfunctionFormActions(){
12+
const[textValue,setTextValue]=useState('0');
13+
const[radioValue,setRadioValue]=useState('two');
14+
const[checkboxValue,setCheckboxValue]=useState([false,true,true]);
15+
const[selectValue,setSelectValue]=useState('three');
16+
17+
return(
18+
<form
19+
action={async()=>{
20+
awaitdefer(500);
21+
}}
22+
onReset={()=>{
23+
setTextValue('0');
24+
setRadioValue('two');
25+
setCheckboxValue([false,true,true]);
26+
setSelectValue('three');
27+
}}>
28+
<divstyle={{display: 'flex'}}>
29+
<fieldsetstyle={{flexBasis: 0}}>
30+
<legend>type="text"</legend>
31+
<input
32+
type="text"
33+
name="text"
34+
value={textValue}
35+
onChange={event=>setTextValue(event.currentTarget.value)}
36+
/>
37+
</fieldset>
38+
<fieldsetstyle={{flexBasis: 0}}>
39+
<legend>type="radio"</legend>
40+
<input
41+
type="radio"
42+
name="radio"
43+
value="one"
44+
checked={radioValue==='one'}
45+
onChange={()=>setRadioValue('one')}
46+
/>
47+
<input
48+
type="radio"
49+
name="radio"
50+
value="two"
51+
checked={radioValue==='two'}
52+
onChange={()=>setRadioValue('two')}
53+
/>
54+
<input
55+
type="radio"
56+
name="radio"
57+
value="three"
58+
checked={radioValue==='three'}
59+
onChange={()=>setRadioValue('three')}
60+
/>
61+
</fieldset>
62+
<fieldsetstyle={{flexBasis: 0}}>
63+
<legend>type="checkbox"</legend>
64+
<input
65+
type="checkbox"
66+
name="checkbox"
67+
value="one"
68+
checked={checkboxValue[0]}
69+
onChange={event=>{
70+
constchecked=event.currentTarget.checked;
71+
setCheckboxValue(pending=>[checked,pending[1],pending[2]]);
72+
}}
73+
/>
74+
<input
75+
type="checkbox"
76+
name="checkbox"
77+
value="two"
78+
checked={checkboxValue[1]}
79+
onChange={event=>{
80+
constchecked=event.currentTarget.checked;
81+
setCheckboxValue(pending=>[pending[0],checked,pending[2]]);
82+
}}
83+
/>
84+
<input
85+
type="checkbox"
86+
name="checkbox"
87+
value="three"
88+
checked={checkboxValue[2]}
89+
onChange={event=>{
90+
constchecked=event.currentTarget.checked;
91+
setCheckboxValue(pending=>[pending[0],pending[1],checked]);
92+
}}
93+
/>
94+
</fieldset>
95+
<fieldsetstyle={{flexBasis: 0}}>
96+
<legend>select</legend>
97+
<select
98+
name="select"
99+
value={selectValue}
100+
onChange={event=>setSelectValue(event.currentTarget.value)}>
101+
<optionvalue="one">one</option>
102+
<optionvalue="two">two</option>
103+
<optionvalue="three">three</option>
104+
</select>
105+
</fieldset>
106+
</div>
107+
<div>
108+
<inputtype="reset"/>
109+
<inputtype="submit"/>
110+
</div>
111+
</form>
112+
);
113+
}

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,5 +6562,7 @@ export const HostTransitionContext: ReactContext<TransitionStatus> = {
65626562

65636563
exporttypeFormInstance=HTMLFormElement;
65646564
exportfunctionresetFormInstance(form: FormInstance): void{
6565+
ReactBrowserEventEmitterSetEnabled(true);
65656566
form.reset();
6567+
ReactBrowserEventEmitterSetEnabled(false);
65666568
}

‎packages/react-dom/src/__tests__/ReactDOMForm-test.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,57 @@ describe('ReactDOMForm', () => {
15961596
expect(divRef.current.textContent).toEqual('Current username: acdlite');
15971597
});
15981598

1599+
it('should fire onReset on automatic form reset',async()=>{
1600+
constformRef=React.createRef();
1601+
constinputRef=React.createRef();
1602+
1603+
letsetValue;
1604+
constdefaultValue=0;
1605+
functionApp({promiseForUsername}){
1606+
const[value,_setValue]=useState(defaultValue);
1607+
setValue=_setValue;
1608+
1609+
return(
1610+
<form
1611+
ref={formRef}
1612+
action={asyncformData=>{
1613+
Scheduler.log(`Async action started`);
1614+
awaitgetText('Wait');
1615+
}}
1616+
onReset={()=>{
1617+
setValue(defaultValue);
1618+
}}>
1619+
<input
1620+
ref={inputRef}
1621+
text="text"
1622+
name="amount"
1623+
value={value}
1624+
onChange={event=>setValue(event.currentTarget.value)}
1625+
/>
1626+
</form>
1627+
);
1628+
}
1629+
1630+
constroot=ReactDOMClient.createRoot(container);
1631+
awaitact(()=>root.render(<App/>));
1632+
1633+
// Dirty the controlled input
1634+
awaitact(()=>setValue('3'));
1635+
expect(inputRef.current.value).toEqual('3');
1636+
1637+
// Submit the form. This will trigger an async action.
1638+
awaitsubmit(formRef.current);
1639+
assertLog(['Async action started']);
1640+
1641+
// We haven't reset yet.
1642+
expect(inputRef.current.value).toEqual('3');
1643+
1644+
// Action completes. onReset has been fired and values reset manually.
1645+
awaitact(()=>resolveText('Wait'));
1646+
assertLog([]);
1647+
expect(inputRef.current.value).toEqual('0');
1648+
});
1649+
15991650
it('requestFormReset schedules a form reset after transition completes',async()=>{
16001651
// This is the same as the previous test, except the form is updated with
16011652
// a userspace action instead of a built-in form action.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit dcab44d

Browse files
authored
[react-dom] Fire onReset when automatically resetting forms (#35176)
1 parent b8a6bfa commit dcab44d

4 files changed

Lines changed: 167 additions & 0 deletions

File tree

‎fixtures/dom/src/components/Header.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class Header extends React.Component {
8888
<optionvalue="/mouse-events">Mouse Events</option>
8989
<optionvalue="/selection-events">Selection Events</option>
9090
<optionvalue="/suspense">Suspense</option>
91+
<optionvalue="/form-actions">Form Actions</option>
9192
<optionvalue="/form-state">Form State</option>
9293
<optionvalue="/fragment-refs">Fragment Refs</option>
9394
</select>
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
constReact=window.React;
2+
3+
const{useState}=React;
4+
5+
asyncfunctiondefer(timeoutMS){
6+
returnnewPromise(resolve=>{
7+
setTimeout(resolve,timeoutMS);
8+
});
9+
}
10+
11+
exportdefaultfunctionFormActions(){
12+
const[textValue,setTextValue]=useState('0');
13+
const[radioValue,setRadioValue]=useState('two');
14+
const[checkboxValue,setCheckboxValue]=useState([false,true,true]);
15+
const[selectValue,setSelectValue]=useState('three');
16+
17+
return(
18+
<form
19+
action={async()=>{
20+
awaitdefer(500);
21+
}}
22+
onReset={()=>{
23+
setTextValue('0');
24+
setRadioValue('two');
25+
setCheckboxValue([false,true,true]);
26+
setSelectValue('three');
27+
}}>
28+
<divstyle={{display: 'flex'}}>
29+
<fieldsetstyle={{flexBasis: 0}}>
30+
<legend>type="text"</legend>
31+
<input
32+
type="text"
33+
name="text"
34+
value={textValue}
35+
onChange={event=>setTextValue(event.currentTarget.value)}
36+
/>
37+
</fieldset>
38+
<fieldsetstyle={{flexBasis: 0}}>
39+
<legend>type="radio"</legend>
40+
<input
41+
type="radio"
42+
name="radio"
43+
value="one"
44+
checked={radioValue==='one'}
45+
onChange={()=>setRadioValue('one')}
46+
/>
47+
<input
48+
type="radio"
49+
name="radio"
50+
value="two"
51+
checked={radioValue==='two'}
52+
onChange={()=>setRadioValue('two')}
53+
/>
54+
<input
55+
type="radio"
56+
name="radio"
57+
value="three"
58+
checked={radioValue==='three'}
59+
onChange={()=>setRadioValue('three')}
60+
/>
61+
</fieldset>
62+
<fieldsetstyle={{flexBasis: 0}}>
63+
<legend>type="checkbox"</legend>
64+
<input
65+
type="checkbox"
66+
name="checkbox"
67+
value="one"
68+
checked={checkboxValue[0]}
69+
onChange={event=>{
70+
constchecked=event.currentTarget.checked;
71+
setCheckboxValue(pending=>[checked,pending[1],pending[2]]);
72+
}}
73+
/>
74+
<input
75+
type="checkbox"
76+
name="checkbox"
77+
value="two"
78+
checked={checkboxValue[1]}
79+
onChange={event=>{
80+
constchecked=event.currentTarget.checked;
81+
setCheckboxValue(pending=>[pending[0],checked,pending[2]]);
82+
}}
83+
/>
84+
<input
85+
type="checkbox"
86+
name="checkbox"
87+
value="three"
88+
checked={checkboxValue[2]}
89+
onChange={event=>{
90+
constchecked=event.currentTarget.checked;
91+
setCheckboxValue(pending=>[pending[0],pending[1],checked]);
92+
}}
93+
/>
94+
</fieldset>
95+
<fieldsetstyle={{flexBasis: 0}}>
96+
<legend>select</legend>
97+
<select
98+
name="select"
99+
value={selectValue}
100+
onChange={event=>setSelectValue(event.currentTarget.value)}>
101+
<optionvalue="one">one</option>
102+
<optionvalue="two">two</option>
103+
<optionvalue="three">three</option>
104+
</select>
105+
</fieldset>
106+
</div>
107+
<div>
108+
<inputtype="reset"/>
109+
<inputtype="submit"/>
110+
</div>
111+
</form>
112+
);
113+
}

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,5 +6562,7 @@ export const HostTransitionContext: ReactContext<TransitionStatus> = {
65626562

65636563
exporttypeFormInstance=HTMLFormElement;
65646564
exportfunctionresetFormInstance(form: FormInstance): void{
6565+
ReactBrowserEventEmitterSetEnabled(true);
65656566
form.reset();
6567+
ReactBrowserEventEmitterSetEnabled(false);
65666568
}

‎packages/react-dom/src/__tests__/ReactDOMForm-test.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,57 @@ describe('ReactDOMForm', () => {
15961596
expect(divRef.current.textContent).toEqual('Current username: acdlite');
15971597
});
15981598

1599+
it('should fire onReset on automatic form reset',async()=>{
1600+
constformRef=React.createRef();
1601+
constinputRef=React.createRef();
1602+
1603+
letsetValue;
1604+
constdefaultValue=0;
1605+
functionApp({promiseForUsername}){
1606+
const[value,_setValue]=useState(defaultValue);
1607+
setValue=_setValue;
1608+
1609+
return(
1610+
<form
1611+
ref={formRef}
1612+
action={asyncformData=>{
1613+
Scheduler.log(`Async action started`);
1614+
awaitgetText('Wait');
1615+
}}
1616+
onReset={()=>{
1617+
setValue(defaultValue);
1618+
}}>
1619+
<input
1620+
ref={inputRef}
1621+
text="text"
1622+
name="amount"
1623+
value={value}
1624+
onChange={event=>setValue(event.currentTarget.value)}
1625+
/>
1626+
</form>
1627+
);
1628+
}
1629+
1630+
constroot=ReactDOMClient.createRoot(container);
1631+
awaitact(()=>root.render(<App/>));
1632+
1633+
// Dirty the controlled input
1634+
awaitact(()=>setValue('3'));
1635+
expect(inputRef.current.value).toEqual('3');
1636+
1637+
// Submit the form. This will trigger an async action.
1638+
awaitsubmit(formRef.current);
1639+
assertLog(['Async action started']);
1640+
1641+
// We haven't reset yet.
1642+
expect(inputRef.current.value).toEqual('3');
1643+
1644+
// Action completes. onReset has been fired and values reset manually.
1645+
awaitact(()=>resolveText('Wait'));
1646+
assertLog([]);
1647+
expect(inputRef.current.value).toEqual('0');
1648+
});
1649+
15991650
it('requestFormReset schedules a form reset after transition completes',async()=>{
16001651
// This is the same as the previous test, except the form is updated with
16011652
// a userspace action instead of a built-in form action.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit dcab44d

Browse files
authored
[react-dom] Fire onReset when automatically resetting forms (#35176)
1 parent b8a6bfa commit dcab44d

4 files changed

Lines changed: 167 additions & 0 deletions

File tree

‎fixtures/dom/src/components/Header.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class Header extends React.Component {
8888
<optionvalue="/mouse-events">Mouse Events</option>
8989
<optionvalue="/selection-events">Selection Events</option>
9090
<optionvalue="/suspense">Suspense</option>
91+
<optionvalue="/form-actions">Form Actions</option>
9192
<optionvalue="/form-state">Form State</option>
9293
<optionvalue="/fragment-refs">Fragment Refs</option>
9394
</select>
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
constReact=window.React;
2+
3+
const{useState}=React;
4+
5+
asyncfunctiondefer(timeoutMS){
6+
returnnewPromise(resolve=>{
7+
setTimeout(resolve,timeoutMS);
8+
});
9+
}
10+
11+
exportdefaultfunctionFormActions(){
12+
const[textValue,setTextValue]=useState('0');
13+
const[radioValue,setRadioValue]=useState('two');
14+
const[checkboxValue,setCheckboxValue]=useState([false,true,true]);
15+
const[selectValue,setSelectValue]=useState('three');
16+
17+
return(
18+
<form
19+
action={async()=>{
20+
awaitdefer(500);
21+
}}
22+
onReset={()=>{
23+
setTextValue('0');
24+
setRadioValue('two');
25+
setCheckboxValue([false,true,true]);
26+
setSelectValue('three');
27+
}}>
28+
<divstyle={{display: 'flex'}}>
29+
<fieldsetstyle={{flexBasis: 0}}>
30+
<legend>type="text"</legend>
31+
<input
32+
type="text"
33+
name="text"
34+
value={textValue}
35+
onChange={event=>setTextValue(event.currentTarget.value)}
36+
/>
37+
</fieldset>
38+
<fieldsetstyle={{flexBasis: 0}}>
39+
<legend>type="radio"</legend>
40+
<input
41+
type="radio"
42+
name="radio"
43+
value="one"
44+
checked={radioValue==='one'}
45+
onChange={()=>setRadioValue('one')}
46+
/>
47+
<input
48+
type="radio"
49+
name="radio"
50+
value="two"
51+
checked={radioValue==='two'}
52+
onChange={()=>setRadioValue('two')}
53+
/>
54+
<input
55+
type="radio"
56+
name="radio"
57+
value="three"
58+
checked={radioValue==='three'}
59+
onChange={()=>setRadioValue('three')}
60+
/>
61+
</fieldset>
62+
<fieldsetstyle={{flexBasis: 0}}>
63+
<legend>type="checkbox"</legend>
64+
<input
65+
type="checkbox"
66+
name="checkbox"
67+
value="one"
68+
checked={checkboxValue[0]}
69+
onChange={event=>{
70+
constchecked=event.currentTarget.checked;
71+
setCheckboxValue(pending=>[checked,pending[1],pending[2]]);
72+
}}
73+
/>
74+
<input
75+
type="checkbox"
76+
name="checkbox"
77+
value="two"
78+
checked={checkboxValue[1]}
79+
onChange={event=>{
80+
constchecked=event.currentTarget.checked;
81+
setCheckboxValue(pending=>[pending[0],checked,pending[2]]);
82+
}}
83+
/>
84+
<input
85+
type="checkbox"
86+
name="checkbox"
87+
value="three"
88+
checked={checkboxValue[2]}
89+
onChange={event=>{
90+
constchecked=event.currentTarget.checked;
91+
setCheckboxValue(pending=>[pending[0],pending[1],checked]);
92+
}}
93+
/>
94+
</fieldset>
95+
<fieldsetstyle={{flexBasis: 0}}>
96+
<legend>select</legend>
97+
<select
98+
name="select"
99+
value={selectValue}
100+
onChange={event=>setSelectValue(event.currentTarget.value)}>
101+
<optionvalue="one">one</option>
102+
<optionvalue="two">two</option>
103+
<optionvalue="three">three</option>
104+
</select>
105+
</fieldset>
106+
</div>
107+
<div>
108+
<inputtype="reset"/>
109+
<inputtype="submit"/>
110+
</div>
111+
</form>
112+
);
113+
}

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,5 +6562,7 @@ export const HostTransitionContext: ReactContext<TransitionStatus> = {
65626562

65636563
exporttypeFormInstance=HTMLFormElement;
65646564
exportfunctionresetFormInstance(form: FormInstance): void{
6565+
ReactBrowserEventEmitterSetEnabled(true);
65656566
form.reset();
6567+
ReactBrowserEventEmitterSetEnabled(false);
65666568
}

‎packages/react-dom/src/__tests__/ReactDOMForm-test.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,57 @@ describe('ReactDOMForm', () => {
15961596
expect(divRef.current.textContent).toEqual('Current username: acdlite');
15971597
});
15981598

1599+
it('should fire onReset on automatic form reset',async()=>{
1600+
constformRef=React.createRef();
1601+
constinputRef=React.createRef();
1602+
1603+
letsetValue;
1604+
constdefaultValue=0;
1605+
functionApp({promiseForUsername}){
1606+
const[value,_setValue]=useState(defaultValue);
1607+
setValue=_setValue;
1608+
1609+
return(
1610+
<form
1611+
ref={formRef}
1612+
action={asyncformData=>{
1613+
Scheduler.log(`Async action started`);
1614+
awaitgetText('Wait');
1615+
}}
1616+
onReset={()=>{
1617+
setValue(defaultValue);
1618+
}}>
1619+
<input
1620+
ref={inputRef}
1621+
text="text"
1622+
name="amount"
1623+
value={value}
1624+
onChange={event=>setValue(event.currentTarget.value)}
1625+
/>
1626+
</form>
1627+
);
1628+
}
1629+
1630+
constroot=ReactDOMClient.createRoot(container);
1631+
awaitact(()=>root.render(<App/>));
1632+
1633+
// Dirty the controlled input
1634+
awaitact(()=>setValue('3'));
1635+
expect(inputRef.current.value).toEqual('3');
1636+
1637+
// Submit the form. This will trigger an async action.
1638+
awaitsubmit(formRef.current);
1639+
assertLog(['Async action started']);
1640+
1641+
// We haven't reset yet.
1642+
expect(inputRef.current.value).toEqual('3');
1643+
1644+
// Action completes. onReset has been fired and values reset manually.
1645+
awaitact(()=>resolveText('Wait'));
1646+
assertLog([]);
1647+
expect(inputRef.current.value).toEqual('0');
1648+
});
1649+
15991650
it('requestFormReset schedules a form reset after transition completes',async()=>{
16001651
// This is the same as the previous test, except the form is updated with
16011652
// a userspace action instead of a built-in form action.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit dcab44d

Browse files
authored
[react-dom] Fire onReset when automatically resetting forms (#35176)
1 parent b8a6bfa commit dcab44d

4 files changed

Lines changed: 167 additions & 0 deletions

File tree

‎fixtures/dom/src/components/Header.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class Header extends React.Component {
8888
<optionvalue="/mouse-events">Mouse Events</option>
8989
<optionvalue="/selection-events">Selection Events</option>
9090
<optionvalue="/suspense">Suspense</option>
91+
<optionvalue="/form-actions">Form Actions</option>
9192
<optionvalue="/form-state">Form State</option>
9293
<optionvalue="/fragment-refs">Fragment Refs</option>
9394
</select>
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
constReact=window.React;
2+
3+
const{useState}=React;
4+
5+
asyncfunctiondefer(timeoutMS){
6+
returnnewPromise(resolve=>{
7+
setTimeout(resolve,timeoutMS);
8+
});
9+
}
10+
11+
exportdefaultfunctionFormActions(){
12+
const[textValue,setTextValue]=useState('0');
13+
const[radioValue,setRadioValue]=useState('two');
14+
const[checkboxValue,setCheckboxValue]=useState([false,true,true]);
15+
const[selectValue,setSelectValue]=useState('three');
16+
17+
return(
18+
<form
19+
action={async()=>{
20+
awaitdefer(500);
21+
}}
22+
onReset={()=>{
23+
setTextValue('0');
24+
setRadioValue('two');
25+
setCheckboxValue([false,true,true]);
26+
setSelectValue('three');
27+
}}>
28+
<divstyle={{display: 'flex'}}>
29+
<fieldsetstyle={{flexBasis: 0}}>
30+
<legend>type="text"</legend>
31+
<input
32+
type="text"
33+
name="text"
34+
value={textValue}
35+
onChange={event=>setTextValue(event.currentTarget.value)}
36+
/>
37+
</fieldset>
38+
<fieldsetstyle={{flexBasis: 0}}>
39+
<legend>type="radio"</legend>
40+
<input
41+
type="radio"
42+
name="radio"
43+
value="one"
44+
checked={radioValue==='one'}
45+
onChange={()=>setRadioValue('one')}
46+
/>
47+
<input
48+
type="radio"
49+
name="radio"
50+
value="two"
51+
checked={radioValue==='two'}
52+
onChange={()=>setRadioValue('two')}
53+
/>
54+
<input
55+
type="radio"
56+
name="radio"
57+
value="three"
58+
checked={radioValue==='three'}
59+
onChange={()=>setRadioValue('three')}
60+
/>
61+
</fieldset>
62+
<fieldsetstyle={{flexBasis: 0}}>
63+
<legend>type="checkbox"</legend>
64+
<input
65+
type="checkbox"
66+
name="checkbox"
67+
value="one"
68+
checked={checkboxValue[0]}
69+
onChange={event=>{
70+
constchecked=event.currentTarget.checked;
71+
setCheckboxValue(pending=>[checked,pending[1],pending[2]]);
72+
}}
73+
/>
74+
<input
75+
type="checkbox"
76+
name="checkbox"
77+
value="two"
78+
checked={checkboxValue[1]}
79+
onChange={event=>{
80+
constchecked=event.currentTarget.checked;
81+
setCheckboxValue(pending=>[pending[0],checked,pending[2]]);
82+
}}
83+
/>
84+
<input
85+
type="checkbox"
86+
name="checkbox"
87+
value="three"
88+
checked={checkboxValue[2]}
89+
onChange={event=>{
90+
constchecked=event.currentTarget.checked;
91+
setCheckboxValue(pending=>[pending[0],pending[1],checked]);
92+
}}
93+
/>
94+
</fieldset>
95+
<fieldsetstyle={{flexBasis: 0}}>
96+
<legend>select</legend>
97+
<select
98+
name="select"
99+
value={selectValue}
100+
onChange={event=>setSelectValue(event.currentTarget.value)}>
101+
<optionvalue="one">one</option>
102+
<optionvalue="two">two</option>
103+
<optionvalue="three">three</option>
104+
</select>
105+
</fieldset>
106+
</div>
107+
<div>
108+
<inputtype="reset"/>
109+
<inputtype="submit"/>
110+
</div>
111+
</form>
112+
);
113+
}

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,5 +6562,7 @@ export const HostTransitionContext: ReactContext<TransitionStatus> = {
65626562

65636563
exporttypeFormInstance=HTMLFormElement;
65646564
exportfunctionresetFormInstance(form: FormInstance): void{
6565+
ReactBrowserEventEmitterSetEnabled(true);
65656566
form.reset();
6567+
ReactBrowserEventEmitterSetEnabled(false);
65666568
}

‎packages/react-dom/src/__tests__/ReactDOMForm-test.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,57 @@ describe('ReactDOMForm', () => {
15961596
expect(divRef.current.textContent).toEqual('Current username: acdlite');
15971597
});
15981598

1599+
it('should fire onReset on automatic form reset',async()=>{
1600+
constformRef=React.createRef();
1601+
constinputRef=React.createRef();
1602+
1603+
letsetValue;
1604+
constdefaultValue=0;
1605+
functionApp({promiseForUsername}){
1606+
const[value,_setValue]=useState(defaultValue);
1607+
setValue=_setValue;
1608+
1609+
return(
1610+
<form
1611+
ref={formRef}
1612+
action={asyncformData=>{
1613+
Scheduler.log(`Async action started`);
1614+
awaitgetText('Wait');
1615+
}}
1616+
onReset={()=>{
1617+
setValue(defaultValue);
1618+
}}>
1619+
<input
1620+
ref={inputRef}
1621+
text="text"
1622+
name="amount"
1623+
value={value}
1624+
onChange={event=>setValue(event.currentTarget.value)}
1625+
/>
1626+
</form>
1627+
);
1628+
}
1629+
1630+
constroot=ReactDOMClient.createRoot(container);
1631+
awaitact(()=>root.render(<App/>));
1632+
1633+
// Dirty the controlled input
1634+
awaitact(()=>setValue('3'));
1635+
expect(inputRef.current.value).toEqual('3');
1636+
1637+
// Submit the form. This will trigger an async action.
1638+
awaitsubmit(formRef.current);
1639+
assertLog(['Async action started']);
1640+
1641+
// We haven't reset yet.
1642+
expect(inputRef.current.value).toEqual('3');
1643+
1644+
// Action completes. onReset has been fired and values reset manually.
1645+
awaitact(()=>resolveText('Wait'));
1646+
assertLog([]);
1647+
expect(inputRef.current.value).toEqual('0');
1648+
});
1649+
15991650
it('requestFormReset schedules a form reset after transition completes',async()=>{
16001651
// This is the same as the previous test, except the form is updated with
16011652
// a userspace action instead of a built-in form action.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit dcab44d

Browse files
authored
[react-dom] Fire onReset when automatically resetting forms (#35176)
1 parent b8a6bfa commit dcab44d

4 files changed

Lines changed: 167 additions & 0 deletions

File tree

‎fixtures/dom/src/components/Header.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class Header extends React.Component {
8888
<optionvalue="/mouse-events">Mouse Events</option>
8989
<optionvalue="/selection-events">Selection Events</option>
9090
<optionvalue="/suspense">Suspense</option>
91+
<optionvalue="/form-actions">Form Actions</option>
9192
<optionvalue="/form-state">Form State</option>
9293
<optionvalue="/fragment-refs">Fragment Refs</option>
9394
</select>
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
constReact=window.React;
2+
3+
const{useState}=React;
4+
5+
asyncfunctiondefer(timeoutMS){
6+
returnnewPromise(resolve=>{
7+
setTimeout(resolve,timeoutMS);
8+
});
9+
}
10+
11+
exportdefaultfunctionFormActions(){
12+
const[textValue,setTextValue]=useState('0');
13+
const[radioValue,setRadioValue]=useState('two');
14+
const[checkboxValue,setCheckboxValue]=useState([false,true,true]);
15+
const[selectValue,setSelectValue]=useState('three');
16+
17+
return(
18+
<form
19+
action={async()=>{
20+
awaitdefer(500);
21+
}}
22+
onReset={()=>{
23+
setTextValue('0');
24+
setRadioValue('two');
25+
setCheckboxValue([false,true,true]);
26+
setSelectValue('three');
27+
}}>
28+
<divstyle={{display: 'flex'}}>
29+
<fieldsetstyle={{flexBasis: 0}}>
30+
<legend>type="text"</legend>
31+
<input
32+
type="text"
33+
name="text"
34+
value={textValue}
35+
onChange={event=>setTextValue(event.currentTarget.value)}
36+
/>
37+
</fieldset>
38+
<fieldsetstyle={{flexBasis: 0}}>
39+
<legend>type="radio"</legend>
40+
<input
41+
type="radio"
42+
name="radio"
43+
value="one"
44+
checked={radioValue==='one'}
45+
onChange={()=>setRadioValue('one')}
46+
/>
47+
<input
48+
type="radio"
49+
name="radio"
50+
value="two"
51+
checked={radioValue==='two'}
52+
onChange={()=>setRadioValue('two')}
53+
/>
54+
<input
55+
type="radio"
56+
name="radio"
57+
value="three"
58+
checked={radioValue==='three'}
59+
onChange={()=>setRadioValue('three')}
60+
/>
61+
</fieldset>
62+
<fieldsetstyle={{flexBasis: 0}}>
63+
<legend>type="checkbox"</legend>
64+
<input
65+
type="checkbox"
66+
name="checkbox"
67+
value="one"
68+
checked={checkboxValue[0]}
69+
onChange={event=>{
70+
constchecked=event.currentTarget.checked;
71+
setCheckboxValue(pending=>[checked,pending[1],pending[2]]);
72+
}}
73+
/>
74+
<input
75+
type="checkbox"
76+
name="checkbox"
77+
value="two"
78+
checked={checkboxValue[1]}
79+
onChange={event=>{
80+
constchecked=event.currentTarget.checked;
81+
setCheckboxValue(pending=>[pending[0],checked,pending[2]]);
82+
}}
83+
/>
84+
<input
85+
type="checkbox"
86+
name="checkbox"
87+
value="three"
88+
checked={checkboxValue[2]}
89+
onChange={event=>{
90+
constchecked=event.currentTarget.checked;
91+
setCheckboxValue(pending=>[pending[0],pending[1],checked]);
92+
}}
93+
/>
94+
</fieldset>
95+
<fieldsetstyle={{flexBasis: 0}}>
96+
<legend>select</legend>
97+
<select
98+
name="select"
99+
value={selectValue}
100+
onChange={event=>setSelectValue(event.currentTarget.value)}>
101+
<optionvalue="one">one</option>
102+
<optionvalue="two">two</option>
103+
<optionvalue="three">three</option>
104+
</select>
105+
</fieldset>
106+
</div>
107+
<div>
108+
<inputtype="reset"/>
109+
<inputtype="submit"/>
110+
</div>
111+
</form>
112+
);
113+
}

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,5 +6562,7 @@ export const HostTransitionContext: ReactContext<TransitionStatus> = {
65626562

65636563
exporttypeFormInstance=HTMLFormElement;
65646564
exportfunctionresetFormInstance(form: FormInstance): void{
6565+
ReactBrowserEventEmitterSetEnabled(true);
65656566
form.reset();
6567+
ReactBrowserEventEmitterSetEnabled(false);
65666568
}

‎packages/react-dom/src/__tests__/ReactDOMForm-test.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,57 @@ describe('ReactDOMForm', () => {
15961596
expect(divRef.current.textContent).toEqual('Current username: acdlite');
15971597
});
15981598

1599+
it('should fire onReset on automatic form reset',async()=>{
1600+
constformRef=React.createRef();
1601+
constinputRef=React.createRef();
1602+
1603+
letsetValue;
1604+
constdefaultValue=0;
1605+
functionApp({promiseForUsername}){
1606+
const[value,_setValue]=useState(defaultValue);
1607+
setValue=_setValue;
1608+
1609+
return(
1610+
<form
1611+
ref={formRef}
1612+
action={asyncformData=>{
1613+
Scheduler.log(`Async action started`);
1614+
awaitgetText('Wait');
1615+
}}
1616+
onReset={()=>{
1617+
setValue(defaultValue);
1618+
}}>
1619+
<input
1620+
ref={inputRef}
1621+
text="text"
1622+
name="amount"
1623+
value={value}
1624+
onChange={event=>setValue(event.currentTarget.value)}
1625+
/>
1626+
</form>
1627+
);
1628+
}
1629+
1630+
constroot=ReactDOMClient.createRoot(container);
1631+
awaitact(()=>root.render(<App/>));
1632+
1633+
// Dirty the controlled input
1634+
awaitact(()=>setValue('3'));
1635+
expect(inputRef.current.value).toEqual('3');
1636+
1637+
// Submit the form. This will trigger an async action.
1638+
awaitsubmit(formRef.current);
1639+
assertLog(['Async action started']);
1640+
1641+
// We haven't reset yet.
1642+
expect(inputRef.current.value).toEqual('3');
1643+
1644+
// Action completes. onReset has been fired and values reset manually.
1645+
awaitact(()=>resolveText('Wait'));
1646+
assertLog([]);
1647+
expect(inputRef.current.value).toEqual('0');
1648+
});
1649+
15991650
it('requestFormReset schedules a form reset after transition completes',async()=>{
16001651
// This is the same as the previous test, except the form is updated with
16011652
// a userspace action instead of a built-in form action.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit dcab44d

Browse files
authored
[react-dom] Fire onReset when automatically resetting forms (#35176)
1 parent b8a6bfa commit dcab44d

4 files changed

Lines changed: 167 additions & 0 deletions

File tree

‎fixtures/dom/src/components/Header.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class Header extends React.Component {
8888
<optionvalue="/mouse-events">Mouse Events</option>
8989
<optionvalue="/selection-events">Selection Events</option>
9090
<optionvalue="/suspense">Suspense</option>
91+
<optionvalue="/form-actions">Form Actions</option>
9192
<optionvalue="/form-state">Form State</option>
9293
<optionvalue="/fragment-refs">Fragment Refs</option>
9394
</select>
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
constReact=window.React;
2+
3+
const{useState}=React;
4+
5+
asyncfunctiondefer(timeoutMS){
6+
returnnewPromise(resolve=>{
7+
setTimeout(resolve,timeoutMS);
8+
});
9+
}
10+
11+
exportdefaultfunctionFormActions(){
12+
const[textValue,setTextValue]=useState('0');
13+
const[radioValue,setRadioValue]=useState('two');
14+
const[checkboxValue,setCheckboxValue]=useState([false,true,true]);
15+
const[selectValue,setSelectValue]=useState('three');
16+
17+
return(
18+
<form
19+
action={async()=>{
20+
awaitdefer(500);
21+
}}
22+
onReset={()=>{
23+
setTextValue('0');
24+
setRadioValue('two');
25+
setCheckboxValue([false,true,true]);
26+
setSelectValue('three');
27+
}}>
28+
<divstyle={{display: 'flex'}}>
29+
<fieldsetstyle={{flexBasis: 0}}>
30+
<legend>type="text"</legend>
31+
<input
32+
type="text"
33+
name="text"
34+
value={textValue}
35+
onChange={event=>setTextValue(event.currentTarget.value)}
36+
/>
37+
</fieldset>
38+
<fieldsetstyle={{flexBasis: 0}}>
39+
<legend>type="radio"</legend>
40+
<input
41+
type="radio"
42+
name="radio"
43+
value="one"
44+
checked={radioValue==='one'}
45+
onChange={()=>setRadioValue('one')}
46+
/>
47+
<input
48+
type="radio"
49+
name="radio"
50+
value="two"
51+
checked={radioValue==='two'}
52+
onChange={()=>setRadioValue('two')}
53+
/>
54+
<input
55+
type="radio"
56+
name="radio"
57+
value="three"
58+
checked={radioValue==='three'}
59+
onChange={()=>setRadioValue('three')}
60+
/>
61+
</fieldset>
62+
<fieldsetstyle={{flexBasis: 0}}>
63+
<legend>type="checkbox"</legend>
64+
<input
65+
type="checkbox"
66+
name="checkbox"
67+
value="one"
68+
checked={checkboxValue[0]}
69+
onChange={event=>{
70+
constchecked=event.currentTarget.checked;
71+
setCheckboxValue(pending=>[checked,pending[1],pending[2]]);
72+
}}
73+
/>
74+
<input
75+
type="checkbox"
76+
name="checkbox"
77+
value="two"
78+
checked={checkboxValue[1]}
79+
onChange={event=>{
80+
constchecked=event.currentTarget.checked;
81+
setCheckboxValue(pending=>[pending[0],checked,pending[2]]);
82+
}}
83+
/>
84+
<input
85+
type="checkbox"
86+
name="checkbox"
87+
value="three"
88+
checked={checkboxValue[2]}
89+
onChange={event=>{
90+
constchecked=event.currentTarget.checked;
91+
setCheckboxValue(pending=>[pending[0],pending[1],checked]);
92+
}}
93+
/>
94+
</fieldset>
95+
<fieldsetstyle={{flexBasis: 0}}>
96+
<legend>select</legend>
97+
<select
98+
name="select"
99+
value={selectValue}
100+
onChange={event=>setSelectValue(event.currentTarget.value)}>
101+
<optionvalue="one">one</option>
102+
<optionvalue="two">two</option>
103+
<optionvalue="three">three</option>
104+
</select>
105+
</fieldset>
106+
</div>
107+
<div>
108+
<inputtype="reset"/>
109+
<inputtype="submit"/>
110+
</div>
111+
</form>
112+
);
113+
}

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,5 +6562,7 @@ export const HostTransitionContext: ReactContext<TransitionStatus> = {
65626562

65636563
exporttypeFormInstance=HTMLFormElement;
65646564
exportfunctionresetFormInstance(form: FormInstance): void{
6565+
ReactBrowserEventEmitterSetEnabled(true);
65656566
form.reset();
6567+
ReactBrowserEventEmitterSetEnabled(false);
65666568
}

‎packages/react-dom/src/__tests__/ReactDOMForm-test.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,57 @@ describe('ReactDOMForm', () => {
15961596
expect(divRef.current.textContent).toEqual('Current username: acdlite');
15971597
});
15981598

1599+
it('should fire onReset on automatic form reset',async()=>{
1600+
constformRef=React.createRef();
1601+
constinputRef=React.createRef();
1602+
1603+
letsetValue;
1604+
constdefaultValue=0;
1605+
functionApp({promiseForUsername}){
1606+
const[value,_setValue]=useState(defaultValue);
1607+
setValue=_setValue;
1608+
1609+
return(
1610+
<form
1611+
ref={formRef}
1612+
action={asyncformData=>{
1613+
Scheduler.log(`Async action started`);
1614+
awaitgetText('Wait');
1615+
}}
1616+
onReset={()=>{
1617+
setValue(defaultValue);
1618+
}}>
1619+
<input
1620+
ref={inputRef}
1621+
text="text"
1622+
name="amount"
1623+
value={value}
1624+
onChange={event=>setValue(event.currentTarget.value)}
1625+
/>
1626+
</form>
1627+
);
1628+
}
1629+
1630+
constroot=ReactDOMClient.createRoot(container);
1631+
awaitact(()=>root.render(<App/>));
1632+
1633+
// Dirty the controlled input
1634+
awaitact(()=>setValue('3'));
1635+
expect(inputRef.current.value).toEqual('3');
1636+
1637+
// Submit the form. This will trigger an async action.
1638+
awaitsubmit(formRef.current);
1639+
assertLog(['Async action started']);
1640+
1641+
// We haven't reset yet.
1642+
expect(inputRef.current.value).toEqual('3');
1643+
1644+
// Action completes. onReset has been fired and values reset manually.
1645+
awaitact(()=>resolveText('Wait'));
1646+
assertLog([]);
1647+
expect(inputRef.current.value).toEqual('0');
1648+
});
1649+
15991650
it('requestFormReset schedules a form reset after transition completes',async()=>{
16001651
// This is the same as the previous test, except the form is updated with
16011652
// a userspace action instead of a built-in form action.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit dcab44d

Browse files
authored
[react-dom] Fire onReset when automatically resetting forms (#35176)
1 parent b8a6bfa commit dcab44d

4 files changed

Lines changed: 167 additions & 0 deletions

File tree

‎fixtures/dom/src/components/Header.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class Header extends React.Component {
8888
<optionvalue="/mouse-events">Mouse Events</option>
8989
<optionvalue="/selection-events">Selection Events</option>
9090
<optionvalue="/suspense">Suspense</option>
91+
<optionvalue="/form-actions">Form Actions</option>
9192
<optionvalue="/form-state">Form State</option>
9293
<optionvalue="/fragment-refs">Fragment Refs</option>
9394
</select>
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
constReact=window.React;
2+
3+
const{useState}=React;
4+
5+
asyncfunctiondefer(timeoutMS){
6+
returnnewPromise(resolve=>{
7+
setTimeout(resolve,timeoutMS);
8+
});
9+
}
10+
11+
exportdefaultfunctionFormActions(){
12+
const[textValue,setTextValue]=useState('0');
13+
const[radioValue,setRadioValue]=useState('two');
14+
const[checkboxValue,setCheckboxValue]=useState([false,true,true]);
15+
const[selectValue,setSelectValue]=useState('three');
16+
17+
return(
18+
<form
19+
action={async()=>{
20+
awaitdefer(500);
21+
}}
22+
onReset={()=>{
23+
setTextValue('0');
24+
setRadioValue('two');
25+
setCheckboxValue([false,true,true]);
26+
setSelectValue('three');
27+
}}>
28+
<divstyle={{display: 'flex'}}>
29+
<fieldsetstyle={{flexBasis: 0}}>
30+
<legend>type="text"</legend>
31+
<input
32+
type="text"
33+
name="text"
34+
value={textValue}
35+
onChange={event=>setTextValue(event.currentTarget.value)}
36+
/>
37+
</fieldset>
38+
<fieldsetstyle={{flexBasis: 0}}>
39+
<legend>type="radio"</legend>
40+
<input
41+
type="radio"
42+
name="radio"
43+
value="one"
44+
checked={radioValue==='one'}
45+
onChange={()=>setRadioValue('one')}
46+
/>
47+
<input
48+
type="radio"
49+
name="radio"
50+
value="two"
51+
checked={radioValue==='two'}
52+
onChange={()=>setRadioValue('two')}
53+
/>
54+
<input
55+
type="radio"
56+
name="radio"
57+
value="three"
58+
checked={radioValue==='three'}
59+
onChange={()=>setRadioValue('three')}
60+
/>
61+
</fieldset>
62+
<fieldsetstyle={{flexBasis: 0}}>
63+
<legend>type="checkbox"</legend>
64+
<input
65+
type="checkbox"
66+
name="checkbox"
67+
value="one"
68+
checked={checkboxValue[0]}
69+
onChange={event=>{
70+
constchecked=event.currentTarget.checked;
71+
setCheckboxValue(pending=>[checked,pending[1],pending[2]]);
72+
}}
73+
/>
74+
<input
75+
type="checkbox"
76+
name="checkbox"
77+
value="two"
78+
checked={checkboxValue[1]}
79+
onChange={event=>{
80+
constchecked=event.currentTarget.checked;
81+
setCheckboxValue(pending=>[pending[0],checked,pending[2]]);
82+
}}
83+
/>
84+
<input
85+
type="checkbox"
86+
name="checkbox"
87+
value="three"
88+
checked={checkboxValue[2]}
89+
onChange={event=>{
90+
constchecked=event.currentTarget.checked;
91+
setCheckboxValue(pending=>[pending[0],pending[1],checked]);
92+
}}
93+
/>
94+
</fieldset>
95+
<fieldsetstyle={{flexBasis: 0}}>
96+
<legend>select</legend>
97+
<select
98+
name="select"
99+
value={selectValue}
100+
onChange={event=>setSelectValue(event.currentTarget.value)}>
101+
<optionvalue="one">one</option>
102+
<optionvalue="two">two</option>
103+
<optionvalue="three">three</option>
104+
</select>
105+
</fieldset>
106+
</div>
107+
<div>
108+
<inputtype="reset"/>
109+
<inputtype="submit"/>
110+
</div>
111+
</form>
112+
);
113+
}

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,5 +6562,7 @@ export const HostTransitionContext: ReactContext<TransitionStatus> = {
65626562

65636563
exporttypeFormInstance=HTMLFormElement;
65646564
exportfunctionresetFormInstance(form: FormInstance): void{
6565+
ReactBrowserEventEmitterSetEnabled(true);
65656566
form.reset();
6567+
ReactBrowserEventEmitterSetEnabled(false);
65666568
}

‎packages/react-dom/src/__tests__/ReactDOMForm-test.js‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,57 @@ describe('ReactDOMForm', () => {
15961596
expect(divRef.current.textContent).toEqual('Current username: acdlite');
15971597
});
15981598

1599+
it('should fire onReset on automatic form reset',async()=>{
1600+
constformRef=React.createRef();
1601+
constinputRef=React.createRef();
1602+
1603+
letsetValue;
1604+
constdefaultValue=0;
1605+
functionApp({promiseForUsername}){
1606+
const[value,_setValue]=useState(defaultValue);
1607+
setValue=_setValue;
1608+
1609+
return(
1610+
<form
1611+
ref={formRef}
1612+
action={asyncformData=>{
1613+
Scheduler.log(`Async action started`);
1614+
awaitgetText('Wait');
1615+
}}
1616+
onReset={()=>{
1617+
setValue(defaultValue);
1618+
}}>
1619+
<input
1620+
ref={inputRef}
1621+
text="text"
1622+
name="amount"
1623+
value={value}
1624+
onChange={event=>setValue(event.currentTarget.value)}
1625+
/>
1626+
</form>
1627+
);
1628+
}
1629+
1630+
constroot=ReactDOMClient.createRoot(container);
1631+
awaitact(()=>root.render(<App/>));
1632+
1633+
// Dirty the controlled input
1634+
awaitact(()=>setValue('3'));
1635+
expect(inputRef.current.value).toEqual('3');
1636+
1637+
// Submit the form. This will trigger an async action.
1638+
awaitsubmit(formRef.current);
1639+
assertLog(['Async action started']);
1640+
1641+
// We haven't reset yet.
1642+
expect(inputRef.current.value).toEqual('3');
1643+
1644+
// Action completes. onReset has been fired and values reset manually.
1645+
awaitact(()=>resolveText('Wait'));
1646+
assertLog([]);
1647+
expect(inputRef.current.value).toEqual('0');
1648+
});
1649+
15991650
it('requestFormReset schedules a form reset after transition completes',async()=>{
16001651
// This is the same as the previous test, except the form is updated with
16011652
// a userspace action instead of a built-in form action.

0 commit comments

Comments
 (0)