From b9e5a72cc1c50e2b017cd6bdbd43cb4406249577 Mon Sep 17 00:00:00 2001 From: Jimmfly Date: Thu, 26 Sep 2024 10:36:27 +0800 Subject: [PATCH] chore: rename AppSidebarLocalState to AppSidebarState --- .../modules/app-sidebar/entities/app-sidebar.ts | 14 +++++++------- .../core/src/modules/app-sidebar/impls/storage.ts | 4 ++-- .../frontend/core/src/modules/app-sidebar/index.ts | 8 ++++---- .../src/modules/app-sidebar/providers/storage.ts | 7 +++---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/packages/frontend/core/src/modules/app-sidebar/entities/app-sidebar.ts b/packages/frontend/core/src/modules/app-sidebar/entities/app-sidebar.ts index 657ce31987..19ba89840b 100644 --- a/packages/frontend/core/src/modules/app-sidebar/entities/app-sidebar.ts +++ b/packages/frontend/core/src/modules/app-sidebar/entities/app-sidebar.ts @@ -1,7 +1,7 @@ import { Entity, LiveData } from '@toeverything/infra'; import { map } from 'rxjs'; -import type { AppSidebarLocalState } from '../providers/storage'; +import type { AppSidebarState } from '../providers/storage'; const isMobile = !BUILD_CONFIG.isElectron && window.innerWidth < 768; @@ -11,19 +11,19 @@ enum APP_SIDEBAR_STATE { } export class AppSidebar extends Entity { - constructor(private readonly appSidebarLocalState: AppSidebarLocalState) { + constructor(private readonly appSidebarState: AppSidebarState) { super(); } open$ = LiveData.from( - this.appSidebarLocalState + this.appSidebarState .watch(APP_SIDEBAR_STATE.OPEN) .pipe(map(value => value ?? !isMobile)), !isMobile ); width$ = LiveData.from( - this.appSidebarLocalState + this.appSidebarState .watch(APP_SIDEBAR_STATE.WIDTH) .pipe(map(value => value ?? 248)), 248 @@ -33,7 +33,7 @@ export class AppSidebar extends Entity { resizing$ = new LiveData(false); getCachedAppSidebarOpenState = () => { - return this.appSidebarLocalState.get(APP_SIDEBAR_STATE.OPEN); + return this.appSidebarState.get(APP_SIDEBAR_STATE.OPEN); }; toggleSidebar = () => { @@ -41,7 +41,7 @@ export class AppSidebar extends Entity { }; setOpen = (open: boolean) => { - this.appSidebarLocalState.set(APP_SIDEBAR_STATE.OPEN, open); + this.appSidebarState.set(APP_SIDEBAR_STATE.OPEN, open); if (!open && this.hoverFloating$.value) { const timeout = setTimeout(() => { this.setHoverFloating(false); @@ -66,6 +66,6 @@ export class AppSidebar extends Entity { }; setWidth = (width: number) => { - this.appSidebarLocalState.set(APP_SIDEBAR_STATE.WIDTH, width); + this.appSidebarState.set(APP_SIDEBAR_STATE.WIDTH, width); }; } diff --git a/packages/frontend/core/src/modules/app-sidebar/impls/storage.ts b/packages/frontend/core/src/modules/app-sidebar/impls/storage.ts index cee7f89d11..9261e692ff 100644 --- a/packages/frontend/core/src/modules/app-sidebar/impls/storage.ts +++ b/packages/frontend/core/src/modules/app-sidebar/impls/storage.ts @@ -4,9 +4,9 @@ import { wrapMemento, } from '@toeverything/infra'; -import type { AppSidebarLocalState } from '../providers/storage'; +import type { AppSidebarState } from '../providers/storage'; -export class AppSidebarLocalStateImpl implements AppSidebarLocalState { +export class AppSidebarStateImpl implements AppSidebarState { wrapped: Memento; constructor(globalState: GlobalState) { this.wrapped = wrapMemento(globalState, `app-sidebar-state:`); diff --git a/packages/frontend/core/src/modules/app-sidebar/index.ts b/packages/frontend/core/src/modules/app-sidebar/index.ts index 9dadee5805..13dcd19fac 100644 --- a/packages/frontend/core/src/modules/app-sidebar/index.ts +++ b/packages/frontend/core/src/modules/app-sidebar/index.ts @@ -1,8 +1,8 @@ import { type Framework, GlobalState } from '@toeverything/infra'; import { AppSidebar } from './entities/app-sidebar'; -import { AppSidebarLocalStateImpl } from './impls/storage'; -import { AppSidebarLocalState } from './providers/storage'; +import { AppSidebarStateImpl } from './impls/storage'; +import { AppSidebarState } from './providers/storage'; import { AppSidebarService } from './services/app-sidebar'; export * from './services/app-sidebar'; @@ -10,6 +10,6 @@ export * from './services/app-sidebar'; export function configureAppSidebarModule(framework: Framework) { framework .service(AppSidebarService) - .entity(AppSidebar, [AppSidebarLocalState]) - .impl(AppSidebarLocalState, AppSidebarLocalStateImpl, [GlobalState]); + .entity(AppSidebar, [AppSidebarState]) + .impl(AppSidebarState, AppSidebarStateImpl, [GlobalState]); } diff --git a/packages/frontend/core/src/modules/app-sidebar/providers/storage.ts b/packages/frontend/core/src/modules/app-sidebar/providers/storage.ts index 2a499e1245..03685bf5cb 100644 --- a/packages/frontend/core/src/modules/app-sidebar/providers/storage.ts +++ b/packages/frontend/core/src/modules/app-sidebar/providers/storage.ts @@ -1,7 +1,6 @@ import { createIdentifier, type Memento } from '@toeverything/infra'; -export interface AppSidebarLocalState extends Memento {} +export interface AppSidebarState extends Memento {} -export const AppSidebarLocalState = createIdentifier( - 'AppSidebarLocalState' -); +export const AppSidebarState = + createIdentifier('AppSidebarState');