livebook-dev/livebook
1
1
Fork 0
mirror of https://github.com/livebook-dev/livebook.git synced 2025-03-04 02:43:09 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix completion shortcut listing for mac (#291)

Browse source
This commit is contained in:
Jonatan Kłosko 2021-05-24 15:45:28 +02:00 committed by GitHub
parent 0a07010cd3
commit 617a51e723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/livebook_web/live/session_live/shortcuts_component.ex
View file

@ -6,7 +6,11 @@ defmodule LivebookWeb.SessionLive.ShortcutsComponent do
%{seq: ["esc"], desc: "Switch back to navigation mode"}, %{seq: ["esc"], desc: "Switch back to navigation mode"},
%{seq: ["ctrl", "↵"], desc: "Evaluate cell and stay in insert mode"}, %{seq: ["ctrl", "↵"], desc: "Evaluate cell and stay in insert mode"},
%{seq: ["tab"], desc: "Autocomplete expression when applicable"}, %{seq: ["tab"], desc: "Autocomplete expression when applicable"},
%{seq: ["ctrl", "␣"], desc: "Show completion list, use twice for details"} %{
seq: ["ctrl", "␣"],
transform_for_mac: false,
desc: "Show completion list, use twice for details"
}
], ],
navigation_mode: [ navigation_mode: [
%{seq: ["?"], desc: "Open this help modal"}, %{seq: ["?"], desc: "Open this help modal"},
@ -88,7 +92,7 @@ defmodule LivebookWeb.SessionLive.ShortcutsComponent do
<%= for shortcut <- @shortcuts do %> <%= for shortcut <- @shortcuts do %>
<tr> <tr>
<td class="py-2 pr-3"> <td class="py-2 pr-3">
<%= render_seq(shortcut.seq, @platform) %> <%= render_shortcut_seq(shortcut, @platform) %>
</td> </td>
<td> <td>
<%= shortcut.desc %> <%= shortcut.desc %>
@ -100,8 +104,13 @@ defmodule LivebookWeb.SessionLive.ShortcutsComponent do
""" """
end end
defp render_seq(seq, platform) do defp render_shortcut_seq(shortcut, platform) do
seq = if(platform == :mac, do: seq_for_mac(seq), else: seq) seq =
if platform == :mac and Map.get(shortcut, :transform_for_mac, true) do
seq_for_mac(shortcut.seq)
else
shortcut.seq
end
joiner = remix_icon("add-line", class: "text-xl text-gray-600") joiner = remix_icon("add-line", class: "text-xl text-gray-600")