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.

Sign up for GitHub

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

Do not apply Table selection if table is not editable #2628

Merged
merged 1 commit into from
May 13, 2024
Merged

Do not apply Table selection if table is not editable #2628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/roosterjs-content-model-core/lib/corePlugin/selection/SelectionPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,7 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {

if (
(table = domHelper.findClosestElementAncestor(tableStart, 'table')) &&
table.isContentEditable &&
(parsedTable = parseTableCells(table)) &&
(firstCo = findCoordinate(parsedTable, tdStart, domHelper))
) {
Expand Down
53 changes: 53 additions & 0 deletions packages/roosterjs-content-model-core/test/corePlugin/selection/SelectionPluginTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ describe('SelectionPlugin handle table selection', () => {
it('MouseDown - save a table selection when left click', () => {
const state = plugin.getState();
const table = document.createElement('table');
table.setAttribute('contenteditable', 'true');
const tr = document.createElement('tr');
const td = document.createElement('td');
const div = document.createElement('div');
Expand Down Expand Up @@ -837,9 +838,57 @@ describe('SelectionPlugin handle table selection', () => {
expect(mouseDispatcher).toBeDefined();
});

it('MouseDown - do not save a table selection when left click, table is not editable', () => {
const state = plugin.getState();
const table = document.createElement('table');
table.setAttribute('contenteditable', 'false');
const tr = document.createElement('tr');
const td = document.createElement('td');
const div = document.createElement('div');

tr.appendChild(td);
table.appendChild(tr);
contentDiv.appendChild(table);
contentDiv.appendChild(div);

getDOMSelectionSpy.and.returnValue({
type: 'table',
});

plugin.onPluginEvent!({
eventType: 'mouseDown',
rawEvent: {
button: 0,
target: div,
} as any,
});

expect(state).toEqual({
selection: null,
tableSelection: null,
imageSelectionBorderColor: undefined,
});

plugin.onPluginEvent!({
eventType: 'mouseDown',
rawEvent: {
button: 0,
target: td,
} as any,
});

expect(state).toEqual({
selection: null,
tableSelection: null,
imageSelectionBorderColor: undefined,
});
expect(mouseDispatcher).toBeUndefined();
});

it('MouseDown - triple click', () => {
const state = plugin.getState();
const table = document.createElement('table');
table.setAttribute('contenteditable', 'true');
const tr = document.createElement('tr');
const td = document.createElement('td');

Expand Down Expand Up @@ -887,6 +936,7 @@ describe('SelectionPlugin handle table selection', () => {
it('MouseMove - in same table', () => {
const state = plugin.getState();
const table = document.createElement('table');
table.setAttribute('contenteditable', 'true');
const tr = document.createElement('tr');
const td1 = document.createElement('td');
const td2 = document.createElement('td');
Expand Down Expand Up @@ -999,6 +1049,8 @@ describe('SelectionPlugin handle table selection', () => {
const state = plugin.getState();
const table1 = document.createElement('table');
const table2 = document.createElement('table');
table1.setAttribute('contenteditable', 'true');
table2.setAttribute('contenteditable', 'true');
const tr1 = document.createElement('tr');
const tr2 = document.createElement('tr');
const td1 = document.createElement('td');
Expand Down Expand Up @@ -1164,6 +1216,7 @@ describe('SelectionPlugin handle table selection', () => {

beforeEach(() => {
table = document.createElement('table');
table.setAttribute('contenteditable', 'true');
tr1 = document.createElement('tr');
tr2 = document.createElement('tr');
td1 = document.createElement('td');
Expand Down
Loading