fix: shortcuts back working

lib/bds/desktop/shell_live.ex

@@ -44,6 +44,7 @@ defmodule BDS.Desktop.ShellLive do
      socket
      |> assign(:page_title, ShellData.title())
      |> assign(:page_language, ShellData.ui_language())
+      |> assign(:client_shortcuts, Commands.client_shortcuts())
      |> assign(:offline_mode, true)
      |> assign(:tab_meta, %{})
       |> assign(:project_menu_open, false)
@@ -940,6 +941,8 @@ defmodule BDS.Desktop.ShellLive do
 
   defp translated(text, bindings \\ %{}), do: ShellData.translate(text, bindings, Process.get(:bds_ui_locale))
 
+  defp encoded_shortcuts(shortcuts), do: Jason.encode!(shortcuts)
+
   defp panel_tab_label(:tasks), do: translated("Tasks")
   defp panel_tab_label(:output), do: translated("Output")
   defp panel_tab_label(:git_log), do: translated("Git Log")

lib/bds/desktop/shell_live/index.html.heex

@@ -1,4 +1,4 @@
-<div class="app" id="bds-shell-app" phx-hook="AppShell" phx-window-keydown="shortcut">
+<div class="app" id="bds-shell-app" phx-hook="AppShell" data-shortcuts={encoded_shortcuts(@client_shortcuts)}>
   <div class="window-titlebar" data-region="title-bar">
     <div class="window-titlebar-menu-bar is-hidden">
       <button class="window-titlebar-menu-button" type="button">File</button>

lib/bds/ui/commands.ex

@@ -17,7 +17,7 @@ defmodule BDS.UI.Commands do
     %{id: :select_all, accelerator: "CTRL+A"},
     %{id: :find, accelerator: "CTRL+F"},
     %{id: :replace, accelerator: "CTRL+H"},
-    %{id: :edit_preferences, accelerator: "CTRL+,"},
+    %{id: :edit_preferences, accelerator: "CTRL+,", key: ",", primary: true},
     %{id: :view_posts, accelerator: "CTRL+1", key: "1", primary: true},
     %{id: :view_media, accelerator: "CTRL+2", key: "2", primary: true},
     %{id: :toggle_sidebar, accelerator: "CTRL+B", key: "b", primary: true},
@@ -37,12 +37,28 @@ defmodule BDS.UI.Commands do
       Map.get(shortcut, :meta, Map.get(shortcut, "meta", false)) or
         Map.get(shortcut, :ctrl, Map.get(shortcut, "ctrl", false))
 
-    case Enum.find(@menu_shortcuts, &shortcut_match?(&1, key, primary)) do
+    shift = Map.get(shortcut, :shift, Map.get(shortcut, "shift", false))
+    alt = Map.get(shortcut, :alt, Map.get(shortcut, "alt", false))
+
+    case Enum.find(@menu_shortcuts, &shortcut_match?(&1, key, primary, shift, alt)) do
       %{id: command_id} -> MenuBar.execute(state, command_id)
       nil -> state
     end
   end
 
+  def client_shortcuts do
+    @menu_shortcuts
+    |> Enum.filter(&Map.has_key?(&1, :key))
+    |> Enum.map(fn shortcut ->
+      %{
+        key: shortcut.key,
+        primary: Map.get(shortcut, :primary, false),
+        shift: Map.get(shortcut, :shift, false),
+        alt: Map.get(shortcut, :alt, false)
+      }
+    end)
+  end
+
   def accelerator_label(command_id) when is_atom(command_id) do
     case Enum.find(@menu_shortcuts, &(&1.id == command_id)) do
       %{accelerator: accelerator} -> accelerator
@@ -50,9 +66,12 @@ defmodule BDS.UI.Commands do
     end
   end
 
-  defp shortcut_match?(%{key: expected_key, primary: expected_primary}, key, primary) do
-    key == expected_key and primary == expected_primary
+  defp shortcut_match?(%{key: expected_key} = shortcut, key, primary, shift, alt) do
+    key == expected_key and
+      primary == Map.get(shortcut, :primary, false) and
+      shift == Map.get(shortcut, :shift, false) and
+      alt == Map.get(shortcut, :alt, false)
   end
 
-  defp shortcut_match?(_shortcut, _key, _primary), do: false
+  defp shortcut_match?(_shortcut, _key, _primary, _shift, _alt), do: false
 end