BugFix: Added Mac support for modifier keys

Author: mugiwara85

main.js

@@ -321,7 +321,7 @@ export function headerExtension(plugin: CodeBlockCustomizerPlugin, settings: Cod
 
       switch (modifierKey) {
         case ButtonModifierKeys.CTRL:
-          return event.ctrlKey;
+          return event.ctrlKey || event.metaKey;
         case ButtonModifierKeys.ALT:
           return event.altKey;
         case ButtonModifierKeys.SHIFT:

src/EditorView/Header.ts

@@ -111,7 +111,7 @@ export function inlineCodeExtension(plugin: CodeBlockCustomizerPlugin, settings:
           return;
 
         const requiredKey = plugin.settings.pluginSettings.inlineCode.copyModifierKey;
-        if ((requiredKey === InlineCodeModifierKeys.CTRL && !event.ctrlKey) || (requiredKey === InlineCodeModifierKeys.ALT && !event.altKey))
+        if ((requiredKey === InlineCodeModifierKeys.CTRL && !event.ctrlKey && !event.metaKey) || (requiredKey === InlineCodeModifierKeys.ALT && !event.altKey))
           return;
 
         const target = event.target as HTMLElement;

src/EditorView/InlineCode.ts

@@ -90,7 +90,7 @@ export class InlineCodeRenderer extends MarkdownRenderChild {
   private createInlineCodeClickHandler(getTextToCopy: () => string): (event: MouseEvent) => void {
     return (event: MouseEvent) => {
       const requiredKey = this.plugin.settings.pluginSettings.inlineCode.copyModifierKey;
-      if ((requiredKey === InlineCodeModifierKeys.CTRL && !event.ctrlKey) || (requiredKey === InlineCodeModifierKeys.ALT && !event.altKey)) {
+      if ((requiredKey === InlineCodeModifierKeys.CTRL && !event.ctrlKey && !event.metaKey) || (requiredKey === InlineCodeModifierKeys.ALT && !event.altKey)) {
         return;
       }
 

src/ReadingView/InlineCodeRenderer.ts

@@ -1,4 +1,4 @@
-import { Notice, Setting, TextComponent } from "obsidian";
+import { Notice, Platform, Setting, TextComponent } from "obsidian";
 
 import { createDetailsGroup, SettingsPage, SettingsPageData, updateLanguageSpecificColorContainer } from "./Common";
 import { getCurrentMode } from "src/Utils";
@@ -446,8 +446,8 @@ export class AppearanceSettings {
       .setName('Modifier key for copy')
       .setDesc('Select the key to hold while clicking to copy.')
       .addDropdown(dropdown => dropdown
-        .addOption(InlineCodeModifierKeys.CTRL, 'Ctrl')
-        .addOption(InlineCodeModifierKeys.ALT, 'Alt')
+        .addOption(InlineCodeModifierKeys.CTRL, Platform.isMacOS ? 'Cmd' : 'Ctrl')
+        .addOption(InlineCodeModifierKeys.ALT, Platform.isMacOS ? 'Option' : 'Alt')
         .setValue(this.plugin.settings.pluginSettings.inlineCode.copyModifierKey)
         .onChange(async (value: InlineCodeModifierKeys) => {
           this.plugin.settings.pluginSettings.inlineCode.copyModifierKey = value;

src/SettingsTab/Appearance.ts

@@ -1,4 +1,4 @@
-import { DropdownComponent, Notice, Setting, TextComponent, ToggleComponent } from "obsidian";
+import { DropdownComponent, Notice, Platform, Setting, TextComponent, ToggleComponent } from "obsidian";
 
 import CodeBlockCustomizerPlugin from "src/main";
 import { createDetailsGroup, SettingsPage, SettingsPageData } from "./Common";
@@ -343,8 +343,8 @@ export class BehaviorSettings {
       .setDesc('Hold this key while clicking copy, select, or delete to include the fence lines in the action.')
       .addDropdown(dropdown => dropdown
         .addOption(ButtonModifierKeys.NONE, 'None')
-        .addOption(ButtonModifierKeys.CTRL, 'Ctrl')
-        .addOption(ButtonModifierKeys.ALT, 'Alt')
+        .addOption(ButtonModifierKeys.CTRL, Platform.isMacOS ? 'Cmd' : 'Ctrl')
+        .addOption(ButtonModifierKeys.ALT, Platform.isMacOS ? 'Option' : 'Alt')
         .addOption(ButtonModifierKeys.SHIFT, 'Shift')
         .setValue(this.plugin.settings.pluginSettings.codeblock.buttons.modifierKey)
         .onChange(async (value: ButtonModifierKeys) => {