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(sheets-ui): constrain drawing popups around frozen panes (#7574)
wpxp123456f50ecb56ebe1
diff --git a/packages/sheets-ui/src/services/__tests__/canvas-pop-manager.service.spec.ts b/packages/sheets-ui/src/services/__tests__/canvas-pop-manager.service.spec.tsindex e8966ac6e1..fa4a133e7a 100644--- a/packages/sheets-ui/src/services/__tests__/canvas-pop-manager.service.spec.ts+++ b/packages/sheets-ui/src/services/__tests__/canvas-pop-manager.service.spec.ts@@ -336,7 +336,7 @@ describe('SheetCanvasPopManagerService', () => {});it('adds scaled sheet header insets to a canvas-constrained drawing popup', () => {- const { service, popupService } = createSheetHarness();+ const { service, popupService, viewport } = createSheetHarness();const targetObject = {left: 20,top: 10,@@ -345,6 +345,8 @@ describe('SheetCanvasPopManagerService', () => {classType: RENDER_CLASS_TYPE.SHAPE,getPropByKey: () => 'image',};+ viewport.left = 20;+ viewport.top = 20;service.attachPopupToObject(targetObject as never, {componentKey: 'drawing-toolbar',@@ -354,6 +356,27 @@ describe('SheetCanvasPopManagerService', () => {expect(popupService.lastPopup()?.boundaryInsets).toEqual({ left: 40, top: 40 });});+ it('includes frozen panes in the boundary insets of a canvas-constrained drawing popup', () => {+ const { service, popupService, viewport } = createSheetHarness();+ const targetObject = {+ left: 80,+ top: 90,+ width: 40,+ height: 30,+ classType: RENDER_CLASS_TYPE.SHAPE,+ getPropByKey: () => 'image',+ };+ viewport.left = 80;+ viewport.top = 100;++ service.attachPopupToObject(targetObject as never, {+ componentKey: 'drawing-toolbar',+ constrainToCanvas: true,+ });++ expect(popupService.lastPopup()?.boundaryInsets).toEqual({ left: 160, top: 200 });+ });+it('keeps absolute-position popups hidden while a selection is being dragged unless the popup opts in', () => {const { service, popupService, refSelectionService, sheetSelectionService } = createSheetHarness();const bound = { top: 10, left: 20, right: 30, bottom: 40 };diff --git a/packages/sheets-ui/src/services/canvas-pop-manager.service.ts b/packages/sheets-ui/src/services/canvas-pop-manager.service.tsindex 7bf30b7ca2..b686666cf5 100644--- a/packages/sheets-ui/src/services/canvas-pop-manager.service.ts+++ b/packages/sheets-ui/src/services/canvas-pop-manager.service.ts@@ -346,7 +346,7 @@ export class SheetCanvasPopManagerService extends Disposable {const canvasElement = currentRender.engine.getCanvasElement();const scaleAdjust = canvasElement.getBoundingClientRect().width / pxToNum(canvasElement.style.width);const { scaleX, scaleY } = currentRender.scene.getAncestorScale();-+ const viewMain = currentRender.scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);const id = this._globalPopupManagerService.addPopup({...popup,unitId,@@ -357,8 +357,8 @@ export class SheetCanvasPopManagerService extends Disposable {canvasElement,boundaryInsets: popup.constrainToCanvas? {- left: skeleton.rowHeaderWidth * scaleAdjust * scaleX,- top: skeleton.columnHeaderHeight * scaleAdjust * scaleY,+ left: (viewMain?.left ?? skeleton.rowHeaderWidth * scaleX) * scaleAdjust,+ top: (viewMain?.top ?? skeleton.columnHeaderHeight * scaleY) * scaleAdjust,}: popup.boundaryInsets,});diff --git a/packages/ui/src/views/components/popup/CanvasPopup.tsx b/packages/ui/src/views/components/popup/CanvasPopup.tsxindex 8640b88c47..dae75447f4 100644--- a/packages/ui/src/views/components/popup/CanvasPopup.tsx+++ b/packages/ui/src/views/components/popup/CanvasPopup.tsx@@ -45,13 +45,15 @@ export const SingleCanvasPopup = ({ popup, children }: ISingleCanvasPopupProps)const hiddenRects$ = useMemo(() => popup.hiddenRects$?.pipe(throttleTime(0, animationFrameScheduler)) ?? of([]), [popup.hiddenRects$]);const excludeRects$ = useMemo(() => popup.excludeRects$?.pipe(throttleTime(0, animationFrameScheduler)), [popup.excludeRects$]);const excludeRectsRef = useObservableRef(excludeRects$, popup.excludeRects);- const { canvasElement, constrainToCanvas = false, hideOnInvisible = true, hiddenType = 'destroy' } = popup;+ const { boundaryInsets, canvasElement, constrainToCanvas = false, hideOnInvisible = true, hiddenType = 'destroy' } = popup;const hidden = useObservable(hideOnInvisible? () => combineLatest([anchorRect$, hiddenRects$]).pipe(map(([rectWithOffset, hiddenRects]) => {const rect = canvasElement.getBoundingClientRect();const { top, left, bottom, right } = rect;+ const insetTop = constrainToCanvas ? boundaryInsets?.top ?? 0 : 0;+ const insetLeft = constrainToCanvas ? boundaryInsets?.left ?? 0 : 0;const rectHeight = rectWithOffset.bottom - rectWithOffset.top;const rectWidth = rectWithOffset.right - rectWithOffset.left;@@ -64,13 +66,13 @@ export const SingleCanvasPopup = ({ popup, children }: ISingleCanvasPopupProps)rectWithOffset.right <= (hiddenRect.right + bufferX);});- return rectWithOffset.bottom < top || rectWithOffset.top > bottom ||- rectWithOffset.right < left || rectWithOffset.left > right || isInHiddenRect;+ return rectWithOffset.bottom < top + insetTop || rectWithOffset.top > bottom ||+ rectWithOffset.right < left + insetLeft || rectWithOffset.left > right || isInHiddenRect;})): null,false,false,- [anchorRect$, canvasElement, hiddenRects$, hideOnInvisible]+ [anchorRect$, boundaryInsets, canvasElement, constrainToCanvas, hiddenRects$, hideOnInvisible]);if ((hidden && hiddenType === 'destroy')) {