Skip to content

Commit 332bb2c

Browse files
committed
Merge branch 'refs/heads/main' into releases
2 parents 74f4ec4 + ece1684 commit 332bb2c

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

packages/core/src/extensions/NonEditableBlocks/NonEditableBlockPlugin.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@ export const NonEditableBlockPlugin = () => {
3333
return true;
3434
}
3535
// Checks if key press is Enter
36-
if (event.key === "Enter") {
36+
if (
37+
event.key === "Enter" &&
38+
!event.shiftKey &&
39+
!event.altKey &&
40+
!event.ctrlKey &&
41+
!event.metaKey
42+
) {
3743
const tr = view.state.tr;
3844
view.dispatch(
3945
tr

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
export * from "./ar";
2+
export * from "./de";
23
export * from "./en";
4+
export * from "./es";
35
export * from "./fr";
46
export * from "./is";
57
export * from "./ja";
68
export * from "./ko";
79
export * from "./nl";
810
export * from "./pl";
911
export * from "./pt";
12+
export * from "./ru";
1013
export * from "./vi";
1114
export * from "./zh";
12-
export * from "./ru";
13-
export * from "./de";

packages/core/src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import * as locales from "./i18n/locales";
22
export * from "./api/exporters/html/externalHTMLExporter";
33
export * from "./api/exporters/html/internalHTMLSerializer";
44
export * from "./api/testUtil";
5+
export * from "./api/getCurrentBlockContentType";
6+
export * from "./blocks/defaultBlockHelpers";
57
export * from "./blocks/AudioBlockContent/AudioBlockContent";
68
export * from "./blocks/FileBlockContent/FileBlockContent";
79
export * from "./blocks/ImageBlockContent/ImageBlockContent";
810
export * from "./blocks/VideoBlockContent/VideoBlockContent";
9-
1011
export * from "./blocks/FileBlockContent/fileBlockHelpers";
1112
export * from "./blocks/FileBlockContent/uploadToTmpFilesDotOrg_DEV_ONLY";
1213
export { parseImageElement } from "./blocks/ImageBlockContent/imageBlockHelpers";

0 commit comments

Comments
 (0)