@antv/infographic 0.2.17 → 0.2.18

package/lib/editor/plugins/edit-bar/edit-bar.js

@@ -4,6 +4,7 @@ exports.EditBar = void 0;
 const constants_1 = require("../../../constants");
 const jsx_1 = require("../../../jsx");
 const utils_1 = require("../../../utils");
+const utils_2 = require("../../utils");
 const base_1 = require("../base");
 const edit_items_1 = require("./edit-items");
 class EditBar extends base_1.Plugin {
@@ -112,29 +113,31 @@ class EditBar extends base_1.Plugin {
         }
         (0, utils_1.setElementRole)(container, constants_1.COMPONENT_ROLE);
         this.container = container;
-        const { getContainer } = this.options || {};
-        const resolvedContainer = typeof getContainer === 'function' ? getContainer() : getContainer;
-        const containerParent = resolvedContainer !== null && resolvedContainer !== void 0 ? resolvedContainer : document.body;
+        const containerParent = this.resolveOverlayRoot();
         containerParent === null || containerParent === void 0 ? void 0 : containerParent.appendChild(container);
         return container;
     }
     getTextEditItems(text) {
         const { attributes = {} } = (0, utils_1.getTextElementProps)(text);
-        return [edit_items_1.FontColor, edit_items_1.FontSize, edit_items_1.FontAlign, edit_items_1.FontFamily].map((item) => item([text], attributes, this.commander));
+        const root = this.resolveOverlayRoot();
+        return [edit_items_1.FontColor, edit_items_1.FontSize, edit_items_1.FontAlign, edit_items_1.FontFamily].map((item) => item([text], attributes, this.commander, { root }));
     }
     getTextCollectionEditItems(selection) {
         const attrs = (0, utils_1.getCommonAttrs)(selection.map((text) => (0, utils_1.getTextElementProps)(text).attributes || {}));
-        const items = [edit_items_1.FontColor, edit_items_1.FontSize, edit_items_1.FontAlign, edit_items_1.FontFamily].map((item) => item(selection, attrs, this.commander));
+        const root = this.resolveOverlayRoot();
+        const items = [edit_items_1.FontColor, edit_items_1.FontSize, edit_items_1.FontAlign, edit_items_1.FontFamily].map((item) => item(selection, attrs, this.commander, { root }));
         const commonItems = this.getElementCollectionEditItems(selection);
         return [...items, ...commonItems];
     }
     getIconEditItems(selection) {
         const attrs = (0, utils_1.getIconAttrs)(selection[0]);
-        return [edit_items_1.IconColor].map((item) => item(selection, attrs, this.commander));
+        const root = this.resolveOverlayRoot();
+        return [edit_items_1.IconColor].map((item) => item(selection, attrs, this.commander, { root }));
     }
     getIconCollectionEditItems(selection) {
         const attrs = (0, utils_1.getCommonAttrs)(selection.map((icon) => (0, utils_1.getIconAttrs)(icon)));
-        return [edit_items_1.IconColor].map((item) => item(selection, attrs, this.commander));
+        const root = this.resolveOverlayRoot();
+        return [edit_items_1.IconColor].map((item) => item(selection, attrs, this.commander, { root }));
     }
     getGeometryEditItems(_selection) {
         return [];
@@ -146,12 +149,19 @@ class EditBar extends base_1.Plugin {
     getElementCollectionEditItems(selection) {
         if (selection.length <= 1)
             return [];
+        const root = this.resolveOverlayRoot();
         return [
             (0, edit_items_1.ElementAlign)(selection, {}, this.commander, {
                 enableDistribution: selection.length > 2,
+                root,
             }),
         ];
     }
+    resolveOverlayRoot() {
+        const { getContainer } = this.options || {};
+        const resolvedContainer = typeof getContainer === 'function' ? getContainer() : getContainer;
+        return resolvedContainer !== null && resolvedContainer !== void 0 ? resolvedContainer : (0, utils_2.getOverlayContainer)(this.editor.getDocument());
+    }
     placeEditBar(container, selection) {
         var _a;
         if (selection.length === 0)

package/lib/editor/plugins/edit-bar/edit-items/align-elements.js

@@ -32,18 +32,19 @@ const ALIGN_OPTIONS = [
 ];
 const ElementAlign = (selection, _attrs, commander, options) => {
     var _a;
-    (0, utils_1.injectStyleOnce)(GRID_STYLE_ID, GRID_STYLES);
+    (0, utils_1.injectStyleOnce)(GRID_STYLE_ID, GRID_STYLES, options === null || options === void 0 ? void 0 : options.root);
     const enableDistribution = (_a = options === null || options === void 0 ? void 0 : options.enableDistribution) !== null && _a !== void 0 ? _a : true;
-    const content = createAlignContent((action) => alignSelection(selection, action, commander), enableDistribution);
+    const content = createAlignContent((action) => alignSelection(selection, action, commander), enableDistribution, options === null || options === void 0 ? void 0 : options.root);
     return (0, components_1.Popover)({
-        target: (0, components_1.IconButton)({ icon: components_1.ELEMENT_ICONS.align }),
+        target: (0, components_1.IconButton)({ icon: components_1.ELEMENT_ICONS.align, root: options === null || options === void 0 ? void 0 : options.root }),
         content,
+        getContainer: options === null || options === void 0 ? void 0 : options.root,
         placement: 'top',
         offset: 12,
     });
 };
 exports.ElementAlign = ElementAlign;
-function createAlignContent(onSelect, enableDistribution) {
+function createAlignContent(onSelect, enableDistribution, root) {
     const content = document.createElement('div');
     content.classList.add(GRID_CLASS);
     if (!enableDistribution)
@@ -53,6 +54,7 @@ function createAlignContent(onSelect, enableDistribution) {
         : ALIGN_OPTIONS.filter(({ action }) => action !== 'H_DISTRIBUTE' && action !== 'V_DISTRIBUTE');
     visibleOptions.forEach(({ icon, action }) => {
         const button = (0, components_1.IconButton)({
+            root,
             icon,
             onClick: () => onSelect(action),
         });

package/lib/editor/plugins/edit-bar/edit-items/font-align.js

@@ -25,13 +25,14 @@ const GRID_STYLES = `
   gap: 2px;
 }
 `;
-const FontAlign = (selection, attrs, commander) => {
-    (0, utils_1.injectStyleOnce)(GRID_STYLE_ID, GRID_STYLES);
+const FontAlign = (selection, attrs, commander, options) => {
+    const root = options === null || options === void 0 ? void 0 : options.root;
+    (0, utils_1.injectStyleOnce)(GRID_STYLE_ID, GRID_STYLES, root);
     const state = {
         horizontal: attrs['data-horizontal-align'],
         vertical: attrs['data-vertical-align'],
     };
-    const button = (0, components_1.IconButton)({ icon: components_1.TEXT_ICONS.align });
+    const button = (0, components_1.IconButton)({ icon: components_1.TEXT_ICONS.align, root });
     const content = createAlignContent(state, (align) => {
         const attributes = {};
         if (align.horizontal)
@@ -43,16 +44,17 @@ const FontAlign = (selection, attrs, commander) => {
         commander.executeBatch(selection.map((text) => new commands_1.UpdateElementCommand(text, {
             attributes,
         })));
-    });
+    }, root);
     return (0, components_1.Popover)({
         target: button,
         content,
+        getContainer: root,
         placement: 'top',
         offset: 12,
     });
 };
 exports.FontAlign = FontAlign;
-function createAlignContent(state, onAlignChange) {
+function createAlignContent(state, onAlignChange, root) {
     const content = document.createElement('div');
     content.classList.add(GRID_CLASS);
     const buttons = {};
@@ -65,6 +67,7 @@ function createAlignContent(state, onAlignChange) {
     const createButtons = (options, stateKey) => {
         options.forEach(({ icon, align }) => {
             const button = (0, components_1.IconButton)({
+                root,
                 icon,
                 onClick: () => {
                     if (state[stateKey] === align)

package/lib/editor/plugins/edit-bar/edit-items/font-color.js

@@ -7,8 +7,9 @@ const components_1 = require("../../components");
 const FONT_COLOR_BUTTON_CLASS = 'infographic-font-color-btn';
 const FONT_COLOR_STYLE_ID = 'infographic-font-color-style';
 const DEFAULT_COLOR = '#1f1f1f';
-const FontColor = (selection, attrs, commander) => {
-    ensureFontColorStyles();
+const FontColor = (selection, attrs, commander, options) => {
+    const root = options === null || options === void 0 ? void 0 : options.root;
+    ensureFontColorStyles(root);
     const color = normalizeColor(attrs.fill);
     const isMixed = attrs.fill === undefined && selection.length > 1;
     const button = document.createElement('button');
@@ -16,6 +17,7 @@ const FontColor = (selection, attrs, commander) => {
     button.classList.add(FONT_COLOR_BUTTON_CLASS);
     setButtonColor(button, color !== null && color !== void 0 ? color : DEFAULT_COLOR, isMixed);
     const picker = (0, components_1.ColorPicker)({
+        root,
         value: color !== null && color !== void 0 ? color : DEFAULT_COLOR,
         onChange: (nextColor) => {
             setButtonColor(button, nextColor, false);
@@ -27,6 +29,7 @@ const FontColor = (selection, attrs, commander) => {
     return (0, components_1.Popover)({
         target: button,
         content: picker,
+        getContainer: root,
         placement: ['top', 'bottom'],
         offset: 12,
         trigger: 'hover',
@@ -48,7 +51,7 @@ function setButtonColor(button, color, mixed) {
     else
         button.removeAttribute('data-mixed');
 }
-function ensureFontColorStyles() {
+function ensureFontColorStyles(target) {
     (0, utils_1.injectStyleOnce)(FONT_COLOR_STYLE_ID, `
 .${FONT_COLOR_BUTTON_CLASS} {
   position: relative;
@@ -77,5 +80,5 @@ function ensureFontColorStyles() {
     #f5f5f5 12px
   );
 }
-`);
+`, target);
 }

package/lib/editor/plugins/edit-bar/edit-items/font-family.js

@@ -9,22 +9,23 @@ const FONT_LIST_CLASS = 'infographic-font-family-list';
 const FONT_OPTION_CLASS = `${FONT_LIST_CLASS}__option`;
 const FONT_LIST_STYLE_ID = 'infographic-font-family-list-style';
 const DEFAULT_FONT_LABEL = '默认';
-const FontFamily = (selection, attrs, commander) => {
-    ensureFontFamilyListStyle();
+const FontFamily = (selection, attrs, commander, editItemOptions) => {
+    const root = editItemOptions === null || editItemOptions === void 0 ? void 0 : editItemOptions.root;
+    ensureFontFamilyListStyle(root);
     const fonts = (0, renderer_1.getFonts)();
     const current = normalizeFontFamily(attrs['font-family']);
-    const options = fonts.map((font) => ({
+    const fontOptions = fonts.map((font) => ({
         label: font.name || font.fontFamily,
         value: font.fontFamily,
     }));
-    if (!options.some((option) => normalizeFontFamily(option.value) === current)) {
-        options.unshift({
+    if (!fontOptions.some((option) => normalizeFontFamily(option.value) === current)) {
+        fontOptions.unshift({
             label: DEFAULT_FONT_LABEL,
             value: current,
         });
     }
     let selected = current;
-    const content = createFontList(options, selected, (value) => {
+    const content = createFontList(fontOptions, selected, (value) => {
         if (selected === value)
             return;
         selected = value;
@@ -32,10 +33,11 @@ const FontFamily = (selection, attrs, commander) => {
             attributes: { 'font-family': (0, utils_1.decodeFontFamily)(value) },
         })));
     });
-    const button = (0, components_1.IconButton)({ icon: components_1.TEXT_ICONS.fontFamily });
+    const button = (0, components_1.IconButton)({ icon: components_1.TEXT_ICONS.fontFamily, root });
     const popover = (0, components_1.Popover)({
         target: button,
         content,
+        getContainer: root,
         placement: ['top', 'bottom'],
         offset: 12,
         trigger: 'hover',
@@ -85,7 +87,7 @@ function normalizeFontFamily(font) {
         return (0, utils_1.encodeFontFamily)(font.join(', '));
     return (0, utils_1.encodeFontFamily)(String(font));
 }
-function ensureFontFamilyListStyle() {
+function ensureFontFamilyListStyle(target) {
     (0, utils_1.injectStyleOnce)(FONT_LIST_STYLE_ID, `
 .${FONT_LIST_CLASS} {
   display: flex;
@@ -115,5 +117,5 @@ function ensureFontFamilyListStyle() {
   background: #e6f4ff;
   color: #0958d9;
 }
-`);
+`, target);
 }

package/lib/editor/plugins/edit-bar/edit-items/font-size.js

@@ -21,24 +21,26 @@ const FONT_SIZE_STYLES = `
   gap: 2px;
 }
 `;
-const FontSize = (selection, attrs, commander) => {
-    (0, utils_1.injectStyleOnce)(FONT_SIZE_STYLE_ID, FONT_SIZE_STYLES);
-    const button = (0, components_1.IconButton)({ icon: components_1.TEXT_ICONS.fontSize });
+const FontSize = (selection, attrs, commander, options) => {
+    const root = options === null || options === void 0 ? void 0 : options.root;
+    (0, utils_1.injectStyleOnce)(FONT_SIZE_STYLE_ID, FONT_SIZE_STYLES, root);
+    const button = (0, components_1.IconButton)({ icon: components_1.TEXT_ICONS.fontSize, root });
     const currentSize = normalizeFontSize(attrs['font-size']);
     const content = createFontSizeContent(currentSize, (size) => {
         commander.executeBatch(selection.map((text) => new commands_1.UpdateElementCommand(text, {
             attributes: { 'font-size': size },
         })));
-    });
+    }, root);
     return (0, components_1.Popover)({
         target: button,
         content,
+        getContainer: root,
         placement: 'top',
         offset: 12,
     });
 };
 exports.FontSize = FontSize;
-function createFontSizeContent(defaultSize, onSizeChange) {
+function createFontSizeContent(defaultSize, onSizeChange, root) {
     const content = document.createElement('div');
     content.classList.add(FONT_SIZE_CLASS);
     let selected = defaultSize;
@@ -51,6 +53,7 @@ function createFontSizeContent(defaultSize, onSizeChange) {
     };
     FONT_SIZE_OPTIONS.forEach(({ label, value }) => {
         const button = (0, components_1.IconButton)({
+            root,
             icon: createLabelIcon(label),
             onClick: () => {
                 if (selected === value)

package/lib/editor/plugins/edit-bar/edit-items/icon-color.js

@@ -7,8 +7,9 @@ const components_1 = require("../../components");
 const ICON_COLOR_BUTTON_CLASS = 'infographic-icon-color-btn';
 const ICON_COLOR_STYLE_ID = 'infographic-icon-color-style';
 const DEFAULT_COLOR = '#1f1f1f';
-const IconColor = (selection, attrs, commander) => {
-    ensureIconColorStyles();
+const IconColor = (selection, attrs, commander, options) => {
+    const root = options === null || options === void 0 ? void 0 : options.root;
+    ensureIconColorStyles(root);
     const color = normalizeColor(attrs.fill);
     const isMixed = attrs.fill === undefined && selection.length > 1;
     const button = document.createElement('button');
@@ -16,6 +17,7 @@ const IconColor = (selection, attrs, commander) => {
     button.classList.add(ICON_COLOR_BUTTON_CLASS);
     setButtonColor(button, color !== null && color !== void 0 ? color : DEFAULT_COLOR, isMixed);
     const picker = (0, components_1.ColorPicker)({
+        root,
         value: color !== null && color !== void 0 ? color : DEFAULT_COLOR,
         onChange: (nextColor) => {
             setButtonColor(button, nextColor, false);
@@ -27,6 +29,7 @@ const IconColor = (selection, attrs, commander) => {
     return (0, components_1.Popover)({
         target: button,
         content: picker,
+        getContainer: root,
         placement: ['top', 'bottom'],
         offset: 12,
         trigger: 'hover',
@@ -48,7 +51,7 @@ function setButtonColor(button, color, mixed) {
     else
         button.removeAttribute('data-mixed');
 }
-function ensureIconColorStyles() {
+function ensureIconColorStyles(target) {
     (0, utils_1.injectStyleOnce)(ICON_COLOR_STYLE_ID, `
 .${ICON_COLOR_BUTTON_CLASS} {
   position: relative;
@@ -77,5 +80,5 @@ function ensureIconColorStyles() {
     #f5f5f5 12px
   );
 }
-`);
+`, target);
 }

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

@@ -1,3 +1,7 @@
 import type { BaseAttributes } from '../../../../types';
 import type { ICommandManager, Selection } from '../../../types';
-export type EditItem<T extends BaseAttributes = BaseAttributes> = (selection: Selection, attrs: T, commander: ICommandManager, options?: Record<string, any>) => HTMLElement;
+export type EditItemOptions = {
+    root?: HTMLElement | ShadowRoot;
+    [key: string]: any;
+};
+export type EditItem<T extends BaseAttributes = BaseAttributes> = (selection: Selection, attrs: T, commander: ICommandManager, options?: EditItemOptions) => HTMLElement;

package/lib/editor/plugins/reset-viewbox.d.ts

@@ -3,8 +3,9 @@ import { Plugin } from './base';
 export interface ResetViewBoxOptions {
     style?: Partial<CSSStyleDeclaration>;
     className?: string;
-    getContainer?: HTMLElement | (() => HTMLElement);
+    getContainer?: OverlayRoot | (() => OverlayRoot);
 }
+type OverlayRoot = HTMLElement | ShadowRoot;
 export declare class ResetViewBox extends Plugin implements IPlugin {
     private options?;
     name: string;
@@ -29,5 +30,7 @@ export declare class ResetViewBox extends Plugin implements IPlugin {
     private showButton;
     private hideButton;
     private removeButton;
+    private resolveOverlayRoot;
     private ensureButtonStyle;
 }
+export {};

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

@@ -4,6 +4,7 @@ exports.ResetViewBox = void 0;
 const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 const commands_1 = require("../commands");
+const utils_2 = require("../utils");
 const base_1 = require("./base");
 const components_1 = require("./components");
 const icons_1 = require("./components/icons");
@@ -36,9 +37,12 @@ class ResetViewBox extends base_1.Plugin {
             if (this.resetButton)
                 return this.resetButton;
             const { style, className } = this.options || {};
+            const containerParent = this.resolveOverlayRoot();
+            this.ensureButtonStyle(containerParent);
             const button = (0, components_1.IconButton)({
                 icon: icons_1.RESET_ICON,
                 onClick: this.resetViewBox,
+                root: containerParent,
             });
             button.classList.add(RESET_BUTTON_CLASS);
             if (className) {
@@ -49,9 +53,6 @@ class ResetViewBox extends base_1.Plugin {
             }
             (0, utils_1.setElementRole)(button, constants_1.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;
         };
@@ -142,7 +143,7 @@ class ResetViewBox extends base_1.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);
@@ -164,7 +165,12 @@ class ResetViewBox extends base_1.Plugin {
         const { padding } = this.state.getOptions();
         this.originViewBox = (0, utils_1.getBoundViewBox)(svg, (0, utils_1.parsePadding)(padding));
     }
-    ensureButtonStyle() {
+    resolveOverlayRoot() {
+        const { getContainer } = this.options || {};
+        const resolvedContainer = typeof getContainer === 'function' ? getContainer() : getContainer;
+        return resolvedContainer !== null && resolvedContainer !== void 0 ? resolvedContainer : (0, utils_2.getOverlayContainer)(this.editor.getDocument());
+    }
+    ensureButtonStyle(target) {
         (0, utils_1.injectStyleOnce)(RESET_BUTTON_STYLE_ID, `
       button.${RESET_BUTTON_CLASS} {
         visibility: hidden;
@@ -182,7 +188,7 @@ class ResetViewBox extends base_1.Plugin {
         box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
         cursor: pointer;
       }
-      `);
+      `, target);
     }
 }
 exports.ResetViewBox = ResetViewBox;

package/lib/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/lib/editor/utils/index.js

@@ -22,3 +22,4 @@ __exportStar(require("./event"), exports);
 __exportStar(require("./extension"), exports);
 __exportStar(require("./hotkey"), exports);
 __exportStar(require("./object"), exports);
+__exportStar(require("./root"), exports);

package/lib/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/lib/editor/utils/root.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOverlayContainer = getOverlayContainer;
+exports.eventPathContains = eventPathContains;
+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;
+}
+function getOverlayContainer(node) {
+    const root = getConnectedRoot(node);
+    return root instanceof ShadowRoot ? root : document.body;
+}
+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/lib/exporter/svg.js

@@ -26,7 +26,10 @@ function getExportViewBox(svg) {
         return (0, utils_1.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();
@@ -218,8 +221,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));
+                }
             }
         });
     });
@@ -427,6 +431,8 @@ function collectDefElements(svg, ids) {
     };
     while (queue.length) {
         const id = queue.shift();
+        if (!id)
+            continue;
         if (visited.has(id))
             continue;
         visited.add(id);
@@ -441,11 +447,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/lib/resource/loaders/search.js

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

package/lib/templates/utils.js

@@ -33,11 +33,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)));
+}
 function findClosestTemplateKey(type, keys) {
     const normalizedType = normalizeTemplateKey(type);
     if (!normalizedType)
@@ -52,11 +61,7 @@ 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/lib/utils/padding.js

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

package/lib/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 {};