Commit c80a075

Browse files
jackpopejackpope
authored
Fix focus set for delegated and already focused elements (#36010)
I found two focus bugs when working on documentation for Fragment Refs. 1) If an element delegates focus handling, it will return false from setFocusIfFocusable even though a focus event has occured on a different element. The fix for this is a document level event listener rather than only listening on the current element. For example, if you have a form with multiple nested label>inputs. Calling focus on the label will focus its input but not fire an event on the label. setFocusIfFocusable returns false and you end up continuing to attempt focus down the form tree. 2) If an element is already focused, setFocusIfFocusable will return false. The fix for this is checking the document's activeElement with an early return. In the same form example, if the first input is already focused and you call fragmentInstance.focus() at the form level, the second input would end up getting focused since the focus event on the first is not triggered.
1 parent 8f41506 commit c80a075

2 files changed

Lines changed: 111 additions & 3 deletions

File tree

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
45204520
//
45214521
// We could compare the node to document.activeElement after focus,
45224522
// but this would not handle the case where application code managed focus to automatically blur.
4523+
const element =((node: any): HTMLElement);
4524+
4525+
// If this element is already the active element, it's focusable and already
4526+
// focused. Calling .focus() on it would be a no-op (no focus event fires),
4527+
// so we short-circuit here.
4528+
if(element.ownerDocument.activeElement===element){
4529+
returntrue;
4530+
}
4531+
45234532
letdidFocus=false;
45244533
consthandleFocus=()=>{
45254534
didFocus=true;
45264535
};
45274536

4528-
constelement=((node: any): HTMLElement);
45294537
try{
4530-
element.addEventListener('focus',handleFocus);
4538+
// Listen on the document in the capture phase so we detect focus even when
4539+
// it lands on a different element than the one we called .focus() on. This
4540+
// happens with <label> elements (focus delegates to the associated input)
4541+
// and shadow hosts with delegatesFocus.
4542+
element.ownerDocument.addEventListener('focus',handleFocus,true);
45314543
// $FlowFixMe[method-unbinding]
45324544
(element.focus||HTMLElement.prototype.focus).call(element,focusOptions);
45334545
}finally{
4534-
element.removeEventListener('focus',handleFocus);
4546+
element.ownerDocument.removeEventListener('focus',handleFocus,true);
45354547
}
45364548

45374549
returndidFocus;

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

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,102 @@ describe('FragmentRefs', () => {
255255
expect(document.activeElement.id).toEqual('child-b');
256256
document.activeElement.blur();
257257
});
258+
259+
// @gate enableFragmentRefs
260+
it('keeps focus on the first focusable child if already focused',async()=>{
261+
constfragmentRef=React.createRef();
262+
constroot=ReactDOMClient.createRoot(container);
263+
264+
functionTest(){
265+
return(
266+
<Fragmentref={fragmentRef}>
267+
<aid="child-a"href="/">
268+
A
269+
</a>
270+
<aid="child-b"href="/">
271+
B
272+
</a>
273+
</Fragment>
274+
);
275+
}
276+
277+
awaitact(()=>{
278+
root.render(<Test/>);
279+
});
280+
281+
// Focus the first child manually
282+
document.getElementById('child-a').focus();
283+
expect(document.activeElement.id).toEqual('child-a');
284+
285+
// Calling fragment.focus() should keep focus on child-a,
286+
// not skip to child-b
287+
awaitact(()=>{
288+
fragmentRef.current.focus();
289+
});
290+
expect(document.activeElement.id).toEqual('child-a');
291+
document.activeElement.blur();
292+
});
293+
294+
// @gate enableFragmentRefs
295+
it('keeps focus on a nested child if already focused',async()=>{
296+
constfragmentRef=React.createRef();
297+
constroot=ReactDOMClient.createRoot(container);
298+
299+
functionTest(){
300+
return(
301+
<Fragmentref={fragmentRef}>
302+
<div>
303+
<inputid="nested-input"/>
304+
</div>
305+
<aid="sibling-link"href="/">
306+
Link
307+
</a>
308+
</Fragment>
309+
);
310+
}
311+
312+
awaitact(()=>{
313+
root.render(<Test/>);
314+
});
315+
316+
// Focus the nested input manually
317+
document.getElementById('nested-input').focus();
318+
expect(document.activeElement.id).toEqual('nested-input');
319+
320+
// Calling fragment.focus() should keep focus on nested-input
321+
awaitact(()=>{
322+
fragmentRef.current.focus();
323+
});
324+
expect(document.activeElement.id).toEqual('nested-input');
325+
document.activeElement.blur();
326+
});
327+
328+
// @gate enableFragmentRefs
329+
it('focuses the first focusable child in a fieldset',async()=>{
330+
constfragmentRef=React.createRef();
331+
constroot=ReactDOMClient.createRoot(container);
332+
333+
functionTest(){
334+
return(
335+
<Fragmentref={fragmentRef}>
336+
<fieldset>
337+
<legend>Shipping</legend>
338+
<inputid="street"name="street"/>
339+
<inputid="city"name="city"/>
340+
</fieldset>
341+
</Fragment>
342+
);
343+
}
344+
345+
awaitact(()=>{
346+
root.render(<Test/>);
347+
});
348+
awaitact(()=>{
349+
fragmentRef.current.focus();
350+
});
351+
expect(document.activeElement.id).toEqual('street');
352+
document.activeElement.blur();
353+
});
258354
});
259355

260356
describe('focusLast()',()=>{

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 c80a075
Browse files
jackpopejackpope
authored
Fix focus set for delegated and already focused elements (#36010)
I found two focus bugs when working on documentation for Fragment Refs.
1) If an element delegates focus handling, it will return false from
setFocusIfFocusable even though a focus event has occured on a different
element. The fix for this is a document level event listener rather than
only listening on the current element.
For example, if you have a form with multiple nested label>inputs.
Calling focus on the label will focus its input but not fire an event on
the label. setFocusIfFocusable returns false and you end up continuing
to attempt focus down the form tree.
2) If an element is already focused, setFocusIfFocusable will return
false. The fix for this is checking the document's activeElement with an
early return.
In the same form example, if the first input is already focused and you
call fragmentInstance.focus() at the form level, the second input would
end up getting focused since the focus event on the first is not
triggered.
1 parent 8f41506 commit c80a075
2 files changed
Lines changed: 111 additions & 3 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
45204520
//
45214521
// We could compare the node to document.activeElement after focus,
45224522
// but this would not handle the case where application code managed focus to automatically blur.
4523+
const element =((node: any): HTMLElement);
4524+
4525+
// If this element is already the active element, it's focusable and already
4526+
// focused. Calling .focus() on it would be a no-op (no focus event fires),
4527+
// so we short-circuit here.
4528+
if(element.ownerDocument.activeElement===element){
4529+
returntrue;
4530+
}
4531+
45234532
letdidFocus=false;
45244533
consthandleFocus=()=>{
45254534
didFocus=true;
45264535
};
45274536

4528-
constelement=((node: any): HTMLElement);
45294537
try{
4530-
 element.addEventListener('focus',handleFocus);
4538+
// Listen on the document in the capture phase so we detect focus even when
4539+
// it lands on a different element than the one we called .focus() on. This
4540+
// happens with <label> elements (focus delegates to the associated input)
4541+
// and shadow hosts with delegatesFocus.
4542+
element.ownerDocument.addEventListener('focus',handleFocus,true);
45314543
// $FlowFixMe[method-unbinding]
45324544
(element.focus||HTMLElement.prototype.focus).call(element,focusOptions);
45334545
}finally{
4534-
element.removeEventListener('focus',handleFocus);
4546+
element.ownerDocument.removeEventListener('focus',handleFocus,true);
45354547
}
45364548

45374549
returndidFocus;
‎packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js‎
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,102 @@ describe('FragmentRefs', () => {
255255
expect(document.activeElement.id).toEqual('child-b');
256256
document.activeElement.blur();
257257
});
258+
259+
// @gate enableFragmentRefs
260+
it('keeps focus on the first focusable child if already focused',async()=>{
261+
constfragmentRef=React.createRef();
262+
constroot=ReactDOMClient.createRoot(container);
263+
264+
functionTest(){
265+
return(
266+
<Fragmentref={fragmentRef}>
267+
<aid="child-a"href="/">
268+
 A
269+
</a>
270+
<aid="child-b"href="/">
271+
 B
272+
</a>
273+
</Fragment>
274+
);
275+
}
276+
277+
awaitact(()=>{
278+
root.render(<Test/>);
279+
});
280+
281+
// Focus the first child manually
282+
document.getElementById('child-a').focus();
283+
expect(document.activeElement.id).toEqual('child-a');
284+
285+
// Calling fragment.focus() should keep focus on child-a,
286+
// not skip to child-b
287+
awaitact(()=>{
288+
fragmentRef.current.focus();
289+
});
290+
expect(document.activeElement.id).toEqual('child-a');
291+
document.activeElement.blur();
292+
});
293+
294+
// @gate enableFragmentRefs
295+
it('keeps focus on a nested child if already focused',async()=>{
296+
constfragmentRef=React.createRef();
297+
constroot=ReactDOMClient.createRoot(container);
298+
299+
functionTest(){
300+
return(
301+
<Fragmentref={fragmentRef}>
302+
<div>
303+
<inputid="nested-input"/>
304+
</div>
305+
<aid="sibling-link"href="/">
306+
 Link
307+
</a>
308+
</Fragment>
309+
);
310+
}
311+
312+
awaitact(()=>{
313+
root.render(<Test/>);
314+
});
315+
316+
// Focus the nested input manually
317+
document.getElementById('nested-input').focus();
318+
expect(document.activeElement.id).toEqual('nested-input');
319+
320+
// Calling fragment.focus() should keep focus on nested-input
321+
awaitact(()=>{
322+
fragmentRef.current.focus();
323+
});
324+
expect(document.activeElement.id).toEqual('nested-input');
325+
document.activeElement.blur();
326+
});
327+
328+
// @gate enableFragmentRefs
329+
it('focuses the first focusable child in a fieldset',async()=>{
330+
constfragmentRef=React.createRef();
331+
constroot=ReactDOMClient.createRoot(container);
332+
333+
functionTest(){
334+
return(
335+
<Fragmentref={fragmentRef}>
336+
<fieldset>
337+
<legend>Shipping</legend>
338+
<inputid="street"name="street"/>
339+
<inputid="city"name="city"/>
340+
</fieldset>
341+
</Fragment>
342+
);
343+
}
344+
345+
awaitact(()=>{
346+
root.render(<Test/>);
347+
});
348+
awaitact(()=>{
349+
fragmentRef.current.focus();
350+
});
351+
expect(document.activeElement.id).toEqual('street');
352+
document.activeElement.blur();
353+
});
258354
});
259355

260356
describe('focusLast()',()=>{
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 c80a075
Browse files
jackpopejackpope
authored
Fix focus set for delegated and already focused elements (#36010)
I found two focus bugs when working on documentation for Fragment Refs.
1) If an element delegates focus handling, it will return false from
setFocusIfFocusable even though a focus event has occured on a different
element. The fix for this is a document level event listener rather than
only listening on the current element.
For example, if you have a form with multiple nested label>inputs.
Calling focus on the label will focus its input but not fire an event on
the label. setFocusIfFocusable returns false and you end up continuing
to attempt focus down the form tree.
2) If an element is already focused, setFocusIfFocusable will return
false. The fix for this is checking the document's activeElement with an
early return.
In the same form example, if the first input is already focused and you
call fragmentInstance.focus() at the form level, the second input would
end up getting focused since the focus event on the first is not
triggered.
1 parent 8f41506 commit c80a075
2 files changed
Lines changed: 111 additions & 3 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
45204520
//
45214521
// We could compare the node to document.activeElement after focus,
45224522
// but this would not handle the case where application code managed focus to automatically blur.
4523+
const element =((node: any): HTMLElement);
4524+
4525+
// If this element is already the active element, it's focusable and already
4526+
// focused. Calling .focus() on it would be a no-op (no focus event fires),
4527+
// so we short-circuit here.
4528+
if(element.ownerDocument.activeElement===element){
4529+
returntrue;
4530+
}
4531+
45234532
letdidFocus=false;
45244533
consthandleFocus=()=>{
45254534
didFocus=true;
45264535
};
45274536

4528-
constelement=((node: any): HTMLElement);
45294537
try{
4530-
 element.addEventListener('focus',handleFocus);
4538+
// Listen on the document in the capture phase so we detect focus even when
4539+
// it lands on a different element than the one we called .focus() on. This
4540+
// happens with <label> elements (focus delegates to the associated input)
4541+
// and shadow hosts with delegatesFocus.
4542+
element.ownerDocument.addEventListener('focus',handleFocus,true);
45314543
// $FlowFixMe[method-unbinding]
45324544
(element.focus||HTMLElement.prototype.focus).call(element,focusOptions);
45334545
}finally{
4534-
element.removeEventListener('focus',handleFocus);
4546+
element.ownerDocument.removeEventListener('focus',handleFocus,true);
45354547
}
45364548

45374549
returndidFocus;
‎packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js‎
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,102 @@ describe('FragmentRefs', () => {
255255
expect(document.activeElement.id).toEqual('child-b');
256256
document.activeElement.blur();
257257
});
258+
259+
// @gate enableFragmentRefs
260+
it('keeps focus on the first focusable child if already focused',async()=>{
261+
constfragmentRef=React.createRef();
262+
constroot=ReactDOMClient.createRoot(container);
263+
264+
functionTest(){
265+
return(
266+
<Fragmentref={fragmentRef}>
267+
<aid="child-a"href="/">
268+
 A
269+
</a>
270+
<aid="child-b"href="/">
271+
 B
272+
</a>
273+
</Fragment>
274+
);
275+
}
276+
277+
awaitact(()=>{
278+
root.render(<Test/>);
279+
});
280+
281+
// Focus the first child manually
282+
document.getElementById('child-a').focus();
283+
expect(document.activeElement.id).toEqual('child-a');
284+
285+
// Calling fragment.focus() should keep focus on child-a,
286+
// not skip to child-b
287+
awaitact(()=>{
288+
fragmentRef.current.focus();
289+
});
290+
expect(document.activeElement.id).toEqual('child-a');
291+
document.activeElement.blur();
292+
});
293+
294+
// @gate enableFragmentRefs
295+
it('keeps focus on a nested child if already focused',async()=>{
296+
constfragmentRef=React.createRef();
297+
constroot=ReactDOMClient.createRoot(container);
298+
299+
functionTest(){
300+
return(
301+
<Fragmentref={fragmentRef}>
302+
<div>
303+
<inputid="nested-input"/>
304+
</div>
305+
<aid="sibling-link"href="/">
306+
 Link
307+
</a>
308+
</Fragment>
309+
);
310+
}
311+
312+
awaitact(()=>{
313+
root.render(<Test/>);
314+
});
315+
316+
// Focus the nested input manually
317+
document.getElementById('nested-input').focus();
318+
expect(document.activeElement.id).toEqual('nested-input');
319+
320+
// Calling fragment.focus() should keep focus on nested-input
321+
awaitact(()=>{
322+
fragmentRef.current.focus();
323+
});
324+
expect(document.activeElement.id).toEqual('nested-input');
325+
document.activeElement.blur();
326+
});
327+
328+
// @gate enableFragmentRefs
329+
it('focuses the first focusable child in a fieldset',async()=>{
330+
constfragmentRef=React.createRef();
331+
constroot=ReactDOMClient.createRoot(container);
332+
333+
functionTest(){
334+
return(
335+
<Fragmentref={fragmentRef}>
336+
<fieldset>
337+
<legend>Shipping</legend>
338+
<inputid="street"name="street"/>
339+
<inputid="city"name="city"/>
340+
</fieldset>
341+
</Fragment>
342+
);
343+
}
344+
345+
awaitact(()=>{
346+
root.render(<Test/>);
347+
});
348+
awaitact(()=>{
349+
fragmentRef.current.focus();
350+
});
351+
expect(document.activeElement.id).toEqual('street');
352+
document.activeElement.blur();
353+
});
258354
});
259355

260356
describe('focusLast()',()=>{
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 c80a075
Browse files
jackpopejackpope
authored
Fix focus set for delegated and already focused elements (#36010)
I found two focus bugs when working on documentation for Fragment Refs.
1) If an element delegates focus handling, it will return false from
setFocusIfFocusable even though a focus event has occured on a different
element. The fix for this is a document level event listener rather than
only listening on the current element.
For example, if you have a form with multiple nested label>inputs.
Calling focus on the label will focus its input but not fire an event on
the label. setFocusIfFocusable returns false and you end up continuing
to attempt focus down the form tree.
2) If an element is already focused, setFocusIfFocusable will return
false. The fix for this is checking the document's activeElement with an
early return.
In the same form example, if the first input is already focused and you
call fragmentInstance.focus() at the form level, the second input would
end up getting focused since the focus event on the first is not
triggered.
1 parent 8f41506 commit c80a075
2 files changed
Lines changed: 111 additions & 3 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
45204520
//
45214521
// We could compare the node to document.activeElement after focus,
45224522
// but this would not handle the case where application code managed focus to automatically blur.
4523+
const element =((node: any): HTMLElement);
4524+
4525+
// If this element is already the active element, it's focusable and already
4526+
// focused. Calling .focus() on it would be a no-op (no focus event fires),
4527+
// so we short-circuit here.
4528+
if(element.ownerDocument.activeElement===element){
4529+
returntrue;
4530+
}
4531+
45234532
letdidFocus=false;
45244533
consthandleFocus=()=>{
45254534
didFocus=true;
45264535
};
45274536

4528-
constelement=((node: any): HTMLElement);
45294537
try{
4530-
 element.addEventListener('focus',handleFocus);
4538+
// Listen on the document in the capture phase so we detect focus even when
4539+
// it lands on a different element than the one we called .focus() on. This
4540+
// happens with <label> elements (focus delegates to the associated input)
4541+
// and shadow hosts with delegatesFocus.
4542+
element.ownerDocument.addEventListener('focus',handleFocus,true);
45314543
// $FlowFixMe[method-unbinding]
45324544
(element.focus||HTMLElement.prototype.focus).call(element,focusOptions);
45334545
}finally{
4534-
element.removeEventListener('focus',handleFocus);
4546+
element.ownerDocument.removeEventListener('focus',handleFocus,true);
45354547
}
45364548

45374549
returndidFocus;
‎packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js‎
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,102 @@ describe('FragmentRefs', () => {
255255
expect(document.activeElement.id).toEqual('child-b');
256256
document.activeElement.blur();
257257
});
258+
259+
// @gate enableFragmentRefs
260+
it('keeps focus on the first focusable child if already focused',async()=>{
261+
constfragmentRef=React.createRef();
262+
constroot=ReactDOMClient.createRoot(container);
263+
264+
functionTest(){
265+
return(
266+
<Fragmentref={fragmentRef}>
267+
<aid="child-a"href="/">
268+
 A
269+
</a>
270+
<aid="child-b"href="/">
271+
 B
272+
</a>
273+
</Fragment>
274+
);
275+
}
276+
277+
awaitact(()=>{
278+
root.render(<Test/>);
279+
});
280+
281+
// Focus the first child manually
282+
document.getElementById('child-a').focus();
283+
expect(document.activeElement.id).toEqual('child-a');
284+
285+
// Calling fragment.focus() should keep focus on child-a,
286+
// not skip to child-b
287+
awaitact(()=>{
288+
fragmentRef.current.focus();
289+
});
290+
expect(document.activeElement.id).toEqual('child-a');
291+
document.activeElement.blur();
292+
});
293+
294+
// @gate enableFragmentRefs
295+
it('keeps focus on a nested child if already focused',async()=>{
296+
constfragmentRef=React.createRef();
297+
constroot=ReactDOMClient.createRoot(container);
298+
299+
functionTest(){
300+
return(
301+
<Fragmentref={fragmentRef}>
302+
<div>
303+
<inputid="nested-input"/>
304+
</div>
305+
<aid="sibling-link"href="/">
306+
 Link
307+
</a>
308+
</Fragment>
309+
);
310+
}
311+
312+
awaitact(()=>{
313+
root.render(<Test/>);
314+
});
315+
316+
// Focus the nested input manually
317+
document.getElementById('nested-input').focus();
318+
expect(document.activeElement.id).toEqual('nested-input');
319+
320+
// Calling fragment.focus() should keep focus on nested-input
321+
awaitact(()=>{
322+
fragmentRef.current.focus();
323+
});
324+
expect(document.activeElement.id).toEqual('nested-input');
325+
document.activeElement.blur();
326+
});
327+
328+
// @gate enableFragmentRefs
329+
it('focuses the first focusable child in a fieldset',async()=>{
330+
constfragmentRef=React.createRef();
331+
constroot=ReactDOMClient.createRoot(container);
332+
333+
functionTest(){
334+
return(
335+
<Fragmentref={fragmentRef}>
336+
<fieldset>
337+
<legend>Shipping</legend>
338+
<inputid="street"name="street"/>
339+
<inputid="city"name="city"/>
340+
</fieldset>
341+
</Fragment>
342+
);
343+
}
344+
345+
awaitact(()=>{
346+
root.render(<Test/>);
347+
});
348+
awaitact(()=>{
349+
fragmentRef.current.focus();
350+
});
351+
expect(document.activeElement.id).toEqual('street');
352+
document.activeElement.blur();
353+
});
258354
});
259355

260356
describe('focusLast()',()=>{
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 c80a075
Browse files
jackpopejackpope
authored
Fix focus set for delegated and already focused elements (#36010)
I found two focus bugs when working on documentation for Fragment Refs.
1) If an element delegates focus handling, it will return false from
setFocusIfFocusable even though a focus event has occured on a different
element. The fix for this is a document level event listener rather than
only listening on the current element.
For example, if you have a form with multiple nested label>inputs.
Calling focus on the label will focus its input but not fire an event on
the label. setFocusIfFocusable returns false and you end up continuing
to attempt focus down the form tree.
2) If an element is already focused, setFocusIfFocusable will return
false. The fix for this is checking the document's activeElement with an
early return.
In the same form example, if the first input is already focused and you
call fragmentInstance.focus() at the form level, the second input would
end up getting focused since the focus event on the first is not
triggered.
1 parent 8f41506 commit c80a075
2 files changed
Lines changed: 111 additions & 3 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
45204520
//
45214521
// We could compare the node to document.activeElement after focus,
45224522
// but this would not handle the case where application code managed focus to automatically blur.
4523+
const element =((node: any): HTMLElement);
4524+
4525+
// If this element is already the active element, it's focusable and already
4526+
// focused. Calling .focus() on it would be a no-op (no focus event fires),
4527+
// so we short-circuit here.
4528+
if(element.ownerDocument.activeElement===element){
4529+
returntrue;
4530+
}
4531+
45234532
letdidFocus=false;
45244533
consthandleFocus=()=>{
45254534
didFocus=true;
45264535
};
45274536

4528-
constelement=((node: any): HTMLElement);
45294537
try{
4530-
 element.addEventListener('focus',handleFocus);
4538+
// Listen on the document in the capture phase so we detect focus even when
4539+
// it lands on a different element than the one we called .focus() on. This
4540+
// happens with <label> elements (focus delegates to the associated input)
4541+
// and shadow hosts with delegatesFocus.
4542+
element.ownerDocument.addEventListener('focus',handleFocus,true);
45314543
// $FlowFixMe[method-unbinding]
45324544
(element.focus||HTMLElement.prototype.focus).call(element,focusOptions);
45334545
}finally{
4534-
element.removeEventListener('focus',handleFocus);
4546+
element.ownerDocument.removeEventListener('focus',handleFocus,true);
45354547
}
45364548

45374549
returndidFocus;
‎packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js‎
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,102 @@ describe('FragmentRefs', () => {
255255
expect(document.activeElement.id).toEqual('child-b');
256256
document.activeElement.blur();
257257
});
258+
259+
// @gate enableFragmentRefs
260+
it('keeps focus on the first focusable child if already focused',async()=>{
261+
constfragmentRef=React.createRef();
262+
constroot=ReactDOMClient.createRoot(container);
263+
264+
functionTest(){
265+
return(
266+
<Fragmentref={fragmentRef}>
267+
<aid="child-a"href="/">
268+
 A
269+
</a>
270+
<aid="child-b"href="/">
271+
 B
272+
</a>
273+
</Fragment>
274+
);
275+
}
276+
277+
awaitact(()=>{
278+
root.render(<Test/>);
279+
});
280+
281+
// Focus the first child manually
282+
document.getElementById('child-a').focus();
283+
expect(document.activeElement.id).toEqual('child-a');
284+
285+
// Calling fragment.focus() should keep focus on child-a,
286+
// not skip to child-b
287+
awaitact(()=>{
288+
fragmentRef.current.focus();
289+
});
290+
expect(document.activeElement.id).toEqual('child-a');
291+
document.activeElement.blur();
292+
});
293+
294+
// @gate enableFragmentRefs
295+
it('keeps focus on a nested child if already focused',async()=>{
296+
constfragmentRef=React.createRef();
297+
constroot=ReactDOMClient.createRoot(container);
298+
299+
functionTest(){
300+
return(
301+
<Fragmentref={fragmentRef}>
302+
<div>
303+
<inputid="nested-input"/>
304+
</div>
305+
<aid="sibling-link"href="/">
306+
 Link
307+
</a>
308+
</Fragment>
309+
);
310+
}
311+
312+
awaitact(()=>{
313+
root.render(<Test/>);
314+
});
315+
316+
// Focus the nested input manually
317+
document.getElementById('nested-input').focus();
318+
expect(document.activeElement.id).toEqual('nested-input');
319+
320+
// Calling fragment.focus() should keep focus on nested-input
321+
awaitact(()=>{
322+
fragmentRef.current.focus();
323+
});
324+
expect(document.activeElement.id).toEqual('nested-input');
325+
document.activeElement.blur();
326+
});
327+
328+
// @gate enableFragmentRefs
329+
it('focuses the first focusable child in a fieldset',async()=>{
330+
constfragmentRef=React.createRef();
331+
constroot=ReactDOMClient.createRoot(container);
332+
333+
functionTest(){
334+
return(
335+
<Fragmentref={fragmentRef}>
336+
<fieldset>
337+
<legend>Shipping</legend>
338+
<inputid="street"name="street"/>
339+
<inputid="city"name="city"/>
340+
</fieldset>
341+
</Fragment>
342+
);
343+
}
344+
345+
awaitact(()=>{
346+
root.render(<Test/>);
347+
});
348+
awaitact(()=>{
349+
fragmentRef.current.focus();
350+
});
351+
expect(document.activeElement.id).toEqual('street');
352+
document.activeElement.blur();
353+
});
258354
});
259355

260356
describe('focusLast()',()=>{
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 c80a075
Browse files
jackpopejackpope
authored
Fix focus set for delegated and already focused elements (#36010)
I found two focus bugs when working on documentation for Fragment Refs.
1) If an element delegates focus handling, it will return false from
setFocusIfFocusable even though a focus event has occured on a different
element. The fix for this is a document level event listener rather than
only listening on the current element.
For example, if you have a form with multiple nested label>inputs.
Calling focus on the label will focus its input but not fire an event on
the label. setFocusIfFocusable returns false and you end up continuing
to attempt focus down the form tree.
2) If an element is already focused, setFocusIfFocusable will return
false. The fix for this is checking the document's activeElement with an
early return.
In the same form example, if the first input is already focused and you
call fragmentInstance.focus() at the form level, the second input would
end up getting focused since the focus event on the first is not
triggered.
1 parent 8f41506 commit c80a075
2 files changed
Lines changed: 111 additions & 3 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
45204520
//
45214521
// We could compare the node to document.activeElement after focus,
45224522
// but this would not handle the case where application code managed focus to automatically blur.
4523+
const element =((node: any): HTMLElement);
4524+
4525+
// If this element is already the active element, it's focusable and already
4526+
// focused. Calling .focus() on it would be a no-op (no focus event fires),
4527+
// so we short-circuit here.
4528+
if(element.ownerDocument.activeElement===element){
4529+
returntrue;
4530+
}
4531+
45234532
letdidFocus=false;
45244533
consthandleFocus=()=>{
45254534
didFocus=true;
45264535
};
45274536

4528-
constelement=((node: any): HTMLElement);
45294537
try{
4530-
 element.addEventListener('focus',handleFocus);
4538+
// Listen on the document in the capture phase so we detect focus even when
4539+
// it lands on a different element than the one we called .focus() on. This
4540+
// happens with <label> elements (focus delegates to the associated input)
4541+
// and shadow hosts with delegatesFocus.
4542+
element.ownerDocument.addEventListener('focus',handleFocus,true);
45314543
// $FlowFixMe[method-unbinding]
45324544
(element.focus||HTMLElement.prototype.focus).call(element,focusOptions);
45334545
}finally{
4534-
element.removeEventListener('focus',handleFocus);
4546+
element.ownerDocument.removeEventListener('focus',handleFocus,true);
45354547
}
45364548

45374549
returndidFocus;
‎packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js‎
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,102 @@ describe('FragmentRefs', () => {
255255
expect(document.activeElement.id).toEqual('child-b');
256256
document.activeElement.blur();
257257
});
258+
259+
// @gate enableFragmentRefs
260+
it('keeps focus on the first focusable child if already focused',async()=>{
261+
constfragmentRef=React.createRef();
262+
constroot=ReactDOMClient.createRoot(container);
263+
264+
functionTest(){
265+
return(
266+
<Fragmentref={fragmentRef}>
267+
<aid="child-a"href="/">
268+
 A
269+
</a>
270+
<aid="child-b"href="/">
271+
 B
272+
</a>
273+
</Fragment>
274+
);
275+
}
276+
277+
awaitact(()=>{
278+
root.render(<Test/>);
279+
});
280+
281+
// Focus the first child manually
282+
document.getElementById('child-a').focus();
283+
expect(document.activeElement.id).toEqual('child-a');
284+
285+
// Calling fragment.focus() should keep focus on child-a,
286+
// not skip to child-b
287+
awaitact(()=>{
288+
fragmentRef.current.focus();
289+
});
290+
expect(document.activeElement.id).toEqual('child-a');
291+
document.activeElement.blur();
292+
});
293+
294+
// @gate enableFragmentRefs
295+
it('keeps focus on a nested child if already focused',async()=>{
296+
constfragmentRef=React.createRef();
297+
constroot=ReactDOMClient.createRoot(container);
298+
299+
functionTest(){
300+
return(
301+
<Fragmentref={fragmentRef}>
302+
<div>
303+
<inputid="nested-input"/>
304+
</div>
305+
<aid="sibling-link"href="/">
306+
 Link
307+
</a>
308+
</Fragment>
309+
);
310+
}
311+
312+
awaitact(()=>{
313+
root.render(<Test/>);
314+
});
315+
316+
// Focus the nested input manually
317+
document.getElementById('nested-input').focus();
318+
expect(document.activeElement.id).toEqual('nested-input');
319+
320+
// Calling fragment.focus() should keep focus on nested-input
321+
awaitact(()=>{
322+
fragmentRef.current.focus();
323+
});
324+
expect(document.activeElement.id).toEqual('nested-input');
325+
document.activeElement.blur();
326+
});
327+
328+
// @gate enableFragmentRefs
329+
it('focuses the first focusable child in a fieldset',async()=>{
330+
constfragmentRef=React.createRef();
331+
constroot=ReactDOMClient.createRoot(container);
332+
333+
functionTest(){
334+
return(
335+
<Fragmentref={fragmentRef}>
336+
<fieldset>
337+
<legend>Shipping</legend>
338+
<inputid="street"name="street"/>
339+
<inputid="city"name="city"/>
340+
</fieldset>
341+
</Fragment>
342+
);
343+
}
344+
345+
awaitact(()=>{
346+
root.render(<Test/>);
347+
});
348+
awaitact(()=>{
349+
fragmentRef.current.focus();
350+
});
351+
expect(document.activeElement.id).toEqual('street');
352+
document.activeElement.blur();
353+
});
258354
});
259355

260356
describe('focusLast()',()=>{
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 c80a075
Browse files
jackpopejackpope
authored
Fix focus set for delegated and already focused elements (#36010)
I found two focus bugs when working on documentation for Fragment Refs.
1) If an element delegates focus handling, it will return false from
setFocusIfFocusable even though a focus event has occured on a different
element. The fix for this is a document level event listener rather than
only listening on the current element.
For example, if you have a form with multiple nested label>inputs.
Calling focus on the label will focus its input but not fire an event on
the label. setFocusIfFocusable returns false and you end up continuing
to attempt focus down the form tree.
2) If an element is already focused, setFocusIfFocusable will return
false. The fix for this is checking the document's activeElement with an
early return.
In the same form example, if the first input is already focused and you
call fragmentInstance.focus() at the form level, the second input would
end up getting focused since the focus event on the first is not
triggered.
1 parent 8f41506 commit c80a075
2 files changed
Lines changed: 111 additions & 3 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
45204520
//
45214521
// We could compare the node to document.activeElement after focus,
45224522
// but this would not handle the case where application code managed focus to automatically blur.
4523+
const element =((node: any): HTMLElement);
4524+
4525+
// If this element is already the active element, it's focusable and already
4526+
// focused. Calling .focus() on it would be a no-op (no focus event fires),
4527+
// so we short-circuit here.
4528+
if(element.ownerDocument.activeElement===element){
4529+
returntrue;
4530+
}
4531+
45234532
letdidFocus=false;
45244533
consthandleFocus=()=>{
45254534
didFocus=true;
45264535
};
45274536

4528-
constelement=((node: any): HTMLElement);
45294537
try{
4530-
 element.addEventListener('focus',handleFocus);
4538+
// Listen on the document in the capture phase so we detect focus even when
4539+
// it lands on a different element than the one we called .focus() on. This
4540+
// happens with <label> elements (focus delegates to the associated input)
4541+
// and shadow hosts with delegatesFocus.
4542+
element.ownerDocument.addEventListener('focus',handleFocus,true);
45314543
// $FlowFixMe[method-unbinding]
45324544
(element.focus||HTMLElement.prototype.focus).call(element,focusOptions);
45334545
}finally{
4534-
element.removeEventListener('focus',handleFocus);
4546+
element.ownerDocument.removeEventListener('focus',handleFocus,true);
45354547
}
45364548

45374549
returndidFocus;
‎packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js‎
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,102 @@ describe('FragmentRefs', () => {
255255
expect(document.activeElement.id).toEqual('child-b');
256256
document.activeElement.blur();
257257
});
258+
259+
// @gate enableFragmentRefs
260+
it('keeps focus on the first focusable child if already focused',async()=>{
261+
constfragmentRef=React.createRef();
262+
constroot=ReactDOMClient.createRoot(container);
263+
264+
functionTest(){
265+
return(
266+
<Fragmentref={fragmentRef}>
267+
<aid="child-a"href="/">
268+
 A
269+
</a>
270+
<aid="child-b"href="/">
271+
 B
272+
</a>
273+
</Fragment>
274+
);
275+
}
276+
277+
awaitact(()=>{
278+
root.render(<Test/>);
279+
});
280+
281+
// Focus the first child manually
282+
document.getElementById('child-a').focus();
283+
expect(document.activeElement.id).toEqual('child-a');
284+
285+
// Calling fragment.focus() should keep focus on child-a,
286+
// not skip to child-b
287+
awaitact(()=>{
288+
fragmentRef.current.focus();
289+
});
290+
expect(document.activeElement.id).toEqual('child-a');
291+
document.activeElement.blur();
292+
});
293+
294+
// @gate enableFragmentRefs
295+
it('keeps focus on a nested child if already focused',async()=>{
296+
constfragmentRef=React.createRef();
297+
constroot=ReactDOMClient.createRoot(container);
298+
299+
functionTest(){
300+
return(
301+
<Fragmentref={fragmentRef}>
302+
<div>
303+
<inputid="nested-input"/>
304+
</div>
305+
<aid="sibling-link"href="/">
306+
 Link
307+
</a>
308+
</Fragment>
309+
);
310+
}
311+
312+
awaitact(()=>{
313+
root.render(<Test/>);
314+
});
315+
316+
// Focus the nested input manually
317+
document.getElementById('nested-input').focus();
318+
expect(document.activeElement.id).toEqual('nested-input');
319+
320+
// Calling fragment.focus() should keep focus on nested-input
321+
awaitact(()=>{
322+
fragmentRef.current.focus();
323+
});
324+
expect(document.activeElement.id).toEqual('nested-input');
325+
document.activeElement.blur();
326+
});
327+
328+
// @gate enableFragmentRefs
329+
it('focuses the first focusable child in a fieldset',async()=>{
330+
constfragmentRef=React.createRef();
331+
constroot=ReactDOMClient.createRoot(container);
332+
333+
functionTest(){
334+
return(
335+
<Fragmentref={fragmentRef}>
336+
<fieldset>
337+
<legend>Shipping</legend>
338+
<inputid="street"name="street"/>
339+
<inputid="city"name="city"/>
340+
</fieldset>
341+
</Fragment>
342+
);
343+
}
344+
345+
awaitact(()=>{
346+
root.render(<Test/>);
347+
});
348+
awaitact(()=>{
349+
fragmentRef.current.focus();
350+
});
351+
expect(document.activeElement.id).toEqual('street');
352+
document.activeElement.blur();
353+
});
258354
});
259355

260356
describe('focusLast()',()=>{
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 c80a075
Browse files
jackpopejackpope
authored
Fix focus set for delegated and already focused elements (#36010)
I found two focus bugs when working on documentation for Fragment Refs.
1) If an element delegates focus handling, it will return false from
setFocusIfFocusable even though a focus event has occured on a different
element. The fix for this is a document level event listener rather than
only listening on the current element.
For example, if you have a form with multiple nested label>inputs.
Calling focus on the label will focus its input but not fire an event on
the label. setFocusIfFocusable returns false and you end up continuing
to attempt focus down the form tree.
2) If an element is already focused, setFocusIfFocusable will return
false. The fix for this is checking the document's activeElement with an
early return.
In the same form example, if the first input is already focused and you
call fragmentInstance.focus() at the form level, the second input would
end up getting focused since the focus event on the first is not
triggered.
1 parent 8f41506 commit c80a075
2 files changed
Lines changed: 111 additions & 3 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,18 +4520,30 @@ export function setFocusIfFocusable(
45204520
//
45214521
// We could compare the node to document.activeElement after focus,
45224522
// but this would not handle the case where application code managed focus to automatically blur.
4523+
const element =((node: any): HTMLElement);
4524+
4525+
// If this element is already the active element, it's focusable and already
4526+
// focused. Calling .focus() on it would be a no-op (no focus event fires),
4527+
// so we short-circuit here.
4528+
if(element.ownerDocument.activeElement===element){
4529+
returntrue;
4530+
}
4531+
45234532
letdidFocus=false;
45244533
consthandleFocus=()=>{
45254534
didFocus=true;
45264535
};
45274536

4528-
constelement=((node: any): HTMLElement);
45294537
try{
4530-
 element.addEventListener('focus',handleFocus);
4538+
// Listen on the document in the capture phase so we detect focus even when
4539+
// it lands on a different element than the one we called .focus() on. This
4540+
// happens with <label> elements (focus delegates to the associated input)
4541+
// and shadow hosts with delegatesFocus.
4542+
element.ownerDocument.addEventListener('focus',handleFocus,true);
45314543
// $FlowFixMe[method-unbinding]
45324544
(element.focus||HTMLElement.prototype.focus).call(element,focusOptions);
45334545
}finally{
4534-
element.removeEventListener('focus',handleFocus);
4546+
element.ownerDocument.removeEventListener('focus',handleFocus,true);
45354547
}
45364548

45374549
returndidFocus;
‎packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js‎
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,102 @@ describe('FragmentRefs', () => {
255255
expect(document.activeElement.id).toEqual('child-b');
256256
document.activeElement.blur();
257257
});
258+
259+
// @gate enableFragmentRefs
260+
it('keeps focus on the first focusable child if already focused',async()=>{
261+
constfragmentRef=React.createRef();
262+
constroot=ReactDOMClient.createRoot(container);
263+
264+
functionTest(){
265+
return(
266+
<Fragmentref={fragmentRef}>
267+
<aid="child-a"href="/">
268+
 A
269+
</a>
270+
<aid="child-b"href="/">
271+
 B
272+
</a>
273+
</Fragment>
274+
);
275+
}
276+
277+
awaitact(()=>{
278+
root.render(<Test/>);
279+
});
280+
281+
// Focus the first child manually
282+
document.getElementById('child-a').focus();
283+
expect(document.activeElement.id).toEqual('child-a');
284+
285+
// Calling fragment.focus() should keep focus on child-a,
286+
// not skip to child-b
287+
awaitact(()=>{
288+
fragmentRef.current.focus();
289+
});
290+
expect(document.activeElement.id).toEqual('child-a');
291+
document.activeElement.blur();
292+
});
293+
294+
// @gate enableFragmentRefs
295+
it('keeps focus on a nested child if already focused',async()=>{
296+
constfragmentRef=React.createRef();
297+
constroot=ReactDOMClient.createRoot(container);
298+
299+
functionTest(){
300+
return(
301+
<Fragmentref={fragmentRef}>
302+
<div>
303+
<inputid="nested-input"/>
304+
</div>
305+
<aid="sibling-link"href="/">
306+
 Link
307+
</a>
308+
</Fragment>
309+
);
310+
}
311+
312+
awaitact(()=>{
313+
root.render(<Test/>);
314+
});
315+
316+
// Focus the nested input manually
317+
document.getElementById('nested-input').focus();
318+
expect(document.activeElement.id).toEqual('nested-input');
319+
320+
// Calling fragment.focus() should keep focus on nested-input
321+
awaitact(()=>{
322+
fragmentRef.current.focus();
323+
});
324+
expect(document.activeElement.id).toEqual('nested-input');
325+
document.activeElement.blur();
326+
});
327+
328+
// @gate enableFragmentRefs
329+
it('focuses the first focusable child in a fieldset',async()=>{
330+
constfragmentRef=React.createRef();
331+
constroot=ReactDOMClient.createRoot(container);
332+
333+
functionTest(){
334+
return(
335+
<Fragmentref={fragmentRef}>
336+
<fieldset>
337+
<legend>Shipping</legend>
338+
<inputid="street"name="street"/>
339+
<inputid="city"name="city"/>
340+
</fieldset>
341+
</Fragment>
342+
);
343+
}
344+
345+
awaitact(()=>{
346+
root.render(<Test/>);
347+
});
348+
awaitact(()=>{
349+
fragmentRef.current.focus();
350+
});
351+
expect(document.activeElement.id).toEqual('street');
352+
document.activeElement.blur();
353+
});
258354
});
259355

260356
describe('focusLast()',()=>{
0 commit comments
Comments
 (0)