Made type guards more generic

Author: matthewlipski

examples/03-ui-components/11-uppy-file-panel/src/FileReplaceButton.tsx

@@ -1,6 +1,6 @@
 import {
   BlockSchema,
-  checkBlockIsFileBlock,
+  blockHasProps,
   InlineContentSchema,
   StyleSchema,
 } from "@blocknote/core";
@@ -41,7 +41,7 @@ export const FileReplaceButton = () => {
 
   if (
     block === undefined ||
-    !checkBlockIsFileBlock(block, editor) ||
+    !blockHasProps(block, { url: { default: "" } }) ||
     !editor.isEditable
   ) {
     return null;

packages/core/src/api/clipboard/fromClipboard/handleFileInsertion.ts

@@ -2,7 +2,6 @@ import { Block, PartialBlock } from "../../../blocks/defaultBlocks.js";
 import type { BlockNoteEditor } from "../../../editor/BlockNoteEditor";
 import {
   BlockSchema,
-  FileBlockConfig,
   InlineContentSchema,
   StyleSchema,
 } from "../../../schema/index.js";
@@ -106,15 +105,11 @@ export async function handleFileInsertion<
 
   event.preventDefault();
 
-  const fileBlockConfigs = Object.values(editor.schema.blockSchema).filter(
-    (blockConfig) => blockConfig.isFileBlock,
-  ) as FileBlockConfig[];
-
   for (let i = 0; i < items.length; i++) {
     // Gets file block corresponding to MIME type.
     let fileBlockType = "file";
-    for (const fileBlockConfig of fileBlockConfigs) {
-      for (const mimeType of fileBlockConfig.fileBlockAccept || []) {
+    for (const fileBlockConfig of Object.values(editor.schema.blockSchema)) {
+      for (const mimeType of fileBlockConfig.meta?.fileBlockAccept || []) {
         const isFileExtension = mimeType.startsWith(".");
         const file = items[i].getAsFile();
 

packages/core/src/blks/Audio/definition.ts

@@ -72,7 +72,7 @@ export const definition = createBlockDefinition(config).implementation(
     },
     render: (block, editor) => {
       const icon = document.createElement("div");
-      icon.innerHTML = config.icon ?? FILE_AUDIO_ICON_SVG;
+      icon.innerHTML = config?.icon ?? FILE_AUDIO_ICON_SVG;
 
       const audio = document.createElement("audio");
       audio.className = "bn-audio";

packages/core/src/blks/Image/definition.ts

@@ -41,7 +41,7 @@ const config = createBlockConfig((_ctx: ImageOptions = {}) => ({
       default: undefined,
       type: "number",
     },
-  },
+  } as const,
   content: "none" as const,
   meta: {
     fileBlockAccept: ["image/*"],
@@ -78,7 +78,7 @@ export const definition = createBlockDefinition(config).implementation(
     },
     render: (block, editor) => {
       const icon = document.createElement("div");
-      icon.innerHTML = config.icon ?? FILE_IMAGE_ICON_SVG;
+      icon.innerHTML = config?.icon ?? FILE_IMAGE_ICON_SVG;
 
       const imageWrapper = document.createElement("div");
       imageWrapper.className = "bn-visual-media-wrapper";

packages/core/src/blks/NumberedListItem/definition.ts

@@ -15,7 +15,7 @@ const config = createBlockConfig(() => ({
   propSchema: {
     ...defaultProps,
     start: { default: undefined, type: "number" },
-  },
+  } as const,
   content: "inline",
 }));
 

packages/core/src/blks/Video/definition.ts

@@ -62,7 +62,7 @@ export const definition = createBlockDefinition(config).implementation(
     },
     render: (block, editor) => {
       const icon = document.createElement("div");
-      icon.innerHTML = config.icon ?? FILE_VIDEO_ICON_SVG;
+      icon.innerHTML = config?.icon ?? FILE_VIDEO_ICON_SVG;
 
       const videoWrapper = document.createElement("div");
       videoWrapper.className = "bn-visual-media-wrapper";

packages/core/src/blks/index.ts

@@ -6,7 +6,7 @@ export * as heading from "./Heading/definition.js";
 export * as numberedListItem from "./NumberedListItem/definition.js";
 export * as pageBreak from "./PageBreak/definition.js";
 export * as paragraph from "./Paragraph/definition.js";
-export * as quoteBlock from "./Quote/definition.js";
+export * as quote from "./Quote/definition.js";
 export * as toggleListItem from "./ToggleListItem/definition.js";
 
 export * as file from "./File/definition.js";