fix shortcuts

Author: sprocketc

portfolio/src/components/shortcuts_scenes.cljs

@@ -1,26 +1,28 @@
 (ns components.shortcuts-scenes
   (:require
    [portfolio.reagent-18 :refer-macros [defscene]]
+   [re-frame.core :as rf]
+   [re-pressed.core :as rp]
+   [renderer.history.events :as-alias history.e]
    [renderer.ui :as ui]
    [renderer.utils.keyboard :as keyb]))
 
+(rf/dispatch [::rp/set-keydown-rules keyb/keydown-rules])
+
 (defscene single-shortcut
   :title "Single shortcut"
-  [:div.toolbar.bg-primary.h-10.p-2
-   [ui/shortcuts [[{:keyCode (keyb/key-codes "P")
-                    :ctrlKey true
-                    :shiftKey true}]]]])
+  [:div.toolbar.bg-primary.h-10.p-2.gap-2
+   "Undo"
+   [ui/shortcuts [::history.e/undo]]])
 
 (defscene multiple-shortcuts
   :title "Multiple shortcuts"
-  [:div.toolbar.bg-primary.h-10.p-2
-   [ui/shortcuts [[{:keyCode (keyb/key-codes "P")
-                    :ctrlKey true
-                    :shiftKey true}]
-                  [{:keyCode (keyb/key-codes "ONE")
-                    :altKey true}]]]])
+  [:div.toolbar.bg-primary.h-10.p-2.gap-2
+   "Redo"
+   [ui/shortcuts [::history.e/redo]]])
 
 (defscene no-shortcuts
   :title "No shortcuts"
-  [:div.toolbar.bg-primary.h-10.p-2
-   [ui/shortcuts []]])
+  [:div.toolbar.bg-primary.h-10.p-2.gap-2
+   "Event with no shortcuts"
+   [ui/shortcuts [:event-id-with-no-shortcut]]])

src/renderer/app/views.cljs

@@ -204,7 +204,7 @@
          [ui/icon "file"]
          [:button.button-link.text-lg
           {:on-click #(rf/dispatch [::document.e/new])} "New"]
-         [ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts [::document.e/new]])]
+         [ui/shortcuts [::document.e/new]]
 
          [:span "or"]
 
@@ -240,7 +240,7 @@
          [:button.button-link.text-lg
           {:on-click #(rf/dispatch [::document.e/open nil])}
           "Open"]
-         [ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts [::document.e/open nil]])]]
+         [ui/shortcuts [::document.e/open nil]]]
 
         (when (seq recent-documents)
           [:<> [:h2.mb-3.mt-8.text-2xl "Recent"]
@@ -262,7 +262,7 @@
           [:button.button-link.text-lg
            {:on-click #(rf/dispatch [::dialog.e/cmdk])}
            "Command panel"]
-          [ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts [::dialog.e/cmdk]])]]]
+          [ui/shortcuts [::dialog.e/cmdk]]]]
         [:div.flex.items-center.gap-2
          [ui/icon "earth"]
          [:button.button-link.text-lg

src/renderer/dialog/views.cljs

@@ -69,7 +69,7 @@
       (when icon [ui/icon icon])]
      label
      [:div.right-slot
-      [ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts action])]]]))
+      [ui/shortcuts action]]]))
 
 (defn cmdk-group-inner
   [items label]

src/renderer/menubar/views.cljs

@@ -561,7 +561,7 @@
     [ui/icon "checkmark"]]
    label
    [:div.right-slot
-    [ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts action])]]])
+    [ui/shortcuts action]]])
 
 (defmethod menu-item :sub-menu
   [{:keys [label items disabled]}]
@@ -603,7 +603,7 @@
     :disabled disabled}
    label
    [:div.right-slot
-    [ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts action])]]])
+    [ui/shortcuts action]]])
 
 (defn root-menu
   []

src/renderer/ui.cljs

@@ -19,6 +19,7 @@
    ["tailwind-merge" :refer [twMerge]]
    [re-frame.core :as rf]
    [reagent.core :as ra]
+   [renderer.app.subs :as-alias app.s]
    [renderer.utils.keyboard :as keyb]))
 
 (defn merge-with-class
@@ -74,11 +75,13 @@
        (into [:span])))
 
 (defn shortcuts
-  [v]
-  (when (seq v)
-    (->> (map format-shortcut v)
-         (interpose [:span])
-         (into [:span.inline-flex.text-muted {:class "gap-1.5"}]))))
+  [event]
+  (let [event-shortcuts @(rf/subscribe [::app.s/event-shortcuts event])]
+    (when (seq event-shortcuts)
+      (->> event-shortcuts
+           (map format-shortcut)
+           (interpose [:span])
+           (into [:span.inline-flex.text-muted {:class "gap-1.5"}])))))
 
 (defn radio-icon-button
   [icon-name active props]