Merge branch 'main' into support-h4-h6

Author: DrewJohnsonGT

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.31.3 (2025-06-18)
+
+### 🩹 Fixes
+
+- AI generation with empty document ([#1740](https://github.com/TypeCellOS/BlockNote/pull/1740))
+- do not send a welcome email if magic link was used on an account older than a minute ago ([db88fe4aa](https://github.com/TypeCellOS/BlockNote/commit/db88fe4aa))
+- AI system messages should always be at start of prompt ([#1741](https://github.com/TypeCellOS/BlockNote/pull/1741))
+- Selection clicking editor padding ([#1717](https://github.com/TypeCellOS/BlockNote/pull/1717))
+- preserve marks across a shift+enter #1672 ([#1743](https://github.com/TypeCellOS/BlockNote/pull/1743), [#1672](https://github.com/TypeCellOS/BlockNote/issues/1672))
+- **ai:** undo-redo after accepting/rejecting changes will undo as expected ([#1752](https://github.com/TypeCellOS/BlockNote/pull/1752))
+- **locales:** add translations for some comment strings ([#1764](https://github.com/TypeCellOS/BlockNote/pull/1764))
+- **website:** log in bug fixes ([#1742](https://github.com/TypeCellOS/BlockNote/pull/1742))
+
+### ❤️ Thank You
+
+- Matthew Lipski @matthewlipski
+- Nick Perez
+- Nick the Sick
+- Vinicius Fernandes @ViniCleFer
+- Yousef
+
 ## 0.31.2 (2025-06-05)
 
 ### 🩹 Fixes

packages/ariakit/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/ariakit"
   },
   "license": "MPL-2.0",
-  "version": "0.31.2",
+  "version": "0.31.3",
   "files": [
     "dist",
     "types",
@@ -57,8 +57,8 @@
   },
   "dependencies": {
     "@ariakit/react": "^0.4.3",
-    "@blocknote/core": "0.31.2",
-    "@blocknote/react": "0.31.2"
+    "@blocknote/core": "0.31.3",
+    "@blocknote/react": "0.31.3"
   },
   "devDependencies": {
     "@types/react": "^18.0.25",

packages/ariakit/src/comments/Comment.tsx

@@ -1,7 +1,11 @@
 import { Group as AriakitGroup } from "@ariakit/react";
 
 import { assertEmpty } from "@blocknote/core";
-import { ComponentProps, useFocusWithin } from "@blocknote/react";
+import {
+  ComponentProps,
+  useDictionary,
+  useFocusWithin,
+} from "@blocknote/react";
 import { forwardRef, useState } from "react";
 
 const AuthorInfo = forwardRef<
@@ -12,6 +16,7 @@ const AuthorInfo = forwardRef<
   >
 >((props, _ref) => {
   const { authorInfo, timeString, edited, ...rest } = props;
+  const dict = useDictionary();
 
   assertEmpty(rest, false);
 
@@ -34,7 +39,7 @@ const AuthorInfo = forwardRef<
       <div className={"bn-ak-username"}>
         {authorInfo.username}
         <span>
-          {timeString} {edited && "(edited)"}
+          {timeString} {edited && `(${dict.comments.edited})`}
         </span>
       </div>
     </AriakitGroup>

packages/code-block/package.json

@@ -9,7 +9,7 @@
     "directory": "packages/code-block"
   },
   "license": "MPL-2.0",
-  "version": "0.31.2",
+  "version": "0.31.3",
   "files": [
     "dist",
     "types",
@@ -49,7 +49,7 @@
     "test-watch": "vitest watch"
   },
   "dependencies": {
-    "@blocknote/core": "0.31.2",
+    "@blocknote/core": "0.31.3",
     "@shikijs/core": "^3.2.1",
     "@shikijs/engine-javascript": "^3.2.1",
     "@shikijs/langs-precompiled": "^3.2.1",

packages/core/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/core"
   },
   "license": "MPL-2.0",
-  "version": "0.31.2",
+  "version": "0.31.3",
   "files": [
     "dist",
     "types",

packages/core/src/extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts

@@ -434,7 +434,7 @@ export const KeyboardShortcutsExtension = Extension.create<{
       ]);
 
     const handleEnter = (withShift = false) => {
-      return this.editor.commands.first(({ commands }) => [
+      return this.editor.commands.first(({ commands, tr }) => [
         // Removes a level of nesting if the block is empty & indented, while the selection is also empty & at the start
         // of the block.
         () =>
@@ -486,9 +486,21 @@ export const KeyboardShortcutsExtension = Extension.create<{
               // both enter and shift+enter.
               blockHardBreakShortcut === "enter"
             ) {
-              return commands.insertContent({
-                type: "hardBreak",
-              });
+              const marks =
+                tr.storedMarks ||
+                tr.selection.$head
+                  .marks()
+                  .filter((m) =>
+                    this.editor.extensionManager.splittableMarks.includes(
+                      m.type.name,
+                    ),
+                  );
+
+              tr.insert(
+                tr.selection.head,
+                tr.doc.type.schema.nodes.hardBreak.create(),
+              ).ensureMarks(marks);
+              return true;
             }
 
             return false;

packages/core/src/i18n/locales/ar.ts

@@ -338,6 +338,9 @@ export const ar: Dictionary = {
     },
   },
   comments: {
+    edited: "تم التحرير",
+    save_button_text: "حفظ",
+    cancel_button_text: "إلغاء",
     actions: {
       add_reaction: "أضف تفاعلًا",
       resolve: "حل",

packages/core/src/i18n/locales/de.ts

@@ -352,6 +352,9 @@ export const de: Dictionary = {
     },
   },
   comments: {
+    edited: "bearbeitet",
+    save_button_text: "Speichern",
+    cancel_button_text: "Abbrechen",
     actions: {
       add_reaction: "Reaktion hinzufügen",
       resolve: "Lösen",

packages/core/src/i18n/locales/en.ts

@@ -353,6 +353,9 @@ export const en = {
     },
   },
   comments: {
+    edited: "edited",
+    save_button_text: "Save",
+    cancel_button_text: "Cancel",
     actions: {
       add_reaction: "Add reaction",
       resolve: "Resolve",

packages/core/src/i18n/locales/es.ts

@@ -351,6 +351,9 @@ export const es: Dictionary = {
     },
   },
   comments: {
+    edited: "editado",
+    save_button_text: "Guardar",
+    cancel_button_text: "Cancelar",
     actions: {
       add_reaction: "Agregar reacción",
       resolve: "Resolver",