🎨 aria label

siyuan-note · Sep 9, 2023 · b0653df · b0653df
1 parent 658e68d
commit b0653df
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 8 deletions.
diff --git a/app/appearance/icons/ant/icon.js b/app/appearance/icons/ant/icon.js
diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html
@@ -28,6 +28,12 @@
 <body>
 <h2>SiYuan</h2>
 <div class="fn__clear">
+    <div>
+        <svg>
+            <use xlink:href="#iconAttr"></use>
+        </svg>
+        iconAttr
+    </div>
     <div>
         <svg>
             <use xlink:href="#iconPaste"></use>

diff --git a/app/appearance/icons/material/icon.js b/app/appearance/icons/material/icon.js
diff --git a/app/src/layout/Wnd.ts b/app/src/layout/Wnd.ts
@@ -61,9 +61,9 @@ export class Wnd {
         <ul class="fn__flex layout-tab-bar"></ul>
         <ul class="layout-tab-bar layout-tab-bar--readonly fn__flex-1">
             <li class="item item--readonly">
-                <span data-type="new" class="block__icon block__icon--show" title="${window.siyuan.languages.newFile}"><svg><use xlink:href="#iconAdd"></use></svg></span>
+                <span data-type="new" class="block__icon block__icon--show ariaLabel" aria-label="${window.siyuan.languages.newFile}"><svg><use xlink:href="#iconAdd"></use></svg></span>
                 <span class="fn__flex-1"></span>
-                <span data-type="more" data-menu="true" class="block__icon block__icon--show" title="${window.siyuan.languages.more}"><svg><use xlink:href="#iconDown"></use></svg></span>
+                <span data-type="more" data-menu="true" class="block__icon block__icon--show ariaLabel" aria-label="${window.siyuan.languages.switchTab}"><svg><use xlink:href="#iconDown"></use></svg></span>
             </li>
         </ul>
     </div>

diff --git a/app/src/menus/navigation.ts b/app/src/menus/navigation.ts
@@ -361,6 +361,7 @@ export const initFileMenu = (app: App, notebookId: string, pathString: string, l
         }));
         window.siyuan.menus.menu.append(new MenuItem({
             label: window.siyuan.languages.attr,
+            icon: "iconAttr",
             click() {
                 fetchPost("/api/block/getDocInfo", {
                     id

diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts
@@ -46,12 +46,12 @@ export class Breadcrumb {
             '<div class="protyle-breadcrumb__bar"></div>'}
 <span class="protyle-breadcrumb__space"></span>
 <button class="protyle-breadcrumb__icon fn__none" data-type="exit-focus">${window.siyuan.languages.exitFocus}</button>
-<button class="block__icon block__icon--show fn__flex-center" data-type="readonly"><svg><use xlink:href="#iconUnlock"></use></svg></button>
+<button class="block__icon block__icon--show fn__flex-center ariaLabel" aria-label="${window.siyuan.languages.editReadonly}" data-type="readonly"><svg><use xlink:href="#iconUnlock"></use></svg></button>
 <span class="fn__space"></span>
-<button class="block__icon block__icon--show fn__flex-center" data-type="a" data-position="right" aria-label="${window.siyuan.languages.gutterTip2}"><svg><use xlink:href="#iconFile"></use></svg></button>
+<button class="block__icon block__icon--show fn__flex-center ariaLabel" data-type="doc" aria-label="${window.siyuan.languages.gutterTip2}"><svg><use xlink:href="#iconFile"></use></svg></button>
 <span class="fn__space"></span>
-<button class="block__icon block__icon--show fn__flex-center" data-type="more"><svg><use xlink:href="#iconMore"></use></svg></button>
-<button class="block__icon block__icon--show fn__flex-center fn__none" style="margin-left: 8px" data-type="context" aria-label="${window.siyuan.languages.context}"><svg><use xlink:href="#iconAlignCenter"></use></svg></button>`;
+<button class="block__icon block__icon--show fn__flex-center ariaLabel" data-type="more" aria-label="${window.siyuan.languages.more}"><svg><use xlink:href="#iconMore"></use></svg></button>
+<button class="block__icon block__icon--show fn__flex-center fn__none ariaLabel" style="margin-left: 8px" data-type="context" aria-label="${window.siyuan.languages.context}"><svg><use xlink:href="#iconAlignCenter"></use></svg></button>`;
 
         this.element = element.firstElementChild as HTMLElement;
         element.addEventListener("click", (event) => {
@@ -83,7 +83,7 @@ export class Breadcrumb {
                     event.preventDefault();
                     event.stopPropagation();
                     break;
-                } else if (type === "a") {
+                } else if (type === "doc") {
                     if (window.siyuan.shiftIsPressed) {
                         fetchPost("/api/block/getDocInfo", {
                             id: protyle.block.rootID
@@ -475,6 +475,7 @@ export class Breadcrumb {
                 const isCustomFullWidth = protyle.wysiwyg.element.getAttribute(Constants.CUSTOM_SY_FULLWIDTH);
                 window.siyuan.menus.menu.append(new MenuItem({
                     label: window.siyuan.languages.fullWidth,
+                    icon: "iconDock",
                     type: "submenu",
                     submenu: [{
                         iconHTML: "",

diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
@@ -1475,6 +1475,7 @@ export class Gutter {
             if (!protyle.disabled) {
                 window.siyuan.menus.menu.append(new MenuItem({
                     label: window.siyuan.languages.attr,
+                    icon: "iconAttr",
                     accelerator: window.siyuan.config.keymap.editor.general.attr.custom + "/" + updateHotkeyTip("⇧Click"),
                     click() {
                         openAttr(nodeElement);

diff --git a/app/src/protyle/header/openTitleMenu.ts b/app/src/protyle/header/openTitleMenu.ts
@@ -53,6 +53,7 @@ export const openTitleMenu = (protyle: IProtyle, position: {
             }
             window.siyuan.menus.menu.append(new MenuItem({
                 label: window.siyuan.languages.attr,
+                icon: "iconAttr",
                 accelerator: window.siyuan.config.keymap.editor.general.attr.custom + "/" + updateHotkeyTip("⇧Click"),
                 click() {
                     openFileAttr(response.data.ial);

diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts
@@ -254,7 +254,7 @@ export const avContextmenu = (protyle: IProtyle, event: MouseEvent & { detail: a
         });
     });
     menu.addItem({
-        icon: "iconList",
+        icon: "iconAttr",
         label: window.siyuan.languages.attr,
         type: "submenu",
         submenu: editAttrSubmenu