Skip to content

Commit 21ef498

Browse files
matthewlipskimatthewlipski
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

+1
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

+4-1
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

+2-2
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

+3-2
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

+2-2
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

+2-2
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

+2-2
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

+3-3
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

+1
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

+2-2
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

‎examples/06-custom-schema/01-alert-block/App.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import {
55
insertOrUpdateBlock,
66
} from "@blocknote/core";
77
import "@blocknote/core/fonts/inter.css";
8+
import { BlockNoteView } from "@blocknote/mantine";
9+
import "@blocknote/mantine/style.css";
810
import {
911
SuggestionMenuController,
1012
getDefaultReactSlashMenuItems,
1113
useCreateBlockNote,
1214
} from "@blocknote/react";
13-
import { BlockNoteView } from "@blocknote/mantine";
14-
import "@blocknote/mantine/style.css";
1515

1616
import { RiAlertFill } from "react-icons/ri";
1717
import { Alert } from "./Alert";

‎examples/06-custom-schema/02-suggestion-menus-mentions/App.tsx

+2-2
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
DefaultReactSuggestionItem,
911
SuggestionMenuController,
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/06-custom-schema/03-font-style/App.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
useComponentsContext,
1919
useCreateBlockNote,
2020
} from "@blocknote/react";
21+
2122
import { RiText } from "react-icons/ri";
2223

2324
import { Font } from "./Font";

‎examples/06-custom-schema/04-pdf-file-block/App.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import {
55
insertOrUpdateBlock,
66
} from "@blocknote/core";
77
import "@blocknote/core/fonts/inter.css";
8+
import { BlockNoteView } from "@blocknote/mantine";
9+
import "@blocknote/mantine/style.css";
810
import {
911
SuggestionMenuController,
1012
getDefaultReactSlashMenuItems,
1113
useCreateBlockNote,
1214
} from "@blocknote/react";
13-
import { BlockNoteView } from "@blocknote/mantine";
14-
import "@blocknote/mantine/style.css";
1515

1616
import { RiFilePdfFill } from "react-icons/ri";
1717

‎examples/06-custom-schema/04-pdf-file-block/PDF.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
FileAndCaptionWrapper,
77
ReactCustomBlockRenderProps,
88
} from "@blocknote/react";
9+
910
import { RiFilePdfFill } from "react-icons/ri";
1011

1112
import "./styles.css";

‎packages/ariakit/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"name": "@blocknote/ariakit",
33
"homepage": "https://github.com/TypeCellOS/BlockNote",
44
"private": false,
5+
"sideEffects": [
6+
"*.css"
7+
],
58
"license": "MPL-2.0",
69
"version": "0.16.0",
710
"files": [

‎packages/ariakit/src/index.tsx

+24-24
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@ import {
1111
} from "@blocknote/react";
1212
import { ComponentProps } from "react";
1313

14-
import { Form } from "./input/Form";
15-
import { GridSuggestionMenu } from "./suggestionMenu/gridSuggestionMenu/GridSuggestionMenu";
16-
import { GridSuggestionMenuEmptyItem } from "./suggestionMenu/gridSuggestionMenu/GridSuggestionMenuEmptyItem";
17-
import { GridSuggestionMenuItem } from "./suggestionMenu/gridSuggestionMenu/GridSuggestionMenuItem";
18-
import { GridSuggestionMenuLoader } from "./suggestionMenu/gridSuggestionMenu/GridSuggestionMenuLoader";
19-
import { TextInput } from "./input/TextInput";
14+
import { Form } from "./input/Form.js";
15+
import { TextInput } from "./input/TextInput.js";
2016
import {
2117
Menu,
2218
MenuDivider,
2319
MenuDropdown,
2420
MenuItem,
2521
MenuLabel,
2622
MenuTrigger,
27-
} from "./menu/Menu";
28-
import { Panel } from "./panel/Panel";
29-
import { PanelButton } from "./panel/PanelButton";
30-
import { PanelFileInput } from "./panel/PanelFileInput";
31-
import { PanelTab } from "./panel/PanelTab";
32-
import { PanelTextInput } from "./panel/PanelTextInput";
33-
import { Popover, PopoverContent, PopoverTrigger } from "./popover/Popover";
34-
import { SideMenu } from "./sideMenu/SideMenu";
35-
import { SideMenuButton } from "./sideMenu/SideMenuButton";
36-
import { SuggestionMenu } from "./suggestionMenu/SuggestionMenu";
37-
import { SuggestionMenuItem } from "./suggestionMenu/SuggestionMenuItem";
38-
import { SuggestionMenuEmptyItem } from "./suggestionMenu/SuggestionMenuEmptyItem";
39-
import { SuggestionMenuLabel } from "./suggestionMenu/SuggestionMenuLabel";
40-
import { SuggestionMenuLoader } from "./suggestionMenu/SuggestionMenuLoader";
41-
import { TableHandle } from "./tableHandle/TableHandle";
42-
import { Toolbar } from "./toolbar/Toolbar";
43-
import { ToolbarButton } from "./toolbar/ToolbarButton";
44-
import { ToolbarSelect } from "./toolbar/ToolbarSelect";
23+
} from "./menu/Menu.js";
24+
import { Panel } from "./panel/Panel.js";
25+
import { PanelButton } from "./panel/PanelButton.js";
26+
import { PanelFileInput } from "./panel/PanelFileInput.js";
27+
import { PanelTab } from "./panel/PanelTab.js";
28+
import { PanelTextInput } from "./panel/PanelTextInput.js";
29+
import { Popover, PopoverContent, PopoverTrigger } from "./popover/Popover.js";
30+
import { SideMenu } from "./sideMenu/SideMenu.js";
31+
import { SideMenuButton } from "./sideMenu/SideMenuButton.js";
32+
import { GridSuggestionMenu } from "./suggestionMenu/gridSuggestionMenu/GridSuggestionMenu.js";
33+
import { GridSuggestionMenuEmptyItem } from "./suggestionMenu/gridSuggestionMenu/GridSuggestionMenuEmptyItem.js";
34+
import { GridSuggestionMenuItem } from "./suggestionMenu/gridSuggestionMenu/GridSuggestionMenuItem.js";
35+
import { GridSuggestionMenuLoader } from "./suggestionMenu/gridSuggestionMenu/GridSuggestionMenuLoader.js";
36+
import { SuggestionMenu } from "./suggestionMenu/SuggestionMenu.js";
37+
import { SuggestionMenuEmptyItem } from "./suggestionMenu/SuggestionMenuEmptyItem.js";
38+
import { SuggestionMenuItem } from "./suggestionMenu/SuggestionMenuItem.js";
39+
import { SuggestionMenuLabel } from "./suggestionMenu/SuggestionMenuLabel.js";
40+
import { SuggestionMenuLoader } from "./suggestionMenu/SuggestionMenuLoader.js";
41+
import { TableHandle } from "./tableHandle/TableHandle.js";
42+
import { Toolbar } from "./toolbar/Toolbar.js";
43+
import { ToolbarButton } from "./toolbar/ToolbarButton.js";
44+
import { ToolbarSelect } from "./toolbar/ToolbarSelect.js";
4545

4646
import "./style.css";
4747

‎packages/core/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"name": "@blocknote/core",
33
"homepage": "https://github.com/TypeCellOS/BlockNote",
44
"private": false,
5+
"sideEffects": [
6+
"*.css"
7+
],
58
"license": "MPL-2.0",
69
"version": "0.16.0",
710
"files": [

0 commit comments

Comments
 (0)