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(docs-ui): popup float menu position (#4881)
ZhangWei610f7103485a
diff --git a/packages/docs-ui/src/controllers/float-menu.controller.ts b/packages/docs-ui/src/controllers/float-menu.controller.tsindex f5219cba0d..2b00f33dd4 100644--- a/packages/docs-ui/src/controllers/float-menu.controller.ts+++ b/packages/docs-ui/src/controllers/float-menu.controller.ts@@ -34,6 +34,11 @@ function isInSameLine(startNodePosition: Nullable<INodePosition>, endNodePositioreturn deepCompare(startRest, endRest);}+const SKIP_SYMBOLS: string[] = [+ DataStreamTreeTokenType.CUSTOM_BLOCK,+ DataStreamTreeTokenType.PARAGRAPH,+];+export class FloatMenuController extends Disposable {private _floatMenu: Nullable<IDisposable> = null;@@ -78,7 +83,8 @@ export class FloatMenuController extends Disposable {return;}- if (range.endOffset - range.startOffset === 1 && documentDataModel.getBody()?.dataStream[range.startOffset] === DataStreamTreeTokenType.CUSTOM_BLOCK) {+ const token = documentDataModel.getBody()?.dataStream[range.startOffset];+ if (range.endOffset - range.startOffset === 1 && token && SKIP_SYMBOLS.includes(token)) {return;}diff --git a/packages/docs-ui/src/services/doc-popup-manager.service.ts b/packages/docs-ui/src/services/doc-popup-manager.service.tsindex 3769906206..1cefa2d077 100644--- a/packages/docs-ui/src/services/doc-popup-manager.service.ts+++ b/packages/docs-ui/src/services/doc-popup-manager.service.ts@@ -94,7 +94,8 @@ export const calcDocRangePositions = (range: ITextRangeParam, currentRender: IReconst { scene, mainComponent, engine } = currentRender;const skeleton = currentRender.with(DocSkeletonManagerService).getSkeleton();const startPosition = skeleton.findNodePositionByCharIndex(range.startOffset, true, range.segmentId, range.segmentPage);- const endPosition = skeleton.findNodePositionByCharIndex(range.endOffset, true, range.segmentId, range.segmentPage);+ const endIndex = range.collapsed ? range.startOffset : range.endOffset - 1;+ const endPosition = skeleton.findNodePositionByCharIndex(endIndex, true, range.segmentId, range.segmentPage);const document = mainComponent as Documents;if (!endPosition || !startPosition) {diff --git a/packages/ui/src/views/components/popup/RectPopup.tsx b/packages/ui/src/views/components/popup/RectPopup.tsxindex 5181253fbe..b75952efdc 100644--- a/packages/ui/src/views/components/popup/RectPopup.tsx+++ b/packages/ui/src/views/components/popup/RectPopup.tsx@@ -77,17 +77,22 @@ function calcPopupPosition(layout: IPopupLayoutInfo): { top: number; left: numbe: { top: Math.min(endY, containerHeight - height - PUSHING_MINIMUM_GAP) };let horizontalStyle;++ const minLeft = PUSHING_MINIMUM_GAP;+ const maxLeft = containerWidth - width - PUSHING_MINIMUM_GAP;+if (direction.includes('center')) {const rectWidth = endX - startX;const offsetX = (rectWidth - width) / 2;- horizontalStyle = {- left: startX + offsetX,- };++ horizontalStyle = (Math.max(startX + offsetX, PUSHING_MINIMUM_GAP) + width) > containerWidth+ ? { left: Math.max(Math.min(maxLeft, endX - width - offsetX), minLeft) }+ : { left: Math.max(minLeft, Math.min(startX + offsetX, maxLeft)) };} else {// If the popup element exceed the visible area. We should "push" it back.horizontalStyle = (startX + width) > containerWidth- ? { left: Math.max(endX - width, PUSHING_MINIMUM_GAP) } // on left- : { left: Math.min(startX, containerWidth - width - PUSHING_MINIMUM_GAP) }; // on right+ ? { left: Math.max(endX - width, minLeft) } // on left+ : { left: Math.min(startX, maxLeft) }; // on right}return { ...verticalStyle, ...horizontalStyle };