Merge pull request #29 from TCOTC/dev-menu-id

app/appearance/langs/es_ES.json

@@ -1063,7 +1063,7 @@
   "export20": "La exportación de archivos Word .docx requiere la conversión del formato mediante <a href=\"https://pandoc.org\" target=\"_blank\">Pandoc</a>",
   "export21": "Exportar plantilla de pie de página PDF",
   "export22": "<code class='fn__code'>%page</code> es el número de página actual, <code class='fn__code'>%pages</code> es el número de página total y es compatible con las funciones de plantilla de Sprig ",
-  "export23": "Exportar descuento con YAML front-matter",
+  "export23": "Exportar Markdown con YAML front-matter",
   "export24": "Después de habilitar, agregue información general de metadatos al comienzo del archivo Markdown exportado",
   "export25": "Exportar ruta de plantilla .docx de Word",
   "export26": "La ruta absoluta de la plantilla utilizada al exportar archivos .docx de Word, es decir, Pandoc <a href=\"https://pandoc.org/MANUAL.html#option--reference-doc\" target =\"_blank\">--reference-doc</a> valor del parámetro",

app/src/assets/scss/business/_drag.scss

@@ -1,5 +1,5 @@
 .dragover {
-  background-color: var(--b3-theme-primary-lightest);
+  background-color: var(--b3-theme-primary-lightest) !important;
 
   // 需要 !important，否则拖拽到闪卡无效果
   &__top {

app/src/assets/scss/protyle/_wysiwyg.scss

@@ -55,6 +55,18 @@
       }
     }
 
+    .bq {
+      .dragover {
+        &__top:not(.av__row) {
+          box-shadow: 0 -3px 0 var(--b3-theme-primary-lighter), inset 0 1px 0 var(--b3-theme-primary-lighter) !important;
+        }
+
+        &__bottom:not(.av__row) {
+          box-shadow: 0 3px 0 var(--b3-theme-primary-lighter), inset 0 -1px 0 var(--b3-theme-primary-lighter) !important;
+        }
+      }
+    }
+
     &.list {
       padding-left: 0;
 
@@ -449,6 +461,10 @@
 
   &--select {
     background-color: var(--b3-theme-primary-lightest) !important;
+
+    [data-node-id][style*="background-color"] {
+      opacity: .86;
+    }
   }
 
   // https://github.com/siyuan-note/siyuan/issues/11589

app/src/block/Panel.ts

@@ -124,7 +124,7 @@ export class BlockPanel {
                         openFileById({
                             app: options.app,
                             id: this.nodeIds[0],
-                            action: this.editors[0].protyle.block.rootID !== this.nodeIds[0] ? [Constants.CB_GET_ALL] : [Constants.CB_GET_CONTEXT],
+                            action: this.editors[0].protyle.block.rootID !== this.nodeIds[0] ? [Constants.CB_GET_ALL, Constants.CB_GET_FOCUS] : [Constants.CB_GET_CONTEXT],
                         });
                         /// #endif
                     }
@@ -237,7 +237,7 @@ export class BlockPanel {
         let openHTML = "";
         /// #if !BROWSER
         if (this.nodeIds.length === 1) {
-            openHTML = `<span data-type="stickTab" class="block__icon block__icon--show b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.openInNewTab}"><svg><use xlink:href="#iconLayoutRight"></use></svg></span>
+            openHTML = `<span data-type="stickTab" class="block__icon block__icon--show b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.openBy}"><svg><use xlink:href="#iconOpen"></use></svg></span>
 <span class="fn__space"></span>
 <span data-type="open" class="block__icon block__icon--show b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.openByNewWindow}"><svg><use xlink:href="#iconOpenWindow"></use></svg></span>
 <span class="fn__space"></span>`;

app/src/config/keymap.ts

@@ -230,7 +230,8 @@ export const keymap = {
         });
     },
     search(value: string, keymapString: string) {
-        keymap.element.querySelectorAll("#keymapList .b3-list-item--hide-action > .b3-list-item__text").forEach(item => {
+        const keymapListElement = keymap.element.querySelector("#keymapList")
+        keymapListElement.querySelectorAll(".b3-list-item--hide-action > .b3-list-item__text").forEach(item => {
             const liElement = item.parentElement;
             let matchedKeymap = false;
             if (keymapString === "" || liElement.querySelector(".b3-text-field").getAttribute("data-value").indexOf(keymapString) > -1) {
@@ -245,10 +246,9 @@ export const keymap = {
             }
             if (!liElement.nextElementSibling) {
                 const toggleElement = liElement.parentElement.previousElementSibling;
-                const toggleIconElement = toggleElement.querySelector(".b3-list-item__arrow");
                 if (value === "" && keymapString === "") {
                     // 复原折叠状态
-                    if (toggleIconElement.classList.contains("b3-list-item__arrow--open")) {
+                    if (toggleElement.querySelector(".b3-list-item__arrow").classList.contains("b3-list-item__arrow--open")) {
                         liElement.parentElement.classList.remove("fn__none");
                     } else {
                         liElement.parentElement.classList.add("fn__none");
@@ -262,8 +262,14 @@ export const keymap = {
                 }
             }
         });
-        // 编辑器中三级菜单单独处理
-        const editorKeymapElement = keymap.element.querySelector("#keymapList").lastElementChild;
+        // 编辑器单独处理
+        this._toggleSearchItem(keymapListElement.lastElementChild, value, keymapString);
+        // 插件单独处理
+        if (keymapListElement.childElementCount === 5) {
+            this._toggleSearchItem(keymapListElement.lastElementChild.previousElementSibling, value, keymapString);
+        }
+    },
+    _toggleSearchItem(editorKeymapElement: HTMLElement, value: string, keymapString: string) {
         if (value === "" && keymapString === "") {
             // 复原折叠状态
             if (editorKeymapElement.querySelector(".b3-list-item__arrow").classList.contains("b3-list-item__arrow--open")) {

app/src/dialog/processSystem.ts

@@ -201,6 +201,11 @@ export const setDefRefCount = (data: {
                     attrElement.innerHTML = `<div class="protyle-attr--refcount popover__block">${data.refCount}</div>${Constants.ZWSP}`;
                 }
             }
+            if (data.refCount === 0) {
+                item.removeAttribute("refcount");
+            } else {
+                item.setAttribute("refcount", data.refCount.toString());
+            }
         });
     });
 

app/src/layout/dock/Files.ts

@@ -20,6 +20,7 @@ import {hasClosestByAttribute, hasClosestByTag, hasTopClosestByTag} from "../../
 import {isTouchDevice} from "../../util/functions";
 import {App} from "../../index";
 import {refreshFileTree} from "../../dialog/processSystem";
+import {hideTooltip} from "../../dialog/tooltip";
 
 export class Files extends Model {
     public element: HTMLElement;
@@ -382,6 +383,7 @@ export class Files extends Model {
                 return;
             }
             window.getSelection().removeAllRanges();
+            hideTooltip();
             const liElement = hasClosestByTag(event.target, "LI");
             if (liElement) {
                 let selectElements: Element[] = Array.from(this.element.querySelectorAll(".b3-list-item--focus"));

app/src/menus/Menu.ts

@@ -256,7 +256,12 @@ export class MenuItem {
 
 const getActionMenu = (element: Element, next: boolean) => {
     let actionMenuElement = element;
-    while (actionMenuElement && (actionMenuElement.classList.contains("b3-menu__separator") || actionMenuElement.classList.contains("b3-menu__item--readonly"))) {
+    while (actionMenuElement &&
+        (actionMenuElement.classList.contains("b3-menu__separator") ||
+            actionMenuElement.classList.contains("b3-menu__item--readonly") ||
+            // https://github.com/siyuan-note/siyuan/issues/12518
+            actionMenuElement.getBoundingClientRect().height === 0)
+        ) {
         if (actionMenuElement.querySelector(".b3-text-field")) {
             break;
         }

app/src/menus/protyle.ts

@@ -25,7 +25,7 @@ import {transaction, updateTransaction} from "../protyle/wysiwyg/transaction";
 import {openMenu} from "./commonMenuItem";
 import {fetchPost} from "../util/fetch";
 import {Constants} from "../constants";
-import {copyPlainText, readText, setStorageVal, writeText} from "../protyle/util/compatibility";
+import {copyPlainText, readText, setStorageVal, updateHotkeyTip, writeText} from "../protyle/util/compatibility";
 import {preventScroll} from "../protyle/scroll/preventScroll";
 import {onGet} from "../protyle/util/onGet";
 import {getAllModels} from "../layout/getAll";
@@ -382,7 +382,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
     window.siyuan.menus.menu.append(new MenuItem({
         label: window.siyuan.languages.refTab,
         icon: "iconEyeoff",
-        accelerator: window.siyuan.config.keymap.editor.general.refTab.custom + "/⌘" + window.siyuan.languages.click,
+        accelerator: window.siyuan.config.keymap.editor.general.refTab.custom + "/" + updateHotkeyTip("⌘") + window.siyuan.languages.click,
         click() {
             checkFold(refBlockId, (zoomIn) => {
                 openFileById({
@@ -398,7 +398,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
     window.siyuan.menus.menu.append(new MenuItem({
         label: window.siyuan.languages.insertRight,
         icon: "iconLayoutRight",
-        accelerator: window.siyuan.config.keymap.editor.general.insertRight.custom + "/⌥" + window.siyuan.languages.click,
+        accelerator: window.siyuan.config.keymap.editor.general.insertRight.custom + "/" + updateHotkeyTip("⌥") + window.siyuan.languages.click,
         click() {
             checkFold(refBlockId, (zoomIn, action, isRoot) => {
                 if (!isRoot) {
@@ -417,7 +417,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
     window.siyuan.menus.menu.append(new MenuItem({
         label: window.siyuan.languages.insertBottom,
         icon: "iconLayoutBottom",
-        accelerator: window.siyuan.config.keymap.editor.general.insertBottom.custom + (window.siyuan.config.keymap.editor.general.insertBottom.custom ? "/" : "") + "⇧" + window.siyuan.languages.click,
+        accelerator: window.siyuan.config.keymap.editor.general.insertBottom.custom + (window.siyuan.config.keymap.editor.general.insertBottom.custom ? "/" : "") + updateHotkeyTip("⇧") + window.siyuan.languages.click,
         click() {
             checkFold(refBlockId, (zoomIn, action, isRoot) => {
                 if (!isRoot) {
@@ -1086,7 +1086,6 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
                 }
             }).element);
         }
-        /// #if !BROWSER
         window.siyuan.menus.menu.append(new MenuItem({
             label: "OCR",
             submenu: [{
@@ -1116,7 +1115,6 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
                 }
             }],
         }).element);
-        /// #endif
         window.siyuan.menus.menu.append(new MenuItem({
             icon: "iconAlignCenter",
             label: window.siyuan.languages.alignCenter,

app/src/protyle/gutter/index.ts

@@ -2139,6 +2139,7 @@ export class Gutter {
             label: window.siyuan.languages.height,
             submenu: styles.concat([{
                 iconHTML: "",
+                type: "readonly",
                 label: `<div style="margin: 4px 0;"  aria-label="${firstElement.style.height.endsWith("px") ? firstElement.style.height : (firstElement.style.height || window.siyuan.languages.default)}" class="b3-tooltips b3-tooltips__n${isMobile() ? "" : " fn__size200"}">
     <input style="box-sizing: border-box" value="${height}" class="b3-slider fn__block" max="100" min="1" step="1" type="range">
 </div>`,

app/src/protyle/header/openTitleMenu.ts

@@ -200,13 +200,13 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => {
         /// #if !MOBILE
         if (!protyle.model) {
             window.siyuan.menus.menu.append(new MenuItem({
-                label: window.siyuan.languages.openInNewTab,
-                icon: "iconLayoutRight",
+                label: window.siyuan.languages.openBy,
+                icon: "iconOpen",
                 click() {
                     openFileById({
                         app: protyle.app,
                         id: protyle.block.id,
-                        action: protyle.block.rootID !== protyle.block.id ? [Constants.CB_GET_ALL] : [Constants.CB_GET_CONTEXT],
+                        action: protyle.block.rootID !== protyle.block.id ? [Constants.CB_GET_ALL, Constants.CB_GET_FOCUS] : [Constants.CB_GET_CONTEXT],
                     });
                 }
             }).element);

app/src/protyle/ui/initUI.ts

@@ -8,6 +8,10 @@ import {fetchPost} from "../../util/fetch";
 import {lineNumberRender} from "../render/highlightRender";
 import {hideMessage, showMessage} from "../../dialog/message";
 import {genUUID} from "../../util/genID";
+import {getContenteditableElement, getLastBlock} from "../wysiwyg/getBlock";
+import {genEmptyElement} from "../../block/util";
+import {transaction} from "../wysiwyg/transaction";
+import {focusByRange} from "../util/selection";
 
 export const initUI = (protyle: IProtyle) => {
     protyle.contentElement = document.createElement("div");
@@ -91,6 +95,48 @@ export const initUI = (protyle: IProtyle) => {
             });
         }, Constants.TIMEOUT_LOAD);
     }, {passive: false});
+    protyle.contentElement.addEventListener("click", (event: MouseEvent & { target: HTMLElement }) => {
+        // wysiwyg 元素下方点击无效果 https://github.com/siyuan-note/siyuan/issues/12009
+        if (protyle.disabled ||
+            (!event.target.classList.contains("protyle-content") && !event.target.classList.contains("protyle-wysiwyg"))) {
+            return
+        }
+        const lastRect = protyle.wysiwyg.element.lastElementChild.getBoundingClientRect();
+        const range = document.createRange();
+        if (event.y > lastRect.bottom) {
+            const lastEditElement = getContenteditableElement(getLastBlock(protyle.wysiwyg.element.lastElementChild));
+            if (!lastEditElement ||
+                (protyle.wysiwyg.element.lastElementChild.getAttribute("data-type") !== "NodeParagraph" && protyle.wysiwyg.element.getAttribute("data-doc-type") !== "NodeListItem") ||
+                (protyle.wysiwyg.element.lastElementChild.getAttribute("data-type") === "NodeParagraph" && getContenteditableElement(lastEditElement).innerHTML !== "")) {
+                const emptyElement = genEmptyElement(false, false);
+                protyle.wysiwyg.element.insertAdjacentElement("beforeend", emptyElement);
+                transaction(protyle, [{
+                    action: "insert",
+                    data: emptyElement.outerHTML,
+                    id: emptyElement.getAttribute("data-node-id"),
+                    previousID: emptyElement.previousElementSibling.getAttribute("data-node-id"),
+                    parentID: protyle.block.parentID
+                }], [{
+                    action: "delete",
+                    id: emptyElement.getAttribute("data-node-id")
+                }]);
+                const emptyEditElement = getContenteditableElement(emptyElement) as HTMLInputElement;
+                range.selectNodeContents(emptyEditElement);
+                range.collapse(true);
+                focusByRange(range);
+                // 需等待 range 更新再次进行渲染
+                if (protyle.options.render.breadcrumb) {
+                    setTimeout(() => {
+                        protyle.breadcrumb.render(protyle);
+                    }, Constants.TIMEOUT_TRANSITION);
+                }
+            } else if (lastEditElement) {
+                range.selectNodeContents(lastEditElement);
+                range.collapse(false);
+                focusByRange(range);
+            }
+        }
+    });
 };
 
 export const addLoading = (protyle: IProtyle, msg?: string) => {