Skip to content

Commit 60871a6

Browse files
committed
fix merge
1 parent 7a53cca commit 60871a6

File tree

3 files changed

+256
-333
lines changed

3 files changed

+256
-333
lines changed

packages/core/src/extensions/SuggestionMenu/getDefaultSlashMenuItems.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,13 @@ export function getDefaultSlashMenuItems<
9090
>(editor: BlockNoteEditor<BSchema, I, S>) {
9191
const items: DefaultSuggestionItem[] = [];
9292

93-
if (editorHasBlockWithType(editor, "heading")) {
93+
if (
94+
editorHasBlockWithType(
95+
editor,
96+
"heading",
97+
createPropSchemaFromZod(z.object({ level: z.number() })),
98+
)
99+
) {
94100
const headingProps = editor.schema.blockSchema.heading.propSchema;
95101
for (const level of [1, 2, 3, 4, 5, 6] as const) {
96102
if (z.safeParse(headingProps._zodSource, { level }).success) {
@@ -340,6 +346,7 @@ export function getDefaultSlashMenuItems<
340346
createPropSchemaFromZod(
341347
z.object({
342348
isToggleable: z.boolean().default(false),
349+
level: z.number(), // TODO
343350
}),
344351
),
345352
)

packages/xl-multi-column/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@
6565
"devDependencies": {
6666
"@types/react": "^19.2.2",
6767
"@types/react-dom": "^19.2.2",
68-
"@vitest/ui": "^2.1.9",
6968
"eslint": "^8.57.1",
70-
"jsdom": "^21.1.2",
69+
"jsdom": "^25.0.1",
7170
"react": "^19.2.0",
7271
"react-dom": "^19.2.0",
7372
"rimraf": "^5.0.10",

0 commit comments

Comments
 (0)