🐛 fix #6622

siyuan-note · Nov 16, 2022 · 06b4d8e · 06b4d8e
1 parent cb58fb0
commit 06b4d8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/util/newFile.ts b/app/src/util/newFile.ts
@@ -1,6 +1,6 @@
 import {showMessage} from "../dialog/message";
 import {getAllModels} from "../layout/getAll";
-import {hasTopClosestByTag} from "../protyle/util/hasClosest";
+import {hasClosestByClassName, hasTopClosestByTag} from "../protyle/util/hasClosest";
 import {getDockByType} from "../layout/util";
 /// #if !MOBILE
 import {Files} from "../layout/dock/Files";
@@ -23,7 +23,7 @@ export const newFile = (notebookId?: string, currentPath?: string, open?: boolea
             if (currentElement.classList.contains("item--focus")) {
                 notebookId = item.editor.protyle.notebookId;
                 currentPath = pathPosix().dirname(item.editor.protyle.path);
-                if (currentElement.parentElement.parentElement.classList.contains("layout__wnd--active")) {
+                if (hasClosestByClassName(currentElement, "layout__wnd--active")) {
                     return true;
                 }
             }

diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts
@@ -191,7 +191,7 @@ const initBar = () => {
 <div id="barSetting" class="toolbar__item b3-tooltips b3-tooltips__sw${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.config} ${updateHotkeyTip(window.siyuan.config.keymap.general.config.custom)}">
     <svg><use xlink:href="#iconSettings"></use></svg>
 </div>
-<div id="barHelp" class="toolbar__item b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.openBy} ${window.siyuan.languages.help}">
+<div id="barTopHelp" class="toolbar__item b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.openBy} ${window.siyuan.languages.help}">
     <svg><use xlink:href="#iconHelp"></use></svg>
 </div>
 <div class="fn__flex" id="windowControls"></div>`;
@@ -251,7 +251,7 @@ const initBar = () => {
                 openSetting();
                 event.stopPropagation();
                 break;
-            } else if (target.id === "barHelp") {
+            } else if (target.id === "barTopHelp") {
                 mountHelp();
                 event.stopPropagation();
                 break;