luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: blob fetch and state syncing between tabs (#1287)

Browse Source
This commit is contained in:
Himself65
2023-03-02 21:48:35 -06:00
committed by GitHub
parent 2a955d1391
commit 4d8d128539
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/web/src/atoms/index.ts
View File

@@ -1,17 +1,10 @@
import { atom } from 'jotai'; import { atom } from 'jotai';
import { createStore } from 'jotai/index'; import { createStore } from 'jotai';
import { atomWithStorage } from 'jotai/utils';
import { unstable_batchedUpdates } from 'react-dom'; import { unstable_batchedUpdates } from 'react-dom';
// workspace necessary atoms // workspace necessary atoms
export const currentWorkspaceIdAtom = atomWithStorage<string | null>( export const currentWorkspaceIdAtom = atom<string | null>(null);
'affine-current-workspace-id', export const currentPageIdAtom = atom<string | null>(null);
null
);
export const currentPageIdAtom = atomWithStorage<string | null>(
'affine-current-page-id',
null
);
// If the workspace is locked, it means that the user maybe updating the workspace // If the workspace is locked, it means that the user maybe updating the workspace
// from local to remote or vice versa // from local to remote or vice versa
export const workspaceLockAtom = atom(false); export const workspaceLockAtom = atom(false);

5
apps/web/src/atoms/public-workspace/index.ts
View File

@@ -16,7 +16,10 @@ export const publicBlockSuiteAtom = atom<Promise<BlockSuiteWorkspace>>(
throw new Error('No workspace id'); throw new Error('No workspace id');
} }
const binary = await apis.downloadWorkspace(workspaceId, true); const binary = await apis.downloadWorkspace(workspaceId, true);
const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(workspaceId); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(
workspaceId,
(_: string) => undefined
);
BlockSuiteWorkspace.Y.applyUpdate( BlockSuiteWorkspace.Y.applyUpdate(
blockSuiteWorkspace.doc, blockSuiteWorkspace.doc,
new Uint8Array(binary) new Uint8Array(binary)

5
apps/web/src/hooks/use-workspaces.ts
View File

@@ -38,7 +38,10 @@ globalThis.dataCenter = dataCenter;
function createRemLocalWorkspace(name: string) { function createRemLocalWorkspace(name: string) {
const id = nanoid(); const id = nanoid();
const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(id); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(
id,
(_: string) => undefined
);
blockSuiteWorkspace.meta.setName(name); blockSuiteWorkspace.meta.setName(name);
const workspace: LocalWorkspace = { const workspace: LocalWorkspace = {
flavour: RemWorkspaceFlavour.LOCAL, flavour: RemWorkspaceFlavour.LOCAL,

6
apps/web/src/pages/_debug/broadcast.dev.tsx
View File

@@ -19,7 +19,11 @@ declare global {
const BroadcastPage: React.FC = () => { const BroadcastPage: React.FC = () => {
const blockSuiteWorkspace = useMemo( const blockSuiteWorkspace = useMemo(
() => createEmptyBlockSuiteWorkspace('broadcast-test'), () =>
createEmptyBlockSuiteWorkspace(
'broadcast-test',
(_: string) => undefined
),
[] []
); );
const [provider, setProvider] = useState<BroadCastChannelProvider | null>( const [provider, setProvider] = useState<BroadCastChannelProvider | null>(

5
apps/web/src/pages/preview/[previewId].tsx
View File

@@ -29,7 +29,10 @@ const PreviewPage: NextPage<PreviewPageProps> = ({
const [blockSuiteWorkspace, setBlockSuiteWorkspace] = const [blockSuiteWorkspace, setBlockSuiteWorkspace] =
useState<BlockSuiteWorkspace | null>(null); useState<BlockSuiteWorkspace | null>(null);
useEffect(() => { useEffect(() => {
const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace('preview'); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(
'preview',
(_: string) => undefined
);
blockSuiteWorkspace.signals.pageAdded.once(() => { blockSuiteWorkspace.signals.pageAdded.once(() => {
setBlockSuiteWorkspace(blockSuiteWorkspace); setBlockSuiteWorkspace(blockSuiteWorkspace);
}); });

10
apps/web/src/plugins/local/index.tsx
View File

@@ -92,7 +92,10 @@ export const LocalPlugin: WorkspacePlugin<RemWorkspaceFlavour.LOCAL> = {
if (config.enableIndexedDBProvider) { if (config.enableIndexedDBProvider) {
const workspaces = await Promise.all( const workspaces = await Promise.all(
ids.map(id => { ids.map(id => {
const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(id); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(
id,
(_: string) => undefined
);
const workspace: LocalWorkspace = { const workspace: LocalWorkspace = {
id, id,
flavour: RemWorkspaceFlavour.LOCAL, flavour: RemWorkspaceFlavour.LOCAL,
@@ -139,7 +142,10 @@ export const LocalPlugin: WorkspacePlugin<RemWorkspaceFlavour.LOCAL> = {
} }
logger.info('no local workspace found, create a new one'); logger.info('no local workspace found, create a new one');
const workspaceId = nanoid(); const workspaceId = nanoid();
const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(workspaceId); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(
workspaceId,
(_: string) => undefined
);
blockSuiteWorkspace.meta.setName('Untitled Workspace'); blockSuiteWorkspace.meta.setName('Untitled Workspace');
localStorage.setItem(kStoreKey, JSON.stringify([workspaceId])); localStorage.setItem(kStoreKey, JSON.stringify([workspaceId]));
blockSuiteWorkspace.createPage(nanoid()); blockSuiteWorkspace.createPage(nanoid());