Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: simple table bugs (#6981)
Kilu.Heebb1b6dffb0c
diff --git a/frontend/appflowy_web_app/src/application/types.ts b/frontend/appflowy_web_app/src/application/types.tsindex 9ccd1da92b..53425f821a 100644--- a/frontend/appflowy_web_app/src/application/types.ts+++ b/frontend/appflowy_web_app/src/application/types.ts@@ -150,13 +150,13 @@ export enum TableAlignType {}export interface SimpleTableData extends BlockData {- column_widths: Record<string, number>;- enable_header_row: boolean;- row_colors: Record<string, string>;- enable_header_column: boolean;- column_aligns: Record<string, TableAlignType>;- column_colors: Record<string, string>;- row_aligns: Record<string, TableAlignType>;+ column_widths?: Record<string, number>;+ enable_header_row?: boolean;+ row_colors?: Record<string, string>;+ enable_header_column?: boolean;+ column_aligns?: Record<string, TableAlignType>;+ column_colors?: Record<string, string>;+ row_aligns?: Record<string, TableAlignType>;}export interface TableCellBlockData extends BlockData {@@ -326,152 +326,152 @@ export enum YjsDatabaseKey {export interface YDoc extends Y.Doc {// eslint-disable-next-line @typescript-eslint/no-explicit-any- getMap (key: YjsEditorKey.data_section): YSharedRoot | any;+ getMap(key: YjsEditorKey.data_section): YSharedRoot | any;}export interface YDatabaseRow extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): RowId;+ get(key: YjsDatabaseKey.id): RowId;- get (key: YjsDatabaseKey.height): string;+ get(key: YjsDatabaseKey.height): string;- get (key: YjsDatabaseKey.visibility): boolean;+ get(key: YjsDatabaseKey.visibility): boolean;- get (key: YjsDatabaseKey.cells): YDatabaseCells;+ get(key: YjsDatabaseKey.cells): YDatabaseCells;- get (key: YjsDatabaseKey.created_at): CreatedAt;+ get(key: YjsDatabaseKey.created_at): CreatedAt;- get (key: YjsDatabaseKey.last_modified): LastModified;+ get(key: YjsDatabaseKey.last_modified): LastModified;}export interface YDatabaseCells extends Y.Map<unknown> {- get (key: FieldId): YDatabaseCell;+ get(key: FieldId): YDatabaseCell;}export type EndTimestamp = string;export type ReminderId = string;export interface YDatabaseCell extends Y.Map<unknown> {- get (key: YjsDatabaseKey.created_at): CreatedAt;+ get(key: YjsDatabaseKey.created_at): CreatedAt;- get (key: YjsDatabaseKey.last_modified): LastModified;+ get(key: YjsDatabaseKey.last_modified): LastModified;- get (key: YjsDatabaseKey.field_type): string;+ get(key: YjsDatabaseKey.field_type): string;- get (key: YjsDatabaseKey.data): object | string | boolean | number;+ get(key: YjsDatabaseKey.data): object | string | boolean | number;- get (key: YjsDatabaseKey.end_timestamp): EndTimestamp;+ get(key: YjsDatabaseKey.end_timestamp): EndTimestamp;- get (key: YjsDatabaseKey.include_time): boolean;+ get(key: YjsDatabaseKey.include_time): boolean;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.is_range): boolean;+ get(key: YjsDatabaseKey.is_range): boolean;- get (key: YjsDatabaseKey.reminder_id): ReminderId;+ get(key: YjsDatabaseKey.reminder_id): ReminderId;}export interface YSharedRoot extends Y.Map<unknown> {- get (key: YjsEditorKey.document): YDocument;+ get(key: YjsEditorKey.document): YDocument;- get (key: YjsEditorKey.folder): YFolder;+ get(key: YjsEditorKey.folder): YFolder;- get (key: YjsEditorKey.database): YDatabase;+ get(key: YjsEditorKey.database): YDatabase;- get (key: YjsEditorKey.database_row): YDatabaseRow;+ get(key: YjsEditorKey.database_row): YDatabaseRow;}export interface YFolder extends Y.Map<unknown> {- get (key: YjsFolderKey.views): YViews;+ get(key: YjsFolderKey.views): YViews;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.meta): YFolderMeta;+ get(key: YjsFolderKey.meta): YFolderMeta;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.relation): YFolderRelation;+ get(key: YjsFolderKey.relation): YFolderRelation;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.section): YFolderSection;+ get(key: YjsFolderKey.section): YFolderSection;}export interface YViews extends Y.Map<unknown> {- get (key: ViewId): YView;+ get(key: ViewId): YView;}export interface YView extends Y.Map<unknown> {- get (key: YjsFolderKey.id): ViewId;+ get(key: YjsFolderKey.id): ViewId;- get (key: YjsFolderKey.bid): string;+ get(key: YjsFolderKey.bid): string;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.name): string;+ get(key: YjsFolderKey.name): string;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.icon | YjsFolderKey.extra): string;+ get(key: YjsFolderKey.icon | YjsFolderKey.extra): string;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.layout): string;+ get(key: YjsFolderKey.layout): string;}export interface YFolderRelation extends Y.Map<unknown> {- get (key: ViewId): Y.Array<ViewId>;+ get(key: ViewId): Y.Array<ViewId>;}export interface YFolderMeta extends Y.Map<unknown> {- get (key: YjsFolderKey.current_view | YjsFolderKey.current_workspace): string;+ get(key: YjsFolderKey.current_view | YjsFolderKey.current_workspace): string;}export interface YFolderSection extends Y.Map<unknown> {- get (key: YjsFolderKey.favorite | YjsFolderKey.private | YjsFolderKey.recent | YjsFolderKey.trash): YFolderSectionItem;+ get(key: YjsFolderKey.favorite | YjsFolderKey.private | YjsFolderKey.recent | YjsFolderKey.trash): YFolderSectionItem;}export interface YFolderSectionItem extends Y.Map<unknown> {- get (key: string): Y.Array<unknown>;+ get(key: string): Y.Array<unknown>;}export interface YDocument extends Y.Map<unknown> {- get (key: YjsEditorKey.blocks | YjsEditorKey.page_id | YjsEditorKey.meta): YBlocks | YMeta | string;+ get(key: YjsEditorKey.blocks | YjsEditorKey.page_id | YjsEditorKey.meta): YBlocks | YMeta | string;}export interface YBlocks extends Y.Map<unknown> {- get (key: BlockId): YBlock;+ get(key: BlockId): YBlock;}export interface YBlock extends Y.Map<unknown> {- get (key: YjsEditorKey.block_id | YjsEditorKey.block_parent): BlockId;+ get(key: YjsEditorKey.block_id | YjsEditorKey.block_parent): BlockId;- get (key: YjsEditorKey.block_type): BlockType;+ get(key: YjsEditorKey.block_type): BlockType;- get (key: YjsEditorKey.block_data): string;+ get(key: YjsEditorKey.block_data): string;- get (key: YjsEditorKey.block_children): ChildrenId;+ get(key: YjsEditorKey.block_children): ChildrenId;- get (key: YjsEditorKey.block_external_id): ExternalId;+ get(key: YjsEditorKey.block_external_id): ExternalId;}export interface YMeta extends Y.Map<unknown> {- get (key: YjsEditorKey.children_map | YjsEditorKey.text_map): YChildrenMap | YTextMap;+ get(key: YjsEditorKey.children_map | YjsEditorKey.text_map): YChildrenMap | YTextMap;}export interface YChildrenMap extends Y.Map<unknown> {- get (key: ChildrenId): Y.Array<BlockId>;+ get(key: ChildrenId): Y.Array<BlockId>;}export interface YTextMap extends Y.Map<unknown> {- get (key: ExternalId): Y.Text;+ get(key: ExternalId): Y.Text;}export interface YDatabase extends Y.Map<unknown> {- get (key: YjsDatabaseKey.views): YDatabaseViews;+ get(key: YjsDatabaseKey.views): YDatabaseViews;- get (key: YjsDatabaseKey.metas): YDatabaseMetas;+ get(key: YjsDatabaseKey.metas): YDatabaseMetas;- get (key: YjsDatabaseKey.fields): YDatabaseFields;+ get(key: YjsDatabaseKey.fields): YDatabaseFields;- get (key: YjsDatabaseKey.id): string;+ get(key: YjsDatabaseKey.id): string;}export interface YDatabaseViews extends Y.Map<YDatabaseView> {- get (key: ViewId): YDatabaseView;+ get(key: ViewId): YDatabaseView;}export type DatabaseId = string;@@ -487,32 +487,32 @@ export enum DatabaseViewLayout {}export interface YDatabaseView extends Y.Map<unknown> {- get (key: YjsDatabaseKey.database_id): DatabaseId;+ get(key: YjsDatabaseKey.database_id): DatabaseId;- get (key: YjsDatabaseKey.name): string;+ get(key: YjsDatabaseKey.name): string;- get (key: YjsDatabaseKey.created_at): CreatedAt;+ get(key: YjsDatabaseKey.created_at): CreatedAt;- get (key: YjsDatabaseKey.modified_at): ModifiedAt;+ get(key: YjsDatabaseKey.modified_at): ModifiedAt;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.layout): string;+ get(key: YjsDatabaseKey.layout): string;- get (key: YjsDatabaseKey.layout_settings): YDatabaseLayoutSettings;+ get(key: YjsDatabaseKey.layout_settings): YDatabaseLayoutSettings;- get (key: YjsDatabaseKey.filters): YDatabaseFilters;+ get(key: YjsDatabaseKey.filters): YDatabaseFilters;- get (key: YjsDatabaseKey.groups): YDatabaseGroups;+ get(key: YjsDatabaseKey.groups): YDatabaseGroups;- get (key: YjsDatabaseKey.sorts): YDatabaseSorts;+ get(key: YjsDatabaseKey.sorts): YDatabaseSorts;- get (key: YjsDatabaseKey.field_settings): YDatabaseFieldSettings;+ get(key: YjsDatabaseKey.field_settings): YDatabaseFieldSettings;- get (key: YjsDatabaseKey.field_orders): YDatabaseFieldOrders;+ get(key: YjsDatabaseKey.field_orders): YDatabaseFieldOrders;- get (key: YjsDatabaseKey.row_orders): YDatabaseRowOrders;+ get(key: YjsDatabaseKey.row_orders): YDatabaseRowOrders;- get (key: YjsDatabaseKey.calculations): YDatabaseCalculations;+ get(key: YjsDatabaseKey.calculations): YDatabaseCalculations;}export type YDatabaseFieldOrders = Y.Array<unknown>; // [ { id: FieldId } ]@@ -533,131 +533,131 @@ export type GroupId = string;export interface YDatabaseLayoutSettings extends Y.Map<unknown> {// DatabaseViewLayout.Board- get (key: '1'): YDatabaseBoardLayoutSetting;+ get(key: '1'): YDatabaseBoardLayoutSetting;// DatabaseViewLayout.Calendar- get (key: '2'): YDatabaseCalendarLayoutSetting;+ get(key: '2'): YDatabaseCalendarLayoutSetting;}export interface YDatabaseBoardLayoutSetting extends Y.Map<unknown> {- get (key: YjsDatabaseKey.hide_ungrouped_column | YjsDatabaseKey.collapse_hidden_groups): boolean;+ get(key: YjsDatabaseKey.hide_ungrouped_column | YjsDatabaseKey.collapse_hidden_groups): boolean;}export interface YDatabaseCalendarLayoutSetting extends Y.Map<unknown> {- get (key: YjsDatabaseKey.first_day_of_week | YjsDatabaseKey.field_id | YjsDatabaseKey.layout_ty): string;+ get(key: YjsDatabaseKey.first_day_of_week | YjsDatabaseKey.field_id | YjsDatabaseKey.layout_ty): string;- get (key: YjsDatabaseKey.show_week_numbers | YjsDatabaseKey.show_weekends): boolean;+ get(key: YjsDatabaseKey.show_week_numbers | YjsDatabaseKey.show_weekends): boolean;}export interface YDatabaseGroup extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): GroupId;+ get(key: YjsDatabaseKey.id): GroupId;- get (key: YjsDatabaseKey.field_id): FieldId;+ get(key: YjsDatabaseKey.field_id): FieldId;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.content): string;+ get(key: YjsDatabaseKey.content): string;- get (key: YjsDatabaseKey.groups): YDatabaseGroupColumns;+ get(key: YjsDatabaseKey.groups): YDatabaseGroupColumns;}export type YDatabaseGroupColumns = Y.Array<YDatabaseGroupColumn>;export interface YDatabaseGroupColumn extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): string;+ get(key: YjsDatabaseKey.id): string;- get (key: YjsDatabaseKey.visible): boolean;+ get(key: YjsDatabaseKey.visible): boolean;}export interface YDatabaseRowOrder extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): SortId;+ get(key: YjsDatabaseKey.id): SortId;- get (key: YjsDatabaseKey.height): number;+ get(key: YjsDatabaseKey.height): number;}export interface YDatabaseSort extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): SortId;+ get(key: YjsDatabaseKey.id): SortId;- get (key: YjsDatabaseKey.field_id): FieldId;+ get(key: YjsDatabaseKey.field_id): FieldId;- get (key: YjsDatabaseKey.condition): string;+ get(key: YjsDatabaseKey.condition): string;}export type FilterId = string;export interface YDatabaseFilter extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): FilterId;+ get(key: YjsDatabaseKey.id): FilterId;- get (key: YjsDatabaseKey.field_id): FieldId;+ get(key: YjsDatabaseKey.field_id): FieldId;- get (key: YjsDatabaseKey.type | YjsDatabaseKey.condition | YjsDatabaseKey.content | YjsDatabaseKey.filter_type): string;+ get(key: YjsDatabaseKey.type | YjsDatabaseKey.condition | YjsDatabaseKey.content | YjsDatabaseKey.filter_type): string;}export interface YDatabaseCalculation extends Y.Map<unknown> {- get (key: YjsDatabaseKey.field_id): FieldId;+ get(key: YjsDatabaseKey.field_id): FieldId;- get (key: YjsDatabaseKey.id | YjsDatabaseKey.type | YjsDatabaseKey.calculation_value): string;+ get(key: YjsDatabaseKey.id | YjsDatabaseKey.type | YjsDatabaseKey.calculation_value): string;}export interface YDatabaseFieldSettings extends Y.Map<unknown> {- get (key: FieldId): YDatabaseFieldSetting;+ get(key: FieldId): YDatabaseFieldSetting;}export interface YDatabaseFieldSetting extends Y.Map<unknown> {- get (key: YjsDatabaseKey.visibility): string;+ get(key: YjsDatabaseKey.visibility): string;- get (key: YjsDatabaseKey.wrap): boolean;+ get(key: YjsDatabaseKey.wrap): boolean;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.width): string;+ get(key: YjsDatabaseKey.width): string;}export interface YDatabaseMetas extends Y.Map<unknown> {- get (key: YjsDatabaseKey.iid): string;+ get(key: YjsDatabaseKey.iid): string;}export interface YDatabaseFields extends Y.Map<YDatabaseField> {- get (key: FieldId): YDatabaseField;+ get(key: FieldId): YDatabaseField;}export interface YDatabaseField extends Y.Map<unknown> {- get (key: YjsDatabaseKey.name): string;+ get(key: YjsDatabaseKey.name): string;- get (key: YjsDatabaseKey.id): FieldId;+ get(key: YjsDatabaseKey.id): FieldId;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.icon): string;+ get(key: YjsDatabaseKey.icon): string;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.type): string;+ get(key: YjsDatabaseKey.type): string;- get (key: YjsDatabaseKey.type_option): YDatabaseFieldTypeOption;+ get(key: YjsDatabaseKey.type_option): YDatabaseFieldTypeOption;- get (key: YjsDatabaseKey.is_primary): boolean;+ get(key: YjsDatabaseKey.is_primary): boolean;- get (key: YjsDatabaseKey.last_modified): LastModified;+ get(key: YjsDatabaseKey.last_modified): LastModified;}export interface YDatabaseFieldTypeOption extends Y.Map<unknown> {// key is the field type- get (key: string): YMapFieldTypeOption;+ get(key: string): YMapFieldTypeOption;}export interface YMapFieldTypeOption extends Y.Map<unknown> {- get (key: YjsDatabaseKey.content): string;+ get(key: YjsDatabaseKey.content): string;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.data): string;+ get(key: YjsDatabaseKey.data): string;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.time_format): string;+ get(key: YjsDatabaseKey.time_format): string;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.date_format): string;+ get(key: YjsDatabaseKey.date_format): string;- get (key: YjsDatabaseKey.database_id): DatabaseId;+ get(key: YjsDatabaseKey.database_id): DatabaseId;// eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.format): string;+ get(key: YjsDatabaseKey.format): string;}export enum Types {diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTable.hooks.ts b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTable.hooks.tsnew file mode 100644index 0000000000..8a29ba72e4--- /dev/null+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTable.hooks.ts@@ -0,0 +1,60 @@+import { SimpleTableNode } from '@/components/editor/editor.type';+import { createHotkey, HOT_KEY_NAME } from '@/utils/hotkeys';+import { useEffect, useState } from 'react';+import { Editor, Path, Range } from 'slate';+import { ReactEditor, useSlateStatic } from 'slate-react';++export function useSimpleTable(node: SimpleTableNode) {+ const editor = useSlateStatic();+ const [inCurrentTable, setInCurrentTable] = useState(false);+ const [isIntersection, setIsIntersection] = useState(false);++ useEffect(() => {+ const { onChange } = editor;++ editor.onChange = () => {+ onChange();+ const { selection } = editor;++ if (!selection) return;+ const path = ReactEditor.findPath(editor, node);+ const [start, end] = Editor.edges(editor, selection);+ const isAncestor = Path.isAncestor(path, end.path) && Path.isAncestor(path, start.path);+ const isIntersection = !isAncestor && Range.intersection(selection, Editor.range(editor, path));++ setIsIntersection(!!isIntersection);+ setInCurrentTable(isAncestor);+ };++ return () => {+ editor.onChange = onChange;+ };+ }, [editor, node]);++ useEffect(() => {+ const editorDom = ReactEditor.toDOMNode(editor, editor);++ const handleKeydown = (event: KeyboardEvent) => {+ if (!inCurrentTable) return;++ switch (true) {+ case createHotkey(HOT_KEY_NAME.UP)(event): {+ event.stopPropagation();+ event.preventDefault();+ }++ }++ };++ editorDom.addEventListener('keydown', handleKeydown);++ return () => {+ editorDom.removeEventListener('keydown', handleKeydown);+ };+ }, [editor, inCurrentTable]);++ return {+ isIntersection,+ };+}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTable.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTable.tsxindex da62087f27..4c75ca1039 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTable.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTable.tsx@@ -1,11 +1,12 @@+import { useSimpleTable } from '@/components/editor/components/blocks/simple-table/SimpleTable.hooks';import { EditorElementProps, SimpleTableNode, SimpleTableRowNode } from '@/components/editor/editor.type';import { useEditorContext } from '@/components/editor/EditorContext';import TableContainer from '@/components/editor/components/table-container/TableContainer';import isEqual from 'lodash-es/isEqual';import React, { forwardRef, memo, useMemo } from 'react';import './simple-table.scss';--const MIN_WIDTH = 120;+import { MIN_WIDTH } from '@/components/editor/components/blocks/simple-table/const';+// import { useReadOnly } from 'slate-react';const SimpleTable = memo(forwardRef<HTMLDivElement, EditorElementProps<SimpleTableNode>>(({@@ -29,8 +30,8 @@ const SimpleTable = memo(const columns = useMemo(() => {return Array.from({ length: columnCount }, (_, index) => {- const width = column_widths[index] || MIN_WIDTH;- const bgColor = column_colors[index] || 'transparent';+ const width = column_widths?.[index] || MIN_WIDTH;+ const bgColor = column_colors?.[index] || 'transparent';return { width, bgColor };});@@ -46,9 +47,10 @@ const SimpleTable = memo())}</colgroup>;}, [columns]);+ const { isIntersection } = useSimpleTable(node);const className = useMemo(() => {- const classList = ['simple-table', 'appflowy-scroller'];+ const classList = ['simple-table', 'appflowy-scroller', 'select-none'];if (classNameProp) {classList.push(classNameProp);@@ -62,14 +64,21 @@ const SimpleTable = memo(classList.push('enable-header-row');}+ if (isIntersection) {+ classList.push('selected');+ }+return classList.join(' ');- }, [classNameProp, enable_header_column, enable_header_row]);+ }, [classNameProp, enable_header_column, enable_header_row, isIntersection]);++ // const readOnly = useReadOnly();return (<divref={ref}{...attributes}className={className}+ contentEditable={false}><TableContainerblockId={blockId}diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTableCell.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTableCell.tsxindex 29c3ea2379..4a6de0ee57 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTableCell.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTableCell.tsx@@ -4,6 +4,7 @@ import { renderColor } from '@/utils/color';import React, { forwardRef, useMemo } from 'react';import { Editor, Element, NodeEntry } from 'slate';import { ReactEditor, useSlate } from 'slate-react';+import { MIN_WIDTH } from '@/components/editor/components/blocks/simple-table/const';const SimpleTableCell =forwardRef<HTMLTableCellElement, EditorElementProps<SimpleTableCellBlockNode>>(({@@ -49,20 +50,24 @@ const SimpleTableCell =return (parentElement.children as Element[]).findIndex((n) => n.blockId === node.blockId);}, [node, row]);- const { horizontalAlign, bgColor } = useMemo(() => {+ const { horizontalAlign, bgColor, width } = useMemo(() => {if (!table || !row) return {bgColor: undefined,horizontalAlign: undefined,+ width: undefined,};const [parentElement] = table;- const horizontalAlign = (parentElement as SimpleTableNode).data.column_aligns[colIndex];- const bgColor = (parentElement as SimpleTableNode).data.column_colors[colIndex];+ const horizontalAlign = (parentElement as SimpleTableNode).data.column_aligns?.[colIndex];+ const bgColor = (parentElement as SimpleTableNode).data.column_colors?.[colIndex];++ const width = (parentElement as SimpleTableNode).data.column_widths?.[colIndex] || MIN_WIDTH;return {horizontalAlign,bgColor,+ width,};}, [colIndex, row, table]);@@ -79,9 +84,12 @@ const SimpleTableCell =style={{...attributes.style,backgroundColor: bgColor ? renderColor(bgColor) : undefined,+ maxWidth: width ? `${width}px` : undefined,}}>- <div className={'cell-children'}>+ <div+ className={'cell-children'}+ >{children}</div></td>diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTableRow.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTableRow.tsxindex 25c0ee614f..0a48c96f68 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTableRow.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/SimpleTableRow.tsx@@ -45,8 +45,8 @@ const SimpleTableRow =const [parentElement] = parent;return {- align: (parentElement as SimpleTableNode).data.row_aligns[index],- bgColor: (parentElement as SimpleTableNode).data.row_colors[index],+ align: (parentElement as SimpleTableNode).data.row_aligns?.[index],+ bgColor: (parentElement as SimpleTableNode).data.row_colors?.[index],};}, [index, parent]);@@ -57,6 +57,7 @@ const SimpleTableRow =ref={ref}{...attributes}data-table-row={blockId}+data-table-row-horizontal-align={align?.toLowerCase()}style={{...attributes.style,diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/const.ts b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/const.tsnew file mode 100644index 0000000000..d3edec50af--- /dev/null+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/const.ts@@ -0,0 +1 @@+export const MIN_WIDTH = 120;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/simple-table.scss b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/simple-table.scssindex c992bf6d4a..cf648be5e1 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/simple-table.scss+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/simple-table/simple-table.scss@@ -1,15 +1,13 @@.simple-table {- font-size: 14px;-&.enable-header-column {tr [data-block-type="simple_table_cell"]:first-child {- @apply font-semibold;+ @apply font-semibold bg-fill-list-hover;}}&.enable-header-row {tr:first-child > [data-block-type="simple_table_cell"] {- @apply font-semibold;+ @apply font-semibold bg-fill-list-hover;}}@@ -26,7 +24,7 @@}td[data-block-type="simple_table_cell"] {- @apply border-r border-b border-line-divider;+ @apply border-r border-b border-line-divider overflow-hidden whitespace-pre-wrap;.cell-children {.block-element {@apply m-0;@@ -97,4 +95,11 @@td {@apply px-2 py-0.5;}++ &.selected {+ table {+ @apply bg-content-blue-50 border border-fill-default;+ }++ }}\ No newline at end of file