Merge branch 'main' into footer-tips

Author: justin-schroeder

__tests__/shortcutsPopup.test.tsx

@@ -5,7 +5,7 @@ import stripAnsi from 'strip-ansi';
 import { ShortcutsPopupApp } from '../src/components/popups/shortcutsPopup.js';
 
 describe('ShortcutsPopupApp', () => {
-  it('shows the focused-pane menu shortcut as M-M', () => {
+  it('shows the focused-pane menu shortcut as Alt+Shift+M', () => {
     const { lastFrame } = render(
       <ShortcutsPopupApp
         resultFile="/tmp/dmux-shortcuts-result.json"
@@ -16,9 +16,9 @@ describe('ShortcutsPopupApp', () => {
 
     const output = stripAnsi(lastFrame() ?? '');
 
-    expect(output).toContain('[M-M]');
+    expect(output).toContain('[Alt+Shift+M]');
     expect(output).toContain('Open the pane menu for the focused tmux pane');
-    expect(output).toContain('Press M-M in any focused pane');
+    expect(output).toContain('Press Alt+Shift+M in any focused pane');
     expect(output).not.toContain('[M-D]');
   });
 });

src/components/popups/shortcutsPopup.tsx

@@ -39,7 +39,7 @@ export const ShortcutsPopupApp: React.FC<ShortcutsPopupAppProps> = ({
   });
 
   const shortcuts = [
-    { key: 'M-M', description: 'Open the pane menu for the focused tmux pane' },
+    { key: 'Alt+Shift+M', description: 'Open the pane menu for the focused tmux pane' },
     { key: 'j', description: 'Jump to selected pane' },
     { key: 'm', description: 'Open pane menu' },
     { key: 'x', description: 'Close selected pane' },
@@ -78,15 +78,15 @@ export const ShortcutsPopupApp: React.FC<ShortcutsPopupAppProps> = ({
 
         {shortcuts.map((shortcut, index) => (
           <Box key={index} marginBottom={0}>
-            <Box width={12}>
+            <Box width={16}>
               <Text color="yellow" bold>[{shortcut.key}]</Text>
             </Box>
             <Text>{shortcut.description}</Text>
           </Box>
         ))}
 
         <Box marginTop={1}>
-          <Text dimColor>Press M-M in any focused pane to open that pane&apos;s menu without returning to the sidebar. Press e for hooks, or Esc/? to close</Text>
+          <Text dimColor>Press Alt+Shift+M in any focused pane to open that pane&apos;s menu without returning to the sidebar. Press e for hooks, or Esc/? to close</Text>
         </Box>
       </Box>
     </PopupWrapper>