Skip to content

Commit cd515d7

Browse files
jackpopejackpope
authored
Minor DOM FragmentInstance refactors (#35641)
Handles TODOs, small follow up refactors
1 parent 78f5c50 commit cd515d7

1 file changed

Lines changed: 44 additions & 26 deletions

File tree

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

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,16 @@ function indexOfEventListener(
30563056
listener: EventListener,
30573057
optionsOrUseCapture: void|EventListenerOptionsOrUseCapture,
30583058
): number{
3059+
if(eventListeners.length===0){
3060+
return-1;
3061+
}
3062+
constnormalizedOptions=normalizeListenerOptions(optionsOrUseCapture);
30593063
for(leti=0;i<eventListeners.length;i++){
30603064
constitem=eventListeners[i];
30613065
if(
30623066
item.type===type&&
30633067
item.listener===listener&&
3064-
normalizeListenerOptions(item.optionsOrUseCapture)===
3065-
normalizeListenerOptions(optionsOrUseCapture)
3068+
normalizeListenerOptions(item.optionsOrUseCapture)===normalizedOptions
30663069
){
30673070
returni;
30683071
}
@@ -3154,18 +3157,34 @@ function collectChildren(child: Fiber, collection: Array<Fiber>): boolean {
31543157
}
31553158
// $FlowFixMe[prop-missing]
31563159
FragmentInstance.prototype.blur=function(this: FragmentInstanceType): void{
3157-
// TODO: When we have a parent element reference, we can skip traversal if the fragment's parent
3158-
// does not contain document.activeElement
3160+
// Early exit if activeElement is not within the fragment's parent
3161+
constparentHostFiber=getFragmentParentHostFiber(this._fragmentFiber);
3162+
if(parentHostFiber===null){
3163+
return;
3164+
}
3165+
constparentHostInstance=
3166+
getInstanceFromHostFiber<Instance>(parentHostFiber);
3167+
constactiveElement=parentHostInstance.ownerDocument.activeElement;
3168+
if(activeElement===null||!parentHostInstance.contains(activeElement)){
3169+
return;
3170+
}
3171+
31593172
traverseFragmentInstance(
31603173
this._fragmentFiber,
31613174
blurActiveElementWithinFragment,
3175+
activeElement,
31623176
);
31633177
};
3164-
functionblurActiveElementWithinFragment(child: Fiber): boolean{
3165-
// TODO: We can get the activeElement from the parent outside of the loop when we have a reference.
3178+
functionblurActiveElementWithinFragment(
3179+
child: Fiber,
3180+
activeElement: Element,
3181+
): boolean{
3182+
// Skip text nodes - they can't be focused
3183+
if(enableFragmentRefsTextNodes&&child.tag===HostText){
3184+
returnfalse;
3185+
}
31663186
constinstance=getInstanceFromHostFiber<Instance>(child);
3167-
constownerDocument=instance.ownerDocument;
3168-
if(instance===ownerDocument.activeElement){
3187+
if(instance===activeElement){
31693188
// $FlowFixMe[prop-missing]
31703189
instance.blur();
31713190
returntrue;
@@ -3312,46 +3331,45 @@ FragmentInstance.prototype.compareDocumentPosition = function (
33123331
);
33133332
}
33143333

3315-
constfirstElement=getInstanceFromHostFiber<Instance>(children[0]);
3316-
constlastElement=getInstanceFromHostFiber<Instance>(
3334+
constfirstNode=getInstanceFromHostFiber<Instance>(children[0]);
3335+
constlastNode=getInstanceFromHostFiber<Instance>(
33173336
children[children.length-1],
33183337
);
33193338

33203339
// If the fragment has been portaled into another host instance, we need to
33213340
// our best guess is to use the parent of the child instance, rather than
33223341
// the fiber tree host parent.
3323-
constfirstInstance=getInstanceFromHostFiber<Instance>(children[0]);
33243342
constparentHostInstanceFromDOM=fiberIsPortaledIntoHost(this._fragmentFiber)
3325-
? (firstInstance.parentElement: ?Instance)
3343+
? (firstNode.parentElement: ?Instance)
33263344
: parentHostInstance;
33273345

33283346
if(parentHostInstanceFromDOM==null){
33293347
returnNode.DOCUMENT_POSITION_DISCONNECTED;
33303348
}
33313349

3332-
// Check if first and last element are actually in the expected document position
3333-
// before relying on them as source of truth for other contained elements
3334-
constfirstElementIsContained=
3335-
parentHostInstanceFromDOM.compareDocumentPosition(firstElement)&
3350+
// Check if first and last node are actually in the expected document position
3351+
// before relying on them as source of truth for other contained nodes
3352+
const firstNodeIsContained =
3353+
parentHostInstanceFromDOM.compareDocumentPosition(firstNode) &
33363354
Node.DOCUMENT_POSITION_CONTAINED_BY;
3337-
constlastElementIsContained=
3338-
parentHostInstanceFromDOM.compareDocumentPosition(lastElement)&
3355+
constlastNodeIsContained=
3356+
parentHostInstanceFromDOM.compareDocumentPosition(lastNode)&
33393357
Node.DOCUMENT_POSITION_CONTAINED_BY;
3340-
constfirstResult=firstElement.compareDocumentPosition(otherNode);
3341-
constlastResult=lastElement.compareDocumentPosition(otherNode);
3358+
constfirstResult=firstNode.compareDocumentPosition(otherNode);
3359+
constlastResult=lastNode.compareDocumentPosition(otherNode);
33423360

33433361
constotherNodeIsFirstOrLastChild=
3344-
(firstElementIsContained&&firstElement===otherNode)||
3345-
(lastElementIsContained&&lastElement===otherNode);
3362+
(firstNodeIsContained&&firstNode===otherNode)||
3363+
(lastNodeIsContained&&lastNode===otherNode);
33463364
constotherNodeIsFirstOrLastChildDisconnected=
3347-
(!firstElementIsContained&&firstElement===otherNode)||
3348-
(!lastElementIsContained&&lastElement===otherNode);
3365+
(!firstNodeIsContained&&firstNode===otherNode)||
3366+
(!lastNodeIsContained&&lastNode===otherNode);
33493367
constotherNodeIsWithinFirstOrLastChild=
33503368
firstResult&Node.DOCUMENT_POSITION_CONTAINED_BY||
33513369
lastResult&Node.DOCUMENT_POSITION_CONTAINED_BY;
33523370
constotherNodeIsBetweenFirstAndLastChildren=
3353-
firstElementIsContained&&
3354-
lastElementIsContained&&
3371+
firstNodeIsContained&&
3372+
lastNodeIsContained&&
33553373
firstResult&Node.DOCUMENT_POSITION_FOLLOWING&&
33563374
lastResult&Node.DOCUMENT_POSITION_PRECEDING;
33573375

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Minor DOM FragmentInstance refactors (#35641) · react/react@cd515d7 · GitHub
Skip to content
Commit cd515d7
Browse files
jackpopejackpope
authored
Minor DOM FragmentInstance refactors (#35641)
Handles TODOs, small follow up refactors
1 parent 78f5c50 commit cd515d7
1 file changed
Lines changed: 44 additions & 26 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,16 @@ function indexOfEventListener(
30563056
listener: EventListener,
30573057
optionsOrUseCapture: void|EventListenerOptionsOrUseCapture,
30583058
): number{
3059+
if(eventListeners.length===0){
3060+
return-1;
3061+
}
3062+
constnormalizedOptions=normalizeListenerOptions(optionsOrUseCapture);
30593063
for(leti=0;i<eventListeners.length;i++){
30603064
constitem=eventListeners[i];
30613065
if(
30623066
item.type===type&&
30633067
item.listener===listener&&
3064-
normalizeListenerOptions(item.optionsOrUseCapture)===
3065-
normalizeListenerOptions(optionsOrUseCapture)
3068+
normalizeListenerOptions(item.optionsOrUseCapture)===normalizedOptions
30663069
){
30673070
returni;
30683071
}
@@ -3154,18 +3157,34 @@ function collectChildren(child: Fiber, collection: Array<Fiber>): boolean {
31543157
}
31553158
// $FlowFixMe[prop-missing]
31563159
FragmentInstance.prototype.blur=function(this: FragmentInstanceType): void{
3157-
// TODO: When we have a parent element reference, we can skip traversal if the fragment's parent
3158-
// does not contain document.activeElement
3160+
// Early exit if activeElement is not within the fragment's parent
3161+
constparentHostFiber=getFragmentParentHostFiber(this._fragmentFiber);
3162+
if(parentHostFiber===null){
3163+
return;
3164+
}
3165+
constparentHostInstance=
3166+
getInstanceFromHostFiber<Instance>(parentHostFiber);
3167+
constactiveElement=parentHostInstance.ownerDocument.activeElement;
3168+
if(activeElement===null||!parentHostInstance.contains(activeElement)){
3169+
return;
3170+
}
3171+
31593172
traverseFragmentInstance(
31603173
this._fragmentFiber,
31613174
blurActiveElementWithinFragment,
3175+
activeElement,
31623176
);
31633177
};
3164-
functionblurActiveElementWithinFragment(child: Fiber): boolean{
3165-
// TODO: We can get the activeElement from the parent outside of the loop when we have a reference.
3178+
functionblurActiveElementWithinFragment(
3179+
child: Fiber,
3180+
activeElement: Element,
3181+
): boolean{
3182+
// Skip text nodes - they can't be focused
3183+
if(enableFragmentRefsTextNodes&&child.tag===HostText){
3184+
returnfalse;
3185+
}
31663186
constinstance=getInstanceFromHostFiber<Instance>(child);
3167-
constownerDocument=instance.ownerDocument;
3168-
if(instance===ownerDocument.activeElement){
3187+
if(instance===activeElement){
31693188
// $FlowFixMe[prop-missing]
31703189
instance.blur();
31713190
returntrue;
@@ -3312,46 +3331,45 @@ FragmentInstance.prototype.compareDocumentPosition = function (
33123331
);
33133332
}
33143333

3315-
constfirstElement=getInstanceFromHostFiber<Instance>(children[0]);
3316-
constlastElement=getInstanceFromHostFiber<Instance>(
3334+
constfirstNode=getInstanceFromHostFiber<Instance>(children[0]);
3335+
constlastNode=getInstanceFromHostFiber<Instance>(
33173336
children[children.length-1],
33183337
);
33193338

33203339
// If the fragment has been portaled into another host instance, we need to
33213340
// our best guess is to use the parent of the child instance, rather than
33223341
// the fiber tree host parent.
3323-
constfirstInstance=getInstanceFromHostFiber<Instance>(children[0]);
33243342
constparentHostInstanceFromDOM=fiberIsPortaledIntoHost(this._fragmentFiber)
3325-
 ? (firstInstance.parentElement: ?Instance)
3343+
 ? (firstNode.parentElement: ?Instance)
33263344
 : parentHostInstance;
33273345

33283346
if(parentHostInstanceFromDOM==null){
33293347
returnNode.DOCUMENT_POSITION_DISCONNECTED;
33303348
}
33313349

3332-
// Check if first and last element are actually in the expected document position
3333-
// before relying on them as source of truth for other contained elements
3334-
constfirstElementIsContained=
3335-
parentHostInstanceFromDOM.compareDocumentPosition(firstElement)&
3350+
 // Check if first and last node are actually in the expected document position
3351+
 // before relying on them as source of truth for other contained nodes
3352+
 const firstNodeIsContained =
3353+
 parentHostInstanceFromDOM.compareDocumentPosition(firstNode) &
33363354
Node.DOCUMENT_POSITION_CONTAINED_BY;
3337-
constlastElementIsContained=
3338-
parentHostInstanceFromDOM.compareDocumentPosition(lastElement)&
3355+
constlastNodeIsContained=
3356+
parentHostInstanceFromDOM.compareDocumentPosition(lastNode)&
33393357
Node.DOCUMENT_POSITION_CONTAINED_BY;
3340-
constfirstResult=firstElement.compareDocumentPosition(otherNode);
3341-
constlastResult=lastElement.compareDocumentPosition(otherNode);
3358+
constfirstResult=firstNode.compareDocumentPosition(otherNode);
3359+
constlastResult=lastNode.compareDocumentPosition(otherNode);
33423360

33433361
constotherNodeIsFirstOrLastChild=
3344-
(firstElementIsContained&&firstElement===otherNode)||
3345-
(lastElementIsContained&&lastElement===otherNode);
3362+
(firstNodeIsContained&&firstNode===otherNode)||
3363+
(lastNodeIsContained&&lastNode===otherNode);
33463364
constotherNodeIsFirstOrLastChildDisconnected=
3347-
(!firstElementIsContained&&firstElement===otherNode)||
3348-
(!lastElementIsContained&&lastElement===otherNode);
3365+
(!firstNodeIsContained&&firstNode===otherNode)||
3366+
(!lastNodeIsContained&&lastNode===otherNode);
33493367
constotherNodeIsWithinFirstOrLastChild=
33503368
firstResult&Node.DOCUMENT_POSITION_CONTAINED_BY||
33513369
lastResult&Node.DOCUMENT_POSITION_CONTAINED_BY;
33523370
constotherNodeIsBetweenFirstAndLastChildren=
3353-
firstElementIsContained&&
3354-
lastElementIsContained&&
3371+
firstNodeIsContained&&
3372+
lastNodeIsContained&&
33553373
firstResult&Node.DOCUMENT_POSITION_FOLLOWING&&
33563374
lastResult&Node.DOCUMENT_POSITION_PRECEDING;
33573375

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Minor DOM FragmentInstance refactors (#35641) · react/react@cd515d7 · GitHub
Skip to content
Commit cd515d7
Browse files
jackpopejackpope
authored
Minor DOM FragmentInstance refactors (#35641)
Handles TODOs, small follow up refactors
1 parent 78f5c50 commit cd515d7
1 file changed
Lines changed: 44 additions & 26 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,16 @@ function indexOfEventListener(
30563056
listener: EventListener,
30573057
optionsOrUseCapture: void|EventListenerOptionsOrUseCapture,
30583058
): number{
3059+
if(eventListeners.length===0){
3060+
return-1;
3061+
}
3062+
constnormalizedOptions=normalizeListenerOptions(optionsOrUseCapture);
30593063
for(leti=0;i<eventListeners.length;i++){
30603064
constitem=eventListeners[i];
30613065
if(
30623066
item.type===type&&
30633067
item.listener===listener&&
3064-
normalizeListenerOptions(item.optionsOrUseCapture)===
3065-
normalizeListenerOptions(optionsOrUseCapture)
3068+
normalizeListenerOptions(item.optionsOrUseCapture)===normalizedOptions
30663069
){
30673070
returni;
30683071
}
@@ -3154,18 +3157,34 @@ function collectChildren(child: Fiber, collection: Array<Fiber>): boolean {
31543157
}
31553158
// $FlowFixMe[prop-missing]
31563159
FragmentInstance.prototype.blur=function(this: FragmentInstanceType): void{
3157-
// TODO: When we have a parent element reference, we can skip traversal if the fragment's parent
3158-
// does not contain document.activeElement
3160+
// Early exit if activeElement is not within the fragment's parent
3161+
constparentHostFiber=getFragmentParentHostFiber(this._fragmentFiber);
3162+
if(parentHostFiber===null){
3163+
return;
3164+
}
3165+
constparentHostInstance=
3166+
getInstanceFromHostFiber<Instance>(parentHostFiber);
3167+
constactiveElement=parentHostInstance.ownerDocument.activeElement;
3168+
if(activeElement===null||!parentHostInstance.contains(activeElement)){
3169+
return;
3170+
}
3171+
31593172
traverseFragmentInstance(
31603173
this._fragmentFiber,
31613174
blurActiveElementWithinFragment,
3175+
activeElement,
31623176
);
31633177
};
3164-
functionblurActiveElementWithinFragment(child: Fiber): boolean{
3165-
// TODO: We can get the activeElement from the parent outside of the loop when we have a reference.
3178+
functionblurActiveElementWithinFragment(
3179+
child: Fiber,
3180+
activeElement: Element,
3181+
): boolean{
3182+
// Skip text nodes - they can't be focused
3183+
if(enableFragmentRefsTextNodes&&child.tag===HostText){
3184+
returnfalse;
3185+
}
31663186
constinstance=getInstanceFromHostFiber<Instance>(child);
3167-
constownerDocument=instance.ownerDocument;
3168-
if(instance===ownerDocument.activeElement){
3187+
if(instance===activeElement){
31693188
// $FlowFixMe[prop-missing]
31703189
instance.blur();
31713190
returntrue;
@@ -3312,46 +3331,45 @@ FragmentInstance.prototype.compareDocumentPosition = function (
33123331
);
33133332
}
33143333

3315-
constfirstElement=getInstanceFromHostFiber<Instance>(children[0]);
3316-
constlastElement=getInstanceFromHostFiber<Instance>(
3334+
constfirstNode=getInstanceFromHostFiber<Instance>(children[0]);
3335+
constlastNode=getInstanceFromHostFiber<Instance>(
33173336
children[children.length-1],
33183337
);
33193338

33203339
// If the fragment has been portaled into another host instance, we need to
33213340
// our best guess is to use the parent of the child instance, rather than
33223341
// the fiber tree host parent.
3323-
constfirstInstance=getInstanceFromHostFiber<Instance>(children[0]);
33243342
constparentHostInstanceFromDOM=fiberIsPortaledIntoHost(this._fragmentFiber)
3325-
 ? (firstInstance.parentElement: ?Instance)
3343+
 ? (firstNode.parentElement: ?Instance)
33263344
 : parentHostInstance;
33273345

33283346
if(parentHostInstanceFromDOM==null){
33293347
returnNode.DOCUMENT_POSITION_DISCONNECTED;
33303348
}
33313349

3332-
// Check if first and last element are actually in the expected document position
3333-
// before relying on them as source of truth for other contained elements
3334-
constfirstElementIsContained=
3335-
parentHostInstanceFromDOM.compareDocumentPosition(firstElement)&
3350+
 // Check if first and last node are actually in the expected document position
3351+
 // before relying on them as source of truth for other contained nodes
3352+
 const firstNodeIsContained =
3353+
 parentHostInstanceFromDOM.compareDocumentPosition(firstNode) &
33363354
Node.DOCUMENT_POSITION_CONTAINED_BY;
3337-
constlastElementIsContained=
3338-
parentHostInstanceFromDOM.compareDocumentPosition(lastElement)&
3355+
constlastNodeIsContained=
3356+
parentHostInstanceFromDOM.compareDocumentPosition(lastNode)&
33393357
Node.DOCUMENT_POSITION_CONTAINED_BY;
3340-
constfirstResult=firstElement.compareDocumentPosition(otherNode);
3341-
constlastResult=lastElement.compareDocumentPosition(otherNode);
3358+
constfirstResult=firstNode.compareDocumentPosition(otherNode);
3359+
constlastResult=lastNode.compareDocumentPosition(otherNode);
33423360

33433361
constotherNodeIsFirstOrLastChild=
3344-
(firstElementIsContained&&firstElement===otherNode)||
3345-
(lastElementIsContained&&lastElement===otherNode);
3362+
(firstNodeIsContained&&firstNode===otherNode)||
3363+
(lastNodeIsContained&&lastNode===otherNode);
33463364
constotherNodeIsFirstOrLastChildDisconnected=
3347-
(!firstElementIsContained&&firstElement===otherNode)||
3348-
(!lastElementIsContained&&lastElement===otherNode);
3365+
(!firstNodeIsContained&&firstNode===otherNode)||
3366+
(!lastNodeIsContained&&lastNode===otherNode);
33493367
constotherNodeIsWithinFirstOrLastChild=
33503368
firstResult&Node.DOCUMENT_POSITION_CONTAINED_BY||
33513369
lastResult&Node.DOCUMENT_POSITION_CONTAINED_BY;
33523370
constotherNodeIsBetweenFirstAndLastChildren=
3353-
firstElementIsContained&&
3354-
lastElementIsContained&&
3371+
firstNodeIsContained&&
3372+
lastNodeIsContained&&
33553373
firstResult&Node.DOCUMENT_POSITION_FOLLOWING&&
33563374
lastResult&Node.DOCUMENT_POSITION_PRECEDING;
33573375

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Minor DOM FragmentInstance refactors (#35641) · react/react@cd515d7 · GitHub
Skip to content
Commit cd515d7
Browse files
jackpopejackpope
authored
Minor DOM FragmentInstance refactors (#35641)
Handles TODOs, small follow up refactors
1 parent 78f5c50 commit cd515d7
1 file changed
Lines changed: 44 additions & 26 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,16 @@ function indexOfEventListener(
30563056
listener: EventListener,
30573057
optionsOrUseCapture: void|EventListenerOptionsOrUseCapture,
30583058
): number{
3059+
if(eventListeners.length===0){
3060+
return-1;
3061+
}
3062+
constnormalizedOptions=normalizeListenerOptions(optionsOrUseCapture);
30593063
for(leti=0;i<eventListeners.length;i++){
30603064
constitem=eventListeners[i];
30613065
if(
30623066
item.type===type&&
30633067
item.listener===listener&&
3064-
normalizeListenerOptions(item.optionsOrUseCapture)===
3065-
normalizeListenerOptions(optionsOrUseCapture)
3068+
normalizeListenerOptions(item.optionsOrUseCapture)===normalizedOptions
30663069
){
30673070
returni;
30683071
}
@@ -3154,18 +3157,34 @@ function collectChildren(child: Fiber, collection: Array<Fiber>): boolean {
31543157
}
31553158
// $FlowFixMe[prop-missing]
31563159
FragmentInstance.prototype.blur=function(this: FragmentInstanceType): void{
3157-
// TODO: When we have a parent element reference, we can skip traversal if the fragment's parent
3158-
// does not contain document.activeElement
3160+
// Early exit if activeElement is not within the fragment's parent
3161+
constparentHostFiber=getFragmentParentHostFiber(this._fragmentFiber);
3162+
if(parentHostFiber===null){
3163+
return;
3164+
}
3165+
constparentHostInstance=
3166+
getInstanceFromHostFiber<Instance>(parentHostFiber);
3167+
constactiveElement=parentHostInstance.ownerDocument.activeElement;
3168+
if(activeElement===null||!parentHostInstance.contains(activeElement)){
3169+
return;
3170+
}
3171+
31593172
traverseFragmentInstance(
31603173
this._fragmentFiber,
31613174
blurActiveElementWithinFragment,
3175+
activeElement,
31623176
);
31633177
};
3164-
functionblurActiveElementWithinFragment(child: Fiber): boolean{
3165-
// TODO: We can get the activeElement from the parent outside of the loop when we have a reference.
3178+
functionblurActiveElementWithinFragment(
3179+
child: Fiber,
3180+
activeElement: Element,
3181+
): boolean{
3182+
// Skip text nodes - they can't be focused
3183+
if(enableFragmentRefsTextNodes&&child.tag===HostText){
3184+
returnfalse;
3185+
}
31663186
constinstance=getInstanceFromHostFiber<Instance>(child);
3167-
constownerDocument=instance.ownerDocument;
3168-
if(instance===ownerDocument.activeElement){
3187+
if(instance===activeElement){
31693188
// $FlowFixMe[prop-missing]
31703189
instance.blur();
31713190
returntrue;
@@ -3312,46 +3331,45 @@ FragmentInstance.prototype.compareDocumentPosition = function (
33123331
);
33133332
}
33143333

3315-
constfirstElement=getInstanceFromHostFiber<Instance>(children[0]);
3316-
constlastElement=getInstanceFromHostFiber<Instance>(
3334+
constfirstNode=getInstanceFromHostFiber<Instance>(children[0]);
3335+
constlastNode=getInstanceFromHostFiber<Instance>(
33173336
children[children.length-1],
33183337
);
33193338

33203339
// If the fragment has been portaled into another host instance, we need to
33213340
// our best guess is to use the parent of the child instance, rather than
33223341
// the fiber tree host parent.
3323-
constfirstInstance=getInstanceFromHostFiber<Instance>(children[0]);
33243342
constparentHostInstanceFromDOM=fiberIsPortaledIntoHost(this._fragmentFiber)
3325-
 ? (firstInstance.parentElement: ?Instance)
3343+
 ? (firstNode.parentElement: ?Instance)
33263344
 : parentHostInstance;
33273345

33283346
if(parentHostInstanceFromDOM==null){
33293347
returnNode.DOCUMENT_POSITION_DISCONNECTED;
33303348
}
33313349

3332-
// Check if first and last element are actually in the expected document position
3333-
// before relying on them as source of truth for other contained elements
3334-
constfirstElementIsContained=
3335-
parentHostInstanceFromDOM.compareDocumentPosition(firstElement)&
3350+
 // Check if first and last node are actually in the expected document position
3351+
 // before relying on them as source of truth for other contained nodes
3352+
 const firstNodeIsContained =
3353+
 parentHostInstanceFromDOM.compareDocumentPosition(firstNode) &
33363354
Node.DOCUMENT_POSITION_CONTAINED_BY;
3337-
constlastElementIsContained=
3338-
parentHostInstanceFromDOM.compareDocumentPosition(lastElement)&
3355+
constlastNodeIsContained=
3356+
parentHostInstanceFromDOM.compareDocumentPosition(lastNode)&
33393357
Node.DOCUMENT_POSITION_CONTAINED_BY;
3340-
constfirstResult=firstElement.compareDocumentPosition(otherNode);
3341-
constlastResult=lastElement.compareDocumentPosition(otherNode);
3358+
constfirstResult=firstNode.compareDocumentPosition(otherNode);
3359+
constlastResult=lastNode.compareDocumentPosition(otherNode);
33423360

33433361
constotherNodeIsFirstOrLastChild=
3344-
(firstElementIsContained&&firstElement===otherNode)||
3345-
(lastElementIsContained&&lastElement===otherNode);
3362+
(firstNodeIsContained&&firstNode===otherNode)||
3363+
(lastNodeIsContained&&lastNode===otherNode);
33463364
constotherNodeIsFirstOrLastChildDisconnected=
3347-
(!firstElementIsContained&&firstElement===otherNode)||
3348-
(!lastElementIsContained&&lastElement===otherNode);
3365+
(!firstNodeIsContained&&firstNode===otherNode)||
3366+
(!lastNodeIsContained&&lastNode===otherNode);
33493367
constotherNodeIsWithinFirstOrLastChild=
33503368
firstResult&Node.DOCUMENT_POSITION_CONTAINED_BY||
33513369
lastResult&Node.DOCUMENT_POSITION_CONTAINED_BY;
33523370
constotherNodeIsBetweenFirstAndLastChildren=
3353-
firstElementIsContained&&
3354-
lastElementIsContained&&
3371+
firstNodeIsContained&&
3372+
lastNodeIsContained&&
33553373
firstResult&Node.DOCUMENT_POSITION_FOLLOWING&&
33563374
lastResult&Node.DOCUMENT_POSITION_PRECEDING;
33573375

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Minor DOM FragmentInstance refactors (#35641) · react/react@cd515d7 · GitHub
Skip to content
Commit cd515d7
Browse files
jackpopejackpope
authored
Minor DOM FragmentInstance refactors (#35641)
Handles TODOs, small follow up refactors
1 parent 78f5c50 commit cd515d7
1 file changed
Lines changed: 44 additions & 26 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,16 @@ function indexOfEventListener(
30563056
listener: EventListener,
30573057
optionsOrUseCapture: void|EventListenerOptionsOrUseCapture,
30583058
): number{
3059+
if(eventListeners.length===0){
3060+
return-1;
3061+
}
3062+
constnormalizedOptions=normalizeListenerOptions(optionsOrUseCapture);
30593063
for(leti=0;i<eventListeners.length;i++){
30603064
constitem=eventListeners[i];
30613065
if(
30623066
item.type===type&&
30633067
item.listener===listener&&
3064-
normalizeListenerOptions(item.optionsOrUseCapture)===
3065-
normalizeListenerOptions(optionsOrUseCapture)
3068+
normalizeListenerOptions(item.optionsOrUseCapture)===normalizedOptions
30663069
){
30673070
returni;
30683071
}
@@ -3154,18 +3157,34 @@ function collectChildren(child: Fiber, collection: Array<Fiber>): boolean {
31543157
}
31553158
// $FlowFixMe[prop-missing]
31563159
FragmentInstance.prototype.blur=function(this: FragmentInstanceType): void{
3157-
// TODO: When we have a parent element reference, we can skip traversal if the fragment's parent
3158-
// does not contain document.activeElement
3160+
// Early exit if activeElement is not within the fragment's parent
3161+
constparentHostFiber=getFragmentParentHostFiber(this._fragmentFiber);
3162+
if(parentHostFiber===null){
3163+
return;
3164+
}
3165+
constparentHostInstance=
3166+
getInstanceFromHostFiber<Instance>(parentHostFiber);
3167+
constactiveElement=parentHostInstance.ownerDocument.activeElement;
3168+
if(activeElement===null||!parentHostInstance.contains(activeElement)){
3169+
return;
3170+
}
3171+
31593172
traverseFragmentInstance(
31603173
this._fragmentFiber,
31613174
blurActiveElementWithinFragment,
3175+
activeElement,
31623176
);
31633177
};
3164-
functionblurActiveElementWithinFragment(child: Fiber): boolean{
3165-
// TODO: We can get the activeElement from the parent outside of the loop when we have a reference.
3178+
functionblurActiveElementWithinFragment(
3179+
child: Fiber,
3180+
activeElement: Element,
3181+
): boolean{
3182+
// Skip text nodes - they can't be focused
3183+
if(enableFragmentRefsTextNodes&&child.tag===HostText){
3184+
returnfalse;
3185+
}
31663186
constinstance=getInstanceFromHostFiber<Instance>(child);
3167-
constownerDocument=instance.ownerDocument;
3168-
if(instance===ownerDocument.activeElement){
3187+
if(instance===activeElement){
31693188
// $FlowFixMe[prop-missing]
31703189
instance.blur();
31713190
returntrue;
@@ -3312,46 +3331,45 @@ FragmentInstance.prototype.compareDocumentPosition = function (
33123331
);
33133332
}
33143333

3315-
constfirstElement=getInstanceFromHostFiber<Instance>(children[0]);
3316-
constlastElement=getInstanceFromHostFiber<Instance>(
3334+
constfirstNode=getInstanceFromHostFiber<Instance>(children[0]);
3335+
constlastNode=getInstanceFromHostFiber<Instance>(
33173336
children[children.length-1],
33183337
);
33193338

33203339
// If the fragment has been portaled into another host instance, we need to
33213340
// our best guess is to use the parent of the child instance, rather than
33223341
// the fiber tree host parent.
3323-
constfirstInstance=getInstanceFromHostFiber<Instance>(children[0]);
33243342
constparentHostInstanceFromDOM=fiberIsPortaledIntoHost(this._fragmentFiber)
3325-
 ? (firstInstance.parentElement: ?Instance)
3343+
 ? (firstNode.parentElement: ?Instance)
33263344
 : parentHostInstance;
33273345

33283346
if(parentHostInstanceFromDOM==null){
33293347
returnNode.DOCUMENT_POSITION_DISCONNECTED;
33303348
}
33313349

3332-
// Check if first and last element are actually in the expected document position
3333-
// before relying on them as source of truth for other contained elements
3334-
constfirstElementIsContained=
3335-
parentHostInstanceFromDOM.compareDocumentPosition(firstElement)&
3350+
 // Check if first and last node are actually in the expected document position
3351+
 // before relying on them as source of truth for other contained nodes
3352+
 const firstNodeIsContained =
3353+
 parentHostInstanceFromDOM.compareDocumentPosition(firstNode) &
33363354
Node.DOCUMENT_POSITION_CONTAINED_BY;
3337-
constlastElementIsContained=
3338-
parentHostInstanceFromDOM.compareDocumentPosition(lastElement)&
3355+
constlastNodeIsContained=
3356+
parentHostInstanceFromDOM.compareDocumentPosition(lastNode)&
33393357
Node.DOCUMENT_POSITION_CONTAINED_BY;
3340-
constfirstResult=firstElement.compareDocumentPosition(otherNode);
3341-
constlastResult=lastElement.compareDocumentPosition(otherNode);
3358+
constfirstResult=firstNode.compareDocumentPosition(otherNode);
3359+
constlastResult=lastNode.compareDocumentPosition(otherNode);
33423360

33433361
constotherNodeIsFirstOrLastChild=
3344-
(firstElementIsContained&&firstElement===otherNode)||
3345-
(lastElementIsContained&&lastElement===otherNode);
3362+
(firstNodeIsContained&&firstNode===otherNode)||
3363+
(lastNodeIsContained&&lastNode===otherNode);
33463364
constotherNodeIsFirstOrLastChildDisconnected=
3347-
(!firstElementIsContained&&firstElement===otherNode)||
3348-
(!lastElementIsContained&&lastElement===otherNode);
3365+
(!firstNodeIsContained&&firstNode===otherNode)||
3366+
(!lastNodeIsContained&&lastNode===otherNode);
33493367
constotherNodeIsWithinFirstOrLastChild=
33503368
firstResult&Node.DOCUMENT_POSITION_CONTAINED_BY||
33513369
lastResult&Node.DOCUMENT_POSITION_CONTAINED_BY;
33523370
constotherNodeIsBetweenFirstAndLastChildren=
3353-
firstElementIsContained&&
3354-
lastElementIsContained&&
3371+
firstNodeIsContained&&
3372+
lastNodeIsContained&&
33553373
firstResult&Node.DOCUMENT_POSITION_FOLLOWING&&
33563374
lastResult&Node.DOCUMENT_POSITION_PRECEDING;
33573375

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Minor DOM FragmentInstance refactors (#35641) · react/react@cd515d7 · GitHub
Skip to content
Commit cd515d7
Browse files
jackpopejackpope
authored
Minor DOM FragmentInstance refactors (#35641)
Handles TODOs, small follow up refactors
1 parent 78f5c50 commit cd515d7
1 file changed
Lines changed: 44 additions & 26 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,16 @@ function indexOfEventListener(
30563056
listener: EventListener,
30573057
optionsOrUseCapture: void|EventListenerOptionsOrUseCapture,
30583058
): number{
3059+
if(eventListeners.length===0){
3060+
return-1;
3061+
}
3062+
constnormalizedOptions=normalizeListenerOptions(optionsOrUseCapture);
30593063
for(leti=0;i<eventListeners.length;i++){
30603064
constitem=eventListeners[i];
30613065
if(
30623066
item.type===type&&
30633067
item.listener===listener&&
3064-
normalizeListenerOptions(item.optionsOrUseCapture)===
3065-
normalizeListenerOptions(optionsOrUseCapture)
3068+
normalizeListenerOptions(item.optionsOrUseCapture)===normalizedOptions
30663069
){
30673070
returni;
30683071
}
@@ -3154,18 +3157,34 @@ function collectChildren(child: Fiber, collection: Array<Fiber>): boolean {
31543157
}
31553158
// $FlowFixMe[prop-missing]
31563159
FragmentInstance.prototype.blur=function(this: FragmentInstanceType): void{
3157-
// TODO: When we have a parent element reference, we can skip traversal if the fragment's parent
3158-
// does not contain document.activeElement
3160+
// Early exit if activeElement is not within the fragment's parent
3161+
constparentHostFiber=getFragmentParentHostFiber(this._fragmentFiber);
3162+
if(parentHostFiber===null){
3163+
return;
3164+
}
3165+
constparentHostInstance=
3166+
getInstanceFromHostFiber<Instance>(parentHostFiber);
3167+
constactiveElement=parentHostInstance.ownerDocument.activeElement;
3168+
if(activeElement===null||!parentHostInstance.contains(activeElement)){
3169+
return;
3170+
}
3171+
31593172
traverseFragmentInstance(
31603173
this._fragmentFiber,
31613174
blurActiveElementWithinFragment,
3175+
activeElement,
31623176
);
31633177
};
3164-
functionblurActiveElementWithinFragment(child: Fiber): boolean{
3165-
// TODO: We can get the activeElement from the parent outside of the loop when we have a reference.
3178+
functionblurActiveElementWithinFragment(
3179+
child: Fiber,
3180+
activeElement: Element,
3181+
): boolean{
3182+
// Skip text nodes - they can't be focused
3183+
if(enableFragmentRefsTextNodes&&child.tag===HostText){
3184+
returnfalse;
3185+
}
31663186
constinstance=getInstanceFromHostFiber<Instance>(child);
3167-
constownerDocument=instance.ownerDocument;
3168-
if(instance===ownerDocument.activeElement){
3187+
if(instance===activeElement){
31693188
// $FlowFixMe[prop-missing]
31703189
instance.blur();
31713190
returntrue;
@@ -3312,46 +3331,45 @@ FragmentInstance.prototype.compareDocumentPosition = function (
33123331
);
33133332
}
33143333

3315-
constfirstElement=getInstanceFromHostFiber<Instance>(children[0]);
3316-
constlastElement=getInstanceFromHostFiber<Instance>(
3334+
constfirstNode=getInstanceFromHostFiber<Instance>(children[0]);
3335+
constlastNode=getInstanceFromHostFiber<Instance>(
33173336
children[children.length-1],
33183337
);
33193338

33203339
// If the fragment has been portaled into another host instance, we need to
33213340
// our best guess is to use the parent of the child instance, rather than
33223341
// the fiber tree host parent.
3323-
constfirstInstance=getInstanceFromHostFiber<Instance>(children[0]);
33243342
constparentHostInstanceFromDOM=fiberIsPortaledIntoHost(this._fragmentFiber)
3325-
 ? (firstInstance.parentElement: ?Instance)
3343+
 ? (firstNode.parentElement: ?Instance)
33263344
 : parentHostInstance;
33273345

33283346
if(parentHostInstanceFromDOM==null){
33293347
returnNode.DOCUMENT_POSITION_DISCONNECTED;
33303348
}
33313349

3332-
// Check if first and last element are actually in the expected document position
3333-
// before relying on them as source of truth for other contained elements
3334-
constfirstElementIsContained=
3335-
parentHostInstanceFromDOM.compareDocumentPosition(firstElement)&
3350+
 // Check if first and last node are actually in the expected document position
3351+
 // before relying on them as source of truth for other contained nodes
3352+
 const firstNodeIsContained =
3353+
 parentHostInstanceFromDOM.compareDocumentPosition(firstNode) &
33363354
Node.DOCUMENT_POSITION_CONTAINED_BY;
3337-
constlastElementIsContained=
3338-
parentHostInstanceFromDOM.compareDocumentPosition(lastElement)&
3355+
constlastNodeIsContained=
3356+
parentHostInstanceFromDOM.compareDocumentPosition(lastNode)&
33393357
Node.DOCUMENT_POSITION_CONTAINED_BY;
3340-
constfirstResult=firstElement.compareDocumentPosition(otherNode);
3341-
constlastResult=lastElement.compareDocumentPosition(otherNode);
3358+
constfirstResult=firstNode.compareDocumentPosition(otherNode);
3359+
constlastResult=lastNode.compareDocumentPosition(otherNode);
33423360

33433361
constotherNodeIsFirstOrLastChild=
3344-
(firstElementIsContained&&firstElement===otherNode)||
3345-
(lastElementIsContained&&lastElement===otherNode);
3362+
(firstNodeIsContained&&firstNode===otherNode)||
3363+
(lastNodeIsContained&&lastNode===otherNode);
33463364
constotherNodeIsFirstOrLastChildDisconnected=
3347-
(!firstElementIsContained&&firstElement===otherNode)||
3348-
(!lastElementIsContained&&lastElement===otherNode);
3365+
(!firstNodeIsContained&&firstNode===otherNode)||
3366+
(!lastNodeIsContained&&lastNode===otherNode);
33493367
constotherNodeIsWithinFirstOrLastChild=
33503368
firstResult&Node.DOCUMENT_POSITION_CONTAINED_BY||
33513369
lastResult&Node.DOCUMENT_POSITION_CONTAINED_BY;
33523370
constotherNodeIsBetweenFirstAndLastChildren=
3353-
firstElementIsContained&&
3354-
lastElementIsContained&&
3371+
firstNodeIsContained&&
3372+
lastNodeIsContained&&
33553373
firstResult&Node.DOCUMENT_POSITION_FOLLOWING&&
33563374
lastResult&Node.DOCUMENT_POSITION_PRECEDING;
33573375

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Minor DOM FragmentInstance refactors (#35641) · react/react@cd515d7 · GitHub
Skip to content
Commit cd515d7
Browse files
jackpopejackpope
authored
Minor DOM FragmentInstance refactors (#35641)
Handles TODOs, small follow up refactors
1 parent 78f5c50 commit cd515d7
1 file changed
Lines changed: 44 additions & 26 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,16 @@ function indexOfEventListener(
30563056
listener: EventListener,
30573057
optionsOrUseCapture: void|EventListenerOptionsOrUseCapture,
30583058
): number{
3059+
if(eventListeners.length===0){
3060+
return-1;
3061+
}
3062+
constnormalizedOptions=normalizeListenerOptions(optionsOrUseCapture);
30593063
for(leti=0;i<eventListeners.length;i++){
30603064
constitem=eventListeners[i];
30613065
if(
30623066
item.type===type&&
30633067
item.listener===listener&&
3064-
normalizeListenerOptions(item.optionsOrUseCapture)===
3065-
normalizeListenerOptions(optionsOrUseCapture)
3068+
normalizeListenerOptions(item.optionsOrUseCapture)===normalizedOptions
30663069
){
30673070
returni;
30683071
}
@@ -3154,18 +3157,34 @@ function collectChildren(child: Fiber, collection: Array<Fiber>): boolean {
31543157
}
31553158
// $FlowFixMe[prop-missing]
31563159
FragmentInstance.prototype.blur=function(this: FragmentInstanceType): void{
3157-
// TODO: When we have a parent element reference, we can skip traversal if the fragment's parent
3158-
// does not contain document.activeElement
3160+
// Early exit if activeElement is not within the fragment's parent
3161+
constparentHostFiber=getFragmentParentHostFiber(this._fragmentFiber);
3162+
if(parentHostFiber===null){
3163+
return;
3164+
}
3165+
constparentHostInstance=
3166+
getInstanceFromHostFiber<Instance>(parentHostFiber);
3167+
constactiveElement=parentHostInstance.ownerDocument.activeElement;
3168+
if(activeElement===null||!parentHostInstance.contains(activeElement)){
3169+
return;
3170+
}
3171+
31593172
traverseFragmentInstance(
31603173
this._fragmentFiber,
31613174
blurActiveElementWithinFragment,
3175+
activeElement,
31623176
);
31633177
};
3164-
functionblurActiveElementWithinFragment(child: Fiber): boolean{
3165-
// TODO: We can get the activeElement from the parent outside of the loop when we have a reference.
3178+
functionblurActiveElementWithinFragment(
3179+
child: Fiber,
3180+
activeElement: Element,
3181+
): boolean{
3182+
// Skip text nodes - they can't be focused
3183+
if(enableFragmentRefsTextNodes&&child.tag===HostText){
3184+
returnfalse;
3185+
}
31663186
constinstance=getInstanceFromHostFiber<Instance>(child);
3167-
constownerDocument=instance.ownerDocument;
3168-
if(instance===ownerDocument.activeElement){
3187+
if(instance===activeElement){
31693188
// $FlowFixMe[prop-missing]
31703189
instance.blur();
31713190
returntrue;
@@ -3312,46 +3331,45 @@ FragmentInstance.prototype.compareDocumentPosition = function (
33123331
);
33133332
}
33143333

3315-
constfirstElement=getInstanceFromHostFiber<Instance>(children[0]);
3316-
constlastElement=getInstanceFromHostFiber<Instance>(
3334+
constfirstNode=getInstanceFromHostFiber<Instance>(children[0]);
3335+
constlastNode=getInstanceFromHostFiber<Instance>(
33173336
children[children.length-1],
33183337
);
33193338

33203339
// If the fragment has been portaled into another host instance, we need to
33213340
// our best guess is to use the parent of the child instance, rather than
33223341
// the fiber tree host parent.
3323-
constfirstInstance=getInstanceFromHostFiber<Instance>(children[0]);
33243342
constparentHostInstanceFromDOM=fiberIsPortaledIntoHost(this._fragmentFiber)
3325-
 ? (firstInstance.parentElement: ?Instance)
3343+
 ? (firstNode.parentElement: ?Instance)
33263344
 : parentHostInstance;
33273345

33283346
if(parentHostInstanceFromDOM==null){
33293347
returnNode.DOCUMENT_POSITION_DISCONNECTED;
33303348
}
33313349

3332-
// Check if first and last element are actually in the expected document position
3333-
// before relying on them as source of truth for other contained elements
3334-
constfirstElementIsContained=
3335-
parentHostInstanceFromDOM.compareDocumentPosition(firstElement)&
3350+
 // Check if first and last node are actually in the expected document position
3351+
 // before relying on them as source of truth for other contained nodes
3352+
 const firstNodeIsContained =
3353+
 parentHostInstanceFromDOM.compareDocumentPosition(firstNode) &
33363354
Node.DOCUMENT_POSITION_CONTAINED_BY;
3337-
constlastElementIsContained=
3338-
parentHostInstanceFromDOM.compareDocumentPosition(lastElement)&
3355+
constlastNodeIsContained=
3356+
parentHostInstanceFromDOM.compareDocumentPosition(lastNode)&
33393357
Node.DOCUMENT_POSITION_CONTAINED_BY;
3340-
constfirstResult=firstElement.compareDocumentPosition(otherNode);
3341-
constlastResult=lastElement.compareDocumentPosition(otherNode);
3358+
constfirstResult=firstNode.compareDocumentPosition(otherNode);
3359+
constlastResult=lastNode.compareDocumentPosition(otherNode);
33423360

33433361
constotherNodeIsFirstOrLastChild=
3344-
(firstElementIsContained&&firstElement===otherNode)||
3345-
(lastElementIsContained&&lastElement===otherNode);
3362+
(firstNodeIsContained&&firstNode===otherNode)||
3363+
(lastNodeIsContained&&lastNode===otherNode);
33463364
constotherNodeIsFirstOrLastChildDisconnected=
3347-
(!firstElementIsContained&&firstElement===otherNode)||
3348-
(!lastElementIsContained&&lastElement===otherNode);
3365+
(!firstNodeIsContained&&firstNode===otherNode)||
3366+
(!lastNodeIsContained&&lastNode===otherNode);
33493367
constotherNodeIsWithinFirstOrLastChild=
33503368
firstResult&Node.DOCUMENT_POSITION_CONTAINED_BY||
33513369
lastResult&Node.DOCUMENT_POSITION_CONTAINED_BY;
33523370
constotherNodeIsBetweenFirstAndLastChildren=
3353-
firstElementIsContained&&
3354-
lastElementIsContained&&
3371+
firstNodeIsContained&&
3372+
lastNodeIsContained&&
33553373
firstResult&Node.DOCUMENT_POSITION_FOLLOWING&&
33563374
lastResult&Node.DOCUMENT_POSITION_PRECEDING;
33573375

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Minor DOM FragmentInstance refactors (#35641) · react/react@cd515d7 · GitHub
Skip to content
Commit cd515d7
Browse files
jackpopejackpope
authored
Minor DOM FragmentInstance refactors (#35641)
Handles TODOs, small follow up refactors
1 parent 78f5c50 commit cd515d7
1 file changed
Lines changed: 44 additions & 26 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,13 +3056,16 @@ function indexOfEventListener(
30563056
listener: EventListener,
30573057
optionsOrUseCapture: void|EventListenerOptionsOrUseCapture,
30583058
): number{
3059+
if(eventListeners.length===0){
3060+
return-1;
3061+
}
3062+
constnormalizedOptions=normalizeListenerOptions(optionsOrUseCapture);
30593063
for(leti=0;i<eventListeners.length;i++){
30603064
constitem=eventListeners[i];
30613065
if(
30623066
item.type===type&&
30633067
item.listener===listener&&
3064-
normalizeListenerOptions(item.optionsOrUseCapture)===
3065-
normalizeListenerOptions(optionsOrUseCapture)
3068+
normalizeListenerOptions(item.optionsOrUseCapture)===normalizedOptions
30663069
){
30673070
returni;
30683071
}
@@ -3154,18 +3157,34 @@ function collectChildren(child: Fiber, collection: Array<Fiber>): boolean {
31543157
}
31553158
// $FlowFixMe[prop-missing]
31563159
FragmentInstance.prototype.blur=function(this: FragmentInstanceType): void{
3157-
// TODO: When we have a parent element reference, we can skip traversal if the fragment's parent
3158-
// does not contain document.activeElement
3160+
// Early exit if activeElement is not within the fragment's parent
3161+
constparentHostFiber=getFragmentParentHostFiber(this._fragmentFiber);
3162+
if(parentHostFiber===null){
3163+
return;
3164+
}
3165+
constparentHostInstance=
3166+
getInstanceFromHostFiber<Instance>(parentHostFiber);
3167+
constactiveElement=parentHostInstance.ownerDocument.activeElement;
3168+
if(activeElement===null||!parentHostInstance.contains(activeElement)){
3169+
return;
3170+
}
3171+
31593172
traverseFragmentInstance(
31603173
this._fragmentFiber,
31613174
blurActiveElementWithinFragment,
3175+
activeElement,
31623176
);
31633177
};
3164-
functionblurActiveElementWithinFragment(child: Fiber): boolean{
3165-
// TODO: We can get the activeElement from the parent outside of the loop when we have a reference.
3178+
functionblurActiveElementWithinFragment(
3179+
child: Fiber,
3180+
activeElement: Element,
3181+
): boolean{
3182+
// Skip text nodes - they can't be focused
3183+
if(enableFragmentRefsTextNodes&&child.tag===HostText){
3184+
returnfalse;
3185+
}
31663186
constinstance=getInstanceFromHostFiber<Instance>(child);
3167-
constownerDocument=instance.ownerDocument;
3168-
if(instance===ownerDocument.activeElement){
3187+
if(instance===activeElement){
31693188
// $FlowFixMe[prop-missing]
31703189
instance.blur();
31713190
returntrue;
@@ -3312,46 +3331,45 @@ FragmentInstance.prototype.compareDocumentPosition = function (
33123331
);
33133332
}
33143333

3315-
constfirstElement=getInstanceFromHostFiber<Instance>(children[0]);
3316-
constlastElement=getInstanceFromHostFiber<Instance>(
3334+
constfirstNode=getInstanceFromHostFiber<Instance>(children[0]);
3335+
constlastNode=getInstanceFromHostFiber<Instance>(
33173336
children[children.length-1],
33183337
);
33193338

33203339
// If the fragment has been portaled into another host instance, we need to
33213340
// our best guess is to use the parent of the child instance, rather than
33223341
// the fiber tree host parent.
3323-
constfirstInstance=getInstanceFromHostFiber<Instance>(children[0]);
33243342
constparentHostInstanceFromDOM=fiberIsPortaledIntoHost(this._fragmentFiber)
3325-
 ? (firstInstance.parentElement: ?Instance)
3343+
 ? (firstNode.parentElement: ?Instance)
33263344
 : parentHostInstance;
33273345

33283346
if(parentHostInstanceFromDOM==null){
33293347
returnNode.DOCUMENT_POSITION_DISCONNECTED;
33303348
}
33313349

3332-
// Check if first and last element are actually in the expected document position
3333-
// before relying on them as source of truth for other contained elements
3334-
constfirstElementIsContained=
3335-
parentHostInstanceFromDOM.compareDocumentPosition(firstElement)&
3350+
 // Check if first and last node are actually in the expected document position
3351+
 // before relying on them as source of truth for other contained nodes
3352+
 const firstNodeIsContained =
3353+
 parentHostInstanceFromDOM.compareDocumentPosition(firstNode) &
33363354
Node.DOCUMENT_POSITION_CONTAINED_BY;
3337-
constlastElementIsContained=
3338-
parentHostInstanceFromDOM.compareDocumentPosition(lastElement)&
3355+
constlastNodeIsContained=
3356+
parentHostInstanceFromDOM.compareDocumentPosition(lastNode)&
33393357
Node.DOCUMENT_POSITION_CONTAINED_BY;
3340-
constfirstResult=firstElement.compareDocumentPosition(otherNode);
3341-
constlastResult=lastElement.compareDocumentPosition(otherNode);
3358+
constfirstResult=firstNode.compareDocumentPosition(otherNode);
3359+
constlastResult=lastNode.compareDocumentPosition(otherNode);
33423360

33433361
constotherNodeIsFirstOrLastChild=
3344-
(firstElementIsContained&&firstElement===otherNode)||
3345-
(lastElementIsContained&&lastElement===otherNode);
3362+
(firstNodeIsContained&&firstNode===otherNode)||
3363+
(lastNodeIsContained&&lastNode===otherNode);
33463364
constotherNodeIsFirstOrLastChildDisconnected=
3347-
(!firstElementIsContained&&firstElement===otherNode)||
3348-
(!lastElementIsContained&&lastElement===otherNode);
3365+
(!firstNodeIsContained&&firstNode===otherNode)||
3366+
(!lastNodeIsContained&&lastNode===otherNode);
33493367
constotherNodeIsWithinFirstOrLastChild=
33503368
firstResult&Node.DOCUMENT_POSITION_CONTAINED_BY||
33513369
lastResult&Node.DOCUMENT_POSITION_CONTAINED_BY;
33523370
constotherNodeIsBetweenFirstAndLastChildren=
3353-
firstElementIsContained&&
3354-
lastElementIsContained&&
3371+
firstNodeIsContained&&
3372+
lastNodeIsContained&&
33553373
firstResult&Node.DOCUMENT_POSITION_FOLLOWING&&
33563374
lastResult&Node.DOCUMENT_POSITION_PRECEDING;
33573375

0 commit comments
Comments
 (0)