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
fix(drawing-ui): render chart option icons (#7520)
siamca07bd93863b
diff --git a/packages/docs-drawing-ui/src/services/doc-drawing-floating-toolbar-adapter.service.ts b/packages/docs-drawing-ui/src/services/doc-drawing-floating-toolbar-adapter.service.tsindex 54348f98c9..d82e684b09 100644--- a/packages/docs-drawing-ui/src/services/doc-drawing-floating-toolbar-adapter.service.ts+++ b/packages/docs-drawing-ui/src/services/doc-drawing-floating-toolbar-adapter.service.ts@@ -25,6 +25,7 @@ export interface IDocDrawingFloatingToolbarParams {}export interface IDocDrawingFloatingToolbarOption {+ icon?: string;label: unknown;value: string;}diff --git a/packages/drawing-ui/src/views/__tests__/DrawingPanelActions.spec.tsx b/packages/drawing-ui/src/views/__tests__/DrawingPanelActions.spec.tsxindex 9a9ab796cc..f3a5f9a11b 100644--- a/packages/drawing-ui/src/views/__tests__/DrawingPanelActions.spec.tsx+++ b/packages/drawing-ui/src/views/__tests__/DrawingPanelActions.spec.tsx@@ -343,4 +343,48 @@ describe('drawing panel actions', () => {expect(executedCommands.map((command) => command.id)).toEqual([chartEditCommandId]);expect(container.querySelector('[data-u-comp="doc-chart-floating-toolbar"]')).toBeNull();});++ it('renders the icon provided by each chart toolbar option', () => {+ const iconManager = univer.__getInjector().get(IconManager);+ iconManager.register({+ LineChartIcon: () => <span data-testid="line-chart-icon" />,+ ColumnChartIcon: () => <span data-testid="column-chart-icon" />,+ });++ const rendered = renderWithRediContext(+ univer.__getInjector(),+ <ImagePopupMenu+ popup={{+ extraProps: {+ variant: 'doc-chart-floating-toolbar',+ menuItems: [{+ type: 'select',+ label: 'chart.type',+ index: 0,+ commandId: chartEditCommandId,+ disable: false,+ value: 'line',+ options: [+ { label: 'Line', value: 'line', icon: 'LineChartIcon' },+ { label: 'Column', value: 'column', icon: 'ColumnChartIcon' },+ ],+ commandParamsFactory: (value) => ({ value }),+ }],+ },+ }}+ />+ );+ root = rendered.root;+ container = rendered.container;++ const chartTypeButton = container.querySelector<HTMLButtonElement>(+ '[data-u-comp="doc-chart-floating-toolbar"] button'+ );+ expect(chartTypeButton?.querySelector('[data-testid="line-chart-icon"]')).not.toBeNull();++ clickElement(chartTypeButton!);++ expect(document.querySelector('[data-testid="line-chart-icon"]')).not.toBeNull();+ expect(document.querySelector('[data-testid="column-chart-icon"]')).not.toBeNull();+ });});diff --git a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsxindex ce7120203c..b70e92a612 100644--- a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx+++ b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx@@ -43,7 +43,7 @@ export interface IImagePopupMenuItem {disable: boolean;type?: 'button' | 'select';value?: string;- options?: Array<{ label: unknown; value: string }>;+ options?: Array<{ icon?: string; label: unknown; value: string }>;commandParamsFactory?: (value: string) => object;hideOnClick?: boolean;icon?: string;@@ -423,11 +423,15 @@ function DocChartFloatingToolbar(props: Pick<IDocImageFloatingToolbarProps, 'menconst actionItems = props.menuItems.filter((item) => item.type !== 'select' && item.icon).sort((a, b) => a.index - b.index);- const chartTypeOptions = (chartTypeItem?.options ?? []).map((option) => ({- label: String(option.label),- value: option.value,- icon: <ChartIcon />,- }));+ const chartTypeOptions = (chartTypeItem?.options ?? []).map((option) => {+ const Icon = option.icon ? iconManager.get(option.icon) : ChartIcon;++ return {+ label: String(option.label),+ value: option.value,+ icon: <Icon />,+ };+ });const executeMenuItem = (item: IImagePopupMenuItem | undefined) => {if (!item || item.disable) {