@mobilon-dev/chotto 0.3.126 → 0.3.129

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.
@@ -1,26 +1,31 @@
1
- import { ref as t, watch as m, unref as v, nextTick as w } from "vue";
2
- function F({ feedRef: u, emit: i, isLoadingMoreRef: p }) {
3
- const s = t(!1), a = t(!1), n = t(!1), r = t(!1), h = t(0), T = t(0), c = t(!1), f = t(!1), d = (o = !0) => {
4
- const l = v(u);
1
+ import { ref as t, watch as g, unref as u, nextTick as y } from "vue";
2
+ function L({
3
+ feedRef: n,
4
+ emit: i,
5
+ isLoadingMoreRef: p,
6
+ stickToBottomRef: h
7
+ }) {
8
+ const s = t(!1), a = t(!1), f = t(!1), r = t(!1), S = t(0), T = t(0), c = t(!1), v = t(!1), m = () => !!(h && u(h)), B = (o = !0) => {
9
+ const l = u(n);
5
10
  if (!l) return;
6
11
  const e = l.scrollHeight - l.scrollTop - l.clientHeight;
7
- r.value ? (l.scrollTop < 300 && (n.value = !1, s.value = !1), e < 300 && (a.value = !1, n.value = !0)) : o && (l.scrollTop < 300 && (h.value = l.scrollHeight, T.value = l.scrollTop, c.value = !0, s.value = !1), e < 300 && (a.value = !1));
8
- }, S = (o = 0) => {
12
+ r.value ? (l.scrollTop < 300 && !m() && (f.value = !1, s.value = !1), e < 300 && (a.value = !1, f.value = !0)) : o && (l.scrollTop < 300 && !m() && (S.value = l.scrollHeight, T.value = l.scrollTop, c.value = !0, s.value = !1), e < 300 && (a.value = !1));
13
+ }, d = (o = 0) => {
9
14
  const l = () => {
10
- w(() => {
15
+ y(() => {
11
16
  requestAnimationFrame(() => {
12
17
  try {
13
- const e = v(u);
18
+ const e = u(n);
14
19
  if (!e || !c.value) return;
15
- const g = e.style.scrollBehavior;
20
+ const w = e.style.scrollBehavior;
16
21
  e.style.scrollBehavior = "auto";
17
- const B = e.scrollHeight - h.value;
18
- e.scrollTop = T.value + B, setTimeout(() => {
19
- e.style.scrollBehavior = g || "auto";
22
+ const H = e.scrollHeight - S.value;
23
+ e.scrollTop = T.value + H, setTimeout(() => {
24
+ e.style.scrollBehavior = w || "auto";
20
25
  }, 50);
21
26
  } finally {
22
- c.value = !1, f.value = !0, setTimeout(() => {
23
- f.value = !1;
27
+ c.value = !1, v.value = !0, setTimeout(() => {
28
+ v.value = !1;
24
29
  }, 500);
25
30
  }
26
31
  });
@@ -28,27 +33,27 @@ function F({ feedRef: u, emit: i, isLoadingMoreRef: p }) {
28
33
  };
29
34
  o > 0 ? setTimeout(l, o) : l();
30
35
  };
31
- return i && m(
36
+ return i && g(
32
37
  () => [a.value, s.value],
33
38
  () => {
34
39
  a.value || i("loadMoreDown"), s.value || i("loadMore");
35
40
  }
36
- ), p && m(
41
+ ), p && g(
37
42
  () => p.value,
38
43
  (o, l) => {
39
- l === !0 && o === !1 && S(0);
44
+ l === !0 && o === !1 && d(0);
40
45
  }
41
46
  ), {
42
47
  allowLoadMoreTop: s,
43
48
  allowLoadMoreBottom: a,
44
- movingDown: n,
49
+ movingDown: f,
45
50
  isScrollByMouseButton: r,
46
51
  pendingTopRestore: c,
47
- topLoadJustHappened: f,
48
- checkScrollPosition: d,
49
- restoreScrollPosition: S,
52
+ topLoadJustHappened: v,
53
+ checkScrollPosition: B,
54
+ restoreScrollPosition: d,
50
55
  startScrollWatch: (o) => {
51
- const l = v(u);
56
+ const l = u(n);
52
57
  if (!l) return;
53
58
  (o.offsetX > l.clientWidth || o.offsetY > l.clientHeight) && (r.value = !0);
54
59
  },
@@ -61,5 +66,5 @@ function F({ feedRef: u, emit: i, isLoadingMoreRef: p }) {
61
66
  };
62
67
  }
63
68
  export {
64
- F as useFeedLoadMore
69
+ L as useFeedLoadMore
65
70
  };
@@ -0,0 +1,45 @@
1
+ import { ref as f, watch as s, onUnmounted as p, nextTick as h } from "vue";
2
+ const _ = 320;
3
+ function F({ feedRef: u, objectsLengthRef: i }) {
4
+ const n = f(0);
5
+ let e = null;
6
+ function r() {
7
+ const t = u.value;
8
+ if (!t || i.value === 0) {
9
+ n.value = 0;
10
+ return;
11
+ }
12
+ const c = t.querySelector(".message-feed__top-spacer"), m = (c == null ? void 0 : c.offsetHeight) ?? 0, d = t.scrollHeight - m, a = Math.max(0, t.clientHeight - d + _);
13
+ a !== n.value && (n.value = a);
14
+ }
15
+ function o() {
16
+ h(() => {
17
+ requestAnimationFrame(() => {
18
+ r(), requestAnimationFrame(r);
19
+ });
20
+ });
21
+ }
22
+ function l(t) {
23
+ e == null || e.disconnect(), t && (e = new ResizeObserver(() => o()), e.observe(t));
24
+ }
25
+ return s(
26
+ u,
27
+ (t) => {
28
+ l(t), o();
29
+ },
30
+ { immediate: !0 }
31
+ ), s(
32
+ i,
33
+ () => o(),
34
+ { immediate: !0 }
35
+ ), p(() => {
36
+ e == null || e.disconnect(), e = null;
37
+ }), {
38
+ topSpacerPx: n,
39
+ scheduleMeasure: o
40
+ };
41
+ }
42
+ export {
43
+ _ as FEED_TOP_LOAD_OVERFLOW_PX,
44
+ F as useFeedTopSpacer
45
+ };
@@ -9,4 +9,5 @@ export * from './useFeedReactionsOverlay';
9
9
  export * from './useFeedReply';
10
10
  export * from './useFeedScroll';
11
11
  export * from './useFeedScrollTo';
12
+ export * from './useFeedTopSpacer';
12
13
  export * from './useStickyDate';
@@ -3,11 +3,13 @@ interface UseFeedLoadMoreOptions {
3
3
  feedRef: Ref<HTMLElement | null>;
4
4
  emit?: (event: 'loadMore' | 'loadMoreDown', ...args: unknown[]) => void;
5
5
  isLoadingMoreRef?: Ref<boolean>;
6
+ /** Пока лента прижата вниз — top load-more не эмитим (#16649 journal 77620). */
7
+ stickToBottomRef?: Ref<boolean>;
6
8
  }
7
9
  /**
8
10
  * Композабл для управления подгрузкой сообщений сверху/снизу и восстановлением позиции скролла
9
11
  */
10
- export declare function useFeedLoadMore({ feedRef, emit, isLoadingMoreRef }: UseFeedLoadMoreOptions): {
12
+ export declare function useFeedLoadMore({ feedRef, emit, isLoadingMoreRef, stickToBottomRef, }: UseFeedLoadMoreOptions): {
11
13
  allowLoadMoreTop: Ref<boolean, boolean>;
12
14
  allowLoadMoreBottom: Ref<boolean, boolean>;
13
15
  movingDown: Ref<boolean, boolean>;
@@ -0,0 +1,16 @@
1
+ import { Ref } from 'vue';
2
+ /** Запас overflow сверху, чтобы short feed всегда скроллился (#16649). */
3
+ export declare const FEED_TOP_LOAD_OVERFLOW_PX = 320;
4
+ interface UseFeedTopSpacerOptions {
5
+ feedRef: Ref<HTMLElement | null>;
6
+ objectsLengthRef: Ref<number>;
7
+ }
8
+ /**
9
+ * Высота top-spacer: content + spacer дают scrollHeight >= clientHeight + OVERFLOW,
10
+ * чтобы жест «вверх» был возможен при любом числе сообщений.
11
+ */
12
+ export declare function useFeedTopSpacer({ feedRef, objectsLengthRef }: UseFeedTopSpacerOptions): {
13
+ topSpacerPx: Ref<number, number>;
14
+ scheduleMeasure: () => void;
15
+ };
16
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mobilon-dev/chotto",
3
- "version": "0.3.126",
3
+ "version": "0.3.129",
4
4
  "type": "module",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.js",