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
feat(docs): active color on icon color or bg toolbar (#6608)
Roman Sergeevd7e74d4929fd
diff --git a/packages/ui/src/services/menu/menu.ts b/packages/ui/src/services/menu/menu.tsindex ce41d68e50..2853f123a7 100644--- a/packages/ui/src/services/menu/menu.ts+++ b/packages/ui/src/services/menu/menu.ts@@ -122,6 +122,10 @@ export function isMenuSelectorItem<T extends MenuItemDefaultValueType>(v: IMenuIreturn v.type === MenuItemType.SELECTOR || v.type === MenuItemType.SUBITEMS;}+export function isMenuButtonSelectorItem<T extends MenuItemDefaultValueType>(v: IMenuItem): v is IMenuSelectorItem<T> {+ return v.type === MenuItemType.BUTTON_SELECTOR;+}+export type MenuItemDefaultValueType = string | number | undefined;export type IMenuItem = IMenuButtonItem<MenuItemDefaultValueType> | IMenuSelectorItem<MenuItemDefaultValueType, any>;diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsxindex e907434bbd..f497fbc5a4 100644--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx@@ -36,7 +36,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenuconst layoutService = useDependency(ILayoutService);const componentManager = useDependency(ComponentManager);- const { value, hidden, disabled, activated } = useToolbarItemStatus(props);+ const { value, hidden, disabled, activated, selectionsValue } = useToolbarItemStatus(props);const executeCommand = (commandId: string, params?: Record<string, unknown>) => {layoutService.focus();@@ -57,6 +57,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu});}}, [selections]);+const options = useObservable(selections$) as IValueOption[];const icon$ = useMemo(() => {@@ -132,7 +133,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu<CustomLabelicon={iconToDisplay}title={title!}- value={value}+ value={selectionsValue ?? value}label={label}onChange={handleSelectionsValueChange}/>diff --git a/packages/ui/src/views/components/ribbon/hook.ts b/packages/ui/src/views/components/ribbon/hook.tsindex 2609ce9608..0097600784 100644--- a/packages/ui/src/views/components/ribbon/hook.ts+++ b/packages/ui/src/views/components/ribbon/hook.ts@@ -14,9 +14,10 @@* limitations under the License.*/-import type { Subscription } from 'rxjs';+import type { Observable, Subscription } from 'rxjs';import type { IDisplayMenuItem, IMenuItem } from '../../../services/menu/menu';import { useEffect, useState } from 'react';+import { isMenuButtonSelectorItem } from '../../../services/menu/menu';export interface IToolbarItemStatus {disabled: boolean;@@ -24,6 +25,8 @@ export interface IToolbarItemStatus {value: any;activated: boolean;hidden: boolean;+ // eslint-disable-next-line ts/no-explicit-any+ selectionsValue: any;}// TODO@wzhudev: maybe we should use `useObservable` here.@@ -36,22 +39,35 @@ export interface IToolbarItemStatus {export function useToolbarItemStatus(menuItem: IDisplayMenuItem<IMenuItem>): IToolbarItemStatus {const { disabled$, hidden$, activated$, value$ } = menuItem;+ // eslint-disable-next-line ts/no-explicit-any+ let selectionsValue$: Observable<any> | undefined;++ if (isMenuButtonSelectorItem(menuItem)) {+ const { selections } = menuItem;++ if (Array.isArray(selections)) {+ selectionsValue$ = selections?.[0]?.value$;+ }+ }+// eslint-disable-next-line ts/no-explicit-anyconst [value, setValue] = useState<any>();const [disabled, setDisabled] = useState(false);const [activated, setActivated] = useState(false);const [hidden, setHidden] = useState(false);+ // eslint-disable-next-line ts/no-explicit-any+ const [selectionsValue, setSelectionsValue] = useState<any>();useEffect(() => {const subscriptions: Subscription[] = [];-disabled$ && subscriptions.push(disabled$.subscribe((disabled) => setDisabled(disabled)));hidden$ && subscriptions.push(hidden$.subscribe((hidden) => setHidden(hidden)));activated$ && subscriptions.push(activated$.subscribe((activated) => setActivated(activated)));value$ && subscriptions.push(value$.subscribe((value) => setValue(value)));+ selectionsValue$ && subscriptions.push(selectionsValue$.subscribe((value) => setSelectionsValue(value)));return () => subscriptions.forEach((subscription) => subscription.unsubscribe());- }, [activated$, disabled$, hidden$, value$]);+ }, [activated$, disabled$, hidden$, value$, selectionsValue$]);- return { disabled, value, activated, hidden };+ return { disabled, value, activated, hidden, selectionsValue };}