Merge branch 'default-blocks-type-guards' into default-blocks

Author: nperez0111

packages/core/src/blocks/defaultBlockTypeGuards.ts

@@ -1,17 +1,7 @@
 import { CellSelection } from "prosemirror-tables";
 import type { BlockNoteEditor } from "../editor/BlockNoteEditor.js";
-import {
-  BlockConfig,
-  BlockSchema,
-  PropSchema,
-  PropSpec,
-  StyleSchema,
-} from "../schema/index.js";
-import {
-  Block,
-  DefaultInlineContentSchema,
-  defaultInlineContentSchema,
-} from "./defaultBlocks.js";
+import { BlockConfig, PropSchema, PropSpec } from "../schema/index.js";
+import { Block } from "./defaultBlocks.js";
 import { Selection } from "prosemirror-state";
 
 export function editorHasBlockWithType<
@@ -174,27 +164,6 @@ export function blockHasType<
   );
 }
 
-// TODO: Only used once in the emoji picker - is it even needed? If so, should
-// be changed to be like the block type guards.
-export function checkDefaultInlineContentTypeInSchema<
-  InlineContentType extends keyof DefaultInlineContentSchema,
-  B extends BlockSchema,
-  S extends StyleSchema,
->(
-  inlineContentType: InlineContentType,
-  editor: BlockNoteEditor<B, any, S>,
-): editor is BlockNoteEditor<
-  B,
-  { [K in InlineContentType]: DefaultInlineContentSchema[InlineContentType] },
-  S
-> {
-  return (
-    inlineContentType in editor.schema.inlineContentSchema &&
-    editor.schema.inlineContentSchema[inlineContentType] ===
-      defaultInlineContentSchema[inlineContentType]
-  );
-}
-
 export function isTableCellSelection(
   selection: Selection,
 ): selection is CellSelection {

packages/core/src/extensions/SuggestionMenu/getDefaultEmojiPickerItems.ts

@@ -1,6 +1,6 @@
 import type { Emoji, EmojiMartData } from "@emoji-mart/data";
 
-import { checkDefaultInlineContentTypeInSchema } from "../../blocks/defaultBlockTypeGuards.js";
+import { defaultInlineContentSchema } from "../../blocks/defaultBlocks.js";
 import { BlockNoteEditor } from "../../editor/BlockNoteEditor.js";
 import {
   BlockSchema,
@@ -54,7 +54,11 @@ export async function getDefaultEmojiPickerItems<
   editor: BlockNoteEditor<BSchema, I, S>,
   query: string,
 ): Promise<DefaultGridSuggestionItem[]> {
-  if (!checkDefaultInlineContentTypeInSchema("text", editor)) {
+  if (
+    !("text" in editor.schema.inlineContentSchema) ||
+    editor.schema.inlineContentSchema["text"] !==
+      defaultInlineContentSchema["text"]
+  ) {
     return [];
   }