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: adjust toolbar item position in uni-mode (#2987)
YuHong285cdf5fe867
diff --git a/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx b/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsxindex e9212ce4a3..1b5ecb5ac9 100644--- a/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx+++ b/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx@@ -46,7 +46,7 @@ export class UniSlidesUIController extends SlidesUIController {private _initUniMenus(): void {([[BuiltinUniToolbarItemId.IMAGE, IMAGE_MENU_ID],- [BuiltinUniToolbarItemId.FONT_SIZE, SHAPE_MENU_ID],+ [BuiltinUniToolbarItemId.FONT_GROUP, SHAPE_MENU_ID],[BuiltinUniToolbarItemId.TABLE, SlideAddTextOperation.id],]).forEach(([id, menuId]) => {this._toolbarService.implementItem(id, { id: menuId, type: UniverInstanceType.UNIVER_SLIDE });diff --git a/packages-experimental/uniui/src/services/toolbar/uni-toolbar-service.ts b/packages-experimental/uniui/src/services/toolbar/uni-toolbar-service.tsindex 1da83e8e0d..598ba65956 100644--- a/packages-experimental/uniui/src/services/toolbar/uni-toolbar-service.ts+++ b/packages-experimental/uniui/src/services/toolbar/uni-toolbar-service.ts@@ -72,7 +72,6 @@ export class UniToolbarService extends Disposable {{ id: FAKE_FONT_GROUP_MENU_ID, type: UniverInstanceType.UNIVER_UNKNOWN },{ id: FONT_GROUP_MENU_ID, type: UniverInstanceType.UNIVER_SHEET },{ id: FONT_GROUP_MENU_ID, type: UniverInstanceType.UNIVER_DOC },- { id: FONT_GROUP_MENU_ID, type: UniverInstanceType.UNIVER_SLIDE },],},{diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsxindex 81aeadfcf2..f50eb324ee 100644--- a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx@@ -67,7 +67,7 @@ export const UniFloatingToolbar = React.forwardRef<IFloatingToolbarRef, { node:}}, [node, setReference]);- if (!node) {+ if (!node || !refs.reference.current) {return null;}diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniToolbar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniToolbar.tsxindex 0dc468a0e1..2a8165ac0c 100644--- a/packages-experimental/uniui/src/views/uni-toolbar/UniToolbar.tsx+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniToolbar.tsx@@ -50,9 +50,15 @@ export function UniToolbar() {const uniVisibleItems = toolbarItems.map((item) => {const { impl } = item;- const id = impl.find((item) => item.type === type) || impl.find((item) => item.type === UniverInstanceType.UNIVER_UNKNOWN);- if (id !== undefined) {- return visibleItems.find((item) => item.id === id.id);+ const typeImpl = impl.find((item) => item.type === type);+ const visibleItem = visibleItems.find((item) => item.id === typeImpl?.id);+ if (visibleItem) {+ return visibleItem;+ }+ const placeHolderImpl = impl.find((item) => item.type === UniverInstanceType.UNIVER_UNKNOWN);+ const placeHolderItem = visibleItems.find((item) => item.id === placeHolderImpl?.id);+ if (placeHolderItem) {+ return placeHolderItem;}return null;}).filter((item) => !!item);