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

style: enable rxjs/finnish (#6276)

Browse Source 
chore(infra): use finnish notation for observables

do rename
This commit is contained in:
EYHN
2024-03-24 17:04:51 +00:00
parent c6676fd074
commit 2b42a75e5a
104 changed files with 797 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/electron/src/main/application-menu/create.ts
View File

@@ -26,7 +26,7 @@ export function createApplicationMenu() {
label: `About ${app.getName()}`,
click: async () => {
await showMainWindow();
applicationMenuSubjects.openAboutPageInSettingModal.next();
applicationMenuSubjects.openAboutPageInSettingModal$.next();
},
},
{ type: 'separator' },
@@ -52,7 +52,7 @@ export function createApplicationMenu() {
click: async () => {
await initAndShowMainWindow();
// fixme: if the window is just created, the new page action will not be triggered
applicationMenuSubjects.newPageAction.next();
applicationMenuSubjects.newPageAction$.next();
},
},
{ type: 'separator' },

4
packages/frontend/electron/src/main/application-menu/index.ts
View File

@@ -12,14 +12,14 @@ export const applicationMenuEvents = {
* File -> New Doc
*/
onNewPageAction: (fn: () => void) => {
const sub = applicationMenuSubjects.newPageAction.subscribe(fn);
const sub = applicationMenuSubjects.newPageAction$.subscribe(fn);
return () => {
sub.unsubscribe();
};
},
openAboutPageInSettingModal: (fn: () => void) => {
const sub =
applicationMenuSubjects.openAboutPageInSettingModal.subscribe(fn);
applicationMenuSubjects.openAboutPageInSettingModal$.subscribe(fn);
return () => {
sub.unsubscribe();
};

4
packages/frontend/electron/src/main/application-menu/subject.ts
View File

@@ -1,6 +1,6 @@
import { Subject } from 'rxjs';
export const applicationMenuSubjects = {
newPageAction: new Subject<void>(),
openAboutPageInSettingModal: new Subject<void>(),
newPageAction$: new Subject<void>(),
openAboutPageInSettingModal$: new Subject<void>(),
};

28
packages/frontend/electron/src/main/main-window.ts
View File

@@ -104,7 +104,7 @@ async function createWindow(additionalArguments: string[]) {
logger.info('main window is ready to show');
if (browserWindow.isMaximized() || browserWindow.isFullScreen()) {
uiSubjects.onMaximized.next(true);
uiSubjects.onMaximized$.next(true);
}
handleWebContentsResize().catch(logger.error);
@@ -141,20 +141,20 @@ async function createWindow(additionalArguments: string[]) {
browserWindow.setSize(size[0] + 1, size[1] + 1);
browserWindow.setSize(size[0], size[1]);
});
uiSubjects.onMaximized.next(false);
uiSubjects.onMaximized$.next(false);
});
browserWindow.on('maximize', () => {
uiSubjects.onMaximized.next(true);
uiSubjects.onMaximized$.next(true);
});
// full-screen == maximized in UI on windows
browserWindow.on('enter-full-screen', () => {
uiSubjects.onMaximized.next(true);
uiSubjects.onMaximized$.next(true);
});
browserWindow.on('unmaximize', () => {
uiSubjects.onMaximized.next(false);
uiSubjects.onMaximized$.next(false);
});
/**
@@ -172,7 +172,7 @@ async function createWindow(additionalArguments: string[]) {
}
// singleton
let browserWindow$: Promise<BrowserWindow> | undefined;
let browserWindow: Promise<BrowserWindow> | undefined;
// a hidden window that prevents the app from quitting on MacOS
let hiddenMacWindow: BrowserWindow | undefined;
@@ -181,11 +181,11 @@ let hiddenMacWindow: BrowserWindow | undefined;
* Init main BrowserWindow. Will create a new window if it's not created yet.
*/
export async function initAndShowMainWindow() {
if (!browserWindow$ || (await browserWindow$.then(w => w.isDestroyed()))) {
if (!browserWindow || (await browserWindow.then(w => w.isDestroyed()))) {
const additionalArguments = await getWindowAdditionalArguments();
browserWindow$ = createWindow(additionalArguments);
browserWindow = createWindow(additionalArguments);
}
const mainWindow = await browserWindow$;
const mainWindow = await browserWindow;
if (IS_DEV) {
// do not gain focus in dev mode
@@ -209,8 +209,8 @@ export async function initAndShowMainWindow() {
}
export async function getMainWindow() {
if (!browserWindow$) return;
const window = await browserWindow$;
if (!browserWindow) return;
const window = await browserWindow;
if (window.isDestroyed()) return;
return window;
}
@@ -251,7 +251,7 @@ export async function setCookie(
arg0: CookiesSetDetails | string,
arg1?: string
) {
const window = await browserWindow$;
const window = await browserWindow;
if (!window) {
// do nothing if window is not ready
return;
@@ -271,7 +271,7 @@ export async function setCookie(
}
export async function removeCookie(url: string, name: string): Promise<void> {
const window = await browserWindow$;
const window = await browserWindow;
if (!window) {
// do nothing if window is not ready
return;
@@ -280,7 +280,7 @@ export async function removeCookie(url: string, name: string): Promise<void> {
}
export async function getCookie(url?: string, name?: string) {
const window = await browserWindow$;
const window = await browserWindow;
if (!window) {
// do nothing if window is not ready
return;

14
packages/frontend/electron/src/main/onboarding.ts
View File

@@ -96,23 +96,23 @@ async function createOnboardingWindow(additionalArguments: string[]) {
return browserWindow;
}
let onBoardingWindow$: Promise<BrowserWindow> | undefined;
let onBoardingWindow: Promise<BrowserWindow> | undefined;
export async function getOrCreateOnboardingWindow() {
const additionalArguments = await getWindowAdditionalArguments();
if (
!onBoardingWindow$ ||
(await onBoardingWindow$.then(w => w.isDestroyed()))
!onBoardingWindow ||
(await onBoardingWindow.then(w => w.isDestroyed()))
) {
onBoardingWindow$ = createOnboardingWindow(additionalArguments);
onBoardingWindow = createOnboardingWindow(additionalArguments);
}
return onBoardingWindow$;
return onBoardingWindow;
}
export async function getOnboardingWindow() {
if (!onBoardingWindow$) return;
const window = await onBoardingWindow$;
if (!onBoardingWindow) return;
const window = await onBoardingWindow;
if (window.isDestroyed()) return;
return window;
}

2
packages/frontend/electron/src/main/ui/events.ts
View File

@@ -6,7 +6,7 @@ import { uiSubjects } from './subject';
*/
export const uiEvents = {
onMaximized: (fn: (maximized: boolean) => void) => {
const sub = uiSubjects.onMaximized.subscribe(fn);
const sub = uiSubjects.onMaximized$.subscribe(fn);
return () => {
sub.unsubscribe();
};

2
packages/frontend/electron/src/main/ui/subject.ts
View File

@@ -1,5 +1,5 @@
import { Subject } from 'rxjs';
export const uiSubjects = {
onMaximized: new Subject<boolean>(),
onMaximized$: new Subject<boolean>(),
};

8
packages/frontend/electron/src/main/updater/electron-updater.ts
View File

@@ -67,7 +67,7 @@ export const downloadUpdate = async () => {
return;
}
downloading = true;
updaterSubjects.downloadProgress.next(0);
updaterSubjects.downloadProgress$.next(0);
autoUpdater.downloadUpdate().catch(e => {
downloading = false;
logger.error('Failed to download update', e);
@@ -115,7 +115,7 @@ export const registerUpdater = async () => {
console.error(err);
});
}
updaterSubjects.updateAvailable.next({
updaterSubjects.updateAvailable$.next({
version: info.version,
allowAutoUpdate,
});
@@ -125,11 +125,11 @@ export const registerUpdater = async () => {
});
autoUpdater.on('download-progress', e => {
logger.info(`Download progress: ${e.percent}`);
updaterSubjects.downloadProgress.next(e.percent);
updaterSubjects.downloadProgress$.next(e.percent);
});
autoUpdater.on('update-downloaded', e => {
downloading = false;
updaterSubjects.updateReady.next({
updaterSubjects.updateReady$.next({
version: e.version,
allowAutoUpdate,
});

12
packages/frontend/electron/src/main/updater/event.ts
View File

@@ -9,26 +9,26 @@ export interface UpdateMeta {
export const updaterSubjects = {
// means it is ready for restart and install the new version
updateAvailable: new Subject<UpdateMeta>(),
updateReady: new Subject<UpdateMeta>(),
downloadProgress: new BehaviorSubject<number>(0),
updateAvailable$: new Subject<UpdateMeta>(),
updateReady$: new Subject<UpdateMeta>(),
downloadProgress$: new BehaviorSubject<number>(0),
};
export const updaterEvents = {
onUpdateAvailable: (fn: (versionMeta: UpdateMeta) => void) => {
const sub = updaterSubjects.updateAvailable.subscribe(fn);
const sub = updaterSubjects.updateAvailable$.subscribe(fn);
return () => {
sub.unsubscribe();
};
},
onUpdateReady: (fn: (versionMeta: UpdateMeta) => void) => {
const sub = updaterSubjects.updateReady.subscribe(fn);
const sub = updaterSubjects.updateReady$.subscribe(fn);
return () => {
sub.unsubscribe();
};
},
onDownloadProgress: (fn: (progress: number) => void) => {
const sub = updaterSubjects.downloadProgress.subscribe(fn);
const sub = updaterSubjects.downloadProgress$.subscribe(fn);
return () => {
sub.unsubscribe();
};

9
packages/frontend/electron/src/main/windows-manager/windows.ts
View File

@@ -1,9 +0,0 @@
import type { BrowserWindow } from 'electron';
import type { LaunchStage } from './types';
export const windows$: Record<LaunchStage, Promise<BrowserWindow> | undefined> =
{
main: undefined,
onboarding: undefined,
};