@zero-library/common 2.4.3 → 2.4.4

package/dist/index.esm.js

@@ -2434,6 +2434,7 @@ var HorizontalRule = TiptapHorizontalRule.extend({
 // src/components/MarkdownEditor/pageNo/constant.ts
 var PAGE_NO_TAG = "page-no";
 var PAGE_NO_KEY = "PageNo";
+var SCROLL_TOP_OFFSET = 80;
 
 // src/components/MarkdownEditor/pageNo/pageNoMark.ts
 var pageNoMark_default = Node$1.create({
@@ -2563,7 +2564,7 @@ var PageNoExtension = Extension.create({
             pageNos.forEach((node) => {
               const rect = node.getBoundingClientRect();
               const top = rect.top - containerTop;
-              if (Math.abs(top) <= 80) {
+              if (Math.abs(top) <= SCROLL_TOP_OFFSET) {
                 closestNode = node;
                 closestTopDiff = 0;
               } else if (top < 0 && top > closestTopDiff) {
@@ -3628,13 +3629,45 @@ function scrollEditorViewToPosInNextFrame(view, pos, options) {
   const { align = "start", behavior = "auto", offset: offset3 = 0 } = options || {};
   requestAnimationFrame(() => {
     try {
-      const result = view.domAtPos(pos);
-      if (!result) return;
-      const el = result.node.nodeType === Node.TEXT_NODE ? result.node.parentElement : result.node;
-      if (!el) return;
       const scrollParent = getScrollParent(view.dom);
+      if (!scrollParent) return;
       const parentRect = scrollParent.getBoundingClientRect();
-      const targetRect = el.getBoundingClientRect();
+      if (!parentRect.height) return;
+      let el = null;
+      const nodeDom = view.nodeDOM?.(pos);
+      if (nodeDom) {
+        el = nodeDom.nodeType === Node.TEXT_NODE ? nodeDom.parentElement : nodeDom;
+      }
+      if (!el) {
+        const result = view.domAtPos(pos);
+        if (result) {
+          if (result.node.nodeType === Node.TEXT_NODE) {
+            el = result.node.parentElement;
+          } else {
+            const container = result.node;
+            const nodeAtOffset = container.childNodes?.[result.offset];
+            const nodeBeforeOffset = container.childNodes?.[result.offset - 1];
+            if (nodeAtOffset?.nodeType === Node.ELEMENT_NODE) {
+              el = nodeAtOffset;
+            } else if (nodeBeforeOffset?.nodeType === Node.ELEMENT_NODE) {
+              el = nodeBeforeOffset;
+            } else {
+              el = container;
+            }
+          }
+        }
+      }
+      let targetRect = null;
+      if (el) {
+        targetRect = el.getBoundingClientRect();
+      } else {
+        try {
+          const coords = view.coordsAtPos(pos);
+          targetRect = new DOMRect(coords.left, coords.top, coords.right - coords.left, coords.bottom - coords.top);
+        } catch {
+          return;
+        }
+      }
       let delta = 0;
       if (align === "start") {
         delta = targetRect.top - parentRect.top;
@@ -3643,8 +3676,10 @@ function scrollEditorViewToPosInNextFrame(view, pos, options) {
       } else if (align === "end") {
         delta = targetRect.bottom - parentRect.bottom;
       }
+      const maxTop = Math.max(0, scrollParent.scrollHeight - scrollParent.clientHeight);
+      const nextTop = Math.max(0, Math.min(scrollParent.scrollTop + delta - offset3, maxTop));
       scrollParent.scrollTo({
-        top: scrollParent.scrollTop + delta - offset3,
+        top: nextTop,
         behavior
       });
     } catch (e) {
@@ -8490,7 +8525,7 @@ var usePageNo = (pageNoConfig) => {
   const setPageNoEditor = (newEditor) => {
     setEditor(newEditor);
   };
-  const onPageChange = useDebounce_default((pageNo = 0) => {
+  const onPageChange = useDebounce_default((pageNo = 1) => {
     lastScrollToPageNoRef.current = pageNo;
     pageNoConfig?.onScrollPage?.(pageNo);
   }, 300);
@@ -8519,7 +8554,7 @@ var usePageNo = (pageNoConfig) => {
     const tryScroll = () => {
       const foundPos = findTargetPos();
       if (!isNullOrUnDef(foundPos)) {
-        scrollEditorViewToPosInNextFrame(editor.view, foundPos, { align: "start", behavior: "smooth" });
+        scrollEditorViewToPosInNextFrame(editor.view, foundPos, { align: "start", offset: SCROLL_TOP_OFFSET });
         return;
       }
       tries += 1;