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

fix: list number should not be contenteditable #6113

Merged
merged 2 commits into from
Jan 25, 2024
Merged

fix: list number should not be contenteditable #6113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2084ac3
fix: list number should not contenteditable
Flrande Jan 25, 2024
d07d62d
Merge branch 'master' into flrande/fix/list-number-0125
Saul-Mirone Jan 25, 2024
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
2 changes: 2 additions & 0 deletions packages/blocks/src/list-block/list-block.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,15 @@ export class ListBlockComponent extends BlockElement<
if (noChildren) return nothing;

const toggleDownTemplate = html`<div
contenteditable="false"
class="toggle-icon"
@click=${this._toggleChildren}
>
${toggleDown}
</div>`;

const toggleRightTemplate = html`<div
contenteditable="false"
class="toggle-icon toggle-icon__collapsed"
@click=${this._toggleChildren}
>
Expand Down
14 changes: 12 additions & 2 deletions packages/blocks/src/list-block/utils/get-list-icon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,35 @@ export function ListIcon(
const { index, deep } = getListInfo(model);
switch (model.type) {
case 'bulleted':
return html`<div class="affine-list-block__prefix" @click=${onClick}>
return html`<div
contenteditable="false"
class="affine-list-block__prefix"
@click=${onClick}
>
${points[deep % points.length]}
</div>`;
case 'numbered':
return html`<div
contenteditable="false"
class="affine-list-block__prefix affine-list-block__numbered"
@click=${onClick}
>
${getNumberPrefix(index, deep)}
</div>`;
case 'todo':
return html`<div
contenteditable="false"
class="affine-list-block__prefix affine-list-block__todo-prefix"
@click=${onClick}
>
${model.checked ? checkboxChecked() : checkboxUnchecked()}
</div>`;
case 'toggle':
return html`<div class="affine-list-block__prefix" @click=${onClick}>
return html`<div
contenteditable="false"
class="affine-list-block__prefix"
@click=${onClick}
>
${showChildren ? toggleDown : toggleRight}
</div>`;
default:
Expand Down
Loading