Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

perf(web): 横排自动滚动的循环只写不读

longmeidao9a3ece2e2501
diff --git a/frontend/src/ui-kit/overlay-scrollbar.ts b/frontend/src/ui-kit/overlay-scrollbar.ts
index 827d38dcd..8d023a5cf 100644
--- a/frontend/src/ui-kit/overlay-scrollbar.ts
+++ b/frontend/src/ui-kit/overlay-scrollbar.ts
@@ -155,8 +155,8 @@ export function attachOverlayScrollbar(
});
paintPosition(g.scrollTop,g.scrollLeft);
};
- /* 尺寸观察器的回调落在本帧布局之后,量的时候不必提前重排;内容增删、图片到手、
- 过渡结束这些零散的触发合到下一帧算一次。挂上时不当场量:第一次回调就在同一帧
+ /* 尺寸观察器的回调落在本帧布局之后,量的时候不必提前重排;内容增删、图片到手
+ 这些零散的触发合到下一帧算一次。挂上时不当场量:第一次回调就在同一帧
绘制之前,轨道在那之前藏着。 */
let pendingSync:number|null=null;
const scheduleSync=()=>{if(pendingSync===null)pendingSync=requestAnimationFrame(()=>{pendingSync=null;sync()})};
diff --git a/frontend/src/ui-kit/scroll.ts b/frontend/src/ui-kit/scroll.ts
index ca188a2a8..e24184877 100644
--- a/frontend/src/ui-kit/scroll.ts
+++ b/frontend/src/ui-kit/scroll.ts
@@ -184,7 +184,7 @@ export function wireAutoScroll(el:any):void{
if(!el||autoScrollers.has(el))return;
if(matchMedia('(prefers-reduced-motion:reduce)').matches)return;
const abort=new AbortController();
- let pos=el.scrollLeft,dir=1,last=0,frame=0,hovered=false,focused=false,onscreen=true,holdUntil=0;
+ let pos=el.scrollLeft,dir=1,last=0,frame=0,hovered=false,focused=false,onscreen=true,holdUntil=0,max=-1,resync=false;
const listen=(target:EventTarget,type:string,fn:()=>void)=>target.addEventListener(type,fn,{passive:true,signal:abort.signal});
/* 在不在屏幕上交给共用的交叉观察器,回调里叫醒;循环里只读自己记下的状态。每帧量
`getBoundingClientRect()` 会在上一帧写完 `scrollLeft` 之后把整棵样式树当场重算。
@@ -199,7 +199,10 @@ export function wireAutoScroll(el:any):void{
frame=requestAnimationFrame(tick);
const dt=last?Math.min(now-last,64):0;last=now;
if(now<holdUntil)return;
- const max=el.scrollWidth-el.clientWidth;
+ /* 循环里只写不读:可滚距离等尺寸变了才重量,人动过之后才回读一次位置。每帧读一次
+ `scrollWidth`,赶上别处刚改过样式(换主题、悬停、滚页面)就是一次整树重算。 */
+ if(max<0)max=el.scrollWidth-el.clientWidth;
+ if(resync){resync=false;pos=el.scrollLeft}
if(max<=1)return;
/* 位置自己记一份小数:一帧只走零点几个像素,`scrollLeft` 读回来是取整后的值,
拿它接着加会一直原地不动。 */
@@ -210,15 +213,19 @@ export function wireAutoScroll(el:any):void{
// 重画换掉了这一排时,挂在 document 上的监听要在下一次叫醒时跟着撤掉。
const wake=()=>{if(!el.isConnected)stop();else if(!frame&&running()){last=0;frame=requestAnimationFrame(tick)}};
const hold=()=>{holdUntil=performance.now()+AUTO_SCROLL_RESUME};
- // 读回来和自己记的差不到一个像素就是自己那一帧;差得多是人滚的,从人停下的地方接着走。
- listen(el,'scroll',()=>{if(Math.abs(el.scrollLeft-pos)>1){pos=el.scrollLeft;hold()}});
+ /* 人能滚这一排的时候指针一定在上面或焦点在里面(滚轮、拖动、触摸、方向键),那时循环已经停了;
+ 离开时记下要回读位置,下一帧从人停下的地方接着走。 */
listen(el,'pointerenter',()=>{hovered=true});
- listen(el,'pointerleave',()=>{hovered=false;hold();wake()});
+ listen(el,'pointerleave',()=>{hovered=false;resync=true;hold();wake()});
listen(el,'focusin',()=>{focused=true});
- listen(el,'focusout',()=>setTimeout(()=>{focused=el.contains(document.activeElement);wake()},0));
+ listen(el,'focusout',()=>setTimeout(()=>{focused=el.contains(document.activeElement);resync=true;wake()},0));
+ const sizes=new ResizeObserver(()=>{max=-1});
+ sizes.observe(el);
+ const contents=new MutationObserver(()=>{max=-1});
+ contents.observe(el,{childList:true});
listen(document,'visibilitychange',wake);
wake();
- function stop(){cancelAnimationFrame(frame);frame=0;abort.abort();autoScrollers.delete(el);autoScrollWakeups.delete(wake);
+ function stop(){cancelAnimationFrame(frame);frame=0;abort.abort();sizes.disconnect();contents.disconnect();autoScrollers.delete(el);autoScrollWakeups.delete(wake);
autoScrollSight?.unobserve(el);autoScrollSightings.delete(el);
if(!autoScrollers.size){autoScrollVisibility?.disconnect();autoScrollVisibility=null;autoScrollSight?.disconnect();autoScrollSight=null}}
autoScrollers.set(el,stop);
diff --git a/web/dist/peach-app.js b/web/dist/peach-app.js
index 865223b4b..d3dc109f5 100644
--- a/web/dist/peach-app.js
+++ b/web/dist/peach-app.js
@@ -2,7 +2,7 @@
(function() {
try {
var e = typeof window < "u" ? window : typeof global < "u" ? global : typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : {}, t = new e.Error().stack;
- t && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[t] = "d91220e0-71b7-4e4c-8443-dc08bcd3a00b", e._sentryDebugIdIdentifier = "sentry-dbid-d91220e0-71b7-4e4c-8443-dc08bcd3a00b");
+ t && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[t] = "aaaf3806-0667-4a38-8810-603f659c5fc1", e._sentryDebugIdIdentifier = "sentry-dbid-aaaf3806-0667-4a38-8810-603f659c5fc1");
} catch {}
})();
var e = Object.create, t = Object.defineProperty, n = Object.getOwnPropertyDescriptor, r = Object.getOwnPropertyNames, i = Object.getPrototypeOf, a = Object.prototype.hasOwnProperty, o = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), s = (e, n) => {
@@ -13298,46 +13298,50 @@ function Ds(e) {
var fee = 24, Os = 2e3, ks = 3e3, As = /* @__PURE__ */ new Map(), js = /* @__PURE__ */ new Set(), Ms = null, Ns = null, Ps = /* @__PURE__ */ new Map();
function Fs(e) {
if (!e || As.has(e) || matchMedia("(prefers-reduced-motion:reduce)").matches) return;
- let t = new AbortController(), n = e.scrollLeft, r = 1, i = 0, a = 0, o = !1, s = !1, c = !0, l = 0, u = (e, n, r) => e.addEventListener(n, r, {
+ let t = new AbortController(), n = e.scrollLeft, r = 1, i = 0, a = 0, o = !1, s = !1, c = !0, l = 0, u = -1, d = !1, f = (e, n, r) => e.addEventListener(n, r, {
passive: !0,
signal: t.signal
- }), d = () => document.body.hasAttribute("data-detail-open") && !e.closest("#stage") || document.body.hasAttribute("data-wall-open") && !e.closest("[data-video-wall]"), f = () => e.isConnected && c && !o && !s && !document.hidden && !d(), p = (t) => {
+ }), p = () => document.body.hasAttribute("data-detail-open") && !e.closest("#stage") || document.body.hasAttribute("data-wall-open") && !e.closest("[data-video-wall]"), m = () => e.isConnected && c && !o && !s && !document.hidden && !p(), h = (t) => {
if (a = 0, !e.isConnected) {
- g();
+ b();
return;
}
- if (!f()) return;
- a = requestAnimationFrame(p);
+ if (!m()) return;
+ a = requestAnimationFrame(h);
let o = i ? Math.min(t - i, 64) : 0;
- if (i = t, t < l) return;
- let s = e.scrollWidth - e.clientWidth;
- s <= 1 || (n = Math.min(s, Math.max(0, n + r * fee * o / 1e3)), e.scrollLeft = n, (n >= s || n <= 0) && (r = n >= s ? -1 : 1, l = t + Os));
- }, m = () => {
- e.isConnected ? !a && f() && (i = 0, a = requestAnimationFrame(p)) : g();
- }, h = () => {
+ i = t, !(t < l) && (u < 0 && (u = e.scrollWidth - e.clientWidth), d && (d = !1, n = e.scrollLeft), !(u <= 1) && (n = Math.min(u, Math.max(0, n + r * fee * o / 1e3)), e.scrollLeft = n, (n >= u || n <= 0) && (r = n >= u ? -1 : 1, l = t + Os)));
+ }, g = () => {
+ e.isConnected ? !a && m() && (i = 0, a = requestAnimationFrame(h)) : b();
+ }, _ = () => {
l = performance.now() + ks;
};
- u(e, "scroll", () => {
- Math.abs(e.scrollLeft - n) > 1 && (n = e.scrollLeft, h());
- }), u(e, "pointerenter", () => {
+ f(e, "pointerenter", () => {
o = !0;
- }), u(e, "pointerleave", () => {
- o = !1, h(), m();
- }), u(e, "focusin", () => {
+ }), f(e, "pointerleave", () => {
+ o = !1, d = !0, _(), g();
+ }), f(e, "focusin", () => {
s = !0;
- }), u(e, "focusout", () => setTimeout(() => {
- s = e.contains(document.activeElement), m();
- }, 0)), u(document, "visibilitychange", m), m();
- function g() {
- cancelAnimationFrame(a), a = 0, t.abort(), As.delete(e), js.delete(m), Ns?.unobserve(e), Ps.delete(e), As.size || (Ms?.disconnect(), Ms = null, Ns?.disconnect(), Ns = null);
+ }), f(e, "focusout", () => setTimeout(() => {
+ s = e.contains(document.activeElement), d = !0, g();
+ }, 0));
+ let v = new ResizeObserver(() => {
+ u = -1;
+ });
+ v.observe(e);
+ let y = new MutationObserver(() => {
+ u = -1;
+ });
+ y.observe(e, { childList: !0 }), f(document, "visibilitychange", g), g();
+ function b() {
+ cancelAnimationFrame(a), a = 0, t.abort(), v.disconnect(), y.disconnect(), As.delete(e), js.delete(g), Ns?.unobserve(e), Ps.delete(e), As.size || (Ms?.disconnect(), Ms = null, Ns?.disconnect(), Ns = null);
}
- As.set(e, g), js.add(m), Ms || (Ms = new MutationObserver(() => js.forEach((e) => e())), Ms.observe(document.body, {
+ As.set(e, b), js.add(g), Ms || (Ms = new MutationObserver(() => js.forEach((e) => e())), Ms.observe(document.body, {
attributes: !0,
attributeFilter: ["data-detail-open", "data-wall-open"]
})), typeof IntersectionObserver == "function" && (Ns ??= new IntersectionObserver((e) => {
for (let t of e) Ps.get(t.target)?.(t.isIntersecting);
}), Ps.set(e, (e) => {
- c = e, m();
+ c = e, g();
}), Ns.observe(e));
}
function Is(e) {
@@ -117010,4 +117014,4 @@ sCt(cCt);
//#endregion
export { DT as applyTheme, yN as peachHistory, Zo as popCount, Rvt as showToast };
-//# debugId=d91220e0-71b7-4e4c-8443-dc08bcd3a00b
\ No newline at end of file
+//# debugId=aaaf3806-0667-4a38-8810-603f659c5fc1
\ No newline at end of file