@zero-library/common 2.4.2 → 2.4.4

package/dist/index.d.mts

@@ -359,10 +359,12 @@ type ToolbarItem = 'undo-redo' | 'heading' | 'list' | 'block' | 'format' | 'scri
  * 分页功能配置接口
  */
 interface PageNoConfig {
+    /** 当前页码，默认为1 */
+    pageNo?: number;
     /** 是否启用分页功能，默认为false */
     enabled: boolean;
     /** 页面滚动回调 */
-    onScrollPage?: (pageIndex: number) => void;
+    onScrollPage?: (pageNo: number) => void;
 }
 
 /**
@@ -2501,4 +2503,4 @@ declare function createTokenManager({ key, storage }: TokenManagerProps): {
     clear: () => void;
 };
 
-export { type AnnotationConfig, type AnnotationType, _default$q as AudioPlayer, type AudioPlayerProps, BusinessCode, type CacheMessage, type CollectionConfig, type CollectionType, type ComponentMapType, DEFAULT_DATE_FORMAT, DEFAULT_DATE_TIME_FORMAT, DEFAULT_YEAR_MONTH_DAY_FORMAT, DEFAULT_YEAR_MONTH_FORMAT, _default$p as DocxPreview, type DocxPreviewProps, _default$o as FileIcon, type FileIconProps, _default$n as FilePreview, _default$m as FilePreviewDrawer, type FilePreviewDrawerProps, type FilePreviewProps, type FindTreeNodesOptions, type FormatSizeOptions, HttpStatus, _default$h as Iframe, type IframeProps, _default$g as LazyComponent, type LazyComponentProps, _default$e as MarkDrawing, type MarkDrawingProps, _default$f as MarkdownEditor, type MarkdownEditorProps, _default$l as MarkdownPreview, type MarkdownPreviewProps, MultiEmailValidator, _default$k as PdfImagePreview, type PdfImagePreviewProps, _default$j as PdfPreview, type PdfPreviewProps, PhoneOrMobileValidator, RegBankCardNo, RegDetailAddress, RegEmail, RegFixedTelePhone, RegIdentityCardNo, RegMobile, RegNumNo, RegPassword, RegSmsCode, RegTaxNo, RegTelePhone, type RenderControl, _default$d as RenderMarkdown, type RenderMarkdownProps, _default$c as RenderWrapper, type RenderWrapperProps, type RequestConfig, type SecureManagerProps, type SetIntervalType, type SizeUnit, ThanNumLengthValidator, ThanNumValidator, type TokenManagerProps, _default$b as UserAvatar, type UserAvatarProps, _default$i as VideoPlayer, type VideoPlayerProps, type WebSocketProps, type WebSocketType, absVal, addUrlLastSlash, aesDecrypt, aesEncrypt, arrToObj, buildUrlParams, cachedMessage, calculate, compareNum, convertCurrency, convertNewlineToBr, copyText, createRequest, createSecureManager, createTokenManager, decimalPlaces, deepCopy, deepEqual, deepMerge, dividedBy, downloadFile, emit, emitToChild, executeScript, findTreeNodesByIds, formatDate, formatNumberWithCommas, formatSize, genNonDuplicateID, generateRandomNumbers, getAllUrlParams, getDeviceId, getEndOfTimestamp, getFileName, getFileSuffixName, getRowSpanCount, getStartOfTimestamp, getTimestamp, getWebSocketUrl, htmlToMarkdown, htmlToText, importThirdPartyFile, is, isArray, isBlob, isBoolean, isDate, isDef, isElement, isEmpty, isEmptyObj, isExpire, isExternal, isFunction, isInteger, isJson, isLocalhost, isMap, isNegative, isNull, isNullOrUnDef, isNumber, isNumberNoNaN, isObject, isPromise, isReferenceType, isRegExp, isScriptSafe, isSet, isString, isUnDef, isWindow, markdownToText, minus, objToOptions, plus, precision, processItemList, propsMerge, setInterval, setUrlMainSource, shouldRender, times, toFixed, transform, transforms, _default$9 as useAsyncQueue, _default$8 as useAutoRefresh, _default$7 as useCountDown, _default$6 as useCreateValtioContext, _default$5 as useDebounce, _default$4 as useDeepEffect, _default$a as useIframeRelayBridge, _default$3 as useRefState, _default$2 as useSyncInput, _default$1 as useThrottle, _default as useWebSocket };
+export { type AnnotationConfig, type AnnotationType, _default$q as AudioPlayer, type AudioPlayerProps, BusinessCode, type CacheMessage, type CollectionConfig, type CollectionType, type ComponentMapType, DEFAULT_DATE_FORMAT, DEFAULT_DATE_TIME_FORMAT, DEFAULT_YEAR_MONTH_DAY_FORMAT, DEFAULT_YEAR_MONTH_FORMAT, _default$p as DocxPreview, type DocxPreviewProps, _default$o as FileIcon, type FileIconProps, _default$n as FilePreview, _default$m as FilePreviewDrawer, type FilePreviewDrawerProps, type FilePreviewProps, type FindTreeNodesOptions, type FormatSizeOptions, HttpStatus, _default$h as Iframe, type IframeProps, _default$g as LazyComponent, type LazyComponentProps, _default$e as MarkDrawing, type MarkDrawingProps, _default$f as MarkdownEditor, type MarkdownEditorProps, _default$l as MarkdownPreview, type MarkdownPreviewProps, MultiEmailValidator, type PageNoConfig, _default$k as PdfImagePreview, type PdfImagePreviewProps, _default$j as PdfPreview, type PdfPreviewProps, PhoneOrMobileValidator, RegBankCardNo, RegDetailAddress, RegEmail, RegFixedTelePhone, RegIdentityCardNo, RegMobile, RegNumNo, RegPassword, RegSmsCode, RegTaxNo, RegTelePhone, type RenderControl, _default$d as RenderMarkdown, type RenderMarkdownProps, _default$c as RenderWrapper, type RenderWrapperProps, type RequestConfig, type SecureManagerProps, type SetIntervalType, type SizeUnit, ThanNumLengthValidator, ThanNumValidator, type TokenManagerProps, _default$b as UserAvatar, type UserAvatarProps, _default$i as VideoPlayer, type VideoPlayerProps, type WebSocketProps, type WebSocketType, absVal, addUrlLastSlash, aesDecrypt, aesEncrypt, arrToObj, buildUrlParams, cachedMessage, calculate, compareNum, convertCurrency, convertNewlineToBr, copyText, createRequest, createSecureManager, createTokenManager, decimalPlaces, deepCopy, deepEqual, deepMerge, dividedBy, downloadFile, emit, emitToChild, executeScript, findTreeNodesByIds, formatDate, formatNumberWithCommas, formatSize, genNonDuplicateID, generateRandomNumbers, getAllUrlParams, getDeviceId, getEndOfTimestamp, getFileName, getFileSuffixName, getRowSpanCount, getStartOfTimestamp, getTimestamp, getWebSocketUrl, htmlToMarkdown, htmlToText, importThirdPartyFile, is, isArray, isBlob, isBoolean, isDate, isDef, isElement, isEmpty, isEmptyObj, isExpire, isExternal, isFunction, isInteger, isJson, isLocalhost, isMap, isNegative, isNull, isNullOrUnDef, isNumber, isNumberNoNaN, isObject, isPromise, isReferenceType, isRegExp, isScriptSafe, isSet, isString, isUnDef, isWindow, markdownToText, minus, objToOptions, plus, precision, processItemList, propsMerge, setInterval, setUrlMainSource, shouldRender, times, toFixed, transform, transforms, _default$9 as useAsyncQueue, _default$8 as useAutoRefresh, _default$7 as useCountDown, _default$6 as useCreateValtioContext, _default$5 as useDebounce, _default$4 as useDeepEffect, _default$a as useIframeRelayBridge, _default$3 as useRefState, _default$2 as useSyncInput, _default$1 as useThrottle, _default as useWebSocket };

package/dist/index.d.ts

@@ -359,10 +359,12 @@ type ToolbarItem = 'undo-redo' | 'heading' | 'list' | 'block' | 'format' | 'scri
  * 分页功能配置接口
  */
 interface PageNoConfig {
+    /** 当前页码，默认为1 */
+    pageNo?: number;
     /** 是否启用分页功能，默认为false */
     enabled: boolean;
     /** 页面滚动回调 */
-    onScrollPage?: (pageIndex: number) => void;
+    onScrollPage?: (pageNo: number) => void;
 }
 
 /**
@@ -2501,4 +2503,4 @@ declare function createTokenManager({ key, storage }: TokenManagerProps): {
     clear: () => void;
 };
 
-export { type AnnotationConfig, type AnnotationType, _default$q as AudioPlayer, type AudioPlayerProps, BusinessCode, type CacheMessage, type CollectionConfig, type CollectionType, type ComponentMapType, DEFAULT_DATE_FORMAT, DEFAULT_DATE_TIME_FORMAT, DEFAULT_YEAR_MONTH_DAY_FORMAT, DEFAULT_YEAR_MONTH_FORMAT, _default$p as DocxPreview, type DocxPreviewProps, _default$o as FileIcon, type FileIconProps, _default$n as FilePreview, _default$m as FilePreviewDrawer, type FilePreviewDrawerProps, type FilePreviewProps, type FindTreeNodesOptions, type FormatSizeOptions, HttpStatus, _default$h as Iframe, type IframeProps, _default$g as LazyComponent, type LazyComponentProps, _default$e as MarkDrawing, type MarkDrawingProps, _default$f as MarkdownEditor, type MarkdownEditorProps, _default$l as MarkdownPreview, type MarkdownPreviewProps, MultiEmailValidator, _default$k as PdfImagePreview, type PdfImagePreviewProps, _default$j as PdfPreview, type PdfPreviewProps, PhoneOrMobileValidator, RegBankCardNo, RegDetailAddress, RegEmail, RegFixedTelePhone, RegIdentityCardNo, RegMobile, RegNumNo, RegPassword, RegSmsCode, RegTaxNo, RegTelePhone, type RenderControl, _default$d as RenderMarkdown, type RenderMarkdownProps, _default$c as RenderWrapper, type RenderWrapperProps, type RequestConfig, type SecureManagerProps, type SetIntervalType, type SizeUnit, ThanNumLengthValidator, ThanNumValidator, type TokenManagerProps, _default$b as UserAvatar, type UserAvatarProps, _default$i as VideoPlayer, type VideoPlayerProps, type WebSocketProps, type WebSocketType, absVal, addUrlLastSlash, aesDecrypt, aesEncrypt, arrToObj, buildUrlParams, cachedMessage, calculate, compareNum, convertCurrency, convertNewlineToBr, copyText, createRequest, createSecureManager, createTokenManager, decimalPlaces, deepCopy, deepEqual, deepMerge, dividedBy, downloadFile, emit, emitToChild, executeScript, findTreeNodesByIds, formatDate, formatNumberWithCommas, formatSize, genNonDuplicateID, generateRandomNumbers, getAllUrlParams, getDeviceId, getEndOfTimestamp, getFileName, getFileSuffixName, getRowSpanCount, getStartOfTimestamp, getTimestamp, getWebSocketUrl, htmlToMarkdown, htmlToText, importThirdPartyFile, is, isArray, isBlob, isBoolean, isDate, isDef, isElement, isEmpty, isEmptyObj, isExpire, isExternal, isFunction, isInteger, isJson, isLocalhost, isMap, isNegative, isNull, isNullOrUnDef, isNumber, isNumberNoNaN, isObject, isPromise, isReferenceType, isRegExp, isScriptSafe, isSet, isString, isUnDef, isWindow, markdownToText, minus, objToOptions, plus, precision, processItemList, propsMerge, setInterval, setUrlMainSource, shouldRender, times, toFixed, transform, transforms, _default$9 as useAsyncQueue, _default$8 as useAutoRefresh, _default$7 as useCountDown, _default$6 as useCreateValtioContext, _default$5 as useDebounce, _default$4 as useDeepEffect, _default$a as useIframeRelayBridge, _default$3 as useRefState, _default$2 as useSyncInput, _default$1 as useThrottle, _default as useWebSocket };
+export { type AnnotationConfig, type AnnotationType, _default$q as AudioPlayer, type AudioPlayerProps, BusinessCode, type CacheMessage, type CollectionConfig, type CollectionType, type ComponentMapType, DEFAULT_DATE_FORMAT, DEFAULT_DATE_TIME_FORMAT, DEFAULT_YEAR_MONTH_DAY_FORMAT, DEFAULT_YEAR_MONTH_FORMAT, _default$p as DocxPreview, type DocxPreviewProps, _default$o as FileIcon, type FileIconProps, _default$n as FilePreview, _default$m as FilePreviewDrawer, type FilePreviewDrawerProps, type FilePreviewProps, type FindTreeNodesOptions, type FormatSizeOptions, HttpStatus, _default$h as Iframe, type IframeProps, _default$g as LazyComponent, type LazyComponentProps, _default$e as MarkDrawing, type MarkDrawingProps, _default$f as MarkdownEditor, type MarkdownEditorProps, _default$l as MarkdownPreview, type MarkdownPreviewProps, MultiEmailValidator, type PageNoConfig, _default$k as PdfImagePreview, type PdfImagePreviewProps, _default$j as PdfPreview, type PdfPreviewProps, PhoneOrMobileValidator, RegBankCardNo, RegDetailAddress, RegEmail, RegFixedTelePhone, RegIdentityCardNo, RegMobile, RegNumNo, RegPassword, RegSmsCode, RegTaxNo, RegTelePhone, type RenderControl, _default$d as RenderMarkdown, type RenderMarkdownProps, _default$c as RenderWrapper, type RenderWrapperProps, type RequestConfig, type SecureManagerProps, type SetIntervalType, type SizeUnit, ThanNumLengthValidator, ThanNumValidator, type TokenManagerProps, _default$b as UserAvatar, type UserAvatarProps, _default$i as VideoPlayer, type VideoPlayerProps, type WebSocketProps, type WebSocketType, absVal, addUrlLastSlash, aesDecrypt, aesEncrypt, arrToObj, buildUrlParams, cachedMessage, calculate, compareNum, convertCurrency, convertNewlineToBr, copyText, createRequest, createSecureManager, createTokenManager, decimalPlaces, deepCopy, deepEqual, deepMerge, dividedBy, downloadFile, emit, emitToChild, executeScript, findTreeNodesByIds, formatDate, formatNumberWithCommas, formatSize, genNonDuplicateID, generateRandomNumbers, getAllUrlParams, getDeviceId, getEndOfTimestamp, getFileName, getFileSuffixName, getRowSpanCount, getStartOfTimestamp, getTimestamp, getWebSocketUrl, htmlToMarkdown, htmlToText, importThirdPartyFile, is, isArray, isBlob, isBoolean, isDate, isDef, isElement, isEmpty, isEmptyObj, isExpire, isExternal, isFunction, isInteger, isJson, isLocalhost, isMap, isNegative, isNull, isNullOrUnDef, isNumber, isNumberNoNaN, isObject, isPromise, isReferenceType, isRegExp, isScriptSafe, isSet, isString, isUnDef, isWindow, markdownToText, minus, objToOptions, plus, precision, processItemList, propsMerge, setInterval, setUrlMainSource, shouldRender, times, toFixed, transform, transforms, _default$9 as useAsyncQueue, _default$8 as useAutoRefresh, _default$7 as useCountDown, _default$6 as useCreateValtioContext, _default$5 as useDebounce, _default$4 as useDeepEffect, _default$a as useIframeRelayBridge, _default$3 as useRefState, _default$2 as useSyncInput, _default$1 as useThrottle, _default as useWebSocket };

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) {
@@ -8484,6 +8519,55 @@ var SearchAndReplace = Extension.create({
   }
 });
 var searchAndReplace_default = SearchAndReplace;
+var usePageNo = (pageNoConfig) => {
+  const [editor, setEditor] = useState(null);
+  const lastScrollToPageNoRef = useRef(void 0);
+  const setPageNoEditor = (newEditor) => {
+    setEditor(newEditor);
+  };
+  const onPageChange = useDebounce_default((pageNo = 1) => {
+    lastScrollToPageNoRef.current = pageNo;
+    pageNoConfig?.onScrollPage?.(pageNo);
+  }, 300);
+  useEffect(() => {
+    if (!editor) return;
+    if (!pageNoConfig?.enabled) return;
+    const targetPageNo = pageNoConfig?.pageNo;
+    if (isNullOrUnDef(targetPageNo)) return;
+    if (lastScrollToPageNoRef.current === targetPageNo) return;
+    let rafId = 0;
+    const targetPageNoStr = String(targetPageNo);
+    const findTargetPos = () => {
+      let foundPos = null;
+      editor.state.doc.descendants((node, pos) => {
+        if (!isNullOrUnDef(foundPos)) return false;
+        if (node.type.name !== PAGE_NO_KEY) return true;
+        if (String(node.attrs?.[PAGE_NO_TAG]) === targetPageNoStr) {
+          foundPos = pos;
+          return false;
+        }
+        return true;
+      });
+      return foundPos;
+    };
+    let tries = 0;
+    const tryScroll = () => {
+      const foundPos = findTargetPos();
+      if (!isNullOrUnDef(foundPos)) {
+        scrollEditorViewToPosInNextFrame(editor.view, foundPos, { align: "start", offset: SCROLL_TOP_OFFSET });
+        return;
+      }
+      tries += 1;
+      if (tries < 10) rafId = requestAnimationFrame(tryScroll);
+    };
+    rafId = requestAnimationFrame(tryScroll);
+    return () => cancelAnimationFrame(rafId);
+  }, [editor, pageNoConfig?.enabled, pageNoConfig?.pageNo]);
+  return {
+    setPageNoEditor,
+    onPageChange
+  };
+};
 var MarkdownEditor_default = ({
   value = ``,
   onChange,
@@ -8500,9 +8584,7 @@ var MarkdownEditor_default = ({
 }) => {
   const isMobile = useIsBreakpoint();
   const lastContentRef = useRef("");
-  const onPageChange = useDebounce_default((pageIndex) => {
-    pageNoConfig?.onScrollPage?.(pageIndex ?? 0);
-  }, 300);
+  const { setPageNoEditor, onPageChange } = usePageNo(pageNoConfig);
   const {
     setAnnotationEditor,
     annotations,
@@ -8638,6 +8720,7 @@ var MarkdownEditor_default = ({
     if (!editor) return;
     setAnnotationEditor(editor);
     setCollectionEditor(editor);
+    setPageNoEditor(editor);
   }, [editor]);
   useEffect(() => {
     if (!editor) return;