@antv/infographic 0.2.11 → 0.2.12

package/esm/exporter/svg.js

@@ -1,39 +1,54 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { createElement, getElementByRole, getViewBox, setAttributes, setElementRole, traverse, } from '../utils/index.js';
 import { embedFonts } from './font.js';
-export async function exportToSVGString(svg, options = {}) {
-    const node = await exportToSVG(svg, options);
-    const str = new XMLSerializer().serializeToString(node);
-    return 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(str);
-}
-export async function exportToSVG(svg, options = {}) {
-    const { embedResources = true, removeIds = false } = options;
-    const clonedSVG = svg.cloneNode(true);
-    const { width, height } = getViewBox(svg);
-    setAttributes(clonedSVG, { width, height });
-    if (removeIds) {
-        inlineUseElements(clonedSVG);
-        inlineDefsReferences(clonedSVG);
-    }
-    else {
-        await embedIcons(clonedSVG);
-    }
-    await embedFonts(clonedSVG, embedResources);
-    cleanSVG(clonedSVG);
-    return clonedSVG;
+export function exportToSVGString(svg_1) {
+    return __awaiter(this, arguments, void 0, function* (svg, options = {}) {
+        const node = yield exportToSVG(svg, options);
+        const str = new XMLSerializer().serializeToString(node);
+        return 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(str);
+    });
 }
-async function embedIcons(svg) {
-    const icons = svg.querySelectorAll('use');
-    const defs = getDefs(svg);
-    icons.forEach((icon) => {
-        const href = icon.getAttribute('href');
-        if (!href)
-            return;
-        const existsSymbol = svg.querySelector(href);
-        if (!existsSymbol) {
-            const symbolElement = document.querySelector(href);
-            if (symbolElement)
-                defs.appendChild(symbolElement.cloneNode(true));
+export function exportToSVG(svg_1) {
+    return __awaiter(this, arguments, void 0, function* (svg, options = {}) {
+        const { embedResources = true, removeIds = false } = options;
+        const clonedSVG = svg.cloneNode(true);
+        const { width, height } = getViewBox(svg);
+        setAttributes(clonedSVG, { width, height });
+        if (removeIds) {
+            inlineUseElements(clonedSVG);
+            inlineDefsReferences(clonedSVG);
         }
+        else {
+            yield embedIcons(clonedSVG);
+        }
+        yield embedFonts(clonedSVG, embedResources);
+        cleanSVG(clonedSVG);
+        return clonedSVG;
+    });
+}
+function embedIcons(svg) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const icons = svg.querySelectorAll('use');
+        const defs = getDefs(svg);
+        icons.forEach((icon) => {
+            const href = icon.getAttribute('href');
+            if (!href)
+                return;
+            const existsSymbol = svg.querySelector(href);
+            if (!existsSymbol) {
+                const symbolElement = document.querySelector(href);
+                if (symbolElement)
+                    defs.appendChild(symbolElement.cloneNode(true));
+            }
+        });
     });
 }
 const iconRole = 'icon-defs';
@@ -64,7 +79,8 @@ function inlineUseElements(svg) {
     });
 }
 function getUseHref(use) {
-    return use.getAttribute('href') ?? use.getAttribute('xlink:href');
+    var _a;
+    return (_a = use.getAttribute('href')) !== null && _a !== void 0 ? _a : use.getAttribute('xlink:href');
 }
 function resolveUseTarget(svg, href) {
     const localTarget = svg.querySelector(href);
@@ -112,10 +128,11 @@ function materializeElement(use, source) {
     return wrapper;
 }
 function buildUseTransform(use) {
+    var _a;
     const x = use.getAttribute('x');
     const y = use.getAttribute('y');
-    const translate = x || y ? `translate(${x ?? 0} ${y ?? 0})` : '';
-    const transform = use.getAttribute('transform') ?? '';
+    const translate = x || y ? `translate(${x !== null && x !== void 0 ? x : 0} ${y !== null && y !== void 0 ? y : 0})` : '';
+    const transform = (_a = use.getAttribute('transform')) !== null && _a !== void 0 ? _a : '';
     if (translate && transform)
         return `${translate} ${transform}`;
     return translate || transform || null;
@@ -269,13 +286,13 @@ function cleanSVG(svg) {
 }
 function removeBtnGroup(svg) {
     const btnGroup = getElementByRole(svg, "btns-group" /* ElementTypeEnum.BtnsGroup */);
-    btnGroup?.remove();
+    btnGroup === null || btnGroup === void 0 ? void 0 : btnGroup.remove();
     const btnIconDefs = getElementByRole(svg, 'btn-icon-defs');
-    btnIconDefs?.remove();
+    btnIconDefs === null || btnIconDefs === void 0 ? void 0 : btnIconDefs.remove();
 }
 function removeTransientContainer(svg) {
     const transientContainer = svg.querySelector('[data-element-type=transient-container]');
-    transientContainer?.remove();
+    transientContainer === null || transientContainer === void 0 ? void 0 : transientContainer.remove();
 }
 function removeUselessAttrs(svg) {
     const groups = svg.querySelectorAll('g');

package/esm/jsx/components/Ellipse.js

@@ -1,9 +1,10 @@
 export function Ellipse(props) {
+    var _a, _b, _c, _d;
     const { x = 0, y = 0, width = 0, height = 0 } = props;
-    props.cx ?? (props.cx = x + width / 2);
-    props.cy ?? (props.cy = y + height / 2);
-    props.rx ?? (props.rx = width / 2);
-    props.ry ?? (props.ry = height / 2);
+    (_a = props.cx) !== null && _a !== void 0 ? _a : (props.cx = x + width / 2);
+    (_b = props.cy) !== null && _b !== void 0 ? _b : (props.cy = y + height / 2);
+    (_c = props.rx) !== null && _c !== void 0 ? _c : (props.rx = width / 2);
+    (_d = props.ry) !== null && _d !== void 0 ? _d : (props.ry = height / 2);
     const node = {
         type: 'ellipse',
         props,

package/esm/jsx/components/Path.js

@@ -1,10 +1,8 @@
 export function Path(props) {
     const { x, y } = props;
-    const finalProps = {
-        ...props,
-    };
+    const finalProps = Object.assign({}, props);
     if (x !== undefined || y !== undefined) {
-        finalProps.transform = `translate(${x ?? 0}, ${y ?? 0})`;
+        finalProps.transform = `translate(${x !== null && x !== void 0 ? x : 0}, ${y !== null && y !== void 0 ? y : 0})`;
     }
     const node = {
         type: 'path',

package/esm/jsx/components/Polygon.js

@@ -1,13 +1,22 @@
-export function Polygon({ points = [], ...props }) {
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+export function Polygon(_a) {
+    var { points = [] } = _a, props = __rest(_a, ["points"]);
     const { x, y } = props;
     const pointsStr = points.map(({ x, y }) => `${x},${y}`).join(' ');
-    const finalProps = {
-        ...props,
-        points: pointsStr,
-    };
+    const finalProps = Object.assign(Object.assign({}, props), { points: pointsStr });
     if (x !== undefined || y !== undefined) {
         finalProps.transform =
-            `translate(${x ?? 0}, ${y ?? 0})` + (finalProps.transform || '');
+            `translate(${x !== null && x !== void 0 ? x : 0}, ${y !== null && y !== void 0 ? y : 0})` + (finalProps.transform || '');
     }
     const node = {
         type: 'polygon',

package/esm/jsx/components/Text.js

@@ -1,6 +1,17 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { measureText } from '../../utils/index.js';
 export function Text(props) {
-    const { id, x = 0, y = 0, width: w, height: h, alignHorizontal = 'left', alignVertical = 'top', children, fontSize = 14, fontFamily, fontStyle, fontWeight, textDecoration, letterSpacing, wordSpacing, opacity, fill = 'black', lineHeight, wordWrap, backgroundColor = 'none', backgroundOpacity = 1, backgroundRadius = 0, ...restProps } = props;
+    const { id, x = 0, y = 0, width: w, height: h, alignHorizontal = 'left', alignVertical = 'top', children, fontSize = 14, fontFamily, fontStyle, fontWeight, textDecoration, letterSpacing, wordSpacing, opacity, fill = 'black', lineHeight, wordWrap, backgroundColor = 'none', backgroundOpacity = 1, backgroundRadius = 0 } = props, restProps = __rest(props, ["id", "x", "y", "width", "height", "alignHorizontal", "alignVertical", "children", "fontSize", "fontFamily", "fontStyle", "fontWeight", "textDecoration", "letterSpacing", "wordSpacing", "opacity", "fill", "lineHeight", "wordWrap", "backgroundColor", "backgroundOpacity", "backgroundRadius"]);
     let width = w;
     let height = h;
     let textX = 0;
@@ -27,12 +38,8 @@ export function Text(props) {
                     ? height
                     : 0;
     }
-    const dataAttrs = Object.entries({
-        width,
-        height,
-        ...(lineHeight !== undefined && { 'line-height': lineHeight }),
-        ...(wordWrap !== undefined && { 'data-word-wrap': wordWrap }),
-    }).reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+    const dataAttrs = Object.entries(Object.assign(Object.assign({ width,
+        height }, (lineHeight !== undefined && { 'line-height': lineHeight })), (wordWrap !== undefined && { 'data-word-wrap': wordWrap }))).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [key]: value })), {});
     const textAnchor = alignHorizontal === 'center'
         ? 'middle'
         : alignHorizontal === 'right'
@@ -43,37 +50,13 @@ export function Text(props) {
         : alignVertical === 'bottom'
             ? 'baseline'
             : 'hanging';
-    const textProps = {
-        'data-element-type': 'text',
-        width,
-        height,
-        x: textX,
-        y: textY,
-        'data-x': 0,
-        'data-y': 0,
-        fill,
+    const textProps = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 'data-element-type': 'text', width,
+        height, x: textX, y: textY, 'data-x': 0, 'data-y': 0, fill,
         fontSize,
         textAnchor,
-        dominantBaseline,
-        'data-horizontal-align': alignHorizontal.toUpperCase(),
-        'data-vertical-align': alignVertical.toUpperCase(),
-        children,
-        ...dataAttrs,
-        ...restProps,
-        ...(fontFamily && { fontFamily }),
-        ...(fontStyle && { fontStyle }),
-        ...(fontWeight && { fontWeight }),
-        ...(textDecoration && textDecoration !== 'none' && { textDecoration }),
-        ...(letterSpacing && { letterSpacing }),
-        ...(wordSpacing && { wordSpacing }),
-        ...(opacity !== undefined && opacity !== 1 && { opacity }),
-    };
-    const containerProps = {
-        ...(x !== 0 || y !== 0 ? { x, y, transform: `translate(${x}, ${y})` } : {}),
-        width,
-        height,
-        ...(id && { id }),
-    };
+        dominantBaseline, 'data-horizontal-align': alignHorizontal.toUpperCase(), 'data-vertical-align': alignVertical.toUpperCase(), children }, dataAttrs), restProps), (fontFamily && { fontFamily })), (fontStyle && { fontStyle })), (fontWeight && { fontWeight })), (textDecoration && textDecoration !== 'none' && { textDecoration })), (letterSpacing && { letterSpacing })), (wordSpacing && { wordSpacing })), (opacity !== undefined && opacity !== 1 && { opacity }));
+    const containerProps = Object.assign(Object.assign(Object.assign({}, (x !== 0 || y !== 0 ? { x, y, transform: `translate(${x}, ${y})` } : {})), { width,
+        height }), (id && { id }));
     const hasBackground = backgroundColor && backgroundColor !== 'none';
     const rectProps = hasBackground
         ? {
@@ -90,12 +73,9 @@ export function Text(props) {
         : undefined;
     return {
         type: 'g',
-        props: {
-            ...containerProps,
-            children: [
+        props: Object.assign(Object.assign({}, containerProps), { children: [
                 ...(rectProps ? [{ type: 'rect', props: rectProps }] : []),
                 { type: 'text', props: textProps },
-            ],
-        },
+            ] }),
     };
 }

package/esm/jsx/renderer.js

@@ -1,3 +1,14 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { DefsSymbol } from './components/index.js';
 import { Fragment } from './jsx-runtime.js';
 import { isLayoutComponent, performLayout } from './layout.js';
@@ -97,14 +108,11 @@ export function renderSVG(element, props = {}) {
     const content = Array.isArray(processed)
         ? processed.map((el) => render(el, context)).join('')
         : render(processed, context);
-    const { x, y, width, height, style, ...rest } = props;
-    const finalProps = {
-        ...rest,
-        xmlns: 'http://www.w3.org/2000/svg',
-    };
+    const { x, y, width, height, style } = props, rest = __rest(props, ["x", "y", "width", "height", "style"]);
+    const finalProps = Object.assign(Object.assign({}, rest), { xmlns: 'http://www.w3.org/2000/svg' });
     if (!finalProps.viewBox) {
         if (width && height) {
-            finalProps.viewBox = `${x ?? 0} ${y ?? 0} ${width ?? 0} ${height ?? 0}`;
+            finalProps.viewBox = `${x !== null && x !== void 0 ? x : 0} ${y !== null && y !== void 0 ? y : 0} ${width !== null && width !== void 0 ? width : 0} ${height !== null && height !== void 0 ? height : 0}`;
         }
         else {
             const bounds = getElementBounds(processed);
@@ -129,7 +137,7 @@ export function renderSVG(element, props = {}) {
 function renderAttrs(props) {
     if (!props)
         return '';
-    const { children, ...attributes } = props;
+    const { children } = props, attributes = __rest(props, ["children"]);
     return Object.entries(attributes)
         .filter(([, value]) => value !== undefined && value !== null)
         .map(([key, value]) => {

package/esm/jsx/utils/bounds.js

@@ -37,6 +37,7 @@ export function getCombinedBounds(list) {
     };
 }
 export function getElementBounds(node) {
+    var _a, _b, _c, _d;
     if (!node)
         return zero();
     if (Array.isArray(node)) {
@@ -51,8 +52,8 @@ export function getElementBounds(node) {
         return getElementBounds(layoutResult);
     }
     if (typeof type === 'function') {
-        const externalX = props.x ?? 0;
-        const externalY = props.y ?? 0;
+        const externalX = (_a = props.x) !== null && _a !== void 0 ? _a : 0;
+        const externalY = (_b = props.y) !== null && _b !== void 0 ? _b : 0;
         const externalWidth = props.width;
         const externalHeight = props.height;
         if (isNumber(externalWidth) && isNumber(externalHeight)) {
@@ -68,8 +69,8 @@ export function getElementBounds(node) {
             return {
                 x: externalX,
                 y: externalY,
-                width: externalWidth ?? 0,
-                height: externalHeight ?? 0,
+                width: externalWidth !== null && externalWidth !== void 0 ? externalWidth : 0,
+                height: externalHeight !== null && externalHeight !== void 0 ? externalHeight : 0,
             };
         }
         if (Array.isArray(renderedResult)) {
@@ -84,8 +85,8 @@ export function getElementBounds(node) {
                     height: externalHeight,
                 };
             }
-            const width = innerBounds.width !== 0 ? innerBounds.width : (externalWidth ?? 0);
-            const height = innerBounds.height !== 0 ? innerBounds.height : (externalHeight ?? 0);
+            const width = innerBounds.width !== 0 ? innerBounds.width : (externalWidth !== null && externalWidth !== void 0 ? externalWidth : 0);
+            const height = innerBounds.height !== 0 ? innerBounds.height : (externalHeight !== null && externalHeight !== void 0 ? externalHeight : 0);
             return {
                 x: externalX + innerBounds.x,
                 y: externalY + innerBounds.y,
@@ -134,8 +135,8 @@ export function getElementBounds(node) {
                     };
                 }
             }
-            const width = innerBounds.width !== 0 ? innerBounds.width : (externalWidth ?? 0);
-            const height = innerBounds.height !== 0 ? innerBounds.height : (externalHeight ?? 0);
+            const width = innerBounds.width !== 0 ? innerBounds.width : (externalWidth !== null && externalWidth !== void 0 ? externalWidth : 0);
+            const height = innerBounds.height !== 0 ? innerBounds.height : (externalHeight !== null && externalHeight !== void 0 ? externalHeight : 0);
             return {
                 x: innerHasSamePosition ? innerBounds.x : externalX + innerBounds.x,
                 y: innerHasSamePosition ? innerBounds.y : externalY + innerBounds.y,
@@ -146,12 +147,12 @@ export function getElementBounds(node) {
         return {
             x: externalX,
             y: externalY,
-            width: externalWidth ?? 0,
-            height: externalHeight ?? 0,
+            width: externalWidth !== null && externalWidth !== void 0 ? externalWidth : 0,
+            height: externalHeight !== null && externalHeight !== void 0 ? externalHeight : 0,
         };
     }
-    const x = props.x ?? 0;
-    const y = props.y ?? 0;
+    const x = (_c = props.x) !== null && _c !== void 0 ? _c : 0;
+    const y = (_d = props.y) !== null && _d !== void 0 ? _d : 0;
     const width = isNumber(props.width) ? props.width : undefined;
     const height = isNumber(props.height) ? props.height : undefined;
     if (isNumber(width) && isNumber(height)) {
@@ -173,8 +174,8 @@ export function getElementBounds(node) {
     return {
         x,
         y,
-        width: width ?? 0,
-        height: height ?? 0,
+        width: width !== null && width !== void 0 ? width : 0,
+        height: height !== null && height !== void 0 ? height : 0,
     };
 }
 export function getElementsBounds(elements) {
@@ -194,7 +195,7 @@ export function getElementsBounds(elements) {
     return getCombinedBounds(list);
 }
 function isPassthrough(innerElement, externalProps) {
-    if (!innerElement?.props || !externalProps) {
+    if (!(innerElement === null || innerElement === void 0 ? void 0 : innerElement.props) || !externalProps) {
         return false;
     }
     const inner = innerElement.props;
@@ -229,8 +230,9 @@ function isPassthrough(innerElement, externalProps) {
     return false;
 }
 function getChildrenFromElement(element) {
+    var _a;
     // React 风格：只从 props.children 获取子元素
-    const children = element.props?.children;
+    const children = (_a = element.props) === null || _a === void 0 ? void 0 : _a.children;
     if (!children) {
         return [];
     }

package/esm/jsx/utils/children.js

@@ -1,5 +1,6 @@
 import { nodeToRenderableNodes } from './element.js';
 export function getRenderableChildrenOf(element) {
+    var _a;
     if (element === null ||
         element === undefined ||
         typeof element === 'boolean') {
@@ -8,7 +9,7 @@ export function getRenderableChildrenOf(element) {
     if (Array.isArray(element))
         return nodeToRenderableNodes(element);
     if (typeof element === 'object') {
-        return nodeToRenderableNodes(element.props?.children);
+        return nodeToRenderableNodes((_a = element.props) === null || _a === void 0 ? void 0 : _a.children);
     }
     return [element];
 }

package/esm/jsx/utils/clone.js

@@ -1,4 +1,15 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 export const cloneElement = (element, props) => {
-    const { type, props: originalProps, ...rest } = element;
-    return { type, props: { ...originalProps, ...props }, ...rest };
+    const { type, props: originalProps } = element, rest = __rest(element, ["type", "props"]);
+    return Object.assign({ type, props: Object.assign(Object.assign({}, originalProps), props) }, rest);
 };

package/esm/jsx/utils/element.js

@@ -4,6 +4,7 @@ export function nodeToElements(node) {
     return nodeToRenderableNodes(node).filter(isJSXElement);
 }
 export function nodeToRenderableNodes(node, result = []) {
+    var _a;
     if (!node || typeof node === 'boolean') {
         return result;
     }
@@ -12,7 +13,7 @@ export function nodeToRenderableNodes(node, result = []) {
     }
     else {
         if (isFragment(node)) {
-            const children = node.props?.children;
+            const children = (_a = node.props) === null || _a === void 0 ? void 0 : _a.children;
             (Array.isArray(children) ? children : [children])
                 .filter(Boolean)
                 .forEach((child) => {