dsh-nav-fold 0.3.3 → 0.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/lib/client.js +53 -9
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.3.4 — 2026-11-16
|
|
4
|
+
|
|
5
|
+
修复 0.3.3 的偏移自增缺陷(严重):滚动后每次外壳重渲染都会让「固定顶部区域」继续下移,最终把图标排推到会话列表下方。
|
|
6
|
+
|
|
7
|
+
- 测量偏移前临时解除 sticky(同一帧内还原),正常流下偏移与滚动位置无关
|
|
8
|
+
- 偏移准入加护栏:0–240px 之外拒绝;已滚动时只接受不变或变小
|
|
9
|
+
- 布局变化(模式/列数/尺寸)时重置基准重新测量
|
|
10
|
+
|
|
3
11
|
## 0.3.3 — 2026-11-16
|
|
4
12
|
|
|
5
13
|
- 固定顶部区域不再"先滑一段再钉住":sticky 的 top 改为按实测内容偏移(nav 8px / 标题行 110px),滚动全程位置不变、行间间隙不再被吃掉
|
package/lib/client.js
CHANGED
|
@@ -29,7 +29,7 @@ const react = require("react");
|
|
|
29
29
|
/** 插件名(cordis 插件标识) */
|
|
30
30
|
const name = "nav-fold";
|
|
31
31
|
/** 版本号:必须与 package.json.version 一致(有单测守着) */
|
|
32
|
-
const PLUGIN_VERSION = "0.3.
|
|
32
|
+
const PLUGIN_VERSION = "0.3.4";
|
|
33
33
|
/** 设置分区 / 控制条占用者 id */
|
|
34
34
|
const ENTRY_ID = "nav-fold";
|
|
35
35
|
/** 注入样式表的幂等标记 */
|
|
@@ -416,6 +416,8 @@ const runtime = {
|
|
|
416
416
|
pinBg: "",
|
|
417
417
|
pinTop: 0,
|
|
418
418
|
pinHeadTop: 0,
|
|
419
|
+
pinMeasured: false,
|
|
420
|
+
pinHeadMeasured: false,
|
|
419
421
|
anomalies: []
|
|
420
422
|
};
|
|
421
423
|
|
|
@@ -589,6 +591,8 @@ function noteAnomaly(kind) {
|
|
|
589
591
|
|
|
590
592
|
/** 清掉固定区标记(只摘标题行标记,不动外壳布局)。 */
|
|
591
593
|
function clearPin() {
|
|
594
|
+
runtime.pinMeasured = false;
|
|
595
|
+
runtime.pinHeadMeasured = false;
|
|
592
596
|
const nodes = runtime.pinNodes;
|
|
593
597
|
if (nodes && nodes.head && typeof nodes.head.removeAttribute === "function") {
|
|
594
598
|
nodes.head.removeAttribute(PIN_ATTR_HEAD);
|
|
@@ -597,24 +601,56 @@ function clearPin() {
|
|
|
597
601
|
runtime.pinBg = "";
|
|
598
602
|
}
|
|
599
603
|
|
|
604
|
+
/** 偏移量的合理上限(导航/标题行不会超过这个高度) */
|
|
605
|
+
const PIN_MAX_OFFSET = 240;
|
|
606
|
+
|
|
600
607
|
/**
|
|
601
|
-
*
|
|
608
|
+
* 量元素在滚动内容里的偏移。
|
|
609
|
+
* 关键:测量前临时把 sticky 摘掉——否则算出来的是「已钉住的 top + 滚动量」,
|
|
610
|
+
* 写回变量后每次重绘都会再叠加一次滚动量(正反馈,导航会被推到列表下方)。
|
|
602
611
|
* @param area - 滚动区。
|
|
603
612
|
* @param el - 目标元素。
|
|
604
|
-
* @returns
|
|
613
|
+
* @returns 像素偏移;失败返回 NaN。
|
|
605
614
|
*/
|
|
606
|
-
function
|
|
607
|
-
if (!area || !el || typeof area.getBoundingClientRect !== "function" || typeof el.getBoundingClientRect !== "function") return
|
|
615
|
+
function measureLayoutOffset(area, el) {
|
|
616
|
+
if (!area || !el || typeof area.getBoundingClientRect !== "function" || typeof el.getBoundingClientRect !== "function") return NaN;
|
|
617
|
+
const style = el.style;
|
|
618
|
+
const prevPos = style ? style.position : "";
|
|
619
|
+
const prevTop = style ? style.top : "";
|
|
608
620
|
try {
|
|
621
|
+
if (style) {
|
|
622
|
+
style.position = "static";
|
|
623
|
+
style.top = "auto";
|
|
624
|
+
}
|
|
609
625
|
const ar = area.getBoundingClientRect();
|
|
610
626
|
const er = el.getBoundingClientRect();
|
|
611
627
|
const scroll = typeof area.scrollTop === "number" ? area.scrollTop : 0;
|
|
612
|
-
return Math.
|
|
628
|
+
return Math.round(er.top - ar.top + scroll);
|
|
613
629
|
} catch (err) {
|
|
614
|
-
return
|
|
630
|
+
return NaN;
|
|
631
|
+
} finally {
|
|
632
|
+
if (style) {
|
|
633
|
+
style.position = prevPos;
|
|
634
|
+
style.top = prevTop;
|
|
635
|
+
}
|
|
615
636
|
}
|
|
616
637
|
}
|
|
617
638
|
|
|
639
|
+
/**
|
|
640
|
+
* 偏移量的准入判定:越界保留旧值;已滚动时只接受"不变或变小",防止再次测到 sticky 态。
|
|
641
|
+
* @param next - 新测到的值。
|
|
642
|
+
* @param prev - 上一次的值。
|
|
643
|
+
* @param scroll - 当前滚动量。
|
|
644
|
+
* @param measured - 是否已有基准。
|
|
645
|
+
* @returns 采用的值。
|
|
646
|
+
*/
|
|
647
|
+
function acceptOffset(next, prev, scroll, measured) {
|
|
648
|
+
if (!isFinite(next) || next < 0 || next > PIN_MAX_OFFSET) return prev;
|
|
649
|
+
if (!measured) return next;
|
|
650
|
+
if (scroll > 0 && next > prev + 2) return prev;
|
|
651
|
+
return next;
|
|
652
|
+
}
|
|
653
|
+
|
|
618
654
|
/**
|
|
619
655
|
* 把 nav 高度与两个 sticky 偏移写进滚动区的 CSS 变量。
|
|
620
656
|
* 用内容偏移而不是写死 0:这样滚动时顶部不动、也不吃掉行间空隙。
|
|
@@ -625,10 +661,15 @@ function contentOffset(area, el) {
|
|
|
625
661
|
function syncPinOffsets(area, nav, head) {
|
|
626
662
|
if (!area || !area.style || typeof area.style.setProperty !== "function") return;
|
|
627
663
|
const height = Math.round(rectHeight(nav));
|
|
628
|
-
const
|
|
629
|
-
const
|
|
664
|
+
const scroll = typeof area.scrollTop === "number" ? area.scrollTop : 0;
|
|
665
|
+
const navTop = acceptOffset(measureLayoutOffset(area, nav), runtime.pinTop, scroll, runtime.pinMeasured);
|
|
666
|
+
const headTop = head
|
|
667
|
+
? acceptOffset(measureLayoutOffset(area, head), runtime.pinHeadTop, scroll, runtime.pinHeadMeasured)
|
|
668
|
+
: navTop + (height || 0);
|
|
630
669
|
runtime.pinTop = navTop;
|
|
631
670
|
runtime.pinHeadTop = headTop;
|
|
671
|
+
runtime.pinMeasured = true;
|
|
672
|
+
runtime.pinHeadMeasured = true;
|
|
632
673
|
try {
|
|
633
674
|
if (height) area.style.setProperty("--navfold-nav-h", height + "px");
|
|
634
675
|
area.style.setProperty("--navfold-pin-top", navTop + "px");
|
|
@@ -2600,6 +2641,9 @@ exports.__internals = {
|
|
|
2600
2641
|
looksLikePanelNav: looksLikePanelNav,
|
|
2601
2642
|
findNav: findNav,
|
|
2602
2643
|
renderBar: renderBar,
|
|
2644
|
+
paintNav: paintNav,
|
|
2645
|
+
measureLayoutOffset: measureLayoutOffset,
|
|
2646
|
+
acceptOffset: acceptOffset,
|
|
2603
2647
|
setMode: setMode,
|
|
2604
2648
|
setModel: setModel,
|
|
2605
2649
|
getMode: getMode,
|