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): improve focus-trap handling by ensuring container stays within the modal subtree (#6546)
白熱be2d617dd4a0
diff --git a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts b/packages/docs-ui/src/services/selection/doc-selection-render.service.tsindex 4379ace4cc..8424578441 100644--- a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts+++ b/packages/docs-ui/src/services/selection/doc-selection-render.service.ts@@ -354,8 +354,20 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo* @deprecated*/activate(x: number, y: number, force = false) {- this._container.style.left = `${x}px`;- this._container.style.top = `${y}px`;+ // Keep the hidden editor inside the Portal subtree when possible to avoid focus-trap loops,+ // then compensate coordinates if a transformed ancestor changes the fixed containing block.+ this._ensureHostContainer();+ let left = x;+ let top = y;+ const fixedContainer = this._container.parentElement;+ if (fixedContainer) {+ const rect = fixedContainer.getBoundingClientRect();+ left -= rect.left;+ top -= rect.top;+ }++ this._container.style.left = `${left}px`;+ this._container.style.top = `${top}px`;this._container.style.zIndex = '1000';if (this.canFocusing || force) {@@ -716,7 +728,9 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMothis._initInput();this._initInputEvents();- document.body.appendChild(container);+ const host = this._layoutService.rootContainerElement;+ const hostElement = host?.isConnected ? host : document.body;+ hostElement.appendChild(container);}private _registerContainer() {@@ -753,6 +767,21 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo`;}+ private _ensureHostContainer(): void {+ // Prefer the Univer root container (often inside a Portal) so focus stays within the modal subtree.+ const host = this._layoutService.rootContainerElement;+ if (host?.isConnected) {+ if (this._container.parentElement !== host) {+ host.appendChild(this._container);+ }+ return;+ }++ if (this._container.parentElement !== document.body) {+ document.body.appendChild(this._container);+ }+ }+private _getNodePosition(node: Nullable<INodeInfo>): Nullable<INodePosition> {if (node == null) {return;