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-ui): optimize doc side-menu active item calc logic (#4967)
ZhangWei4a58711dbdeb
diff --git a/packages/core/src/docs/data-model/text-x/utils.ts b/packages/core/src/docs/data-model/text-x/utils.tsindex a159843d1e..a1f50145d5 100644--- a/packages/core/src/docs/data-model/text-x/utils.ts+++ b/packages/core/src/docs/data-model/text-x/utils.ts@@ -17,7 +17,7 @@import type { ICustomBlock, ICustomDecoration, ICustomRange, IDocumentBody, IParagraph, ISectionBreak, ITextRun } from '../../../types/interfaces/i-document-data';import type { IRetainAction } from './action-types';import { UpdateDocsAttributeType } from '../../../shared/command-enum';-import { Tools } from '../../../shared/tools';+import { generateRandomId, Tools } from '../../../shared/tools';import { normalizeTextRuns } from './apply-utils/common';import { coverTextRuns } from './apply-utils/update-apply';@@ -114,7 +114,11 @@ export function getParagraphsSlice(for (const paragraph of paragraphs) {const { startIndex } = paragraph;if (startIndex >= startOffset && startIndex < endOffset) {- newParagraphs.push(Tools.deepClone(paragraph));+ const copy = Tools.deepClone(paragraph);+ newParagraphs.push(copy);+ if (copy.paragraphStyle?.headingId) {+ copy.paragraphStyle.headingId = generateRandomId(6);+ }}}diff --git a/packages/docs-ui/src/services/doc-paragraph-menu.service.ts b/packages/docs-ui/src/services/doc-paragraph-menu.service.tsindex 66d0254101..e4732d20f3 100644--- a/packages/docs-ui/src/services/doc-paragraph-menu.service.ts+++ b/packages/docs-ui/src/services/doc-paragraph-menu.service.ts@@ -151,6 +151,7 @@ export class DocParagraphMenuService extends Disposable implements IRenderModule}});},+ zIndex: 101,},this._context.unitId);diff --git a/packages/docs-ui/src/services/doc-popup-manager.service.ts b/packages/docs-ui/src/services/doc-popup-manager.service.tsindex 89f9b93d44..348200165b 100644--- a/packages/docs-ui/src/services/doc-popup-manager.service.ts+++ b/packages/docs-ui/src/services/doc-popup-manager.service.ts@@ -84,7 +84,7 @@ export function transformOffset2Bound(offsetX: number, offsetY: number, scene: S};}-export interface IDocCanvasPopup extends Pick<IPopup, 'direction' | 'excludeOutside' | 'componentKey' | 'offset' | 'onClickOutside' | 'hideOnInvisible' | 'customActive'> {+export interface IDocCanvasPopup extends Omit<IPopup, 'anchorRect$' | 'children' | 'unitId' | 'subUnitId' | 'canvasElement'> {mask?: boolean;extraProps?: Record<string, any>;multipleDirection?: IPopup['direction'];diff --git a/packages/docs-ui/src/views/side-menu/index.tsx b/packages/docs-ui/src/views/side-menu/index.tsxindex 2ef4613957..514ec2b8a6 100644--- a/packages/docs-ui/src/views/side-menu/index.tsx+++ b/packages/docs-ui/src/views/side-menu/index.tsx@@ -83,16 +83,16 @@ export function DocSideMenu() {const renderManagerService = useDependency(IRenderManagerService);const fullDataStream = currentDoc?.getBody()?.dataStream ?? '';const [_updateKey, setUpdateKey] = useState(0);+ const [activeId, setActiveId] = useState<string | undefined>(undefined);const unitId = currentDoc?.getUnitId() ?? '';const renderer = renderManagerService.getRenderById(unitId);const title = currentDoc?.getTitle();const docEventManagerService = renderer?.with(DocEventManagerService);const paragraphBounds = docEventManagerService?.paragraphBounds;const left = renderer?.mainComponent?.left ?? 0;- const [scrollTop, setScrollTop] = useState(0);const canvasHeight = renderer?.engine.height ?? 0;const scaleY = renderer?.scene.scaleY ?? 1;- const bottom = scrollTop + (canvasHeight / scaleY);+const paragraphs = currentDoc?.getBody()?.paragraphs ?? [];const paragraphMap = useMemo(() => {const map = new Map<number, IParagraph>();@@ -127,6 +127,15 @@ export function DocSideMenu() {}).filter(Boolean) as ISideMenuItem[];+ const handleScroll = useEvent((params) => {+ const scrollTop = params.viewportScrollY;+ const bottom = scrollTop + (canvasHeight / scaleY);+ const activeId = findActiveHeading(paragraphBounds, paragraphMap, scrollTop, bottom);+ if (activeId) {+ setActiveId(activeId);+ }+ });+const menus = paragraphMenus?.find((p) => p.isTitle)? paragraphMenus: [@@ -142,7 +151,6 @@ export function DocSideMenu() {].filter(Boolean) as ISideMenuItem[];const [open, setOpen] = useState(true);- const activeId = findActiveHeading(paragraphBounds, paragraphMap, scrollTop, bottom);useEffect(() => {const debounceUpdater = debounce(setUpdateKey, 100);@@ -159,15 +167,15 @@ export function DocSideMenu() {sub.dispose();};}, [commandService, currentDoc]);+useEffect(() => {const viewport = renderer?.scene.getViewport(VIEWPORT_KEY.VIEW_MAIN);if (!viewport) {return;}- const sub = fromEventSubject(viewport.onScrollAfter$).pipe(throttleTime(33)).subscribe((params) => {- setScrollTop(params.viewportScrollY);- });+ const sub = fromEventSubject(viewport.onScrollAfter$).pipe(throttleTime(33)).subscribe(handleScroll);+return () => {sub.unsubscribe();};@@ -193,6 +201,7 @@ export function DocSideMenu() {}viewport.scrollToViewportPos({ viewportScrollY: bound.rect.top });+ setActiveId(menu.id);});if (!currentDoc || isInternalEditorID(unitId) || !menus?.length) {diff --git a/packages/ui/src/views/components/popup/CanvasPopup.tsx b/packages/ui/src/views/components/popup/CanvasPopup.tsxindex fce5edc63a..a666b1e201 100644--- a/packages/ui/src/views/components/popup/CanvasPopup.tsx+++ b/packages/ui/src/views/components/popup/CanvasPopup.tsx@@ -81,6 +81,7 @@ const SingleCanvasPopup = ({ popup, children }: ISingleCanvasPopupProps) => {return (<RectPopup+ {...popup}hidden={hidden}anchorRect$={anchorRect$}direction={popup.direction}