Support Mac specific keybinds #762

tomasmatus · 2024-10-03T15:09:11Z

fixes: #757

tomasmatus · 2024-10-03T15:09:35Z

I hope we can find a mac friend to test this 👀

mac2net · 2024-10-03T18:44:49Z

I am a Mac friend. I see you want the keyboard commands tested?
But on what exactly?
I currently only install Cockpit and addons though the repository on to Fedora.
I run Fedora 40, 41 beta and Rawhide in VMs on a Minisforum UM780 XTX (AMD 7840HS)
I guess in order to test this I need to install the development version of Files... and also Cockpit?
How do I do that under the circumstances?
I can test this over the weekend, if that's OK.
I use quite a bit of software related to system management and web development so there are a number of utilities fighting for keyboard shortcuts amongst themselves and with MacOS as well.
Please advise if you want me to proceed.
Cheers Mike

tomasmatus · 2024-10-07T09:09:07Z

Hello @mac2net thanks for your interest to help me test this!
I'd recommend testing in a fedora-40 VM, maybe even spin up a new one just for this test.
Install cockpit using dnf and probably the developer group just to get build dependencies in.

dnf install cockpit
dnf groupinstall "Development Tools"
dnf install gettext nodejs npm make

pull and checkout to this branch

git clone https://github.com/tomasmatus/cockpit-files.git
cd cockpit-files
git switch mac-keybinds

and then you can follow README.md to build and install

make

make devel-install

Now you should have cockpit and cockpit-files ready so please connect to the webui using your macbook and try all of the keybinds listed in the help menu (the screenshot above). You might need to refresh the page if you had the webui running before installing cockpit-files.

mac2net · 2024-10-07T09:41:00Z

Hi @tomasmatus
Thanks for the instructions.
Before installing the developer version of Cockpit-files, is it good enough to do a normal DNF remove in order to delete the repository version of it?
Cheers Mike

tomasmatus · 2024-10-07T09:54:59Z

@mac2net yes, if you already have cockpit-files installed from the repository you can remove it using dnf. Also when you want to uninstall the developer version there is make devel-uninstall.

mac2net · 2024-10-08T08:35:06Z

Hi @tomasmatus There are issues, mostly to do with visual feedback when navigating around. I compared it with the experience in XFCE accessed via VNC with a Mac app called Jump. There are some issues there too.

I don't do a lot of keyboard stuff inside a web page on the Mac, but the MacOS Finder UI is ingrained in my DNA. If you don't have a Mac you should take a trip to an Apple Store to test this. While it is probably not possible or even desired to reproduce the behaviour of the Finder, it is the starting point for Mac users with Cockpit Files.

There is one conflict with Safari – Command-Shift-L opens the left Tab Manager sidebar and in Firefox nothing happens, probably not allowed. Via VNC Control Shift L works fine

jelly · 2024-10-15T07:25:02Z

src/files-card-body.tsx

        };

        const onKeyboardNav = (e: KeyboardEvent) => {
+            const ctrlKey = isApple ? e.metaKey : e.ctrlKey;


Coverage complains as it checks both sides of the branch, so isApple is never true so no 💯 code coverage.

jelly · 2025-01-09T15:20:36Z

@tomasmatus a while back I got an offer from Simon from Image builder to do some testing on a M1. So if this is still good I can ask him.

jelly · 2025-01-09T15:27:25Z

There is one conflict with Safari – Command-Shift-L opens the left Tab Manager sidebar and in Firefox nothing happens, probably not allowed. Via VNC Control Shift L works fine

I can't find that shortcut for Safari here.

But according to this website it is showing the reading list. So that needs to be changed.

fixes: cockpit-project#757

supakeen · 2025-01-27T20:52:26Z

Tested with:

Firefox on macOS

Option + UP: pass.
Option + DOWN: pass.
Option + LEFT: fail.
Option + RIGHT: fail.
Enter: pass.
Cmd + Shift + L: fail.
F2: fail.
Shift + N: pass.
Cmd + C: pass.
Cmd + V: pass.
Cmd + A: pass.

Safari on macOS:

Option + UP: pass.
Option + DOWN: pass.
Option + LEFT: fail.
Option + RIGHT: fail.
Enter: pass.
Cmd + Shift + L: fail.
F2: fail.
Shift + N: pass.
Cmd + C: pass.
Cmd + V: pass.
Cmd + A: pass.

Note that Option + LEFT and Option + RIGHT do not work. However, Cmd + LEFT and Cmd + RIGHT do work since they're the default back/forward buttons for both browsers.

Note that on Safari Cmd + Shift + L means "show sidebar" on Safari.

tomasmatus · 2025-01-28T09:07:14Z

Thanks for the feedback @supakeen!

Note that Option + LEFT and Option + RIGHT do not work. However, Cmd + LEFT and Cmd + RIGHT do work since they're the default back/forward buttons for both browsers.

Right, go back and go forward should be the same as browser keybinds I'll change it accordingly.
I'd probably also change Opt + UP and Opt + DOWN to use Cmd so it's the same. It would conflict with a keybind for "Scroll to the top-left or bottom-left corner of the webpage" however I think that is fine. What do you think?

Note that on Safari Cmd + Shift + L means "show sidebar" on Safari.

Then I need to come up with something new... Cmd + Opt + L or is that too crazy?

F2: fail

I assume you know what you're doing but just to be sure - did you select (single click) a file before using this keybind?

Cmd + left - back in history, browser default Cmd + right - forward in history, browser default Cmd + up - go up a dir Cmd + down - go into selected dir Cmd + Opt + l - edit path

cockpituous · 2025-01-28T09:56:44Z

src/app.tsx

        const onKeyboardNav = (e: KeyboardEvent) => {
-            if (e.key === "L" && e.ctrlKey && !e.altKey) {
+            if (isApple ? (e.key === "l" && e.metaKey && e.altKey) : (e.key === "L" && e.ctrlKey && !e.altKey)) {


This added line is not executed by any test.

cockpituous · 2025-01-28T09:56:44Z

src/dialogs/keyboardShortcutsHelp.tsx

+    const ctrlString = isApple ? "Command" : "Ctrl";
+    const altString = isApple ? "Command" : "Alt";


These 2 added lines are not executed by any test.

cockpituous · 2025-01-28T09:56:44Z

src/dialogs/keyboardShortcutsHelp.tsx

-                <kbd className="key">Ctrl</kbd> +
-                <kbd className="key">Shift</kbd> +
+                <kbd className="key">{ctrlString}</kbd> +
+                <kbd className="key">{isApple ? "Option" : "Shift"}</kbd> +


This added line is not executed by any test.

cockpituous · 2025-01-28T09:56:44Z

src/files-card-body.tsx

+            const ctrlKey = isApple ? e.metaKey : e.ctrlKey;
+            const altKey = isApple ? e.metaKey : e.altKey;


These 2 added lines are not executed by any test.

supakeen · 2025-01-28T11:05:13Z

Thanks for the feedback @supakeen!

Note that Option + LEFT and Option + RIGHT do not work. However, Cmd + LEFT and Cmd + RIGHT do work since they're the default back/forward buttons for both browsers.

Right, go back and go forward should be the same as browser keybinds I'll change it accordingly. I'd probably also change Opt + UP and Opt + DOWN to use Cmd so it's the same. It would conflict with a keybind for "Scroll to the top-left or bottom-left corner of the webpage" however I think that is fine. What do you think?

Sounds fine to me; let's see if it works :)

Note that on Safari Cmd + Shift + L means "show sidebar" on Safari.

Then I need to come up with something new... Cmd + Opt + L or is that too crazy?

Sounds fine to me; let's see if it works :)

F2: fail

I assume you know what you're doing but just to be sure - did you select (single click) a file before using this keybind?

I did!

jelly reviewed Oct 15, 2024

View reviewed changes

Support Mac specific keybinds

5e2268b

fixes: cockpit-project#757

jelly force-pushed the mac-keybinds branch from 2518198 to 5e2268b Compare January 27, 2025 18:32

change keybinds on mac devices

4e928cc

Cmd + left - back in history, browser default Cmd + right - forward in history, browser default Cmd + up - go up a dir Cmd + down - go into selected dir Cmd + Opt + l - edit path

cockpituous reviewed Jan 28, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Mac specific keybinds #762

Support Mac specific keybinds #762

tomasmatus commented Oct 3, 2024

tomasmatus commented Oct 3, 2024 •

edited

Loading

mac2net commented Oct 3, 2024

tomasmatus commented Oct 7, 2024

mac2net commented Oct 7, 2024

tomasmatus commented Oct 7, 2024

mac2net commented Oct 8, 2024

jelly Oct 15, 2024

jelly commented Jan 9, 2025

jelly commented Jan 9, 2025

supakeen commented Jan 27, 2025 •

edited

Loading

tomasmatus commented Jan 28, 2025 •

edited

Loading

cockpituous Jan 28, 2025

cockpituous Jan 28, 2025

cockpituous Jan 28, 2025

cockpituous Jan 28, 2025

supakeen commented Jan 28, 2025

		const ctrlString = isApple ? "Command" : "Ctrl";
		const altString = isApple ? "Command" : "Alt";

		const ctrlKey = isApple ? e.metaKey : e.ctrlKey;
		const altKey = isApple ? e.metaKey : e.altKey;

Support Mac specific keybinds #762

Are you sure you want to change the base?

Support Mac specific keybinds #762

Conversation

tomasmatus commented Oct 3, 2024

tomasmatus commented Oct 3, 2024 • edited Loading

mac2net commented Oct 3, 2024

tomasmatus commented Oct 7, 2024

mac2net commented Oct 7, 2024

tomasmatus commented Oct 7, 2024

mac2net commented Oct 8, 2024

jelly Oct 15, 2024

Choose a reason for hiding this comment

jelly commented Jan 9, 2025

jelly commented Jan 9, 2025

supakeen commented Jan 27, 2025 • edited Loading

Firefox on macOS

Safari on macOS:

tomasmatus commented Jan 28, 2025 • edited Loading

cockpituous Jan 28, 2025

Choose a reason for hiding this comment

cockpituous Jan 28, 2025

Choose a reason for hiding this comment

cockpituous Jan 28, 2025

Choose a reason for hiding this comment

cockpituous Jan 28, 2025

Choose a reason for hiding this comment

supakeen commented Jan 28, 2025

tomasmatus commented Oct 3, 2024 •

edited

Loading

supakeen commented Jan 27, 2025 •

edited

Loading

tomasmatus commented Jan 28, 2025 •

edited

Loading