From 5ec29d600da42e62578ce6ca4e781faaf6b83b23 Mon Sep 17 00:00:00 2001
From: Konstantinos Kaloutas <konstantinos@logseq.com>
Date: Fri, 2 Sep 2022 12:42:39 +0300
Subject: [PATCH] fix: remove action bar from accessibility tree

---
 src/main/frontend/components/block.cljs | 96 +++++++++++++------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index b33f739976..95c86c2cf5 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -311,55 +311,59 @@
          metadata)]
        [:.asset-overlay]
        (let [image-src (string/replace src #"^assets://" "")]
-         [:.asset-action-bar
-        [:button.asset-action-btn.text-left
-         {:title (t (if local? :asset/show-in-folder :asset/open-in-browser))
-          :on-mouse-down util/stop
-          :on-click (fn [e]
-                      (util/stop e)
-                      (if (and (util/electron?) local?)
-                        (js/window.apis.showItemInFolder image-src)
-                        (js/window.apis.openExternal src)))}
-         image-src]
-        [:.flex
-         [:button.asset-action-btn
-          {:title (t :asset/delete)
-           :on-mouse-down util/stop
-           :on-click
-           (fn [e]
-             (when-let [block-id (:block/uuid config)]
-               (let [confirm-fn (ui/make-confirm-modal
-                                 {:title         (t :asset/confirm-delete (.toLocaleLowerCase (t :text/image)))
-                                  :sub-title     (if local? :asset/physical-delete "")
-                                  :sub-checkbox? local?
-                                  :on-confirm    (fn [_e {:keys [close-fn sub-selected]}]
-                                                   (close-fn)
-                                                   (editor-handler/delete-asset-of-block!
-                                                    {:block-id    block-id
-                                                     :local?      local?
-                                                     :delete-local? (and sub-selected (first sub-selected))
-                                                     :repo        (state/get-current-repo)
-                                                     :href        src
-                                                     :title       title
-                                                     :full-text   full_text}))})]
-                 (util/stop e)
-                 (state/set-modal! confirm-fn))))}
-          (ui/icon "trash")]
+         [:.asset-action-bar {:aria-hidden "true"}
+          [:button.asset-action-btn.text-left
+           {:title (t (if local? :asset/show-in-folder :asset/open-in-browser))
+            :tabIndex "-1"
+            :on-mouse-down util/stop
+            :on-click (fn [e]
+                        (util/stop e)
+                        (if (and (util/electron?) local?)
+                          (js/window.apis.showItemInFolder image-src)
+                          (js/window.apis.openExternal src)))}
+           image-src]
+          [:.flex
+           [:button.asset-action-btn
+            {:title (t :asset/delete)
+             :tabIndex "-1"
+             :on-mouse-down util/stop
+             :on-click
+             (fn [e]
+               (when-let [block-id (:block/uuid config)]
+                 (let [confirm-fn (ui/make-confirm-modal
+                                   {:title         (t :asset/confirm-delete (.toLocaleLowerCase (t :text/image)))
+                                    :sub-title     (if local? :asset/physical-delete "")
+                                    :sub-checkbox? local?
+                                    :on-confirm    (fn [_e {:keys [close-fn sub-selected]}]
+                                                     (close-fn)
+                                                     (editor-handler/delete-asset-of-block!
+                                                      {:block-id    block-id
+                                                       :local?      local?
+                                                       :delete-local? (and sub-selected (first sub-selected))
+                                                       :repo        (state/get-current-repo)
+                                                       :href        src
+                                                       :title       title
+                                                       :full-text   full_text}))})]
+                   (util/stop e)
+                   (state/set-modal! confirm-fn))))}
+            (ui/icon "trash")]
 
-         [:button.asset-action-btn
-          {:title (t :asset/copy)
-           :on-mouse-down util/stop
-           :on-click (fn [e]
-                       (util/stop e)
-                       (copy-image-to-clipboard image-src))}
-          (ui/icon "copy")]
+           [:button.asset-action-btn
+            {:title (t :asset/copy)
+             :tabIndex "-1"
+             :on-mouse-down util/stop
+             :on-click (fn [e]
+                         (util/stop e)
+                         (copy-image-to-clipboard image-src))}
+            (ui/icon "copy")]
 
-         [:button.asset-action-btn
-          {:title (t :asset/maximize)
-           :on-mouse-down util/stop
-           :on-click open-lightbox}
+           [:button.asset-action-btn
+            {:title (t :asset/maximize)
+             :tabIndex "-1"
+             :on-mouse-down util/stop
+             :on-click open-lightbox}
 
-          (ui/icon "maximize")]]])]))))
+            (ui/icon "maximize")]]])]))))
 
 (rum/defc audio-cp [src]
   [:audio {:src src