Skip to content

Commit 61331f3

Browse files
gaearongaearon
authored
Fix ViewTransition crash in Mobile Safari (#35337)
Speculative fix to #35336 written by Claude. I have verified that applying a similar patch locally to the repro from #35336 does fix the crash. I'm not familiar enough with the underlying APIs to tell whether the fix is correct or sufficient.
1 parent 55480b4 commit 61331f3

1 file changed

Lines changed: 17 additions & 22 deletions

File tree

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

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,26 +1996,6 @@ export function hasInstanceAffectedParent(
19961996
returnoldRect.height!==newRect.height||oldRect.width!==newRect.width;
19971997
}
19981998

1999-
functioncancelAllViewTransitionAnimations(scope: Element){
2000-
// In Safari, we need to manually cancel all manually start animations
2001-
// or it'll block or interfer with future transitions.
2002-
// $FlowFixMe[prop-missing]
2003-
constanimations=scope.getAnimations({subtree: true});
2004-
for(leti=0;i<animations.length;i++){
2005-
constanim=animations[i];
2006-
consteffect: KeyframeEffect=(anim.effect: any);
2007-
// $FlowFixMe
2008-
constpseudo: ?string=effect.pseudoElement;
2009-
if(
2010-
pseudo!=null&&
2011-
pseudo.startsWith('::view-transition')&&
2012-
effect.target===scope
2013-
){
2014-
anim.cancel();
2015-
}
2016-
}
2017-
}
2018-
20191999
// How long to wait for new fonts to load before just committing anyway.
20202000
// This freezes the screen. It needs to be short enough that it doesn't cause too much of
20212001
// an issue when it's a new load and slow, yet long enough that you have a chance to load
@@ -2210,6 +2190,8 @@ export function startViewTransition(
22102190
// $FlowFixMe[prop-missing]
22112191
ownerDocument.__reactViewTransition=transition;
22122192

2193+
constviewTransitionAnimations: Array<Animation>=[];
2194+
22132195
constreadyCallback=()=>{
22142196
constdocumentElement: Element=(ownerDocument.documentElement: any);
22152197
// Loop through all View Transition Animations.
@@ -2224,6 +2206,7 @@ export function startViewTransition(
22242206
pseudoElement!=null&&
22252207
pseudoElement.startsWith('::view-transition')
22262208
){
2209+
viewTransitionAnimations.push(animation);
22272210
constkeyframes=effect.getKeyframes();
22282211
// Next, we're going to try to optimize this animation in case the auto-generated
22292212
// width/height keyframes are unnecessary.
@@ -2315,7 +2298,12 @@ export function startViewTransition(
23152298
};
23162299
transition.ready.then(readyCallback,handleError);
23172300
transition.finished.finally(()=>{
2318-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2301+
for(leti=0;i<viewTransitionAnimations.length;i++){
2302+
// In Safari, we need to manually cancel all manually started animations
2303+
// or it'll block or interfer with future transitions.
2304+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2305+
viewTransitionAnimations[i].cancel();
2306+
}
23192307
// $FlowFixMe[prop-missing]
23202308
if(ownerDocument.__reactViewTransition===transition){
23212309
// $FlowFixMe[prop-missing]
@@ -2549,6 +2537,7 @@ export function startGestureTransition(
25492537
// $FlowFixMe[prop-missing]
25502538
ownerDocument.__reactViewTransition=transition;
25512539
constcustomTimelineCleanup: Array<()=>void>=[];// Cleanup Animations started in a CustomTimeline
2540+
constviewTransitionAnimations: Array<Animation>=[];
25522541
constreadyCallback=()=>{
25532542
constdocumentElement: Element=(ownerDocument.documentElement: any);
25542543
// Loop through all View Transition Animations.
@@ -2566,6 +2555,7 @@ export function startGestureTransition(
25662555
constpseudoElement: ?string=effect.pseudoElement;
25672556
if(pseudoElement==null){
25682557
}elseif(pseudoElement.startsWith('::view-transition')){
2558+
viewTransitionAnimations.push(animations[i]);
25692559
consttiming=effect.getTiming();
25702560
constduration=
25712561
// $FlowFixMe[prop-missing]
@@ -2743,7 +2733,12 @@ export function startGestureTransition(
27432733
};
27442734
transition.ready.then(readyForAnimations,handleError);
27452735
transition.finished.finally(()=>{
2746-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2736+
for(leti=0;i<viewTransitionAnimations.length;i++){
2737+
// In Safari, we need to manually cancel all manually started animations
2738+
// or it'll block or interfer with future transitions.
2739+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2740+
viewTransitionAnimations[i].cancel();
2741+
}
27472742
for(leti=0;i<customTimelineCleanup.length;i++){
27482743
constcleanup=customTimelineCleanup[i];
27492744
cleanup();

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" + '
Fix ViewTransition crash in Mobile Safari (#35337) · react/react@61331f3 · GitHub
Skip to content
Commit 61331f3
Browse files
gaearongaearon
authored
Fix ViewTransition crash in Mobile Safari (#35337)
Speculative fix to #35336
written by Claude.
I have verified that applying a similar patch locally to the repro from
#35336 does fix the crash.
I'm not familiar enough with the underlying APIs to tell whether the fix
is correct or sufficient.
1 parent 55480b4 commit 61331f3
1 file changed
Lines changed: 17 additions & 22 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,26 +1996,6 @@ export function hasInstanceAffectedParent(
19961996
returnoldRect.height!==newRect.height||oldRect.width!==newRect.width;
19971997
}
19981998

1999-
functioncancelAllViewTransitionAnimations(scope: Element){
2000-
// In Safari, we need to manually cancel all manually start animations
2001-
// or it'll block or interfer with future transitions.
2002-
// $FlowFixMe[prop-missing]
2003-
constanimations=scope.getAnimations({subtree: true});
2004-
for(leti=0;i<animations.length;i++){
2005-
constanim=animations[i];
2006-
consteffect: KeyframeEffect=(anim.effect: any);
2007-
// $FlowFixMe
2008-
constpseudo: ?string=effect.pseudoElement;
2009-
if(
2010-
pseudo!=null&&
2011-
pseudo.startsWith('::view-transition')&&
2012-
effect.target===scope
2013-
){
2014-
anim.cancel();
2015-
}
2016-
}
2017-
}
2018-
20191999
// How long to wait for new fonts to load before just committing anyway.
20202000
// This freezes the screen. It needs to be short enough that it doesn't cause too much of
20212001
// an issue when it's a new load and slow, yet long enough that you have a chance to load
@@ -2210,6 +2190,8 @@ export function startViewTransition(
22102190
// $FlowFixMe[prop-missing]
22112191
ownerDocument.__reactViewTransition=transition;
22122192

2193+
constviewTransitionAnimations: Array<Animation>=[];
2194+
22132195
constreadyCallback=()=>{
22142196
constdocumentElement: Element=(ownerDocument.documentElement: any);
22152197
// Loop through all View Transition Animations.
@@ -2224,6 +2206,7 @@ export function startViewTransition(
22242206
pseudoElement!=null&&
22252207
pseudoElement.startsWith('::view-transition')
22262208
){
2209+
viewTransitionAnimations.push(animation);
22272210
constkeyframes=effect.getKeyframes();
22282211
// Next, we're going to try to optimize this animation in case the auto-generated
22292212
// width/height keyframes are unnecessary.
@@ -2315,7 +2298,12 @@ export function startViewTransition(
23152298
};
23162299
transition.ready.then(readyCallback,handleError);
23172300
transition.finished.finally(()=>{
2318-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2301+
for(leti=0;i<viewTransitionAnimations.length;i++){
2302+
// In Safari, we need to manually cancel all manually started animations
2303+
// or it'll block or interfer with future transitions.
2304+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2305+
viewTransitionAnimations[i].cancel();
2306+
}
23192307
// $FlowFixMe[prop-missing]
23202308
if(ownerDocument.__reactViewTransition===transition){
23212309
// $FlowFixMe[prop-missing]
@@ -2549,6 +2537,7 @@ export function startGestureTransition(
25492537
// $FlowFixMe[prop-missing]
25502538
ownerDocument.__reactViewTransition=transition;
25512539
constcustomTimelineCleanup: Array<()=>void>=[];// Cleanup Animations started in a CustomTimeline
2540+
constviewTransitionAnimations: Array<Animation>=[];
25522541
constreadyCallback=()=>{
25532542
constdocumentElement: Element=(ownerDocument.documentElement: any);
25542543
// Loop through all View Transition Animations.
@@ -2566,6 +2555,7 @@ export function startGestureTransition(
25662555
constpseudoElement: ?string=effect.pseudoElement;
25672556
if(pseudoElement==null){
25682557
}elseif(pseudoElement.startsWith('::view-transition')){
2558+
viewTransitionAnimations.push(animations[i]);
25692559
consttiming=effect.getTiming();
25702560
constduration=
25712561
// $FlowFixMe[prop-missing]
@@ -2743,7 +2733,12 @@ export function startGestureTransition(
27432733
};
27442734
transition.ready.then(readyForAnimations,handleError);
27452735
 transition.finished.finally(()=>{
2746-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2736+
for(leti=0;i<viewTransitionAnimations.length;i++){
2737+
// In Safari, we need to manually cancel all manually started animations
2738+
// or it'll block or interfer with future transitions.
2739+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2740+
viewTransitionAnimations[i].cancel();
2741+
}
27472742
for(leti=0;i<customTimelineCleanup.length;i++){
27482743
constcleanup=customTimelineCleanup[i];
27492744
cleanup();
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('^' + ".*" + '
Fix ViewTransition crash in Mobile Safari (#35337) · react/react@61331f3 · GitHub
Skip to content
Commit 61331f3
Browse files
gaearongaearon
authored
Fix ViewTransition crash in Mobile Safari (#35337)
Speculative fix to #35336
written by Claude.
I have verified that applying a similar patch locally to the repro from
#35336 does fix the crash.
I'm not familiar enough with the underlying APIs to tell whether the fix
is correct or sufficient.
1 parent 55480b4 commit 61331f3
1 file changed
Lines changed: 17 additions & 22 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,26 +1996,6 @@ export function hasInstanceAffectedParent(
19961996
returnoldRect.height!==newRect.height||oldRect.width!==newRect.width;
19971997
}
19981998

1999-
functioncancelAllViewTransitionAnimations(scope: Element){
2000-
// In Safari, we need to manually cancel all manually start animations
2001-
// or it'll block or interfer with future transitions.
2002-
// $FlowFixMe[prop-missing]
2003-
constanimations=scope.getAnimations({subtree: true});
2004-
for(leti=0;i<animations.length;i++){
2005-
constanim=animations[i];
2006-
consteffect: KeyframeEffect=(anim.effect: any);
2007-
// $FlowFixMe
2008-
constpseudo: ?string=effect.pseudoElement;
2009-
if(
2010-
pseudo!=null&&
2011-
pseudo.startsWith('::view-transition')&&
2012-
effect.target===scope
2013-
){
2014-
anim.cancel();
2015-
}
2016-
}
2017-
}
2018-
20191999
// How long to wait for new fonts to load before just committing anyway.
20202000
// This freezes the screen. It needs to be short enough that it doesn't cause too much of
20212001
// an issue when it's a new load and slow, yet long enough that you have a chance to load
@@ -2210,6 +2190,8 @@ export function startViewTransition(
22102190
// $FlowFixMe[prop-missing]
22112191
ownerDocument.__reactViewTransition=transition;
22122192

2193+
constviewTransitionAnimations: Array<Animation>=[];
2194+
22132195
constreadyCallback=()=>{
22142196
constdocumentElement: Element=(ownerDocument.documentElement: any);
22152197
// Loop through all View Transition Animations.
@@ -2224,6 +2206,7 @@ export function startViewTransition(
22242206
pseudoElement!=null&&
22252207
pseudoElement.startsWith('::view-transition')
22262208
){
2209+
viewTransitionAnimations.push(animation);
22272210
constkeyframes=effect.getKeyframes();
22282211
// Next, we're going to try to optimize this animation in case the auto-generated
22292212
// width/height keyframes are unnecessary.
@@ -2315,7 +2298,12 @@ export function startViewTransition(
23152298
};
23162299
transition.ready.then(readyCallback,handleError);
23172300
transition.finished.finally(()=>{
2318-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2301+
for(leti=0;i<viewTransitionAnimations.length;i++){
2302+
// In Safari, we need to manually cancel all manually started animations
2303+
// or it'll block or interfer with future transitions.
2304+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2305+
viewTransitionAnimations[i].cancel();
2306+
}
23192307
// $FlowFixMe[prop-missing]
23202308
if(ownerDocument.__reactViewTransition===transition){
23212309
// $FlowFixMe[prop-missing]
@@ -2549,6 +2537,7 @@ export function startGestureTransition(
25492537
// $FlowFixMe[prop-missing]
25502538
ownerDocument.__reactViewTransition=transition;
25512539
constcustomTimelineCleanup: Array<()=>void>=[];// Cleanup Animations started in a CustomTimeline
2540+
constviewTransitionAnimations: Array<Animation>=[];
25522541
constreadyCallback=()=>{
25532542
constdocumentElement: Element=(ownerDocument.documentElement: any);
25542543
// Loop through all View Transition Animations.
@@ -2566,6 +2555,7 @@ export function startGestureTransition(
25662555
constpseudoElement: ?string=effect.pseudoElement;
25672556
if(pseudoElement==null){
25682557
}elseif(pseudoElement.startsWith('::view-transition')){
2558+
viewTransitionAnimations.push(animations[i]);
25692559
consttiming=effect.getTiming();
25702560
constduration=
25712561
// $FlowFixMe[prop-missing]
@@ -2743,7 +2733,12 @@ export function startGestureTransition(
27432733
};
27442734
transition.ready.then(readyForAnimations,handleError);
27452735
 transition.finished.finally(()=>{
2746-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2736+
for(leti=0;i<viewTransitionAnimations.length;i++){
2737+
// In Safari, we need to manually cancel all manually started animations
2738+
// or it'll block or interfer with future transitions.
2739+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2740+
viewTransitionAnimations[i].cancel();
2741+
}
27472742
for(leti=0;i<customTimelineCleanup.length;i++){
27482743
constcleanup=customTimelineCleanup[i];
27492744
cleanup();
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('^' + ".*" + '
Fix ViewTransition crash in Mobile Safari (#35337) · react/react@61331f3 · GitHub
Skip to content
Commit 61331f3
Browse files
gaearongaearon
authored
Fix ViewTransition crash in Mobile Safari (#35337)
Speculative fix to #35336
written by Claude.
I have verified that applying a similar patch locally to the repro from
#35336 does fix the crash.
I'm not familiar enough with the underlying APIs to tell whether the fix
is correct or sufficient.
1 parent 55480b4 commit 61331f3
1 file changed
Lines changed: 17 additions & 22 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,26 +1996,6 @@ export function hasInstanceAffectedParent(
19961996
returnoldRect.height!==newRect.height||oldRect.width!==newRect.width;
19971997
}
19981998

1999-
functioncancelAllViewTransitionAnimations(scope: Element){
2000-
// In Safari, we need to manually cancel all manually start animations
2001-
// or it'll block or interfer with future transitions.
2002-
// $FlowFixMe[prop-missing]
2003-
constanimations=scope.getAnimations({subtree: true});
2004-
for(leti=0;i<animations.length;i++){
2005-
constanim=animations[i];
2006-
consteffect: KeyframeEffect=(anim.effect: any);
2007-
// $FlowFixMe
2008-
constpseudo: ?string=effect.pseudoElement;
2009-
if(
2010-
pseudo!=null&&
2011-
pseudo.startsWith('::view-transition')&&
2012-
effect.target===scope
2013-
){
2014-
anim.cancel();
2015-
}
2016-
}
2017-
}
2018-
20191999
// How long to wait for new fonts to load before just committing anyway.
20202000
// This freezes the screen. It needs to be short enough that it doesn't cause too much of
20212001
// an issue when it's a new load and slow, yet long enough that you have a chance to load
@@ -2210,6 +2190,8 @@ export function startViewTransition(
22102190
// $FlowFixMe[prop-missing]
22112191
ownerDocument.__reactViewTransition=transition;
22122192

2193+
constviewTransitionAnimations: Array<Animation>=[];
2194+
22132195
constreadyCallback=()=>{
22142196
constdocumentElement: Element=(ownerDocument.documentElement: any);
22152197
// Loop through all View Transition Animations.
@@ -2224,6 +2206,7 @@ export function startViewTransition(
22242206
pseudoElement!=null&&
22252207
pseudoElement.startsWith('::view-transition')
22262208
){
2209+
viewTransitionAnimations.push(animation);
22272210
constkeyframes=effect.getKeyframes();
22282211
// Next, we're going to try to optimize this animation in case the auto-generated
22292212
// width/height keyframes are unnecessary.
@@ -2315,7 +2298,12 @@ export function startViewTransition(
23152298
};
23162299
transition.ready.then(readyCallback,handleError);
23172300
transition.finished.finally(()=>{
2318-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2301+
for(leti=0;i<viewTransitionAnimations.length;i++){
2302+
// In Safari, we need to manually cancel all manually started animations
2303+
// or it'll block or interfer with future transitions.
2304+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2305+
viewTransitionAnimations[i].cancel();
2306+
}
23192307
// $FlowFixMe[prop-missing]
23202308
if(ownerDocument.__reactViewTransition===transition){
23212309
// $FlowFixMe[prop-missing]
@@ -2549,6 +2537,7 @@ export function startGestureTransition(
25492537
// $FlowFixMe[prop-missing]
25502538
ownerDocument.__reactViewTransition=transition;
25512539
constcustomTimelineCleanup: Array<()=>void>=[];// Cleanup Animations started in a CustomTimeline
2540+
constviewTransitionAnimations: Array<Animation>=[];
25522541
constreadyCallback=()=>{
25532542
constdocumentElement: Element=(ownerDocument.documentElement: any);
25542543
// Loop through all View Transition Animations.
@@ -2566,6 +2555,7 @@ export function startGestureTransition(
25662555
constpseudoElement: ?string=effect.pseudoElement;
25672556
if(pseudoElement==null){
25682557
}elseif(pseudoElement.startsWith('::view-transition')){
2558+
viewTransitionAnimations.push(animations[i]);
25692559
consttiming=effect.getTiming();
25702560
constduration=
25712561
// $FlowFixMe[prop-missing]
@@ -2743,7 +2733,12 @@ export function startGestureTransition(
27432733
};
27442734
transition.ready.then(readyForAnimations,handleError);
27452735
 transition.finished.finally(()=>{
2746-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2736+
for(leti=0;i<viewTransitionAnimations.length;i++){
2737+
// In Safari, we need to manually cancel all manually started animations
2738+
// or it'll block or interfer with future transitions.
2739+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2740+
viewTransitionAnimations[i].cancel();
2741+
}
27472742
for(leti=0;i<customTimelineCleanup.length;i++){
27482743
constcleanup=customTimelineCleanup[i];
27492744
cleanup();
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" + '
Fix ViewTransition crash in Mobile Safari (#35337) · react/react@61331f3 · GitHub
Skip to content
Commit 61331f3
Browse files
gaearongaearon
authored
Fix ViewTransition crash in Mobile Safari (#35337)
Speculative fix to #35336
written by Claude.
I have verified that applying a similar patch locally to the repro from
#35336 does fix the crash.
I'm not familiar enough with the underlying APIs to tell whether the fix
is correct or sufficient.
1 parent 55480b4 commit 61331f3
1 file changed
Lines changed: 17 additions & 22 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,26 +1996,6 @@ export function hasInstanceAffectedParent(
19961996
returnoldRect.height!==newRect.height||oldRect.width!==newRect.width;
19971997
}
19981998

1999-
functioncancelAllViewTransitionAnimations(scope: Element){
2000-
// In Safari, we need to manually cancel all manually start animations
2001-
// or it'll block or interfer with future transitions.
2002-
// $FlowFixMe[prop-missing]
2003-
constanimations=scope.getAnimations({subtree: true});
2004-
for(leti=0;i<animations.length;i++){
2005-
constanim=animations[i];
2006-
consteffect: KeyframeEffect=(anim.effect: any);
2007-
// $FlowFixMe
2008-
constpseudo: ?string=effect.pseudoElement;
2009-
if(
2010-
pseudo!=null&&
2011-
pseudo.startsWith('::view-transition')&&
2012-
effect.target===scope
2013-
){
2014-
anim.cancel();
2015-
}
2016-
}
2017-
}
2018-
20191999
// How long to wait for new fonts to load before just committing anyway.
20202000
// This freezes the screen. It needs to be short enough that it doesn't cause too much of
20212001
// an issue when it's a new load and slow, yet long enough that you have a chance to load
@@ -2210,6 +2190,8 @@ export function startViewTransition(
22102190
// $FlowFixMe[prop-missing]
22112191
ownerDocument.__reactViewTransition=transition;
22122192

2193+
constviewTransitionAnimations: Array<Animation>=[];
2194+
22132195
constreadyCallback=()=>{
22142196
constdocumentElement: Element=(ownerDocument.documentElement: any);
22152197
// Loop through all View Transition Animations.
@@ -2224,6 +2206,7 @@ export function startViewTransition(
22242206
pseudoElement!=null&&
22252207
pseudoElement.startsWith('::view-transition')
22262208
){
2209+
viewTransitionAnimations.push(animation);
22272210
constkeyframes=effect.getKeyframes();
22282211
// Next, we're going to try to optimize this animation in case the auto-generated
22292212
// width/height keyframes are unnecessary.
@@ -2315,7 +2298,12 @@ export function startViewTransition(
23152298
};
23162299
transition.ready.then(readyCallback,handleError);
23172300
transition.finished.finally(()=>{
2318-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2301+
for(leti=0;i<viewTransitionAnimations.length;i++){
2302+
// In Safari, we need to manually cancel all manually started animations
2303+
// or it'll block or interfer with future transitions.
2304+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2305+
viewTransitionAnimations[i].cancel();
2306+
}
23192307
// $FlowFixMe[prop-missing]
23202308
if(ownerDocument.__reactViewTransition===transition){
23212309
// $FlowFixMe[prop-missing]
@@ -2549,6 +2537,7 @@ export function startGestureTransition(
25492537
// $FlowFixMe[prop-missing]
25502538
ownerDocument.__reactViewTransition=transition;
25512539
constcustomTimelineCleanup: Array<()=>void>=[];// Cleanup Animations started in a CustomTimeline
2540+
constviewTransitionAnimations: Array<Animation>=[];
25522541
constreadyCallback=()=>{
25532542
constdocumentElement: Element=(ownerDocument.documentElement: any);
25542543
// Loop through all View Transition Animations.
@@ -2566,6 +2555,7 @@ export function startGestureTransition(
25662555
constpseudoElement: ?string=effect.pseudoElement;
25672556
if(pseudoElement==null){
25682557
}elseif(pseudoElement.startsWith('::view-transition')){
2558+
viewTransitionAnimations.push(animations[i]);
25692559
consttiming=effect.getTiming();
25702560
constduration=
25712561
// $FlowFixMe[prop-missing]
@@ -2743,7 +2733,12 @@ export function startGestureTransition(
27432733
};
27442734
transition.ready.then(readyForAnimations,handleError);
27452735
 transition.finished.finally(()=>{
2746-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2736+
for(leti=0;i<viewTransitionAnimations.length;i++){
2737+
// In Safari, we need to manually cancel all manually started animations
2738+
// or it'll block or interfer with future transitions.
2739+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2740+
viewTransitionAnimations[i].cancel();
2741+
}
27472742
for(leti=0;i<customTimelineCleanup.length;i++){
27482743
constcleanup=customTimelineCleanup[i];
27492744
cleanup();
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('^' + ".*" + '
Fix ViewTransition crash in Mobile Safari (#35337) · react/react@61331f3 · GitHub
Skip to content
Commit 61331f3
Browse files
gaearongaearon
authored
Fix ViewTransition crash in Mobile Safari (#35337)
Speculative fix to #35336
written by Claude.
I have verified that applying a similar patch locally to the repro from
#35336 does fix the crash.
I'm not familiar enough with the underlying APIs to tell whether the fix
is correct or sufficient.
1 parent 55480b4 commit 61331f3
1 file changed
Lines changed: 17 additions & 22 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,26 +1996,6 @@ export function hasInstanceAffectedParent(
19961996
returnoldRect.height!==newRect.height||oldRect.width!==newRect.width;
19971997
}
19981998

1999-
functioncancelAllViewTransitionAnimations(scope: Element){
2000-
// In Safari, we need to manually cancel all manually start animations
2001-
// or it'll block or interfer with future transitions.
2002-
// $FlowFixMe[prop-missing]
2003-
constanimations=scope.getAnimations({subtree: true});
2004-
for(leti=0;i<animations.length;i++){
2005-
constanim=animations[i];
2006-
consteffect: KeyframeEffect=(anim.effect: any);
2007-
// $FlowFixMe
2008-
constpseudo: ?string=effect.pseudoElement;
2009-
if(
2010-
pseudo!=null&&
2011-
pseudo.startsWith('::view-transition')&&
2012-
effect.target===scope
2013-
){
2014-
anim.cancel();
2015-
}
2016-
}
2017-
}
2018-
20191999
// How long to wait for new fonts to load before just committing anyway.
20202000
// This freezes the screen. It needs to be short enough that it doesn't cause too much of
20212001
// an issue when it's a new load and slow, yet long enough that you have a chance to load
@@ -2210,6 +2190,8 @@ export function startViewTransition(
22102190
// $FlowFixMe[prop-missing]
22112191
ownerDocument.__reactViewTransition=transition;
22122192

2193+
constviewTransitionAnimations: Array<Animation>=[];
2194+
22132195
constreadyCallback=()=>{
22142196
constdocumentElement: Element=(ownerDocument.documentElement: any);
22152197
// Loop through all View Transition Animations.
@@ -2224,6 +2206,7 @@ export function startViewTransition(
22242206
pseudoElement!=null&&
22252207
pseudoElement.startsWith('::view-transition')
22262208
){
2209+
viewTransitionAnimations.push(animation);
22272210
constkeyframes=effect.getKeyframes();
22282211
// Next, we're going to try to optimize this animation in case the auto-generated
22292212
// width/height keyframes are unnecessary.
@@ -2315,7 +2298,12 @@ export function startViewTransition(
23152298
};
23162299
transition.ready.then(readyCallback,handleError);
23172300
transition.finished.finally(()=>{
2318-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2301+
for(leti=0;i<viewTransitionAnimations.length;i++){
2302+
// In Safari, we need to manually cancel all manually started animations
2303+
// or it'll block or interfer with future transitions.
2304+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2305+
viewTransitionAnimations[i].cancel();
2306+
}
23192307
// $FlowFixMe[prop-missing]
23202308
if(ownerDocument.__reactViewTransition===transition){
23212309
// $FlowFixMe[prop-missing]
@@ -2549,6 +2537,7 @@ export function startGestureTransition(
25492537
// $FlowFixMe[prop-missing]
25502538
ownerDocument.__reactViewTransition=transition;
25512539
constcustomTimelineCleanup: Array<()=>void>=[];// Cleanup Animations started in a CustomTimeline
2540+
constviewTransitionAnimations: Array<Animation>=[];
25522541
constreadyCallback=()=>{
25532542
constdocumentElement: Element=(ownerDocument.documentElement: any);
25542543
// Loop through all View Transition Animations.
@@ -2566,6 +2555,7 @@ export function startGestureTransition(
25662555
constpseudoElement: ?string=effect.pseudoElement;
25672556
if(pseudoElement==null){
25682557
}elseif(pseudoElement.startsWith('::view-transition')){
2558+
viewTransitionAnimations.push(animations[i]);
25692559
consttiming=effect.getTiming();
25702560
constduration=
25712561
// $FlowFixMe[prop-missing]
@@ -2743,7 +2733,12 @@ export function startGestureTransition(
27432733
};
27442734
transition.ready.then(readyForAnimations,handleError);
27452735
 transition.finished.finally(()=>{
2746-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2736+
for(leti=0;i<viewTransitionAnimations.length;i++){
2737+
// In Safari, we need to manually cancel all manually started animations
2738+
// or it'll block or interfer with future transitions.
2739+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2740+
viewTransitionAnimations[i].cancel();
2741+
}
27472742
for(leti=0;i<customTimelineCleanup.length;i++){
27482743
constcleanup=customTimelineCleanup[i];
27492744
cleanup();
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('^' + ".*" + '
Fix ViewTransition crash in Mobile Safari (#35337) · react/react@61331f3 · GitHub
Skip to content
Commit 61331f3
Browse files
gaearongaearon
authored
Fix ViewTransition crash in Mobile Safari (#35337)
Speculative fix to #35336
written by Claude.
I have verified that applying a similar patch locally to the repro from
#35336 does fix the crash.
I'm not familiar enough with the underlying APIs to tell whether the fix
is correct or sufficient.
1 parent 55480b4 commit 61331f3
1 file changed
Lines changed: 17 additions & 22 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,26 +1996,6 @@ export function hasInstanceAffectedParent(
19961996
returnoldRect.height!==newRect.height||oldRect.width!==newRect.width;
19971997
}
19981998

1999-
functioncancelAllViewTransitionAnimations(scope: Element){
2000-
// In Safari, we need to manually cancel all manually start animations
2001-
// or it'll block or interfer with future transitions.
2002-
// $FlowFixMe[prop-missing]
2003-
constanimations=scope.getAnimations({subtree: true});
2004-
for(leti=0;i<animations.length;i++){
2005-
constanim=animations[i];
2006-
consteffect: KeyframeEffect=(anim.effect: any);
2007-
// $FlowFixMe
2008-
constpseudo: ?string=effect.pseudoElement;
2009-
if(
2010-
pseudo!=null&&
2011-
pseudo.startsWith('::view-transition')&&
2012-
effect.target===scope
2013-
){
2014-
anim.cancel();
2015-
}
2016-
}
2017-
}
2018-
20191999
// How long to wait for new fonts to load before just committing anyway.
20202000
// This freezes the screen. It needs to be short enough that it doesn't cause too much of
20212001
// an issue when it's a new load and slow, yet long enough that you have a chance to load
@@ -2210,6 +2190,8 @@ export function startViewTransition(
22102190
// $FlowFixMe[prop-missing]
22112191
ownerDocument.__reactViewTransition=transition;
22122192

2193+
constviewTransitionAnimations: Array<Animation>=[];
2194+
22132195
constreadyCallback=()=>{
22142196
constdocumentElement: Element=(ownerDocument.documentElement: any);
22152197
// Loop through all View Transition Animations.
@@ -2224,6 +2206,7 @@ export function startViewTransition(
22242206
pseudoElement!=null&&
22252207
pseudoElement.startsWith('::view-transition')
22262208
){
2209+
viewTransitionAnimations.push(animation);
22272210
constkeyframes=effect.getKeyframes();
22282211
// Next, we're going to try to optimize this animation in case the auto-generated
22292212
// width/height keyframes are unnecessary.
@@ -2315,7 +2298,12 @@ export function startViewTransition(
23152298
};
23162299
transition.ready.then(readyCallback,handleError);
23172300
transition.finished.finally(()=>{
2318-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2301+
for(leti=0;i<viewTransitionAnimations.length;i++){
2302+
// In Safari, we need to manually cancel all manually started animations
2303+
// or it'll block or interfer with future transitions.
2304+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2305+
viewTransitionAnimations[i].cancel();
2306+
}
23192307
// $FlowFixMe[prop-missing]
23202308
if(ownerDocument.__reactViewTransition===transition){
23212309
// $FlowFixMe[prop-missing]
@@ -2549,6 +2537,7 @@ export function startGestureTransition(
25492537
// $FlowFixMe[prop-missing]
25502538
ownerDocument.__reactViewTransition=transition;
25512539
constcustomTimelineCleanup: Array<()=>void>=[];// Cleanup Animations started in a CustomTimeline
2540+
constviewTransitionAnimations: Array<Animation>=[];
25522541
constreadyCallback=()=>{
25532542
constdocumentElement: Element=(ownerDocument.documentElement: any);
25542543
// Loop through all View Transition Animations.
@@ -2566,6 +2555,7 @@ export function startGestureTransition(
25662555
constpseudoElement: ?string=effect.pseudoElement;
25672556
if(pseudoElement==null){
25682557
}elseif(pseudoElement.startsWith('::view-transition')){
2558+
viewTransitionAnimations.push(animations[i]);
25692559
consttiming=effect.getTiming();
25702560
constduration=
25712561
// $FlowFixMe[prop-missing]
@@ -2743,7 +2733,12 @@ export function startGestureTransition(
27432733
};
27442734
transition.ready.then(readyForAnimations,handleError);
27452735
 transition.finished.finally(()=>{
2746-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2736+
for(leti=0;i<viewTransitionAnimations.length;i++){
2737+
// In Safari, we need to manually cancel all manually started animations
2738+
// or it'll block or interfer with future transitions.
2739+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2740+
viewTransitionAnimations[i].cancel();
2741+
}
27472742
for(leti=0;i<customTimelineCleanup.length;i++){
27482743
constcleanup=customTimelineCleanup[i];
27492744
cleanup();
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); }
})();
})();
Fix ViewTransition crash in Mobile Safari (#35337) · react/react@61331f3 · GitHub
Skip to content
Commit 61331f3
Browse files
gaearongaearon
authored
Fix ViewTransition crash in Mobile Safari (#35337)
Speculative fix to #35336
written by Claude.
I have verified that applying a similar patch locally to the repro from
#35336 does fix the crash.
I'm not familiar enough with the underlying APIs to tell whether the fix
is correct or sufficient.
1 parent 55480b4 commit 61331f3
1 file changed
Lines changed: 17 additions & 22 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,26 +1996,6 @@ export function hasInstanceAffectedParent(
19961996
returnoldRect.height!==newRect.height||oldRect.width!==newRect.width;
19971997
}
19981998

1999-
functioncancelAllViewTransitionAnimations(scope: Element){
2000-
// In Safari, we need to manually cancel all manually start animations
2001-
// or it'll block or interfer with future transitions.
2002-
// $FlowFixMe[prop-missing]
2003-
constanimations=scope.getAnimations({subtree: true});
2004-
for(leti=0;i<animations.length;i++){
2005-
constanim=animations[i];
2006-
consteffect: KeyframeEffect=(anim.effect: any);
2007-
// $FlowFixMe
2008-
constpseudo: ?string=effect.pseudoElement;
2009-
if(
2010-
pseudo!=null&&
2011-
pseudo.startsWith('::view-transition')&&
2012-
effect.target===scope
2013-
){
2014-
anim.cancel();
2015-
}
2016-
}
2017-
}
2018-
20191999
// How long to wait for new fonts to load before just committing anyway.
20202000
// This freezes the screen. It needs to be short enough that it doesn't cause too much of
20212001
// an issue when it's a new load and slow, yet long enough that you have a chance to load
@@ -2210,6 +2190,8 @@ export function startViewTransition(
22102190
// $FlowFixMe[prop-missing]
22112191
ownerDocument.__reactViewTransition=transition;
22122192

2193+
constviewTransitionAnimations: Array<Animation>=[];
2194+
22132195
constreadyCallback=()=>{
22142196
constdocumentElement: Element=(ownerDocument.documentElement: any);
22152197
// Loop through all View Transition Animations.
@@ -2224,6 +2206,7 @@ export function startViewTransition(
22242206
pseudoElement!=null&&
22252207
pseudoElement.startsWith('::view-transition')
22262208
){
2209+
viewTransitionAnimations.push(animation);
22272210
constkeyframes=effect.getKeyframes();
22282211
// Next, we're going to try to optimize this animation in case the auto-generated
22292212
// width/height keyframes are unnecessary.
@@ -2315,7 +2298,12 @@ export function startViewTransition(
23152298
};
23162299
transition.ready.then(readyCallback,handleError);
23172300
transition.finished.finally(()=>{
2318-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2301+
for(leti=0;i<viewTransitionAnimations.length;i++){
2302+
// In Safari, we need to manually cancel all manually started animations
2303+
// or it'll block or interfer with future transitions.
2304+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2305+
viewTransitionAnimations[i].cancel();
2306+
}
23192307
// $FlowFixMe[prop-missing]
23202308
if(ownerDocument.__reactViewTransition===transition){
23212309
// $FlowFixMe[prop-missing]
@@ -2549,6 +2537,7 @@ export function startGestureTransition(
25492537
// $FlowFixMe[prop-missing]
25502538
ownerDocument.__reactViewTransition=transition;
25512539
constcustomTimelineCleanup: Array<()=>void>=[];// Cleanup Animations started in a CustomTimeline
2540+
constviewTransitionAnimations: Array<Animation>=[];
25522541
constreadyCallback=()=>{
25532542
constdocumentElement: Element=(ownerDocument.documentElement: any);
25542543
// Loop through all View Transition Animations.
@@ -2566,6 +2555,7 @@ export function startGestureTransition(
25662555
constpseudoElement: ?string=effect.pseudoElement;
25672556
if(pseudoElement==null){
25682557
}elseif(pseudoElement.startsWith('::view-transition')){
2558+
viewTransitionAnimations.push(animations[i]);
25692559
consttiming=effect.getTiming();
25702560
constduration=
25712561
// $FlowFixMe[prop-missing]
@@ -2743,7 +2733,12 @@ export function startGestureTransition(
27432733
};
27442734
transition.ready.then(readyForAnimations,handleError);
27452735
 transition.finished.finally(()=>{
2746-
cancelAllViewTransitionAnimations((ownerDocument.documentElement: any));
2736+
for(leti=0;i<viewTransitionAnimations.length;i++){
2737+
// In Safari, we need to manually cancel all manually started animations
2738+
// or it'll block or interfer with future transitions.
2739+
// We can't use getAnimations() due to #35336 so we collect them in an array.
2740+
viewTransitionAnimations[i].cancel();
2741+
}
27472742
for(leti=0;i<customTimelineCleanup.length;i++){
27482743
constcleanup=customTimelineCleanup[i];
27492744
cleanup();
0 commit comments
Comments
 (0)