From 143054075ed3c9dac273d2b0d93e527b4bfa4834 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 13 Sep 2023 12:07:17 +0800 Subject: [PATCH] :rotating_light: --- app/src/block/Panel.ts | 1 - app/src/boot/globalEvent/keydown.ts | 1 - app/src/config/editor.ts | 1 - app/src/dialog/tooltip.ts | 2 +- app/src/editor/util.ts | 1 - app/src/mobile/menu/search.ts | 2 +- app/src/protyle/breadcrumb/action.ts | 2 +- app/src/protyle/breadcrumb/index.ts | 1 - app/src/protyle/index.ts | 2 +- app/src/protyle/ui/initUI.ts | 5 ++--- app/src/protyle/util/setEditMode.ts | 1 - app/src/protyle/wysiwyg/transaction.ts | 1 - app/src/search/util.ts | 2 +- 13 files changed, 7 insertions(+), 15 deletions(-) diff --git a/app/src/block/Panel.ts b/app/src/block/Panel.ts index bcd738b39..39d82a431 100644 --- a/app/src/block/Panel.ts +++ b/app/src/block/Panel.ts @@ -1,7 +1,6 @@ import {hasClosestByClassName} from "../protyle/util/hasClosest"; import {Protyle} from "../protyle"; import {genUUID} from "../util/genID"; -import {setPadding} from "../protyle/ui/initUI"; import {setPosition} from "../util/setPosition"; import {hideElements} from "../protyle/ui/hideElements"; import {Constants} from "../constants"; diff --git a/app/src/boot/globalEvent/keydown.ts b/app/src/boot/globalEvent/keydown.ts index 95b379c8a..1625e59c8 100644 --- a/app/src/boot/globalEvent/keydown.ts +++ b/app/src/boot/globalEvent/keydown.ts @@ -50,7 +50,6 @@ import {lockScreen} from "../../dialog/processSystem"; import {isWindow} from "../../util/functions"; import {reloadProtyle} from "../../protyle/util/reload"; import {fullscreen} from "../../protyle/breadcrumb/action"; -import {setPadding} from "../../protyle/ui/initUI"; import {openRecentDocs} from "../../business/openRecentDocs"; import {App} from "../../index"; import {commandPanel} from "../../plugin/commandPanel"; diff --git a/app/src/config/editor.ts b/app/src/config/editor.ts index 9de3803bc..923d3575a 100644 --- a/app/src/config/editor.ts +++ b/app/src/config/editor.ts @@ -2,7 +2,6 @@ import {getAllModels} from "../layout/getAll"; import {setInlineStyle} from "../util/assets"; import {fetchPost} from "../util/fetch"; import {confirmDialog} from "../dialog/confirmDialog"; -import {setPadding} from "../protyle/ui/initUI"; import {reloadProtyle} from "../protyle/util/reload"; import {updateHotkeyTip} from "../protyle/util/compatibility"; import {Constants} from "../constants"; diff --git a/app/src/dialog/tooltip.ts b/app/src/dialog/tooltip.ts index c9d5b95af..a6e71dc18 100644 --- a/app/src/dialog/tooltip.ts +++ b/app/src/dialog/tooltip.ts @@ -36,7 +36,7 @@ export const showTooltip = (message: string, target: Element, error = false) => if (target.getAttribute("data-position") === "right") { left = targetRect.right - messageElement.clientWidth; } - const bottomHeight = window.innerHeight - targetRect.bottom + const bottomHeight = window.innerHeight - targetRect.bottom; messageElement.style.maxHeight = Math.max(targetRect.top, bottomHeight) + "px"; if (targetRect.top > bottomHeight) { messageElement.style.top = (targetRect.top - messageElement.clientHeight) + "px"; diff --git a/app/src/editor/util.ts b/app/src/editor/util.ts index b2f3d830c..3f00d0293 100644 --- a/app/src/editor/util.ts +++ b/app/src/editor/util.ts @@ -8,7 +8,6 @@ import {getDisplayName, pathPosix} from "../util/pathName"; import {Constants} from "../constants"; import {setEditMode} from "../protyle/util/setEditMode"; import {Files} from "../layout/dock/Files"; -import {setPadding} from "../protyle/ui/initUI"; import {fetchPost, fetchSyncPost} from "../util/fetch"; import {focusBlock, focusByRange} from "../protyle/util/selection"; import {onGet} from "../protyle/util/onGet"; diff --git a/app/src/mobile/menu/search.ts b/app/src/mobile/menu/search.ts index 7b345946b..809d337ce 100644 --- a/app/src/mobile/menu/search.ts +++ b/app/src/mobile/menu/search.ts @@ -6,7 +6,7 @@ import {getIconByType} from "../../editor/getIcon"; import {preventScroll} from "../../protyle/scroll/preventScroll"; import {openModel} from "./model"; import {getDisplayName, getNotebookIcon, getNotebookName, movePathTo, pathPosix} from "../../util/pathName"; -import {getKeyByLiElement, initCriteriaMenu, moreMenu, queryMenu} from "../../search/menu"; +import {getKeyByLiElement, initCriteriaMenu, moreMenu} from "../../search/menu"; import {setStorageVal} from "../../protyle/util/compatibility"; import {escapeGreat, escapeHtml} from "../../util/escape"; import {unicode2Emoji} from "../../emoji"; diff --git a/app/src/protyle/breadcrumb/action.ts b/app/src/protyle/breadcrumb/action.ts index 8ddeb2bd5..485a13e56 100644 --- a/app/src/protyle/breadcrumb/action.ts +++ b/app/src/protyle/breadcrumb/action.ts @@ -1,7 +1,7 @@ /// #if !MOBILE import {getAllModels} from "../../layout/getAll"; /// #endif -import {addLoading, setPadding} from "../ui/initUI"; +import {addLoading} from "../ui/initUI"; import {fetchPost} from "../../util/fetch"; import {Constants} from "../../constants"; import {hideAllElements, hideElements} from "../ui/hideElements"; diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index 72f76b464..cf3691b26 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -13,7 +13,6 @@ import {needSubscribe} from "../../util/needSubscribe"; import {isMobile} from "../../util/functions"; import {zoomOut} from "../../menus/protyle"; import {getEditorRange} from "../util/selection"; -import {setPadding} from "../ui/initUI"; /// #if !MOBILE import {openFileById} from "../../editor/util"; import {setPanelFocus} from "../../layout/util"; diff --git a/app/src/protyle/index.ts b/app/src/protyle/index.ts index 8fd00a6ba..1a4ec9ea5 100644 --- a/app/src/protyle/index.ts +++ b/app/src/protyle/index.ts @@ -2,7 +2,7 @@ import {Constants} from "../constants"; import {Hint} from "./hint"; import {setLute} from "./render/setLute"; import {Preview} from "./preview"; -import {addLoading, initUI, removeLoading, setPadding} from "./ui/initUI"; +import {addLoading, initUI, removeLoading} from "./ui/initUI"; import {Undo} from "./undo"; import {Upload} from "./upload"; import {Options} from "./util/Options"; diff --git a/app/src/protyle/ui/initUI.ts b/app/src/protyle/ui/initUI.ts index 03fb944b7..c018d934e 100644 --- a/app/src/protyle/ui/initUI.ts +++ b/app/src/protyle/ui/initUI.ts @@ -1,5 +1,4 @@ import {setEditMode} from "../util/setEditMode"; -import {lineNumberRender} from "../render/highlightRender"; import {scrollEvent} from "../scroll/event"; import {isMobile} from "../../util/functions"; import {Constants} from "../../constants"; @@ -123,7 +122,7 @@ export const setPadding = (protyle: IProtyle) => { padding: 0 }; } - const oldLeft = parseInt(protyle.wysiwyg.element.style.paddingLeft) + const oldLeft = parseInt(protyle.wysiwyg.element.style.paddingLeft); let left = 16; let right = 24; if (!isMobile()) { @@ -172,7 +171,7 @@ export const setPadding = (protyle: IProtyle) => { } } const oldWidth = protyle.wysiwyg.element.getAttribute("data-realwidth"); - const newWidth = protyle.wysiwyg.element.clientWidth - parseInt(protyle.wysiwyg.element.style.paddingLeft) - parseInt(protyle.wysiwyg.element.style.paddingRight) + const newWidth = protyle.wysiwyg.element.clientWidth - parseInt(protyle.wysiwyg.element.style.paddingLeft) - parseInt(protyle.wysiwyg.element.style.paddingRight); protyle.wysiwyg.element.setAttribute("data-realwidth", newWidth.toString()); return { width: Math.abs(parseInt(oldWidth) - newWidth), diff --git a/app/src/protyle/util/setEditMode.ts b/app/src/protyle/util/setEditMode.ts index 3e04330d3..a0e3869a5 100644 --- a/app/src/protyle/util/setEditMode.ts +++ b/app/src/protyle/util/setEditMode.ts @@ -1,4 +1,3 @@ -import {setPadding} from "../ui/initUI"; import {hideElements} from "../ui/hideElements"; import {getAllModels} from "../../layout/getAll"; import {updateOutline} from "../../editor/util"; diff --git a/app/src/protyle/wysiwyg/transaction.ts b/app/src/protyle/wysiwyg/transaction.ts index f13c49bd0..3fd175c7b 100644 --- a/app/src/protyle/wysiwyg/transaction.ts +++ b/app/src/protyle/wysiwyg/transaction.ts @@ -18,7 +18,6 @@ import {hideElements} from "../ui/hideElements"; import {reloadProtyle} from "../util/reload"; import {countBlockWord} from "../../layout/status"; import {needLogin, needSubscribe} from "../../util/needSubscribe"; -import {setPadding} from "../ui/initUI"; import {resize} from "../util/resize"; const removeTopElement = (updateElement: Element, protyle: IProtyle) => { diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 9b66a303b..ef18fb9f0 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -13,7 +13,7 @@ import {MenuItem} from "../menus/Menu"; import {getDisplayName, getNotebookIcon, getNotebookName, movePathTo, pathPosix} from "../util/pathName"; import {Protyle} from "../protyle"; import {onGet} from "../protyle/util/onGet"; -import {addLoading, setPadding} from "../protyle/ui/initUI"; +import {addLoading} from "../protyle/ui/initUI"; import {getIconByType} from "../editor/getIcon"; import {unicode2Emoji} from "../emoji"; import {hasClosestByClassName} from "../protyle/util/hasClosest";