Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[lexical-table] Support first column freeze #7134

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/lexical-playground/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -1315,6 +1315,7 @@ i.page-break,

.table-cell-action-button-container {
position: absolute;
z-index: 3;
top: 0;
left: 0;
will-change: transform;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,21 @@ function TableActionMenu({
});
}, [editor, tableCellNode, clearTableSelection, onClose]);

const toggleFirstColumnFreeze = useCallback(() => {
editor.update(() => {
if (tableCellNode.isAttached()) {
const tableNode = $getTableNodeFromLexicalNodeOrThrow(tableCellNode);
if (tableNode) {
tableNode.setFrozenColumns(
tableNode.getFrozenColumns() === 0 ? 1 : 0,
);
}
}
clearTableSelection();
onClose();
});
}, [editor, tableCellNode, clearTableSelection, onClose]);

const handleCellBackgroundColor = useCallback(
(value: string) => {
editor.update(() => {
Expand Down Expand Up @@ -528,6 +543,13 @@ function TableActionMenu({
data-test-id="table-row-striping">
<span className="text">Toggle Row Striping</span>
</button>
<button
type="button"
className="item"
onClick={() => toggleFirstColumnFreeze()}
data-test-id="table-freeze-first-column">
<span className="text">Toggle First Column Freeze</span>
</button>
<hr />
<button
type="button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,27 @@
margin-top: 25px;
margin-bottom: 30px;
}
.PlaygroundEditorTheme__tableFrozenColumn tr > td:first-child {
background-color: #ffffff;
position: sticky;
z-index: 2;
left: 0;
}
.PlaygroundEditorTheme__tableFrozenColumn tr > th:first-child {
background-color: #f2f3f5;
position: sticky;
z-index: 2;
left: 0;
}
.PlaygroundEditorTheme__tableFrozenColumn tr > :first-child::after {
content: '';
position: absolute;
left: 0;
top: 0;
right: 0;
height: 100%;
border-right: 1px solid #bbb;
}
.PlaygroundEditorTheme__tableRowStriping tr:nth-child(even) {
background-color: #f2f5fb;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ const theme: EditorThemeClasses = {
tableCellHeader: 'PlaygroundEditorTheme__tableCellHeader',
tableCellResizer: 'PlaygroundEditorTheme__tableCellResizer',
tableCellSelected: 'PlaygroundEditorTheme__tableCellSelected',
tableFrozenColumn: 'PlaygroundEditorTheme__tableFrozenColumn',
tableRowStriping: 'PlaygroundEditorTheme__tableRowStriping',
tableScrollableWrapper: 'PlaygroundEditorTheme__tableScrollableWrapper',
tableSelected: 'PlaygroundEditorTheme__tableSelected',
Expand Down
35 changes: 35 additions & 0 deletions packages/lexical-table/src/LexicalTableNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export type SerializedTableNode = Spread<
{
colWidths?: readonly number[];
rowStriping?: boolean;
frozenColumnCount?: number;
},
SerializedElementNode
>;
Expand Down Expand Up @@ -88,6 +89,20 @@ function setRowStriping(
}
}

function setFrozenColumns(
dom: HTMLElement,
config: EditorConfig,
frozenColumnCount: number,
): void {
if (frozenColumnCount > 0) {
addClassNamesToElement(dom, config.theme.tableFrozenColumn);
dom.setAttribute('data-lexical-frozen-column', 'true');
} else {
removeClassNamesFromElement(dom, config.theme.tableFrozenColumn);
dom.removeAttribute('data-lexical-frozen-column');
}
}

function alignTableElement(
dom: HTMLElement,
config: EditorConfig,
Expand Down Expand Up @@ -137,6 +152,7 @@ export function setScrollableTablesActive(
export class TableNode extends ElementNode {
/** @internal */
__rowStriping: boolean;
__frozenColumnCount: number;
__colWidths?: readonly number[];

static getType(): string {
Expand Down Expand Up @@ -164,6 +180,7 @@ export class TableNode extends ElementNode {
super.afterCloneFrom(prevNode);
this.__colWidths = prevNode.__colWidths;
this.__rowStriping = prevNode.__rowStriping;
this.__frozenColumnCount = prevNode.__frozenColumnCount;
}

static importDOM(): DOMConversionMap | null {
Expand All @@ -183,12 +200,14 @@ export class TableNode extends ElementNode {
return super
.updateFromJSON(serializedNode)
.setRowStriping(serializedNode.rowStriping || false)
.setFrozenColumns(serializedNode.frozenColumnCount || 0)
.setColWidths(serializedNode.colWidths);
}

constructor(key?: NodeKey) {
super(key);
this.__rowStriping = false;
this.__frozenColumnCount = 0;
}

exportJSON(): SerializedTableNode {
Expand Down Expand Up @@ -234,6 +253,9 @@ export class TableNode extends ElementNode {

addClassNamesToElement(tableElement, config.theme.table);
alignTableElement(tableElement, config, this.getFormatType());
if (this.__frozenColumnCount) {
setFrozenColumns(tableElement, config, this.__frozenColumnCount);
}
if (this.__rowStriping) {
setRowStriping(tableElement, config, true);
}
Expand All @@ -256,6 +278,9 @@ export class TableNode extends ElementNode {
if (prevNode.__rowStriping !== this.__rowStriping) {
setRowStriping(dom, config, this.__rowStriping);
}
if (prevNode.__frozenColumnCount !== this.__frozenColumnCount) {
setFrozenColumns(dom, config, this.__frozenColumnCount);
}
updateColgroup(dom, config, this.getColumnCount(), this.getColWidths());
alignTableElement(
this.getDOMSlot(dom).element,
Expand Down Expand Up @@ -472,6 +497,16 @@ export class TableNode extends ElementNode {
return self;
}

setFrozenColumns(columnCount: number): this {
const self = this.getWritable();
self.__frozenColumnCount = columnCount;
return self;
}

getFrozenColumns(): number {
return this.getLatest().__frozenColumnCount;
}

canSelectBefore(): true {
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const editorConfig = Object.freeze({
center: 'test-table-alignment-center',
right: 'test-table-alignment-right',
},
tableFrozenColumn: 'test-table-frozen-column-class',
tableRowStriping: 'test-table-row-striping-class',
tableScrollableWrapper: 'table-scrollable-wrapper',
},
Expand Down Expand Up @@ -1044,6 +1045,70 @@ describe('LexicalTableNode tests', () => {
});
});

test('Toggle frozen first column ON/OFF', async () => {
const {editor} = testEnv;

await editor.update(() => {
const root = $getRoot();
const table = $createTableNodeWithDimensions(4, 4, true);
root.append(table);
});
await editor.update(() => {
const root = $getRoot();
const table = root.getLastChild<TableNode>();
if (table) {
table.setFrozenColumns(1);
}
});

await editor.update(() => {
const root = $getRoot();
const table = root.getLastChild<TableNode>();
expectTableHtmlToBeEqual(
table!.createDOM(editorConfig).outerHTML,
html`
<table
class="${editorConfig.theme.table} ${editorConfig.theme
.tableFrozenColumn}"
data-lexical-frozen-column="true">
<colgroup>
<col />
<col />
<col />
<col />
</colgroup>
</table>
`,
);
});

await editor.update(() => {
const root = $getRoot();
const table = root.getLastChild<TableNode>();
if (table) {
table.setFrozenColumns(0);
}
});

await editor.update(() => {
const root = $getRoot();
const table = root.getLastChild<TableNode>();
expectTableHtmlToBeEqual(
table!.createDOM(editorConfig).outerHTML,
html`
<table class="${editorConfig.theme.table}">
<colgroup>
<col />
<col />
<col />
<col />
</colgroup>
</table>
`,
);
});
});

test('Change Table-level alignment', async () => {
const {editor} = testEnv;

Expand Down