@blocknote/core 0.24.2 → 0.25.0

package/src/i18n/locales/ru.ts

@@ -157,6 +157,9 @@ export const ru: Dictionary = {
     bulletListItem: "Список",
     numberedListItem: "Список",
     checkListItem: "Список",
+    new_comment: "Напишите комментарий...",
+    edit_comment: "Редактировать комментарий...",
+    comment_reply: "Добавить комментарий...",
   },
   file_blocks: {
     image: {
@@ -180,6 +183,8 @@ export const ru: Dictionary = {
   drag_handle: {
     delete_menuitem: "Удалить",
     colors_menuitem: "Цвета",
+    header_row_menuitem: "Заголовок строки",
+    header_column_menuitem: "Заголовок столбца",
   },
   table_handle: {
     delete_column_menuitem: "Удалить столбец",
@@ -188,6 +193,9 @@ export const ru: Dictionary = {
     add_right_menuitem: "Добавить столбец справа",
     add_above_menuitem: "Добавить строку выше",
     add_below_menuitem: "Добавить строку ниже",
+    split_cell_menuitem: "Разделить ячейку",
+    merge_cells_menuitem: "Объединить ячейки",
+    background_color_menuitem: "Цвет фона",
   },
   suggestion_menu: {
     no_items_title: "ничего не найдено",
@@ -303,6 +311,9 @@ export const ru: Dictionary = {
     align_justify: {
       tooltip: "По середине текст",
     },
+    table_cell_merge: {
+      tooltip: "Объединить ячейки",
+    },
     comment: {
       tooltip: "Добавить комментарий",
     },
@@ -345,6 +356,18 @@ export const ru: Dictionary = {
       url_placeholder: "Изменить URL",
     },
   },
+  comments: {
+    actions: {
+      add_reaction: "Добавить реакцию",
+      resolve: "Решить",
+      edit_comment: "Редактировать комментарий",
+      delete_comment: "Удалить комментарий",
+      more_actions: "Другие действия",
+    },
+    reactions: {
+      reacted_by: "Отреагировал(а)",
+    },
+  },
   generic: {
     ctrl_shortcut: "Ctrl",
   },

package/src/i18n/locales/uk.ts

@@ -155,6 +155,9 @@ export const uk: Dictionary = {
     bulletListItem: "Список",
     numberedListItem: "Список",
     checkListItem: "Список",
+    new_comment: "Напишіть коментар...",
+    edit_comment: "Редагувати коментар...",
+    comment_reply: "Додати коментар...",
   },
   file_blocks: {
     image: {
@@ -178,6 +181,8 @@ export const uk: Dictionary = {
   drag_handle: {
     delete_menuitem: "Видалити",
     colors_menuitem: "Кольори",
+    header_row_menuitem: "Заголовок рядка",
+    header_column_menuitem: "Заголовок стовпця",
   },
   table_handle: {
     delete_column_menuitem: "Видалити стовпець",
@@ -186,6 +191,9 @@ export const uk: Dictionary = {
     add_right_menuitem: "Додати стовпець справа",
     add_above_menuitem: "Додати рядок вище",
     add_below_menuitem: "Додати рядок нижче",
+    split_cell_menuitem: "Розділити клітинку",
+    merge_cells_menuitem: "Об'єднати клітинки",
+    background_color_menuitem: "Змінити колір фону",
   },
   suggestion_menu: {
     no_items_title: "Нічого не знайдено",
@@ -300,6 +308,9 @@ export const uk: Dictionary = {
     align_justify: {
       tooltip: "Вирівняти за шириною",
     },
+    table_cell_merge: {
+      tooltip: "Об'єднати клітинки",
+    },
     comment: {
       tooltip: "Додати коментар",
     },
@@ -342,6 +353,18 @@ export const uk: Dictionary = {
       url_placeholder: "Редагувати URL",
     },
   },
+  comments: {
+    actions: {
+      add_reaction: "Додати реакцію",
+      resolve: "Вирішити",
+      edit_comment: "Редагувати коментар",
+      delete_comment: "Видалити коментар",
+      more_actions: "Більше дій",
+    },
+    reactions: {
+      reacted_by: "Відреагував(ла)",
+    },
+  },
   generic: {
     ctrl_shortcut: "Ctrl",
   },

package/src/i18n/locales/vi.ts

@@ -129,6 +129,9 @@ export const vi: Dictionary = {
     bulletListItem: "Danh sách",
     numberedListItem: "Danh sách",
     checkListItem: "Danh sách",
+    new_comment: "Viết bình luận...",
+    edit_comment: "Chỉnh sửa bình luận...",
+    comment_reply: "Thêm bình luận...",
   },
   file_blocks: {
     image: {
@@ -152,6 +155,8 @@ export const vi: Dictionary = {
   drag_handle: {
     delete_menuitem: "Xóa",
     colors_menuitem: "Màu sắc",
+    header_row_menuitem: "Tiêu đề hàng",
+    header_column_menuitem: "Tiêu đề cột",
   },
   table_handle: {
     delete_column_menuitem: "Xóa cột",
@@ -160,6 +165,9 @@ export const vi: Dictionary = {
     add_right_menuitem: "Thêm cột bên phải",
     add_above_menuitem: "Thêm hàng phía trên",
     add_below_menuitem: "Thêm hàng phía dưới",
+    split_cell_menuitem: "Chia ô",
+    merge_cells_menuitem: "Gộp ô",
+    background_color_menuitem: "Màu nền",
   },
   suggestion_menu: {
     no_items_title: "Không tìm thấy mục nào",
@@ -275,6 +283,9 @@ export const vi: Dictionary = {
     align_justify: {
       tooltip: "Căn đều văn bản",
     },
+    table_cell_merge: {
+      tooltip: "Gộp các ô",
+    },
     comment: {
       tooltip: "Thêm bình luận",
     },
@@ -317,6 +328,18 @@ export const vi: Dictionary = {
       url_placeholder: "Chỉnh sửa URL",
     },
   },
+  comments: {
+    actions: {
+      add_reaction: "Thêm phản ứng",
+      resolve: "Giải quyết",
+      edit_comment: "Chỉnh sửa bình luận",
+      delete_comment: "Xóa bình luận",
+      more_actions: "Thêm hành động",
+    },
+    reactions: {
+      reacted_by: "Phản ứng bởi",
+    },
+  },
   generic: {
     ctrl_shortcut: "Ctrl",
   },

package/src/i18n/locales/zh.ts

@@ -163,6 +163,9 @@ export const zh: Dictionary = {
     bulletListItem: "列表",
     numberedListItem: "列表",
     checkListItem: "列表",
+    new_comment: "写评论...",
+    edit_comment: "编辑评论...",
+    comment_reply: "添加评论...",
   },
   file_blocks: {
     image: {
@@ -186,6 +189,8 @@ export const zh: Dictionary = {
   drag_handle: {
     delete_menuitem: "删除",
     colors_menuitem: "颜色",
+    header_row_menuitem: "行标题",
+    header_column_menuitem: "列标题",
   },
   table_handle: {
     delete_column_menuitem: "删除列",
@@ -194,6 +199,9 @@ export const zh: Dictionary = {
     add_right_menuitem: "右侧添加列",
     add_above_menuitem: "上方添加行",
     add_below_menuitem: "下方添加行",
+    split_cell_menuitem: "拆分单元格",
+    merge_cells_menuitem: "合并单元格",
+    background_color_menuitem: "背景色",
   },
   suggestion_menu: {
     no_items_title: "无匹配项",
@@ -309,6 +317,9 @@ export const zh: Dictionary = {
     align_justify: {
       tooltip: "文本对齐",
     },
+    table_cell_merge: {
+      tooltip: "合并单元格",
+    },
     comment: {
       tooltip: "添加评论",
     },
@@ -351,6 +362,18 @@ export const zh: Dictionary = {
       url_placeholder: "编辑链接地址",
     },
   },
+  comments: {
+    actions: {
+      add_reaction: "添加反应",
+      resolve: "解决",
+      edit_comment: "编辑评论",
+      delete_comment: "删除评论",
+      more_actions: "更多操作",
+    },
+    reactions: {
+      reacted_by: "已回应",
+    },
+  },
   generic: {
     ctrl_shortcut: "Ctrl",
   },

package/src/index.ts

@@ -1,4 +1,5 @@
 import * as locales from "./i18n/locales/index.js";
+export * from "./api/blockManipulation/commands/updateBlock/updateBlock.js";
 export * from "./api/exporters/html/externalHTMLExporter.js";
 export * from "./api/exporters/html/internalHTMLSerializer.js";
 export * from "./api/getBlockInfoFromPos.js";
@@ -6,9 +7,6 @@ export * from "./api/nodeUtil.js";
 export * from "./api/testUtil/index.js";
 export * from "./blocks/AudioBlockContent/AudioBlockContent.js";
 export * from "./blocks/CodeBlockContent/CodeBlockContent.js";
-export * from "./blocks/PageBreakBlockContent/PageBreakBlockContent.js";
-export * from "./blocks/PageBreakBlockContent/getPageBreakSlashMenuItems.js";
-export * from "./blocks/PageBreakBlockContent/schema.js";
 export * from "./blocks/FileBlockContent/FileBlockContent.js";
 export * from "./blocks/FileBlockContent/helpers/parse/parseEmbedElement.js";
 export * from "./blocks/FileBlockContent/helpers/parse/parseFigureElement.js";
@@ -20,6 +18,9 @@ export * from "./blocks/FileBlockContent/helpers/toExternalHTML/createFigureWith
 export * from "./blocks/FileBlockContent/helpers/toExternalHTML/createLinkWithCaption.js";
 export * from "./blocks/FileBlockContent/uploadToTmpFilesDotOrg_DEV_ONLY.js";
 export * from "./blocks/ImageBlockContent/ImageBlockContent.js";
+export * from "./blocks/PageBreakBlockContent/PageBreakBlockContent.js";
+export * from "./blocks/PageBreakBlockContent/getPageBreakSlashMenuItems.js";
+export * from "./blocks/PageBreakBlockContent/schema.js";
 export {
   EMPTY_CELL_HEIGHT,
   EMPTY_CELL_WIDTH,
@@ -52,11 +53,11 @@ export * from "./schema/index.js";
 export * from "./util/browser.js";
 export * from "./util/combineByGroup.js";
 export * from "./util/esmDependencies.js";
+export * from "./util/table.js";
 export * from "./util/string.js";
 export * from "./util/typescript.js";
 export { UnreachableCaseError, assertEmpty } from "./util/typescript.js";
 export { locales };
-export * from "./api/blockManipulation/commands/updateBlock/updateBlock.js";
 
 // for testing from react (TODO: move):
 export * from "./api/nodeConversions/blockToNode.js";
@@ -68,3 +69,4 @@ export * from "./extensions/UniqueID/UniqueID.js";
 export * from "./api/exporters/markdown/markdownExporter.js";
 export * from "./api/parsers/html/parseHTML.js";
 export * from "./api/parsers/markdown/parseMarkdown.js";
+

package/src/schema/blocks/types.ts

@@ -144,14 +144,33 @@ export type BlockSchemaWithBlock<
   [k in BType]: C;
 };
 
+export type TableCellProps = {
+  backgroundColor: string;
+  textColor: string;
+  textAlignment: "left" | "center" | "right" | "justify";
+  colspan?: number;
+  rowspan?: number;
+};
+
+export type TableCell<
+  I extends InlineContentSchema,
+  S extends StyleSchema = StyleSchema
+> = {
+  type: "tableCell";
+  props: TableCellProps;
+  content: InlineContent<I, S>[];
+};
+
 export type TableContent<
   I extends InlineContentSchema,
   S extends StyleSchema = StyleSchema
 > = {
   type: "tableContent";
   columnWidths: (number | undefined)[];
+  headerRows?: number;
+  headerCols?: number;
   rows: {
-    cells: InlineContent<I, S>[][];
+    cells: InlineContent<I, S>[][] | TableCell<I, S>[];
   }[];
 };
 
@@ -220,14 +239,25 @@ export type SpecificBlock<
  *
  */
 
+export type PartialTableCell<
+  I extends InlineContentSchema,
+  S extends StyleSchema = StyleSchema
+> = {
+  type: "tableCell";
+  props?: Partial<TableCellProps>;
+  content?: PartialInlineContent<I, S>;
+};
+
 export type PartialTableContent<
   I extends InlineContentSchema,
   S extends StyleSchema = StyleSchema
 > = {
   type: "tableContent";
   columnWidths?: (number | undefined)[];
+  headerRows?: number;
+  headerCols?: number;
   rows: {
-    cells: PartialInlineContent<I, S>[];
+    cells: PartialInlineContent<I, S>[] | PartialTableCell<I, S>[];
   }[];
 };
 

package/src/util/browser.ts

@@ -12,7 +12,7 @@ export function formatKeyboardShortcut(shortcut: string, ctrlText = "Ctrl") {
   }
 }
 
-export function mergeCSSClasses(...classes: (string | undefined)[]) {
+export function mergeCSSClasses(...classes: (string | false | undefined)[]) {
   return classes.filter((c) => c).join(" ");
 }
 

package/src/util/table.ts

@@ -0,0 +1,107 @@
+import type {
+  InlineContentSchema,
+  StyleSchema,
+  PartialInlineContent,
+  InlineContent,
+} from "../schema";
+import { PartialTableCell, TableCell } from "../schema/blocks/types.js";
+
+/**
+ * This will map a table cell to a TableCell object.
+ * This is useful for when we want to get the full table cell object from a partial table cell.
+ * It is guaranteed to return a new TableCell object.
+ */
+export function mapTableCell<
+  T extends InlineContentSchema,
+  S extends StyleSchema
+>(
+  content: PartialInlineContent<T, S> | PartialTableCell<T, S> | TableCell<T, S>
+): TableCell<T, S> {
+  return isTableCell(content)
+    ? { ...content }
+    : isPartialTableCell(content)
+    ? {
+        type: "tableCell",
+        content: ([] as InlineContent<T, S>[]).concat(content.content as any),
+        props: {
+          backgroundColor: content.props?.backgroundColor ?? "default",
+          textColor: content.props?.textColor ?? "default",
+          textAlignment: content.props?.textAlignment ?? "left",
+          colspan: content.props?.colspan ?? 1,
+          rowspan: content.props?.rowspan ?? 1,
+        },
+      }
+    : {
+        type: "tableCell",
+        content: ([] as InlineContent<T, S>[]).concat(content as any),
+        props: {
+          backgroundColor: "default",
+          textColor: "default",
+          textAlignment: "left",
+          colspan: 1,
+          rowspan: 1,
+        },
+      };
+}
+
+export function isPartialTableCell<
+  T extends InlineContentSchema,
+  S extends StyleSchema
+>(
+  content:
+    | TableCell<T, S>
+    | PartialInlineContent<T, S>
+    | PartialTableCell<T, S>
+    | undefined
+    | null
+): content is PartialTableCell<T, S> {
+  return (
+    content !== undefined &&
+    content !== null &&
+    typeof content !== "string" &&
+    !Array.isArray(content) &&
+    content.type === "tableCell"
+  );
+}
+
+export function isTableCell<
+  T extends InlineContentSchema,
+  S extends StyleSchema
+>(
+  content:
+    | TableCell<T, S>
+    | PartialInlineContent<T, S>
+    | PartialTableCell<T, S>
+    | undefined
+    | null
+): content is TableCell<T, S> {
+  return (
+    isPartialTableCell(content) &&
+    content.props !== undefined &&
+    content.content !== undefined
+  );
+}
+
+export function getColspan(
+  cell:
+    | TableCell<any, any>
+    | PartialTableCell<any, any>
+    | PartialInlineContent<any, any>
+): number {
+  if (isTableCell(cell)) {
+    return cell.props.colspan ?? 1;
+  }
+  return 1;
+}
+
+export function getRowspan(
+  cell:
+    | TableCell<any, any>
+    | PartialTableCell<any, any>
+    | PartialInlineContent<any, any>
+): number {
+  if (isTableCell(cell)) {
+    return cell.props.rowspan ?? 1;
+  }
+  return 1;
+}