From fed401d45cc540f0d9dd09e7b101d26fdf97d433 Mon Sep 17 00:00:00 2001
From: JATIN <Jatin04072005@gmail.com>
Date: Sat, 8 Mar 2025 18:10:25 +0530
Subject: [PATCH 1/2] Adding ShortCut Key 'Ctrl/Cmd+Alt+f' for newFolder

---
 client/common/useKeyDownHandlers.js                       | 3 +++
 client/modules/IDE/components/Header/Nav.jsx              | 3 +++
 .../Header/__snapshots__/Nav.unit.test.jsx.snap           | 5 +++++
 client/modules/IDE/components/IDEKeyHandlers.jsx          | 8 +++++++-
 client/modules/IDE/components/KeyboardShortcutModal.jsx   | 6 ++++++
 translations/locales/en-US/translations.json              | 3 ++-
 6 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/client/common/useKeyDownHandlers.js b/client/common/useKeyDownHandlers.js
index dbe2ee06bb..6152508813 100644
--- a/client/common/useKeyDownHandlers.js
+++ b/client/common/useKeyDownHandlers.js
@@ -41,6 +41,9 @@ export default function useKeyDownHandlers(keyHandlers) {
     } else if (isCtrl && e.altKey && e.code === 'KeyN') {
       // specifically for creating a new file
       handlers.current[`ctrl-alt-n`]?.(e);
+    } else if (isCtrl && e.altKey && e.code === 'KeyF') {
+      // specifically for creating a new folder
+      handlers.current[`ctrl-alt-f`]?.(e);
     } else if (isCtrl) {
       handlers.current[`ctrl-${e.key.toLowerCase()}`]?.(e);
     }
diff --git a/client/modules/IDE/components/Header/Nav.jsx b/client/modules/IDE/components/Header/Nav.jsx
index f40e9137bf..4098ab3c7b 100644
--- a/client/modules/IDE/components/Header/Nav.jsx
+++ b/client/modules/IDE/components/Header/Nav.jsx
@@ -139,6 +139,8 @@ const ProjectMenu = () => {
     metaKey === 'Ctrl' ? `${metaKeyName}+H` : `${metaKeyName}+⌥+F`;
   const newFileCommand =
     metaKey === 'Ctrl' ? `${metaKeyName}+Alt+N` : `${metaKeyName}+⌥+N`;
+  const newFolderCommand =
+    metaKey === 'Ctrl' ? `${metaKeyName}+Alt+F` : `${metaKeyName}+⌥+F`;
 
   return (
     <ul className="nav__items-left" role="menubar">
@@ -230,6 +232,7 @@ const ProjectMenu = () => {
         </MenubarItem>
         <MenubarItem onClick={() => dispatch(newFolder(rootFile.id))}>
           {t('Nav.Sketch.AddFolder')}
+          <span className="nav__keyboard-shortcut">{newFolderCommand}</span>
         </MenubarItem>
         <MenubarItem onClick={() => dispatch(startSketch())}>
           {t('Nav.Sketch.Run')}
diff --git a/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap b/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
index 290528582a..3140d77511 100644
--- a/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
+++ b/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
@@ -653,6 +653,11 @@ exports[`Nav renders editor version for desktop 1`] = `
                 role="menuitem"
               >
                 Add Folder
+                 <span
+                  class="nav__keyboard-shortcut"
+                >
+                  Ctrl+Alt+F
+                </span>
               </button>
             </li>
             <li
diff --git a/client/modules/IDE/components/IDEKeyHandlers.jsx b/client/modules/IDE/components/IDEKeyHandlers.jsx
index fc0219f27d..72264768c4 100644
--- a/client/modules/IDE/components/IDEKeyHandlers.jsx
+++ b/client/modules/IDE/components/IDEKeyHandlers.jsx
@@ -9,7 +9,8 @@ import {
   showErrorModal,
   startSketch,
   stopSketch,
-  newFile
+  newFile,
+  newFolder
 } from '../actions/ide';
 import { setAllAccessibleOutput } from '../actions/preferences';
 import { cloneProject, saveProject } from '../actions/project';
@@ -82,6 +83,11 @@ export const useIDEKeyHandlers = ({ getContent }) => {
       e.stopPropagation();
       dispatch(newFile(rootFile.id));
     },
+    'ctrl-alt-f': (e) => {
+      e.preventDefault();
+      e.stopPropagation();
+      dispatch(newFolder(rootFile.id));
+    },
     'ctrl-`': (e) => {
       e.preventDefault();
       dispatch(consoleIsExpanded ? collapseConsole() : expandConsole());
diff --git a/client/modules/IDE/components/KeyboardShortcutModal.jsx b/client/modules/IDE/components/KeyboardShortcutModal.jsx
index fbca28a572..4f16ef4e0e 100644
--- a/client/modules/IDE/components/KeyboardShortcutModal.jsx
+++ b/client/modules/IDE/components/KeyboardShortcutModal.jsx
@@ -8,6 +8,8 @@ function KeyboardShortcutModal() {
     metaKey === 'Ctrl' ? `${metaKeyName} + H` : `${metaKeyName} + ⌥ + F`;
   const newFileCommand =
     metaKey === 'Ctrl' ? `${metaKeyName} + Alt + N` : `${metaKeyName} + ⌥ + N`;
+  const newFolderCommand =
+    metaKey === 'Ctrl' ? `${metaKeyName} + Alt + F` : `${metaKeyName} + ⌥ + F`;
   return (
     <div className="keyboard-shortcuts">
       <h3 className="keyboard-shortcuts__title">
@@ -75,6 +77,10 @@ function KeyboardShortcutModal() {
           <span className="keyboard-shortcut__command">{newFileCommand}</span>
           <span>{t('KeyboardShortcuts.CodeEditing.CreateNewFile')}</span>
         </li>
+        <li className="keyboard-shortcut-item">
+          <span className="keyboard-shortcut__command">{newFolderCommand}</span>
+          <span>{t('KeyboardShortcuts.CodeEditing.CreateNewFolder')}</span>
+        </li>
       </ul>
       <h3 className="keyboard-shortcuts__title">General</h3>
       <ul className="keyboard-shortcuts__list">
diff --git a/translations/locales/en-US/translations.json b/translations/locales/en-US/translations.json
index 0f46c59c14..798c22a252 100644
--- a/translations/locales/en-US/translations.json
+++ b/translations/locales/en-US/translations.json
@@ -228,7 +228,8 @@
       "FindPreviousTextMatch": "Find Previous Text Match",
       "CodeEditing": "Code Editing",
       "ColorPicker": "Show Inline Color Picker",
-      "CreateNewFile": "Create New File"
+      "CreateNewFile": "Create New File",
+      "CreateNewFolder": "Create New Folder"
     },
     "General": {
       "StartSketch": "Start Sketch",

From 5bfc2810d9d1b33c99fd5ad586446897c0ef1c69 Mon Sep 17 00:00:00 2001
From: JATIN <Jatin04072005@gmail.com>
Date: Sat, 8 Mar 2025 18:30:35 +0530
Subject: [PATCH 2/2] fix npm run  test

---
 .../IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap b/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
index 3140d77511..317526fcd7 100644
--- a/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
+++ b/client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap
@@ -653,7 +653,7 @@ exports[`Nav renders editor version for desktop 1`] = `
                 role="menuitem"
               >
                 Add Folder
-                 <span
+                <span
                   class="nav__keyboard-shortcut"
                 >
                   Ctrl+Alt+F