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

Author: nperez0111

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

@@ -1,6 +1,6 @@
 import {
   BlockSchema,
-  checkBlockIsFileBlock,
+  blockHasType,
   InlineContentSchema,
   StyleSchema,
 } from "@blocknote/core";
@@ -41,7 +41,7 @@ export const FileReplaceButton = () => {
 
   if (
     block === undefined ||
-    !checkBlockIsFileBlock(block, editor) ||
+    !blockHasType(block, editor, { url: "string" }) ||
     !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/blocks/AudioBlockContent/AudioBlockContent.ts

@@ -2,7 +2,7 @@ import type { BlockNoteEditor } from "../../editor/BlockNoteEditor.js";
 import {
   BlockFromConfig,
   createBlockSpec,
-  FileBlockConfig,
+  // FileBlockConfig,
   Props,
   PropSchema,
 } from "../../schema/index.js";
@@ -43,7 +43,7 @@ export const audioBlockConfig = {
   content: "none",
   isFileBlock: true,
   fileBlockAccept: ["audio/*"],
-} satisfies FileBlockConfig;
+} as any;
 
 export const audioRender = (
   block: BlockFromConfig<typeof audioBlockConfig, any, any>,

packages/core/src/blocks/FileBlockContent/FileBlockContent.ts

@@ -1,7 +1,7 @@
 import type { BlockNoteEditor } from "../../editor/BlockNoteEditor.js";
 import {
   BlockFromConfig,
-  FileBlockConfig,
+  // FileBlockConfig,
   PropSchema,
   createBlockSpec,
 } from "../../schema/index.js";
@@ -32,7 +32,7 @@ export const fileBlockConfig = {
   propSchema: filePropSchema,
   content: "none",
   isFileBlock: true,
-} satisfies FileBlockConfig;
+} as any;
 
 export const fileRender = (
   block: BlockFromConfig<typeof fileBlockConfig, any, any>,

packages/core/src/blocks/FileBlockContent/helpers/render/createAddFileButton.ts

@@ -1,8 +1,11 @@
 import type { BlockNoteEditor } from "../../../../editor/BlockNoteEditor.js";
-import { BlockFromConfig, FileBlockConfig } from "../../../../schema/index.js";
+import {
+  BlockConfig,
+  BlockFromConfigNoChildren,
+} from "../../../../schema/index.js";
 
 export const createAddFileButton = (
-  block: BlockFromConfig<FileBlockConfig, any, any>,
+  block: BlockFromConfigNoChildren<BlockConfig<string, any, "none">, any, any>,
   editor: BlockNoteEditor<any, any, any>,
   buttonText?: string,
   buttonIcon?: HTMLElement,

packages/core/src/blocks/FileBlockContent/helpers/render/createFileBlockWrapper.ts

@@ -1,19 +1,28 @@
 import type { BlockNoteEditor } from "../../../../editor/BlockNoteEditor.js";
 import {
-  BlockFromConfig,
-  BlockSchemaWithBlock,
-  FileBlockConfig,
+  BlockConfig,
+  BlockFromConfigNoChildren,
 } from "../../../../schema/index.js";
 import { createAddFileButton } from "./createAddFileButton.js";
 import { createFileNameWithIcon } from "./createFileNameWithIcon.js";
 
 export const createFileBlockWrapper = (
-  block: BlockFromConfig<FileBlockConfig, any, any>,
-  editor: BlockNoteEditor<
-    BlockSchemaWithBlock<FileBlockConfig["type"], FileBlockConfig>,
+  block: BlockFromConfigNoChildren<
+    BlockConfig<
+      string,
+      {
+        backgroundColor: { default: "default" };
+        name: { default: "" };
+        url: { default: "" };
+        caption: { default: "" };
+        showPreview?: { default: true };
+      },
+      "none"
+    >,
     any,
     any
   >,
+  editor: BlockNoteEditor<any, any, any>,
   element?: { dom: HTMLElement; destroy?: () => void },
   buttonText?: string,
   buttonIcon?: HTMLElement,

packages/core/src/blocks/FileBlockContent/helpers/render/createFileNameWithIcon.ts

@@ -1,9 +1,22 @@
-import { BlockFromConfig, FileBlockConfig } from "../../../../schema/index.js";
+import {
+  BlockConfig,
+  BlockFromConfigNoChildren,
+} from "../../../../schema/index.js";
 
 export const FILE_ICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M3 8L9.00319 2H19.9978C20.5513 2 21 2.45531 21 2.9918V21.0082C21 21.556 20.5551 22 20.0066 22H3.9934C3.44476 22 3 21.5501 3 20.9932V8ZM10 4V9H5V20H19V4H10Z"></path></svg>`;
 
 export const createFileNameWithIcon = (
-  block: BlockFromConfig<FileBlockConfig, any, any>,
+  block: BlockFromConfigNoChildren<
+    BlockConfig<
+      string,
+      {
+        name: { default: "" };
+      },
+      "none"
+    >,
+    any,
+    any
+  >,
 ): { dom: HTMLElement; destroy?: () => void } => {
   const file = document.createElement("div");
   file.className = "bn-file-name-with-icon";

packages/core/src/blocks/FileBlockContent/helpers/render/createResizableFileBlockWrapper.ts

@@ -1,9 +1,28 @@
 import type { BlockNoteEditor } from "../../../../editor/BlockNoteEditor.js";
-import { BlockFromConfig, FileBlockConfig } from "../../../../schema/index.js";
+import {
+  BlockConfig,
+  BlockFromConfigNoChildren,
+} from "../../../../schema/index.js";
 import { createFileBlockWrapper } from "./createFileBlockWrapper.js";
 
 export const createResizableFileBlockWrapper = (
-  block: BlockFromConfig<FileBlockConfig, any, any>,
+  block: BlockFromConfigNoChildren<
+    BlockConfig<
+      string,
+      {
+        backgroundColor: { default: "default" };
+        name: { default: "" };
+        url: { default: "" };
+        caption: { default: "" };
+        showPreview?: { default: true };
+        previewWidth?: { default: number };
+        textAlignment?: { default: "left" };
+      },
+      "none"
+    >,
+    any,
+    any
+  >,
   editor: BlockNoteEditor<any, any, any>,
   element: { dom: HTMLElement; destroy?: () => void },
   resizeHandlesContainerElement: HTMLElement,

packages/core/src/blocks/ImageBlockContent/ImageBlockContent.ts

@@ -2,7 +2,7 @@ import type { BlockNoteEditor } from "../../editor/BlockNoteEditor.js";
 import {
   BlockFromConfig,
   createBlockSpec,
-  FileBlockConfig,
+  // FileBlockConfig,
   Props,
   PropSchema,
 } from "../../schema/index.js";
@@ -48,7 +48,7 @@ export const imageBlockConfig = {
   content: "none",
   isFileBlock: true,
   fileBlockAccept: ["image/*"],
-} satisfies FileBlockConfig;
+} as any;
 
 export const imageRender = (
   block: BlockFromConfig<typeof imageBlockConfig, any, any>,

packages/core/src/blocks/PageBreakBlockContent/PageBreakBlockContent.ts

@@ -8,8 +8,6 @@ export const pageBreakConfig = {
   type: "pageBreak" as const,
   propSchema: {},
   content: "none",
-  isFileBlock: false,
-  isSelectable: false,
 } satisfies CustomBlockConfig;
 export const pageBreakRender = () => {
   const pageBreak = document.createElement("div");