Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-14 13:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(editor): unify block props api (#10888)

Browse Source 
Closes: [BS-2707](https://linear.app/affine-design/issue/BS-2707/统一使用props获取和更新block-prop)
This commit is contained in:
Saul-Mirone
2025-03-16 05:48:34 +00:00
parent 8f9e5bf0aa
commit 26285f7dcb
193 changed files with 1019 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
blocksuite/affine/shared/src/utils/collapsed/paragraph.ts
View File

@@ -16,10 +16,10 @@ export function calculateCollapsedSiblings(
if (
i > index &&
matchModels(child, [ParagraphBlockModel]) &&
child.type.startsWith('h')
child.props.type.startsWith('h')
) {
const modelLevel = parseInt(model.type.slice(1));
const childLevel = parseInt(child.type.slice(1));
const modelLevel = parseInt(model.props.type.slice(1));
const childLevel = parseInt(child.props.type.slice(1));
return childLevel <= modelLevel;
}
return false;
@@ -47,7 +47,7 @@ export function getNearestHeadingBefore(
const sibling = parent.children[i];
if (
matchModels(sibling, [ParagraphBlockModel]) &&
sibling.type.startsWith('h')
sibling.props.type.startsWith('h')
) {
return sibling;
}

4
blocksuite/affine/shared/src/utils/model/getter.ts
View File

@@ -49,7 +49,7 @@ export function getLastNoteBlock(doc: Store) {
const child = children[i];
if (
matchModels(child, [NoteBlockModel]) &&
child.displayMode !== NoteDisplayMode.EdgelessOnly
child.props.displayMode !== NoteDisplayMode.EdgelessOnly
) {
note = child as NoteBlockModel;
break;
@@ -65,7 +65,7 @@ export function getFirstNoteBlock(doc: Store) {
for (const child of children) {
if (
matchModels(child, [NoteBlockModel]) &&
child.displayMode !== NoteDisplayMode.EdgelessOnly
child.props.displayMode !== NoteDisplayMode.EdgelessOnly
) {
note = child as NoteBlockModel;
break;

13
blocksuite/affine/shared/src/utils/model/list.ts
View File

@@ -23,7 +23,7 @@ export function getNextContinuousNumberedLists(
const firstNotNumberedListIndex = parent.children.findIndex(
(model, i) =>
i > modelIndex &&
(!matchModels(model, [ListBlockModel]) || model.type !== 'numbered')
(!matchModels(model, [ListBlockModel]) || model.props.type !== 'numbered')
);
const newContinuousLists = parent.children.slice(
modelIndex + 1,
@@ -31,7 +31,8 @@ export function getNextContinuousNumberedLists(
);
if (
!newContinuousLists.every(
model => matchModels(model, [ListBlockModel]) && model.type === 'numbered'
model =>
matchModels(model, [ListBlockModel]) && model.props.type === 'numbered'
)
)
return [];
@@ -56,11 +57,11 @@ export function toNumberedList(
if (
prevSibling &&
matchModels(prevSibling, [ListBlockModel]) &&
prevSibling.type === 'numbered'
prevSibling.props.type === 'numbered'
) {
doc.transact(() => {
if (!prevSibling.order) prevSibling.order = 1;
realOrder = prevSibling.order + 1;
if (!prevSibling.props.order) prevSibling.props.order = 1;
realOrder = prevSibling.props.order + 1;
});
}
@@ -93,7 +94,7 @@ export function toNumberedList(
let base = realOrder + 1;
nextContinuousNumberedLists.forEach(list => {
doc.transact(() => {
list.order = base;
list.props.order = base;
});
base += 1;
});