@blocknote/core 0.9.2 → 0.9.3

package/package.json

@@ -3,7 +3,7 @@
   "homepage": "https://github.com/TypeCellOS/BlockNote",
   "private": false,
   "license": "MPL-2.0",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "files": [
     "dist",
     "types",
@@ -109,5 +109,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "4d18bc8a01e841954672b9e522f20ce12f4ada10"
+  "gitHead": "3a3ca4dfc448556f9796ce884b6ba61f036dfe1a"
 }

package/src/extensions/Blocks/nodes/BlockContainer.ts

@@ -192,18 +192,42 @@ export const BlockContainer = Node.create<{
               );
             }
 
-            // Changes the blockContent node type and adds the provided props as attributes. Also preserves all existing
-            // attributes that are compatible with the new type.
-            state.tr.setNodeMarkup(
-              startPos,
-              block.type === undefined
-                ? undefined
-                : state.schema.nodes[block.type],
-              {
-                ...contentNode.attrs,
-                ...block.props,
-              }
-            );
+            // Since some block types contain inline content and others don't,
+            // we either need to call setNodeMarkup to just update type &
+            // attributes, or replaceWith to replace the whole blockContent.
+            const oldType = contentNode.type.name;
+            const newType = block.type || oldType;
+
+            const oldContentType = state.schema.nodes[oldType].spec.content;
+            const newContentType = state.schema.nodes[newType].spec.content;
+
+            if (oldContentType === "inline*" && newContentType === "") {
+              // Replaces the blockContent node with one of the new type and
+              // adds the provided props as attributes. Also preserves all
+              // existing attributes that are compatible with the new type.
+              state.tr.replaceWith(
+                startPos,
+                endPos,
+                state.schema.nodes[newType].create({
+                  ...contentNode.attrs,
+                  ...block.props,
+                })
+              );
+            } else {
+              // Changes the blockContent node type and adds the provided props
+              // as attributes. Also preserves all existing attributes that are
+              // compatible with the new type.
+              state.tr.setNodeMarkup(
+                startPos,
+                block.type === undefined
+                  ? undefined
+                  : state.schema.nodes[block.type],
+                {
+                  ...contentNode.attrs,
+                  ...block.props,
+                }
+              );
+            }
 
             // Adds all provided props as attributes to the parent blockContainer node too, and also preserves existing
             // attributes.

package/src/extensions/Blocks/nodes/BlockContent/HeadingBlockContent/HeadingBlockContent.ts

@@ -73,6 +73,7 @@ export const HeadingBlockContent = createTipTapBlock<"heading">({
     return [
       "div",
       mergeAttributes(HTMLAttributes, {
+        ...blockContentDOMAttributes,
         class: mergeCSSClasses(
           styles.blockContent,
           blockContentDOMAttributes.class
@@ -82,6 +83,7 @@ export const HeadingBlockContent = createTipTapBlock<"heading">({
       [
         "h" + node.attrs.level,
         {
+          ...inlineContentDOMAttributes,
           class: mergeCSSClasses(
             styles.inlineContent,
             inlineContentDOMAttributes.class

package/src/extensions/Blocks/nodes/BlockContent/ListItemBlockContent/BulletListItemBlockContent/BulletListItemBlockContent.ts

@@ -91,6 +91,7 @@ export const BulletListItemBlockContent = createTipTapBlock<"bulletListItem">({
     return [
       "div",
       mergeAttributes(HTMLAttributes, {
+        ...blockContentDOMAttributes,
         class: mergeCSSClasses(
           styles.blockContent,
           blockContentDOMAttributes.class
@@ -100,6 +101,7 @@ export const BulletListItemBlockContent = createTipTapBlock<"bulletListItem">({
       [
         "p",
         {
+          ...inlineContentDOMAttributes,
           class: mergeCSSClasses(
             styles.inlineContent,
             inlineContentDOMAttributes.class

package/src/extensions/Blocks/nodes/BlockContent/ListItemBlockContent/NumberedListItemBlockContent/NumberedListItemBlockContent.ts

@@ -115,6 +115,7 @@ export const NumberedListItemBlockContent =
       return [
         "div",
         mergeAttributes(HTMLAttributes, {
+          ...blockContentDOMAttributes,
           class: mergeCSSClasses(
             styles.blockContent,
             blockContentDOMAttributes.class
@@ -126,6 +127,7 @@ export const NumberedListItemBlockContent =
         [
           "p",
           {
+            ...inlineContentDOMAttributes,
             class: mergeCSSClasses(
               styles.inlineContent,
               inlineContentDOMAttributes.class

package/src/extensions/TrailingNode/TrailingNodeExtension.ts

@@ -64,7 +64,19 @@ export const TrailingNode = Extension.create<TrailingNodeOptions>({
             if (!lastNode || lastNode.type.name !== "blockContainer") {
               throw new Error("Expected blockContainer");
             }
-            return lastNode.nodeSize > 4; // empty <block><content/></block> is length 4
+
+            const lastContentNode = lastNode.firstChild;
+
+            if (!lastContentNode) {
+              throw new Error("Expected blockContent");
+            }
+
+            // If last node is not empty (size > 4) or it doesn't contain
+            // inline content, we need to add a trailing node.
+            return (
+              lastNode.nodeSize > 4 ||
+              lastContentNode.type.spec.content !== "inline*"
+            );
           },
         },
       }),

package/types/src/extensions/Blocks/NonEditableBlockPlugin.d.ts

@@ -0,0 +1,2 @@
+import { Plugin } from "prosemirror-state";
+export declare const NonEditableBlockPlugin: () => Plugin<any>;

package/types/src/extensions/Blocks/api/defaultProps.d.ts

@@ -0,0 +1,14 @@
+import { Props } from "./blockTypes";
+export declare const defaultProps: {
+    backgroundColor: {
+        default: "transparent";
+    };
+    textColor: {
+        default: "black";
+    };
+    textAlignment: {
+        default: "left";
+        values: readonly ["left", "center", "right", "justify"];
+    };
+};
+export type DefaultProps = Props<typeof defaultProps>;

package/types/src/extensions/Blocks/nodes/BlockContent/ImageBlockContent/Image.d.ts

@@ -0,0 +1,6 @@
+import "@uppy/core/dist/style.css";
+import "@uppy/dashboard/dist/style.css";
+import "@uppy/drag-drop/dist/style.css";
+import "@uppy/file-input/dist/style.css";
+import "@uppy/progress-bar/dist/style.css";
+export declare const Image: BlockSpec<BType, PSchema, ContainsInlineContent>;

package/types/src/extensions/Blocks/nodes/BlockContent/ImageBlockContent/ImageBlockContent.d.ts

@@ -0,0 +1,37 @@
+import { BlockSpec } from "../../../api/blockTypes";
+export declare const imagePropSchema: {
+    textAlignment: {
+        default: "left";
+        values: readonly ["left", "center", "right", "justify"];
+    };
+    backgroundColor: {
+        default: "transparent";
+    };
+    url: {
+        default: "";
+    };
+    caption: {
+        default: "";
+    };
+    width: {
+        default: 512;
+    };
+};
+export declare const Image: BlockSpec<"image", {
+    textAlignment: {
+        default: "left";
+        values: readonly ["left", "center", "right", "justify"];
+    };
+    backgroundColor: {
+        default: "transparent";
+    };
+    url: {
+        default: "";
+    };
+    caption: {
+        default: "";
+    };
+    width: {
+        default: 512;
+    };
+}, false>;

package/types/src/extensions/ImageToolbar/ImageToolbarPlugin.d.ts

@@ -0,0 +1,36 @@
+import { EditorState, Plugin, PluginKey } from "prosemirror-state";
+import { EditorView } from "prosemirror-view";
+import { BaseUiElementCallbacks, BaseUiElementState, BlockNoteEditor, BlockSchema, BlockSpec, SpecificBlock } from "../..";
+import { EventEmitter } from "../../shared/EventEmitter";
+export type ImageToolbarCallbacks = BaseUiElementCallbacks;
+export type ImageToolbarState = BaseUiElementState & {
+    block: SpecificBlock<BlockSchema & {
+        image: BlockSpec<"image", {
+            src: {
+                default: string;
+            };
+        }, false>;
+    }, "image">;
+};
+export declare class ImageToolbarView {
+    private readonly pluginKey;
+    private readonly pmView;
+    private imageToolbarState?;
+    updateImageToolbar: () => void;
+    prevWasEditable: boolean | null;
+    shouldShow: (state: EditorState) => boolean;
+    constructor(pluginKey: PluginKey, pmView: EditorView, updateImageToolbar: (imageToolbarState: ImageToolbarState) => void);
+    mouseDownHandler: () => void;
+    dragstartHandler: () => void;
+    blurHandler: (event: FocusEvent) => void;
+    scrollHandler: () => void;
+    update(view: EditorView, prevState: EditorState): void;
+    destroy(): void;
+}
+export declare const imageToolbarPluginKey: PluginKey<any>;
+export declare class ImageToolbarProsemirrorPlugin<BSchema extends BlockSchema> extends EventEmitter<any> {
+    private view;
+    readonly plugin: Plugin;
+    constructor(_editor: BlockNoteEditor<BSchema>);
+    onUpdate(callback: (state: ImageToolbarState) => void): () => void;
+}

package/types/src/extensions/Blocks/nodes/TableCell.d.ts

@@ -1,5 +0,0 @@
-import { Node } from "@tiptap/core";
-export interface TableCellOptions {
-    HTMLAttributes: Record<string, any>;
-}
-export declare const TableCell: Node<TableCellOptions, any>;

package/types/src/extensions/Blocks/nodes/TableRow.d.ts

@@ -1,5 +0,0 @@
-import { Node } from "@tiptap/core";
-export interface TableRowOptions {
-    HTMLAttributes: Record<string, any>;
-}
-export declare const TableRow: Node<TableRowOptions, any>;