fix: additional logic of optional open item on checkbox (#154)

Author: liuycy

src/pages/home/folder/GridItem.tsx

@@ -62,8 +62,7 @@ export const GridItem = (props: { obj: StoreObj; index: number }) => {
         on:click={(e: MouseEvent) => {
           if (!checkboxOpen()) return
           e.preventDefault()
-          if (e.altKey) {
-            // click with alt/option key
+          if (isShouldOpenItem()) {
             to(pushHref(props.obj.name))
             return
           }

src/pages/home/folder/ImageItem.tsx

@@ -86,8 +86,8 @@ export const ImageItem = (props: { obj: StoreObj; index: number }) => {
             cursor={
               !checkboxOpen() || isShouldOpenItem() ? "pointer" : "default"
             }
-            on:click={(e: MouseEvent) => {
-              if (!checkboxOpen() || e.altKey) {
+            on:click={() => {
+              if (!checkboxOpen() || isShouldOpenItem()) {
                 bus.emit("gallery", props.obj.name)
                 return
               }

src/pages/home/folder/ListItem.tsx

@@ -65,7 +65,6 @@ export const ListItem = (props: { obj: StoreObj; index: number }) => {
           if (!checkboxOpen()) return
           e.preventDefault()
           if (isShouldOpenItem()) {
-            // click with alt/option key
             to(pushHref(props.obj.name))
             return
           }

src/pages/home/folder/helper.ts

@@ -1,12 +1,14 @@
 import { createKeyHold } from "@solid-primitives/keyboard"
 import { createEffect, createSignal } from "solid-js"
+import { isMac } from "~/utils/compatibility"
 import { local } from "~/store"
 
 export function useOpenItemWithCheckbox() {
   const [shouldOpen, setShouldOpen] = createSignal(
     local["open_item_on_checkbox"] === "direct",
   )
   const isAltKeyPressed = createKeyHold("Alt")
+  const isMetaKeyPressed = createKeyHold("Meta")
   const isControlKeyPressed = createKeyHold("Control")
   createEffect(() => {
     switch (local["open_item_on_checkbox"]) {
@@ -15,7 +17,10 @@ export function useOpenItemWithCheckbox() {
         break
       }
       case "with_ctrl": {
-        setShouldOpen(isControlKeyPressed())
+        // FYI why should use metaKey on a Mac
+        // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/ctrlKey
+        // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/metaKey
+        setShouldOpen(isMac ? isMetaKeyPressed() : isControlKeyPressed())
         break
       }
       case "with_alt": {

src/store/local_settings.ts

@@ -56,7 +56,7 @@ export const initialLocalSettings = [
     key: "open_item_on_checkbox",
     default: "direct",
     type: "select",
-    options: ["direct", "with_alt"], // "with_ctrl",? mac's control key can't be prevented
+    options: ["direct", "with_alt", "with_ctrl"],
   },
 ]
 export type LocalSetting = (typeof initialLocalSettings)[number]