Merge pull request #48 from whale4113/fix/whale/scroll

scroll up and down to fully load doc

Author: whale4113

.changeset/calm-eels-dream.md

@@ -0,0 +1,5 @@
+---
+'@dolphin/chrome-extension': patch
+---
+
+feat: adjusting the scroll down threshold

.changeset/fluffy-eels-chew.md

@@ -0,0 +1,5 @@
+---
+'@dolphin/lark': patch
+---
+
+feat: `offset` option support function format

.changeset/mighty-pigs-fetch.md

@@ -0,0 +1,5 @@
+---
+'@dolphin/lark': patch
+---
+
+fix: `keepAlive` option is for `Toast.loading()`

.changeset/pretty-jars-move.md

@@ -0,0 +1,5 @@
+---
+'@dolphin/chrome-extension': patch
+---
+
+fix: scroll up and down to fully load doc

.changeset/tough-starfishes-perform.md

@@ -0,0 +1,5 @@
+---
+'@dolphin/common': patch
+---
+
+feat: add `Minute` const

apps/chrome-extension/src/common/notification.ts

@@ -1,5 +1,6 @@
-import { Toast } from '@dolphin/lark/env'
 import i18next from 'i18next'
+import { Toast } from '@dolphin/lark/env'
+import { Minute } from '@dolphin/common'
 import { CommonTranslationKey, Namespace } from './i18n'
 
 export const confirm = (): Promise<boolean> => {
@@ -8,6 +9,7 @@ export const confirm = (): Promise<boolean> => {
 
     Toast.info({
       closable: true,
+      duration: Minute,
       content: i18next.t(CommonTranslationKey.CONTINUE, {
         ns: Namespace.COMMON,
       }),

apps/chrome-extension/src/scripts/download-lark-docx-as-markdown.ts

@@ -1,6 +1,6 @@
 import i18next from 'i18next'
 import { Toast, Docx, docx, mdast } from '@dolphin/lark'
-import { OneHundred, Second, waitFor } from '@dolphin/common'
+import { Minute, OneHundred, Second, waitFor } from '@dolphin/common'
 import { fileSave, supported } from 'browser-fs-access'
 import { fs } from '@zip.js/zip.js'
 import normalizeFileName from 'filenamify/browser'
@@ -448,9 +448,34 @@ const prepare = async (): Promise<PrepareResult> => {
       })
     }
 
+    enum Direction {
+      Up,
+      Down,
+    }
+    let direction = Direction.Down
+    const calculateDirection = () => {
+      const scrollHeight = docx.container?.scrollHeight ?? 0
+      const clientHeight = docx.container?.clientHeight ?? 0
+
+      if (
+        direction === Direction.Down &&
+        top > scrollHeight + 2 * clientHeight
+      ) {
+        return Direction.Up
+      }
+
+      if (direction === Direction.Up && top < 0) {
+        return Direction.Down
+      }
+
+      return direction
+    }
+
     let top = 0
+
     docx.scrollTo({
       top,
+      behavior: 'instant',
     })
 
     const maxTryTimes = OneHundred
@@ -471,12 +496,20 @@ const prepare = async (): Promise<PrepareResult> => {
     while (!checkIsReady() && tryTimes <= maxTryTimes) {
       docx.scrollTo({
         top,
+        behavior: 'smooth',
       })
 
       await waitFor(0.4 * Second)
 
+      direction = calculateDirection()
+
       tryTimes++
-      top += (docx.container?.clientHeight ?? 4 * OneHundred) * 2
+
+      const sign = direction === Direction.Down ? 1 : -1
+      const containerClientHeight =
+        docx.container?.clientHeight ?? 4 * OneHundred
+
+      top += sign * containerClientHeight
     }
 
     Toast.remove(TranslationKey.SCROLL_DOCUMENT)
@@ -641,7 +674,7 @@ main({
         actionText: i18next.t(CommonTranslationKey.CONFIRM_REPORT_BUG, {
           ns: Namespace.COMMON,
         }),
-        duration: Number.POSITIVE_INFINITY,
+        duration: Minute,
         onActionClick: () => {
           reportBug(error)
 

packages/common/src/time.ts

@@ -1,5 +1,7 @@
 export const Second = 1000
 
+export const Minute = 60 * Second
+
 export const waitFor = (timeout = 0.4 * Second): Promise<void> =>
   new Promise(resolve => {
     setTimeout(() => {

packages/lark/src/docx.ts

@@ -738,7 +738,9 @@ interface ScrollToBlock {
       /**
        * @default 0
        */
-      offset?: number
+      offset?:
+        | number
+        | ((options: { container: HTMLDivElement | null }) => number)
     },
   ): void
 }
@@ -1006,7 +1008,6 @@ export class Transformer {
                   console.error(error)
                 }
 
-                const delta = OneHundred / 2
                 let offset = 0
                 try {
                   await waitForFunction(
@@ -1015,7 +1016,8 @@ export class Transformer {
 
                       if (!exists) {
                         this.options.scrollToBlock?.(whiteboard.id, {
-                          offset: (offset += delta),
+                          offset: ({ container }) =>
+                            (offset += container?.clientHeight ?? OneHundred),
                         })
                       }
 
@@ -1176,7 +1178,9 @@ export class Docx {
   }
 
   get container() {
-    const container = document.querySelector('#mainBox .bear-web-x-container')
+    const container = document.querySelector<HTMLDivElement>(
+      '#mainBox .bear-web-x-container',
+    )
 
     return container
   }
@@ -1239,7 +1243,7 @@ export class Docx {
     })
 
     const wrapperSelector =
-      '.zone-container > .page-block-children .render-unit-wrapper'
+      '.zone-container > .page-block-children > .root-render-unit-container > .render-unit-wrapper'
     const wrapper = this.container?.querySelector(wrapperSelector)
 
     if (wrapper) {
@@ -1285,15 +1289,19 @@ export class Docx {
       blockId: number,
       options = {},
     ): void => {
-      const { offset = 0 } = options
-
       const cacheScrollTop = this.blockIdToScrollTop.get(String(blockId))
       if (cacheScrollTop === undefined) {
         throw new Error(`Block ${blockId} no cache scroll top.`)
       }
 
+      const { offset = 0 } = options
+      const normalizedOffset =
+        typeof offset === 'number'
+          ? offset
+          : offset({ container: this.container })
+
       this.scrollTo({
-        top: cacheScrollTop + offset,
+        top: cacheScrollTop + normalizedOffset,
         behavior: 'instant',
       })
     }

packages/lark/src/env.ts

@@ -1,12 +1,12 @@
 const noop = () => {}
 
 interface ToastOptions {
-  content: string
   key?: string
-  keepAlive?: boolean
-  closable?: boolean
+  content: string
   actionText?: string
   duration?: number
+  keepAlive?: boolean
+  closable?: boolean
   onActionClick?: () => void
   onClose?: () => void
 }