Changed file panel extension state from object with block ID string to just block ID string

Author: matthewlipski

packages/core/src/extensions/FilePanel/FilePanel.ts

@@ -4,14 +4,10 @@ import {
 } from "../../editor/BlockNoteExtension.js";
 
 export const FilePanelExtension = createExtension(({ editor }) => {
-  const store = createStore({
-    blockId: undefined as string | undefined,
-  });
+  const store = createStore<string | undefined>(undefined);
 
   function closeMenu() {
-    store.setState({
-      blockId: undefined,
-    });
+    store.setState(undefined);
   }
 
   return {
@@ -39,9 +35,7 @@ export const FilePanelExtension = createExtension(({ editor }) => {
     },
     closeMenu,
     showMenu(blockId: string) {
-      store.setState({
-        blockId,
-      });
+      store.setState(blockId);
     },
   } as const;
 });

packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts

@@ -493,8 +493,8 @@ export const KeyboardShortcutsExtension = Extension.create<{
           this.options.tabBehavior !== "prefer-indent" &&
           (this.options.editor.getExtension(FormattingToolbarExtension)?.store
             .state ||
-            this.options.editor.getExtension(FilePanelExtension)?.store.state
-              .blockId)
+            this.options.editor.getExtension(FilePanelExtension)?.store
+              .state !== undefined)
           // TODO need to check if the link toolbar is open or another alternative entirely
         ) {
           // don't handle tabs if a toolbar is shown, so we can tab into / out of it
@@ -507,8 +507,8 @@ export const KeyboardShortcutsExtension = Extension.create<{
           this.options.tabBehavior !== "prefer-indent" &&
           (this.options.editor.getExtension(FormattingToolbarExtension)?.store
             .state ||
-            this.options.editor.getExtension(FilePanelExtension)?.store.state
-              .blockId)
+            this.options.editor.getExtension(FilePanelExtension)?.store
+              .state !== undefined)
           // TODO need to check if the link toolbar is open or another alternative entirely
           // other menu types?
         ) {

packages/react/src/components/FilePanel/FilePanelController.tsx

@@ -16,9 +16,7 @@ export const FilePanelController = (props: {
   const editor = useBlockNoteEditor<any, any, any>();
 
   const filePanel = useExtension(FilePanelExtension);
-  const blockId = useExtensionState(FilePanelExtension, {
-    selector: (state) => state.blockId,
-  });
+  const blockId = useExtensionState(FilePanelExtension);
 
   const floatingUIOptions = useMemo<FloatingUIOptions>(
     () => ({