Skip to content

Commit b739907

Browse files
committed
Merge branch 'refs/heads/main' into releases
# Conflicts: # docs/package.json # lerna.json # package-lock.json # packages/ariakit/package.json # packages/core/package.json # packages/dev-scripts/package.json # packages/mantine/package.json # packages/react/package.json # packages/server-util/package.json # packages/shadcn/package.json # playground/package.json # tests/package.json
2 parents 448b99b + 91d7a88 commit b739907

File tree

79 files changed

+2332
-872
lines changed

Some content is hidden

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

79 files changed

+2332
-872
lines changed
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: "Submit a Custom Block"
2+
description: "Use this template to submit a new custom block (schema) for BlockNote."
3+
title: "<Your Block Name>"
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
## Submit a Custom Block (Schema)
9+
10+
Thank you for contributing to BlockNote! Please fill out the following sections to submit your custom block. Make sure to provide as much detail as possible to help us understand and showcase your block effectively.
11+
12+
- type: input
13+
id: block_name
14+
attributes:
15+
label: "Block Name"
16+
description: "Enter the name of your custom block."
17+
placeholder: "e.g., Alert Block"
18+
19+
- type: textarea
20+
id: block_description
21+
attributes:
22+
label: "Block Description"
23+
description: "Provide a detailed description of your custom block. Explain its purpose and how it works."
24+
placeholder: "This block is used to display alert messages with different severity levels."
25+
26+
- type: textarea
27+
id: block_dependencies
28+
attributes:
29+
label: "Dependencies"
30+
description: "Provide a full list of all the dependencies needed to make your custom block work."
31+
placeholder: "`npm_package_1`, `npm_package_2`, ...etc "
32+
33+
- type: input
34+
id: live_example
35+
attributes:
36+
label: "Live Example"
37+
description: "Please provide a valid URL to a codepen, stackblitz, codeSandbox, or simply a github repo"
38+
placeholder: "live example URL here"
39+
40+
- type: textarea
41+
id: usage_instructions
42+
attributes:
43+
label: "Usage Instructions"
44+
description: "Explain how to use your custom block in a BlockNote application. Include any necessary setup steps."
45+
placeholder: |
46+
```markdown
47+
1. Import your custom block.
48+
2. Add it to the BlockNote editor configuration.
49+
3. Use it within the BlockNote editor.
50+
```
51+
52+
- type: textarea
53+
id: additional_notes
54+
attributes:
55+
label: "Additional Notes"
56+
description: "Include any additional information or notes about your custom block."
57+
placeholder: "Any additional context or information."

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ React rich text editor. Easily add a modern text editing experience to your app.
2020
Documentation
2121
</a> - <a href="https://www.blocknotejs.org/docs/quickstart">
2222
Quickstart
23-
</a>- <a href="https://www.blocknotejs.org/docs/examples">
23+
</a>- <a href="https://www.blocknotejs.org/examples">
2424
Examples
2525
</a>
2626
</p>

docs/components/pages/pricing/faq.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const faqs = [
1616
{
1717
question:
1818
"What License is BlockNote using? Can I use it for commercial projects?",
19-
answer: `BlockNote is licensed under the MPL 2.0 license, which allows you to use BlockNote in commercial (and closed-source) applications.
19+
answer: `BlockNote is open source software licensed under the MPL 2.0 license, which allows you to use BlockNote in commercial (and closed-source) applications - even without a subscription.
2020
If you make changes to the BlockNote source files, you're expected to publish these changes so the wider community can benefit as well.`,
2121
},
2222
// More questions...

docs/components/pages/pricing/tiers.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export function Tiers({
107107
frequency: Frequency;
108108
}) {
109109
return (
110-
<div className="isolate mx-auto mt-10 grid max-w-md grid-cols-1 gap-4 lg:mx-0 lg:max-w-none lg:grid-cols-4">
110+
<div className="isolate mx-auto mt-10 grid max-w-md grid-cols-1 gap-4 lg:mx-0 lg:max-w-none lg:grid-cols-3">
111111
{tiers.map((tier) => (
112112
<div
113113
key={tier.id}

docs/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "docs",
3-
"version": "0.15.2",
3+
"version": "0.15.3",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",
@@ -9,11 +9,11 @@
99
"lint": "next lint"
1010
},
1111
"dependencies": {
12-
"@blocknote/ariakit": "^0.15.2",
13-
"@blocknote/core": "^0.15.2",
14-
"@blocknote/mantine": "^0.15.2",
15-
"@blocknote/react": "^0.15.2",
16-
"@blocknote/shadcn": "^0.15.2",
12+
"@blocknote/ariakit": "^0.15.3",
13+
"@blocknote/core": "^0.15.3",
14+
"@blocknote/mantine": "^0.15.3",
15+
"@blocknote/react": "^0.15.3",
16+
"@blocknote/shadcn": "^0.15.3",
1717
"@headlessui/react": "^1.7.18",
1818
"@heroicons/react": "^2.1.4",
1919
"@mantine/core": "^7.10.1",

docs/pages/examples/_meta.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"theming": "Theming",
77
"interoperability": "Interoperability",
88
"custom-schema": "Custom Schemas",
9-
"collaboration": "Collaboration"
9+
"collaboration": "Collaboration",
10+
"extensions": "Extensions"
1011
}

docs/pages/pricing.mdx

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import { Tiers } from "../components/pages/pricing/tiers";
44

55
export default function Pricing() {
66
const tiers = [
7-
{
8-
id: "tier-free",
9-
title: "Community",
10-
description: "Everything necessary to get started for individuals and non-commercial projects.",
11-
price: "Free",
12-
features: [
13-
"Use BlockNote for free (open source license)",
14-
"Community Discord for help & feedback",
15-
],
16-
href: "/docs/",
17-
},
7+
// {
8+
// id: "tier-free",
9+
// title: "Community",
10+
// description: "Everything necessary to get started for individuals and non-commercial projects.",
11+
// price: "Free",
12+
// features: [
13+
// "Use BlockNote for free (open source license)",
14+
// "Community Discord for help & feedback",
15+
// ],
16+
// href: "/docs/",
17+
// },
1818
{
1919
id: "tier-starter",
20-
mostPopular: true,
20+
mostPopular: false,
2121
title: "Starter",
2222
description:
2323
"Best for companies and organizations building products with BlockNote.",
@@ -32,6 +32,7 @@ export default function Pricing() {
3232
{
3333
id: "tier-business",
3434
title: "Business",
35+
mostPopular: true,
3536
description:
3637
"Best for companies that want a direct line to the team.",
3738
price: { month: 189, year: 48 },

examples/03-ui-components/12-custom-ui/App.tsx

Lines changed: 0 additions & 57 deletions
This file was deleted.

examples/03-ui-components/12-custom-ui/ColorMenu.tsx

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)