feat: bump blocksuite (#6078)

This commit is contained in:
regischen
2024-03-13 17:04:21 +08:00
committed by GitHub
parent 573528be41
commit fddbb426a6
126 changed files with 891 additions and 918 deletions

View File

@@ -17,11 +17,11 @@ export class CollectionService {
constructor(private readonly workspace: Workspace) {}
private get doc() {
return this.workspace.blockSuiteWorkspace.doc;
return this.workspace.docCollection.doc;
}
private get setting() {
return this.workspace.blockSuiteWorkspace.doc.getMap(SETTING_KEY);
return this.workspace.docCollection.doc.getMap(SETTING_KEY);
}
private get collectionsYArray(): YArray<Collection> | undefined {
@@ -96,7 +96,7 @@ export class CollectionService {
return;
}
const set = new Set(ids);
this.workspace.blockSuiteWorkspace.doc.transact(() => {
this.workspace.docCollection.doc.transact(() => {
const indexList: number[] = [];
const list: Collection[] = [];
collectionsYArray.forEach((collection, i) => {

View File

@@ -61,7 +61,7 @@ const PageItem = ({
const mode = useLiveData(pageRecord.mode);
const workspace = useService(Workspace);
const { isJournal } = useJournalInfoHelper(
workspace.blockSuiteWorkspace,
workspace.docCollection,
pageRecord.id
);
@@ -100,10 +100,10 @@ const EditorJournalPanel = () => {
const doc = useService(Doc);
const workspace = useService(Workspace);
const { journalDate, isJournal } = useJournalInfoHelper(
workspace.blockSuiteWorkspace,
workspace.docCollection,
doc.id
);
const { openJournal } = useJournalRouteHelper(workspace.blockSuiteWorkspace);
const { openJournal } = useJournalRouteHelper(workspace.docCollection);
const [date, setDate] = useState(dayjs().format('YYYY-MM-DD'));
useEffect(() => {
@@ -314,7 +314,7 @@ const ConflictList = ({
const navigateHelper = useNavigateHelper();
const workspace = useService(Workspace);
const currentDoc = useService(Doc);
const { setTrashModal } = useTrashModalHelper(workspace.blockSuiteWorkspace);
const { setTrashModal } = useTrashModalHelper(workspace.docCollection);
const handleOpenTrashModal = useCallback(
(pageRecord: PageRecord) => {
@@ -361,7 +361,7 @@ const JournalConflictBlock = ({ date }: JournalBlockProps) => {
const t = useAFFiNEI18N();
const workspace = useService(Workspace);
const pageRecordList = useService(PageRecordList);
const journalHelper = useJournalHelper(workspace.blockSuiteWorkspace);
const journalHelper = useJournalHelper(workspace.docCollection);
const docs = journalHelper.getJournalsByDate(date.format('YYYY-MM-DD'));
const pageRecords = useLiveData(pageRecordList.records).filter(v => {
return docs.some(doc => doc.id === v.id);

View File

@@ -28,10 +28,7 @@ export const MultiTabSidebarHeaderSwitcher = ({
FeatureType.Copilot
);
const { isJournal } = useJournalInfoHelper(
workspace.blockSuiteWorkspace,
doc.id
);
const { isJournal } = useJournalInfoHelper(workspace.docCollection, doc.id);
const exts = useMemo(
() =>

View File

@@ -30,7 +30,7 @@ export class WorkspacePropertiesAdapter {
constructor(public readonly workspace: Workspace) {
// check if properties exists, if not, create one
const rootDoc = workspace.blockSuiteWorkspace.doc;
const rootDoc = workspace.docCollection.doc;
this.properties = rootDoc.getMap(AFFINE_PROPERTIES_ID);
this.proxy = createYProxy(this.properties);
@@ -58,8 +58,8 @@ export class WorkspacePropertiesAdapter {
source: 'system',
type: PagePropertyType.Tags,
options:
this.workspace.blockSuiteWorkspace.meta.properties.tags
?.options ?? [], // better use a one time migration
this.workspace.docCollection.meta.properties.tags?.options ??
[], // better use a one time migration
},
},
},
@@ -89,8 +89,8 @@ export class WorkspacePropertiesAdapter {
}
// leak some yjs abstraction to modify multiple properties at once
transact = this.workspace.blockSuiteWorkspace.doc.transact.bind(
this.workspace.blockSuiteWorkspace.doc
transact = this.workspace.docCollection.doc.transact.bind(
this.workspace.docCollection.doc
);
get schema() {

View File

@@ -14,19 +14,18 @@ export class WorkspaceLegacyProperties {
}
get properties() {
return this.workspace.blockSuiteWorkspace.meta.properties;
return this.workspace.docCollection.meta.properties;
}
get tagOptions() {
return this.properties.tags?.options ?? [];
}
updateProperties = (properties: DocsPropertiesMeta) => {
this.workspace.blockSuiteWorkspace.meta.setProperties(properties);
this.workspace.docCollection.meta.setProperties(properties);
};
subscribe(cb: () => void) {
const disposable =
this.workspace.blockSuiteWorkspace.meta.docMetaUpdated.on(cb);
const disposable = this.workspace.docCollection.meta.docMetaUpdated.on(cb);
return disposable.dispose;
}
@@ -58,10 +57,10 @@ export class WorkspaceLegacyProperties {
};
removeTagOption = (id: string) => {
this.workspace.blockSuiteWorkspace.doc.transact(() => {
this.workspace.docCollection.doc.transact(() => {
this.updateTagOptions(this.tagOptions.filter(o => o.id !== id));
// need to remove tag from all pages
this.workspace.blockSuiteWorkspace.docs.forEach(doc => {
this.workspace.docCollection.docs.forEach(doc => {
const tags = doc.meta?.tags ?? [];
if (tags.includes(id)) {
this.updatePageTags(
@@ -74,7 +73,7 @@ export class WorkspaceLegacyProperties {
};
updatePageTags = (pageId: string, tags: string[]) => {
this.workspace.blockSuiteWorkspace.setDocMeta(pageId, {
this.workspace.docCollection.setDocMeta(pageId, {
tags,
});
};