Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
chore(mobile): add theme switch service (#5359)
Evan Hu01882fae8b5c
diff --git a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsxindex b15985ff5e..a3197bfcdb 100644--- a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx+++ b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx@@ -140,7 +140,7 @@ export function UniWorkbench(props: IUniWorkbenchProps) {// cleanupdocument.body.removeChild(portalContainer);};- }, [localeService, mountContainer, portalContainer, themeService.currentTheme$]);+ }, [localeService, mountContainer, portalContainer]);const nodeTypes: NodeTypes = {customNode: UnitNode,diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.tsindex a91431669e..512971b9cc 100644--- a/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts@@ -34,7 +34,16 @@ export function SmartToggleFilterMenuItemFactory(accessor: IAccessor): IMenuSeletooltip: 'sheets-filter.toolbar.smart-toggle-filter-tooltip',hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),activated$: sheetsFilterService.activeFilterModel$.pipe(map((model) => !!model)),- disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, { worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission], rangeTypes: [RangeProtectionPermissionViewPoint] })),+ disabled$: getObservableWithExclusiveRange$(+ accessor,+ getCurrentRangeDisable$(+ accessor,+ {+ worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission],+ rangeTypes: [RangeProtectionPermissionViewPoint],+ }+ )+ ),};}diff --git a/packages/ui/src/components/menu/mobile/MobileMenu.tsx b/packages/ui/src/components/menu/mobile/MobileMenu.tsxindex 37a2cd223d..7ae6b7938f 100644--- a/packages/ui/src/components/menu/mobile/MobileMenu.tsx+++ b/packages/ui/src/components/menu/mobile/MobileMenu.tsx@@ -59,7 +59,7 @@ export function MobileMenu(props: IBaseMenuProps) {univer-bg-gray-900 univer-px-2 univer-py-1`}style={{- gridTemplateColumns: `repeat(${Math.min(2, flattedMenuItems.length)}, 48px)`,+ gridTemplateColumns: `repeat(${Math.min(2, flattedMenuItems.length)}, 72px)`,}}>{flattedMenuItems.map((item) => item.item && (@@ -95,7 +95,7 @@ function MobileMenuItem(props: IMobileMenuItemProps) {<buttontype="button"className={clsx(`- univer-flex univer-w-12 univer-flex-col univer-items-center univer-justify-center univer-border-none+ univer-flex univer-w-18 univer-flex-col univer-items-center univer-justify-center univer-border-noneuniver-bg-transparent univer-text-white[&>span]:univer-mt-0.5 [&>span]:univer-w-full [&>span]:univer-truncate [&>span]:univer-text-sm[&>svg]:univer-size-[18px] [&>svg]:univer-text-lgdiff --git a/packages/ui/src/mobile-plugin.ts b/packages/ui/src/mobile-plugin.tsindex d2b762fcb7..088271f726 100644--- a/packages/ui/src/mobile-plugin.ts+++ b/packages/ui/src/mobile-plugin.ts@@ -50,6 +50,7 @@ import { ShortcutPanelService } from './services/shortcut/shortcut-panel.serviceimport { IShortcutService, ShortcutService } from './services/shortcut/shortcut.service';import { DesktopSidebarService } from './services/sidebar/desktop-sidebar.service';import { ISidebarService } from './services/sidebar/sidebar.service';+import { ThemeSwitcherService } from './services/theme-switcher/theme-switcher.service';import { DesktopZenZoneService } from './services/zen-zone/desktop-zen-zone.service';import { IZenZoneService } from './services/zen-zone/zen-zone.service';@@ -78,6 +79,7 @@ export class UniverMobileUIPlugin extends Plugin {[ShortcutPanelService],[IUIPartsService, { useClass: UIPartsService }],[ILayoutService, { useClass: DesktopLayoutService }],+ [ThemeSwitcherService],[IShortcutService, { useClass: ShortcutService }],[IPlatformService, { useClass: PlatformService }],[IMenuManagerService, { useClass: MenuManagerService }],diff --git a/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx b/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsxindex 04e6b5f72b..8de50b694a 100644--- a/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx+++ b/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx@@ -18,8 +18,9 @@ import type { ILocale } from '@univerjs/design';import type { IWorkbenchOptions } from '../../controllers/ui/ui.controller';import { LocaleService, ThemeService } from '@univerjs/core';import { borderBottomClassName, clsx, ConfigProvider } from '@univerjs/design';-import { useEffect, useMemo, useRef, useState } from 'react';+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';import { BuiltInUIPart } from '../../services/parts/parts.service';+import { ThemeSwitcherService } from '../../services/theme-switcher/theme-switcher.service';import { useDependency } from '../../utils/di';import { ComponentContainer, useComponentsOfPart } from '../components/ComponentContainer';import { MobileContextMenu } from '../components/context-menu/MobileContextMenu';@@ -44,6 +45,8 @@ export function MobileWorkbench(props: IUniverAppProps) {const localeService = useDependency(LocaleService);const themeService = useDependency(ThemeService);+ const themeSwitcherService = useDependency(ThemeSwitcherService);+const contentRef = useRef<HTMLDivElement>(null);const footerComponents = useComponentsOfPart(BuiltInUIPart.FOOTER);@@ -74,6 +77,16 @@ export function MobileWorkbench(props: IUniverAppProps) {// Create a portal container for injecting global component themes.const portalContainer = useMemo<HTMLElement>(() => document.createElement('div'), []);+ useLayoutEffect(() => {+ const sub = themeService.currentTheme$.subscribe((theme) => {+ themeSwitcherService.injectThemeToHead(theme);+ });++ return () => {+ sub.unsubscribe();+ };+ }, []);+useEffect(() => {document.body.appendChild(portalContainer);@@ -90,7 +103,7 @@ export function MobileWorkbench(props: IUniverAppProps) {// cleanupdocument.body.removeChild(portalContainer);};- }, [localeService, mountContainer, portalContainer, themeService.currentTheme$]);+ }, [localeService, mountContainer, portalContainer]);return (<ConfigProvider locale={locale?.design} mountContainer={portalContainer}>diff --git a/packages/ui/src/views/workbench/Workbench.tsx b/packages/ui/src/views/workbench/Workbench.tsxindex 0492a0fc7a..e693417d7a 100644--- a/packages/ui/src/views/workbench/Workbench.tsx+++ b/packages/ui/src/views/workbench/Workbench.tsx@@ -126,7 +126,7 @@ export function DesktopWorkbenchContent(props: IUniverWorkbenchProps) {// cleanupdocument.body.removeChild(portalContainer);};- }, [localeService, mountContainer, portalContainer, themeService.currentTheme$]);+ }, [localeService, mountContainer, portalContainer]);return (<ConfigProvider locale={locale?.design} mountContainer={portalContainer}>