@antv/infographic 0.2.17 → 0.2.18

package/esm/editor/plugins/reset-viewbox.js

@@ -1,6 +1,7 @@
 import { COMPONENT_ROLE } from '../../constants/index.js';
 import { getBoundViewBox, getViewBox, injectStyleOnce, parsePadding, setElementRole, viewBoxToString, } from '../../utils/index.js';
 import { UpdateOptionsCommand } from '../commands/index.js';
+import { getOverlayContainer } from '../utils/index.js';
 import { Plugin } from './base.js';
 import { IconButton } from './components/index.js';
 import { RESET_ICON } from './components/icons.js';
@@ -33,9 +34,12 @@ export class ResetViewBox extends Plugin {
             if (this.resetButton)
                 return this.resetButton;
             const { style, className } = this.options || {};
+            const containerParent = this.resolveOverlayRoot();
+            this.ensureButtonStyle(containerParent);
             const button = IconButton({
                 icon: RESET_ICON,
                 onClick: this.resetViewBox,
+                root: containerParent,
             });
             button.classList.add(RESET_BUTTON_CLASS);
             if (className) {
@@ -46,9 +50,6 @@ export class ResetViewBox extends Plugin {
             }
             setElementRole(button, COMPONENT_ROLE);
             this.resetButton = button;
-            const { getContainer } = this.options || {};
-            const resolvedContainer = typeof getContainer === 'function' ? getContainer() : getContainer;
-            const containerParent = resolvedContainer !== null && resolvedContainer !== void 0 ? resolvedContainer : document.body;
             containerParent === null || containerParent === void 0 ? void 0 : containerParent.appendChild(button);
             return button;
         };
@@ -139,7 +140,7 @@ export class ResetViewBox extends Plugin {
     init(options) {
         super.init(options);
         // Initialize originViewBox
-        this.ensureButtonStyle();
+        this.ensureButtonStyle(this.resolveOverlayRoot());
         this.updateOriginViewBox();
         this.unregisterSync = this.editor.registerSync('viewBox', this.handleViewBoxChange);
         window.addEventListener('resize', this.handleResize);
@@ -161,7 +162,12 @@ export class ResetViewBox extends Plugin {
         const { padding } = this.state.getOptions();
         this.originViewBox = getBoundViewBox(svg, parsePadding(padding));
     }
-    ensureButtonStyle() {
+    resolveOverlayRoot() {
+        const { getContainer } = this.options || {};
+        const resolvedContainer = typeof getContainer === 'function' ? getContainer() : getContainer;
+        return resolvedContainer !== null && resolvedContainer !== void 0 ? resolvedContainer : getOverlayContainer(this.editor.getDocument());
+    }
+    ensureButtonStyle(target) {
         injectStyleOnce(RESET_BUTTON_STYLE_ID, `
       button.${RESET_BUTTON_CLASS} {
         visibility: hidden;
@@ -179,7 +185,7 @@ export class ResetViewBox extends Plugin {
         box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
         cursor: pointer;
       }
-      `);
+      `, target);
     }
 }
 const RESET_BUTTON_CLASS = 'infographic-reset-viewbox-btn';

package/esm/editor/utils/index.d.ts

@@ -6,3 +6,4 @@ export * from './event';
 export * from './extension';
 export * from './hotkey';
 export * from './object';
+export * from './root';

package/esm/editor/utils/index.js

@@ -6,3 +6,4 @@ export * from './event.js';
 export * from './extension.js';
 export * from './hotkey.js';
 export * from './object.js';
+export * from './root.js';

package/esm/editor/utils/root.d.ts

@@ -0,0 +1,3 @@
+export type OverlayContainer = HTMLElement | ShadowRoot;
+export declare function getOverlayContainer(node?: Node | null): OverlayContainer;
+export declare function eventPathContains(event: Event, node: Node): boolean;

package/esm/editor/utils/root.js

@@ -0,0 +1,18 @@
+function getConnectedRoot(node) {
+    if (!(node === null || node === void 0 ? void 0 : node.isConnected))
+        return document;
+    const root = node.getRootNode();
+    return root instanceof ShadowRoot ? root : document;
+}
+export function getOverlayContainer(node) {
+    const root = getConnectedRoot(node);
+    return root instanceof ShadowRoot ? root : document.body;
+}
+export function eventPathContains(event, node) {
+    const path = typeof event.composedPath === 'function' ? event.composedPath() : [];
+    if (path.length > 0) {
+        return path.some((current) => current === node || (current instanceof Node && node.contains(current)));
+    }
+    const target = event.target;
+    return target instanceof Node && (target === node || node.contains(target));
+}

package/esm/exporter/svg.js

@@ -22,7 +22,10 @@ function getExportViewBox(svg) {
         return getViewBox(svg);
     const width = parseAbsoluteLength(svg.getAttribute('width'));
     const height = parseAbsoluteLength(svg.getAttribute('height'));
-    if (width > 0 && height > 0) {
+    if (!Number.isNaN(width) &&
+        width > 0 &&
+        !Number.isNaN(height) &&
+        height > 0) {
         return { x: 0, y: 0, width, height };
     }
     const rect = svg.getBoundingClientRect();
@@ -214,8 +217,9 @@ function embedIcons(svg) {
             const existsSymbol = svg.querySelector(href);
             if (!existsSymbol) {
                 const symbolElement = document.querySelector(href);
-                if (symbolElement)
+                if (symbolElement) {
                     defs.appendChild(symbolElement.cloneNode(true));
+                }
             }
         });
     });
@@ -423,6 +427,8 @@ function collectDefElements(svg, ids) {
     };
     while (queue.length) {
         const id = queue.shift();
+        if (!id)
+            continue;
         if (visited.has(id))
             continue;
         visited.add(id);
@@ -437,11 +443,65 @@ function collectDefElements(svg, ids) {
     }
     return collected;
 }
+// Fallback implementation based on the CSS.escape algorithm
+function cssEscape(value) {
+    const string = String(value);
+    const length = string.length;
+    let result = '';
+    if (length === 0) {
+        return '';
+    }
+    for (let i = 0; i < length; i++) {
+        const codeUnit = string.charCodeAt(i);
+        // Null character
+        if (codeUnit === 0x0000) {
+            result += '\uFFFD';
+            continue;
+        }
+        // Control characters or DEL
+        if ((codeUnit >= 0x0001 && codeUnit <= 0x001f) || codeUnit === 0x007f) {
+            result += '\\' + codeUnit.toString(16) + ' ';
+            continue;
+        }
+        // Escape if first character is a digit
+        if (i === 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) {
+            result += '\\' + codeUnit.toString(16) + ' ';
+            continue;
+        }
+        // Escape if second character is a digit and first is a hyphen
+        if (i === 1 &&
+            codeUnit >= 0x0030 &&
+            codeUnit <= 0x0039 &&
+            string.charCodeAt(0) === 0x002d) {
+            result += '\\' + codeUnit.toString(16) + ' ';
+            continue;
+        }
+        // If the character is the first and is a hyphen followed by end of string, escape it
+        if (i === 0 && length === 1 && codeUnit === 0x002d) {
+            result += '\\' + string.charAt(i);
+            continue;
+        }
+        // Characters that are safe to use unescaped
+        if (codeUnit >= 0x0080 ||
+            (codeUnit >= 0x0030 && codeUnit <= 0x0039) || // 0-9
+            (codeUnit >= 0x0041 && codeUnit <= 0x005a) || // A-Z
+            (codeUnit >= 0x0061 && codeUnit <= 0x007a) || // a-z
+            codeUnit === 0x002d || // -
+            codeUnit === 0x005f // _
+        ) {
+            result += string.charAt(i);
+            continue;
+        }
+        // All other characters
+        result += '\\' + string.charAt(i);
+    }
+    return result;
+}
 function escapeCssId(id) {
     if (globalThis.CSS && typeof globalThis.CSS.escape === 'function') {
         return globalThis.CSS.escape(id);
     }
-    return id.replace(/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g, '\\$1');
+    return cssEscape(id);
 }
 function removeDefs(svg) {
     const defsList = Array.from(svg.querySelectorAll('defs'));

package/esm/resource/loaders/search.js

@@ -54,9 +54,6 @@ export function loadSearchResource(query, format) {
                 const svgText = commaIndex >= 0 ? result.slice(commaIndex + 1) : result;
                 return loadSVGResource(svgText);
             }
-            if (mimeType === 'image/svg+xml' && format === 'svg' && isBase64) {
-                return loadImageBase64Resource(result);
-            }
             return loadImageBase64Resource(result);
         }
         return loadRemoteResource(result, format);

package/esm/templates/utils.js

@@ -30,11 +30,20 @@ function getLevenshteinDistance(source, target) {
 function getCommonPrefixLength(source, target) {
     const limit = Math.min(source.length, target.length);
     let index = 0;
-    while (index < limit && source[index] === target[index]) {
+    while (index < limit &&
+        source.charCodeAt(index) === target.charCodeAt(index)) {
         index += 1;
     }
     return index;
 }
+function isBetterMatch(bestMatch, bestDistance, bestPrefixLength, candidateKey, candidateDistance, candidatePrefixLength) {
+    return (candidateDistance < bestDistance ||
+        (candidateDistance === bestDistance &&
+            candidatePrefixLength > bestPrefixLength) ||
+        (candidateDistance === bestDistance &&
+            candidatePrefixLength === bestPrefixLength &&
+            (!bestMatch || candidateKey < bestMatch)));
+}
 export function findClosestTemplateKey(type, keys) {
     const normalizedType = normalizeTemplateKey(type);
     if (!normalizedType)
@@ -49,11 +58,7 @@ export function findClosestTemplateKey(type, keys) {
         }
         const distance = getLevenshteinDistance(normalizedType, normalizedKey);
         const prefixLength = getCommonPrefixLength(normalizedType, normalizedKey);
-        if (distance < bestDistance ||
-            (distance === bestDistance && prefixLength > bestPrefixLength) ||
-            (distance === bestDistance &&
-                prefixLength === bestPrefixLength &&
-                (!bestMatch || key < bestMatch))) {
+        if (isBetterMatch(bestMatch, bestDistance, bestPrefixLength, key, distance, prefixLength)) {
             bestMatch = key;
             bestDistance = distance;
             bestPrefixLength = prefixLength;

package/esm/utils/padding.js

@@ -26,7 +26,7 @@ export function setSVGPadding(svg, padding) {
         setSVGPaddingInNode(svg, padding);
     }
     else {
-        if (document.contains(svg)) {
+        if (svg.isConnected) {
             setSVGPaddingInBrowser(svg, padding);
         }
         else {

package/esm/utils/style.d.ts

@@ -1 +1,3 @@
-export declare function injectStyleOnce(id: string, styles: string): void;
+type StyleTarget = Document | ShadowRoot | Node | null | undefined;
+export declare function injectStyleOnce(id: string, styles: string, target?: StyleTarget): void;
+export {};

package/esm/utils/style.js

@@ -1,8 +1,31 @@
-export function injectStyleOnce(id, styles) {
-    if (document.getElementById(id))
+function resolveStyleRoot(target) {
+    if (!target)
+        return document;
+    if (target instanceof Document || target instanceof ShadowRoot)
+        return target;
+    if (!target.isConnected)
+        return document;
+    const root = target.getRootNode();
+    return root instanceof ShadowRoot ? root : document;
+}
+function hasStyle(root, id) {
+    if (root instanceof Document)
+        return Boolean(root.getElementById(id));
+    return Boolean(root.querySelector(`#${id}`));
+}
+export function injectStyleOnce(id, styles, target) {
+    var _a;
+    const root = resolveStyleRoot(target);
+    if (hasStyle(root, id))
         return;
-    const style = document.createElement('style');
+    const doc = root instanceof Document ? root : ((_a = root.ownerDocument) !== null && _a !== void 0 ? _a : document);
+    const style = doc.createElement('style');
     style.id = id;
     style.textContent = styles;
-    document.head.appendChild(style);
+    if (root instanceof Document) {
+        root.head.appendChild(style);
+    }
+    else {
+        root.appendChild(style);
+    }
 }

package/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.2.17";
+export declare const VERSION = "0.2.18";

package/esm/version.js

@@ -1 +1 @@
-export const VERSION = '0.2.17';
+export const VERSION = '0.2.18';

package/lib/constants/service.d.ts

@@ -1 +1 @@
-export declare const ICON_SERVICE_URL = "https://lab.weavefox.cn/api/v1/infographic/icon";
+export declare const ICON_SERVICE_URL = "https://www.weavefox.cn/api/v1/infographic/icon";

package/lib/constants/service.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ICON_SERVICE_URL = void 0;
-exports.ICON_SERVICE_URL = 'https://lab.weavefox.cn/api/v1/infographic/icon';
+exports.ICON_SERVICE_URL = 'https://www.weavefox.cn/api/v1/infographic/icon';

package/lib/designs/structures/chart-line.js

@@ -9,6 +9,8 @@ const components_1 = require("../components");
 const layouts_1 = require("../layouts");
 const utils_2 = require("../utils");
 const registry_1 = require("./registry");
+const ITEM_POSITION_H = 'center';
+const ITEM_POSITION_V = 'normal';
 const ChartLine = (props) => {
     const { Title, Item, data, width, height = 260, gap = 10, padding = 24, showValue = true, options, valueFormatter = (value) => value.toString(), } = props;
     const { title, desc, items = [], xTitle, yTitle } = data;
@@ -21,8 +23,8 @@ const ChartLine = (props) => {
         indexes: [0],
         datum: items[0],
         data,
-        positionH: 'center',
-        positionV: 'normal',
+        positionH: ITEM_POSITION_H,
+        positionV: ITEM_POSITION_V,
     };
     const sampleBounds = (0, jsx_1.getElementBounds)((0, jsx_runtime_1.jsx)(Item, Object.assign({}, itemProps)));
     const labelWidth = sampleBounds.width;
@@ -162,7 +164,7 @@ const ChartLine = (props) => {
     if (yTitle) {
         titleElements.push((0, jsx_runtime_1.jsx)(jsx_1.Text, { x: paddingLeft + yTitleSpace / 2, y: chartOriginY + height / 2, alignHorizontal: "center", alignVertical: "middle", fontSize: 14, fontWeight: "bold", fill: axisColor, children: yTitle }));
     }
-    return ((0, jsx_runtime_1.jsxs)(layouts_1.FlexLayout, { id: "infographic-container", flexDirection: "column", justifyContent: "center", alignItems: "center", children: [titleContent, (0, jsx_runtime_1.jsxs)(jsx_1.Group, { width: totalWidth, height: totalHeight, children: [(0, jsx_runtime_1.jsxs)(jsx_1.Defs, { children: [(0, jsx_runtime_1.jsx)("linearGradient", { id: gradientStrokeId, x1: "0%", y1: "0%", x2: "100%", y2: "0%", children: gradientStops }), (0, jsx_runtime_1.jsxs)("linearGradient", { id: gradientAreaId, x1: "0%", y1: "0%", x2: "100%", y2: "0%", children: [areaStops, (0, jsx_runtime_1.jsx)("stop", { offset: "100%", stopColor: colorPrimary, stopOpacity: "0.04" })] })] }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: gridElements }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: [...axisElements, ...tickElements] }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: lineElements }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: pointElements }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: valueElements }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: titleElements }), (0, jsx_runtime_1.jsx)(components_1.ItemsGroup, { children: xLabels })] })] }));
+    return ((0, jsx_runtime_1.jsxs)(layouts_1.FlexLayout, { id: "infographic-container", flexDirection: "column", justifyContent: "center", alignItems: "center", children: [titleContent, (0, jsx_runtime_1.jsxs)(jsx_1.Group, { width: totalWidth, height: totalHeight, children: [(0, jsx_runtime_1.jsxs)(jsx_1.Defs, { children: [(0, jsx_runtime_1.jsx)("linearGradient", { id: gradientStrokeId, x1: "0%", y1: "0%", x2: "100%", y2: "0%", children: gradientStops }), (0, jsx_runtime_1.jsx)("linearGradient", { id: gradientAreaId, x1: "0%", y1: "0%", x2: "100%", y2: "0%", children: areaStops })] }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: gridElements }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: [...axisElements, ...tickElements] }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: lineElements }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: pointElements }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: valueElements }), (0, jsx_runtime_1.jsx)(jsx_1.Group, { children: titleElements }), (0, jsx_runtime_1.jsx)(components_1.ItemsGroup, { children: xLabels })] })] }));
 };
 exports.ChartLine = ChartLine;
 (0, registry_1.registerStructure)('chart-line', {

package/lib/editor/interactions/dblclick-edit-text.js

@@ -76,7 +76,7 @@ function editText(text, options) {
     const entity = (0, utils_1.getTextEntity)(text);
     if (!entity)
         return;
-    ensureEditorStyles();
+    ensureEditorStyles(entity);
     new InlineTextEditor(entity, options).start();
 }
 class InlineTextEditor {
@@ -207,7 +207,7 @@ class InlineTextEditor {
         return this.entity.textContent || '';
     }
 }
-function ensureEditorStyles() {
+function ensureEditorStyles(target) {
     (0, utils_1.injectStyleOnce)(EDITOR_STYLE_ID, `
 .${EDITOR_BASE_CLASS} {
   margin: 0;
@@ -220,5 +220,5 @@ function ensureEditorStyles() {
 .${EDITOR_BASE_CLASS}::selection {
   background-color: #b3d4fc;
 }
-`);
+`, target);
 }

package/lib/editor/managers/interaction.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InteractionManager = void 0;
 const utils_1 = require("../../utils");
 const utils_2 = require("../utils");
+const utils_3 = require("../utils");
 class InteractionManager {
     constructor() {
-        this.extensions = new utils_2.Extension();
+        this.extensions = new utils_3.Extension();
         this.interactions = [];
         this.active = false;
         this.running = null;
@@ -22,14 +23,15 @@ class InteractionManager {
         this.selection = new Set();
         this.handleClick = (event) => {
             const doc = this.editor.getDocument();
-            const target = event.target;
-            if (!target) {
+            const path = typeof event.composedPath === 'function' ? event.composedPath() : [];
+            const insideInfographic = (0, utils_2.eventPathContains)(event, doc) ||
+                path.some((node) => node instanceof HTMLElement && (0, utils_1.isInfographicComponent)(node));
+            if (!event.target) {
                 this.deactivate();
                 return;
             }
             // 点击画布 SVG 或者标记为组件的元素
-            if (doc.contains(target) ||
-                (0, utils_1.isInfographicComponent)(target))
+            if (insideInfographic)
                 this.activate();
             else
                 this.deactivate();

package/lib/editor/plugins/components/button.d.ts

@@ -4,9 +4,10 @@ export interface IconButtonProps {
     icon: Icon;
     onClick?: () => void;
     activate?: boolean;
+    root?: Node;
 }
 export interface IconButtonHandle {
     activate: boolean;
     setActivate: (activate: boolean) => void;
 }
-export declare const IconButton: ({ icon, onClick, activate, }: IconButtonProps) => Button;
+export declare const IconButton: ({ icon, onClick, activate, root, }: IconButtonProps) => Button;

package/lib/editor/plugins/components/button.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IconButton = void 0;
 const utils_1 = require("../../../utils");
-const IconButton = ({ icon, onClick, activate = false, }) => {
-    ensureIconButtonStyle();
+const IconButton = ({ icon, onClick, activate = false, root, }) => {
+    ensureIconButtonStyle(root);
     const button = document.createElement('button');
     button.type = 'button';
     button.classList.add(ICON_BUTTON_CLASS);
@@ -27,7 +27,7 @@ const IconButton = ({ icon, onClick, activate = false, }) => {
 exports.IconButton = IconButton;
 const ICON_BUTTON_CLASS = 'infographic-edit-bar-icon-btn';
 const ICON_BUTTON_STYLE_ID = 'infographic-edit-bar-icon-btn-style';
-function ensureIconButtonStyle() {
+function ensureIconButtonStyle(target) {
     (0, utils_1.injectStyleOnce)(ICON_BUTTON_STYLE_ID, `
 .${ICON_BUTTON_CLASS} {
   padding: 0;
@@ -53,5 +53,5 @@ function ensureIconButtonStyle() {
 .${ICON_BUTTON_CLASS}[data-activate="true"] {
   background-color: #d9d9d9;
 }
-`);
+`, target);
 }

package/lib/editor/plugins/components/color-picker.d.ts

@@ -2,6 +2,7 @@ export type ColorPickerProps = {
     value?: string;
     swatches?: string[];
     onChange?: (value: string) => void;
+    root?: Node;
 };
 export type ColorPickerHandle = {
     setValue: (value?: string) => void;

package/lib/editor/plugins/components/color-picker.js

@@ -49,7 +49,7 @@ function ColorPicker(props) {
     if (typeof document === 'undefined') {
         throw new Error('ColorPicker can only be used in the browser.');
     }
-    ensureColorPickerStyles();
+    ensureColorPickerStyles(props.root);
     const container = document.createElement('div');
     container.classList.add(COLOR_PICKER_CLASS);
     const swatchContainer = document.createElement('div');
@@ -242,7 +242,7 @@ function createSwitchLabel(text) {
     span.classList.add(COLOR_PICKER_SWITCH_LABEL_CLASS);
     return span;
 }
-function ensureColorPickerStyles() {
+function ensureColorPickerStyles(target) {
     (0, utils_1.injectStyleOnce)(COLOR_PICKER_STYLE_ID, `
 .${COLOR_PICKER_CLASS} {
   width: 240px;
@@ -353,5 +353,5 @@ function ensureColorPickerStyles() {
 .${COLOR_PICKER_SWITCH_CLASS}[data-format="rgba"] .${COLOR_PICKER_SWITCH_LABEL_CLASS}:last-child {
   color: #ffffff;
 }
-`);
+`, target);
 }

package/lib/editor/plugins/components/popover.d.ts

@@ -3,7 +3,7 @@ export type PopoverPlacementPreference = PopoverPlacement | PopoverPlacement[];
 export interface PopoverProps {
     content: HTMLElement | string | (() => HTMLElement | string);
     target?: HTMLElement;
-    getContainer?: HTMLElement | (() => HTMLElement);
+    getContainer?: OverlayRoot | (() => OverlayRoot);
     placement?: PopoverPlacementPreference;
     padding?: number | string;
     open?: boolean;
@@ -13,6 +13,7 @@ export interface PopoverProps {
     mouseLeaveDelay?: number;
     offset?: number;
 }
+type OverlayRoot = HTMLElement | ShadowRoot;
 export interface PopoverHandle {
     setOpen: (open: boolean) => void;
     toggle: () => void;
@@ -21,3 +22,4 @@ export interface PopoverHandle {
     destroy: () => void;
 }
 export declare function Popover(props: PopoverProps): HTMLDivElement & PopoverHandle;
+export {};

package/lib/editor/plugins/components/popover.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Popover = Popover;
+const utils_1 = require("../../utils");
 const constants_1 = require("../../../constants");
-const utils_1 = require("../../../utils");
+const utils_2 = require("../../../utils");
 const POPOVER_CLASS = 'infographic-edit-popover';
 const POPOVER_CONTENT_CLASS = `${POPOVER_CLASS}__content`;
 const POPOVER_ARROW_CLASS = `${POPOVER_CLASS}__arrow`;
 const POPOVER_STYLE_ID = 'infographic-edit-popover-style';
 function Popover(props) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    ensurePopoverStyle();
     const placement = (_a = props.placement) !== null && _a !== void 0 ? _a : 'top';
     const closeOnOutsideClick = (_b = props.closeOnOutsideClick) !== null && _b !== void 0 ? _b : true;
     const triggerActions = Array.isArray(props.trigger)
@@ -31,11 +31,11 @@ function Popover(props) {
         const next = typeof props.getContainer === 'function'
             ? props.getContainer()
             : props.getContainer;
-        return next !== null && next !== void 0 ? next : document.body;
+        return next !== null && next !== void 0 ? next : (0, utils_1.getOverlayContainer)(trigger);
     };
     const content = document.createElement('div');
     content.classList.add(POPOVER_CONTENT_CLASS);
-    (0, utils_1.setElementRole)(content, constants_1.COMPONENT_ROLE);
+    (0, utils_2.setElementRole)(content, constants_1.COMPONENT_ROLE);
     content.dataset.placement = Array.isArray(placement)
         ? placement[0]
         : placement;
@@ -44,7 +44,18 @@ function Popover(props) {
     content.style.setProperty('--popover-arrow-size', `${arrowSize}px`);
     content.style.setProperty('--popover-arrow-inner-size', `${arrowInnerSize}px`);
     const contentContainer = getContentContainer();
+    ensurePopoverStyle(contentContainer);
     const isPortal = contentContainer !== container;
+    const getPortalOffsetParent = () => {
+        const offsetParent = content.offsetParent;
+        if (offsetParent)
+            return offsetParent;
+        if (contentContainer instanceof ShadowRoot)
+            return contentContainer.host;
+        if (contentContainer instanceof HTMLElement)
+            return contentContainer;
+        return document.documentElement;
+    };
     const arrow = document.createElement('div');
     arrow.classList.add(POPOVER_ARROW_CLASS);
     content.appendChild(arrow);
@@ -122,8 +133,17 @@ function Popover(props) {
         if (!isPortal)
             return;
         ({ left, top } = position);
-        content.style.left = `${left}px`;
-        content.style.top = `${top}px`;
+        const offsetParent = getPortalOffsetParent();
+        if (offsetParent === document.body ||
+            offsetParent === document.documentElement) {
+            content.style.left = `${left}px`;
+            content.style.top = `${top}px`;
+        }
+        else {
+            const parentRect = offsetParent.getBoundingClientRect();
+            content.style.left = `${left - parentRect.left + offsetParent.scrollLeft}px`;
+            content.style.top = `${top - parentRect.top + offsetParent.scrollTop}px`;
+        }
         content.style.right = 'auto';
         content.style.bottom = 'auto';
         content.style.transform = 'translate(0, 0)';
@@ -167,9 +187,9 @@ function Popover(props) {
     };
     const toggle = () => setOpen(!open);
     const handleOutsideClick = (event) => {
-        const targetNode = event.target;
-        if (!container.contains(targetNode) &&
-            (isPortal ? !content.contains(targetNode) : true)) {
+        const insideTrigger = (0, utils_1.eventPathContains)(event, container);
+        const insideContent = (0, utils_1.eventPathContains)(event, content);
+        if (!insideTrigger && !insideContent) {
             setOpen(false);
         }
     };
@@ -237,8 +257,8 @@ function Popover(props) {
     };
     return Object.assign(container, api);
 }
-function ensurePopoverStyle() {
-    (0, utils_1.injectStyleOnce)(POPOVER_STYLE_ID, `
+function ensurePopoverStyle(target) {
+    (0, utils_2.injectStyleOnce)(POPOVER_STYLE_ID, `
 .${POPOVER_CLASS} {
   position: relative;
   display: inline-flex;
@@ -380,5 +400,5 @@ function ensurePopoverStyle() {
 .${POPOVER_CONTENT_CLASS}[data-placement="right"][data-open="true"] {
   transform: translate(0, -50%);
 }
-`);
+`, target);
 }

package/lib/editor/plugins/edit-bar/edit-bar.d.ts

@@ -4,8 +4,9 @@ import { Plugin } from '../base';
 export interface EditBarOptions {
     style?: Partial<CSSStyleDeclaration>;
     className?: string;
-    getContainer?: HTMLElement | (() => HTMLElement);
+    getContainer?: OverlayRoot | (() => OverlayRoot);
 }
+type OverlayRoot = HTMLElement | ShadowRoot;
 type EditItem = HTMLElement;
 export declare class EditBar extends Plugin implements IPlugin {
     private options?;
@@ -27,6 +28,7 @@ export declare class EditBar extends Plugin implements IPlugin {
     protected getGeometryEditItems(_selection: Selection): EditItem[];
     protected getGeometryCollectionEditItems(selection: Selection): EditItem[];
     protected getElementCollectionEditItems(selection: Selection): EditItem[];
+    private resolveOverlayRoot;
     private placeEditBar;
 }
 export {};