Skip to content

Commit 21ef498

Browse files
committed
Merge branch 'main' into releases
2 parents 92bd2c2 + 2daa264 commit 21ef498

File tree

299 files changed

+32772
-4700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+32772
-4700
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ module.exports = {
2828
rules: {
2929
"no-console": "error",
3030
curly: 1,
31+
"import/extensions": ["error", "always", { ignorePackages: true }],
3132
"import/no-extraneous-dependencies": [
3233
"error",
3334
{

docs/.eslintrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"extends": "next/core-web-vitals"
2+
"extends": "next/core-web-vitals",
3+
"rules": {
4+
"import/extensions": 0
5+
}
36
}

docs/pages/docs/editor-api/manipulating-blocks.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Use `insertBlocks` to insert new blocks into the document:
115115
insertBlocks(
116116
blocksToInsert: PartialBlock[],
117117
referenceBlock: BlockIdentifier,
118-
placement: "before" | "after" | "nested" = "before"
118+
placement: "before" | "after" = "before"
119119
): void;
120120

121121
// Usage
@@ -126,7 +126,7 @@ editor.insertBlocks([{type: "paragraph", content: "Hello World"}], referenceBloc
126126

127127
`referenceBlock:` An [identifier](/docs/editor-api/manipulating-blocks#block-identifiers) for an existing block, at which the new blocks should be inserted.
128128

129-
`placement:` Whether the blocks should be inserted just before, just after, or nested inside the `referenceBlock`. Inserts the blocks at the start of the existing block's children if `"nested"` is used.
129+
`placement:` Whether the blocks should be inserted just before or just after the `referenceBlock`.
130130

131131
If a block's `id` is undefined, BlockNote generates one automatically.
132132

examples/03-ui-components/03-formatting-toolbar-block-type-items/App.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { BlockNoteSchema, defaultBlockSpecs } from "@blocknote/core";
22
import "@blocknote/core/fonts/inter.css";
3+
import { BlockNoteView } from "@blocknote/mantine";
4+
import "@blocknote/mantine/style.css";
35
import {
46
BlockTypeSelectItem,
57
FormattingToolbar,
68
FormattingToolbarController,
79
blockTypeSelectItems,
810
useCreateBlockNote,
911
} from "@blocknote/react";
10-
import { BlockNoteView } from "@blocknote/mantine";
11-
import "@blocknote/mantine/style.css";
12+
1213
import { RiAlertFill } from "react-icons/ri";
1314

1415
import { Alert } from "./Alert";

examples/03-ui-components/04-side-menu-buttons/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import "@blocknote/core/fonts/inter.css";
2+
import { BlockNoteView } from "@blocknote/mantine";
3+
import "@blocknote/mantine/style.css";
24
import {
35
DragHandleButton,
46
SideMenu,
57
SideMenuController,
68
useCreateBlockNote,
79
} from "@blocknote/react";
8-
import { BlockNoteView } from "@blocknote/mantine";
9-
import "@blocknote/mantine/style.css";
1010

1111
import { RemoveBlockButton } from "./RemoveBlockButton";
1212

examples/03-ui-components/05-side-menu-drag-handle-items/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import "@blocknote/core/fonts/inter.css";
2+
import { BlockNoteView } from "@blocknote/mantine";
3+
import "@blocknote/mantine/style.css";
24
import {
35
BlockColorsItem,
46
DragHandleMenu,
@@ -7,8 +9,6 @@ import {
79
SideMenuController,
810
useCreateBlockNote,
911
} from "@blocknote/react";
10-
import { BlockNoteView } from "@blocknote/mantine";
11-
import "@blocknote/mantine/style.css";
1212

1313
import { ResetBlockTypeItem } from "./ResetBlockTypeItem";
1414

examples/03-ui-components/10-suggestion-menus-grid-mentions/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import {
44
filterSuggestionItems,
55
} from "@blocknote/core";
66
import "@blocknote/core/fonts/inter.css";
7+
import { BlockNoteView } from "@blocknote/mantine";
8+
import "@blocknote/mantine/style.css";
79
import {
810
DefaultReactGridSuggestionItem,
911
GridSuggestionMenuController,
1012
useCreateBlockNote,
1113
} from "@blocknote/react";
12-
import { BlockNoteView } from "@blocknote/mantine";
13-
import "@blocknote/mantine/style.css";
1414

1515
import { Mention } from "./Mention";
1616

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import "@blocknote/core/fonts/inter.css";
2+
import { BlockNoteView } from "@blocknote/mantine";
3+
import "@blocknote/mantine/style.css";
24
import {
35
FilePanelController,
46
FormattingToolbar,
57
FormattingToolbarController,
68
getFormattingToolbarItems,
79
useCreateBlockNote,
810
} from "@blocknote/react";
9-
import { BlockNoteView } from "@blocknote/mantine";
10-
import "@blocknote/mantine/style.css";
1111

12-
import { uploadFile, UppyFilePanel } from "./UppyFilePanel";
1312
import { FileReplaceButton } from "./FileReplaceButton";
13+
import { uploadFile, UppyFilePanel } from "./UppyFilePanel";
1414

1515
export default function App() {
1616
// Creates a new editor instance.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
useSelectedBlocks,
1212
} from "@blocknote/react";
1313
import { useEffect, useState } from "react";
14+
1415
import { RiImageEditFill } from "react-icons/ri";
1516
import { UppyFilePanel } from "./UppyFilePanel";
1617

examples/03-ui-components/link-toolbar-buttons/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import "@blocknote/core/fonts/inter.css";
2+
import { BlockNoteView } from "@blocknote/mantine";
3+
import "@blocknote/mantine/style.css";
24
import {
35
LinkToolbar,
46
LinkToolbarController,
57
useCreateBlockNote,
68
} from "@blocknote/react";
7-
import { BlockNoteView } from "@blocknote/mantine";
8-
import "@blocknote/mantine/style.css";
99

1010
import { AlertButton } from "./AlertButton";
1111

0 commit comments

Comments
 (0)