Merge branch 'main' into feature/optimize-timeline-ruler

1 files changed, 6 insertions, 0 deletions

diff --git a/apps/web/src/components/editor-provider.tsx b/apps/web/src/components/editor-provider.tsx
index 38255956..d970f86d 100644
--- a/apps/web/src/components/editor-provider.tsx
+++ b/apps/web/src/components/editor-provider.tsx
@@ -3,6 +3,7 @@
 import { useEffect } from "react";

 import { Loader2 } from "lucide-react";

 import { useEditorStore } from "@/stores/editor-store";

+import { useKeyboardShortcuts } from "@/hooks/use-keyboard-shortcuts";

 

 interface EditorProviderProps {

   children: React.ReactNode;

@@ -11,6 +12,11 @@ interface EditorProviderProps {
 export function EditorProvider({ children }: EditorProviderProps) {

   const { isInitializing, isPanelsReady, initializeApp } = useEditorStore();

 

+  useKeyboardShortcuts({

+    enabled: !isInitializing && isPanelsReady,

+    context: "editor",

+  });

+

   useEffect(() => {

     initializeApp();

   }, [initializeApp]);