@logicflow/core 2.0.0-beta.1 → 2.0.0-beta.3

package/lib/view/shape/Rect.js

@@ -29,15 +29,16 @@ var __read = (this && this.__read) || function (o, n) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rect = void 0;
 var jsx_runtime_1 = require("preact/jsx-runtime");
+var lodash_es_1 = require("lodash-es");
 function Rect(props) {
-    var x = props.x, y = props.y, width = props.width, height = props.height, className = props.className, radius = props.radius;
+    var x = props.x, y = props.y, width = props.width, height = props.height, className = props.className, strokeWidth = props.strokeWidth, _a = props.radius, radius = _a === void 0 ? 0 : _a;
     var leftTopX = x - width / 2;
     var leftTopY = y - height / 2;
     var attrs = {};
-    Object.entries(props).forEach(function (_a) {
+    attrs['stroke-width'] = strokeWidth;
+    (0, lodash_es_1.forEach)((0, lodash_es_1.toPairs)(props), function (_a) {
         var _b = __read(_a, 2), k = _b[0], v = _b[1];
-        var valueType = typeof v;
-        if (valueType !== 'object') {
+        if (typeof v !== 'object') {
             attrs[k] = v;
         }
     });
@@ -45,7 +46,7 @@ function Rect(props) {
         attrs.className = "lf-basic-shape ".concat(className);
     }
     else {
-        attrs.className = 'lf-shape';
+        attrs.className = 'lf-basic-shape';
     }
     if (radius) {
         attrs.rx = radius;
@@ -56,9 +57,5 @@ function Rect(props) {
     return (0, jsx_runtime_1.jsx)("rect", __assign({}, attrs));
 }
 exports.Rect = Rect;
-Rect.defaultProps = {
-    className: '',
-    radius: '',
-};
 exports.default = Rect;
 //# sourceMappingURL=Rect.js.map

package/lib/view/shape/Rect.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../src/view/shape/Rect.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,SAAgB,IAAI,CAAC,KAAiB;IAC5B,IAAA,CAAC,GAA0C,KAAK,EAA/C,EAAE,CAAC,GAAuC,KAAK,EAA5C,EAAE,KAAK,GAAgC,KAAK,MAArC,EAAE,MAAM,GAAwB,KAAK,OAA7B,EAAE,SAAS,GAAa,KAAK,UAAlB,EAAE,MAAM,GAAK,KAAK,OAAV,CAAU;IAExD,IAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;IAC9B,IAAM,QAAQ,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,CAAA;IAC/B,IAAM,KAAK,GAAwB,EAAE,CAAA;IACrC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QAClC,IAAM,SAAS,GAAG,OAAO,CAAC,CAAA;QAC1B,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,CAAC,SAAS,GAAG,yBAAkB,SAAS,CAAE,CAAA;IACjD,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,SAAS,GAAG,UAAU,CAAA;IAC9B,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,KAAK,CAAC,EAAE,GAAG,MAAM,CAAA;QACjB,KAAK,CAAC,EAAE,GAAG,MAAM,CAAA;IACnB,CAAC;IACD,KAAK,CAAC,CAAC,GAAG,QAAQ,CAAA;IAClB,KAAK,CAAC,CAAC,GAAG,QAAQ,CAAA;IAClB,OAAO,4CAAU,KAAK,EAAI,CAAA;AAC5B,CAAC;AAzBD,oBAyBC;AAED,IAAI,CAAC,YAAY,GAAG;IAClB,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,EAAE;CACX,CAAA;AAED,kBAAe,IAAI,CAAA"}
+{"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../src/view/shape/Rect.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAA4C;AAa5C,SAAgB,IAAI,CAAC,KAAiB;IAC5B,IAAA,CAAC,GAA2D,KAAK,EAAhE,EAAE,CAAC,GAAwD,KAAK,EAA7D,EAAE,KAAK,GAAiD,KAAK,MAAtD,EAAE,MAAM,GAAyC,KAAK,OAA9C,EAAE,SAAS,GAA8B,KAAK,UAAnC,EAAE,WAAW,GAAiB,KAAK,YAAtB,EAAE,KAAe,KAAK,OAAV,EAAV,MAAM,mBAAG,CAAC,KAAA,CAAU;IAEzE,IAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;IAC9B,IAAM,QAAQ,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,CAAA;IAC/B,IAAM,KAAK,GAAwB,EAAE,CAAA;IACrC,KAAK,CAAC,cAAc,CAAC,GAAG,WAAW,CAAA;IACnC,IAAA,mBAAO,EAAC,IAAA,mBAAO,EAAC,KAAK,CAAC,EAAE,UAAC,EAA2B;YAA3B,KAAA,aAA2B,EAA1B,CAAC,QAAA,EAAE,CAAC,QAAA;QAC5B,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,CAAC,SAAS,GAAG,yBAAkB,SAAS,CAAE,CAAA;IACjD,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,SAAS,GAAG,gBAAgB,CAAA;IACpC,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,KAAK,CAAC,EAAE,GAAG,MAAM,CAAA;QACjB,KAAK,CAAC,EAAE,GAAG,MAAM,CAAA;IACnB,CAAC;IACD,KAAK,CAAC,CAAC,GAAG,QAAQ,CAAA;IAClB,KAAK,CAAC,CAAC,GAAG,QAAQ,CAAA;IAElB,OAAO,4CAAU,KAAK,EAAI,CAAA;AAC5B,CAAC;AA3BD,oBA2BC;AAED,kBAAe,IAAI,CAAA"}

package/lib/view/shape/Text.d.ts

@@ -1,2 +1,20 @@
-export declare function Text(props: any): import("preact").JSX.Element | null;
+import { createElement as h } from 'preact/compat';
+import { BaseNodeModel, BaseEdgeModel } from '../../model';
+export type ITextProps = {
+    x: number;
+    y: number;
+    value: string;
+    fontSize?: number;
+    fill?: string;
+    overflowMode?: 'default' | 'autoWrap' | 'ellipsis';
+    textWidth?: number;
+    lineHeight?: number;
+    fontFamily?: string | null;
+    wrapPadding?: string | number | null;
+    model: BaseNodeModel | BaseEdgeModel;
+    [key: string]: any;
+};
+export type ForeignObjectPropsType = 'string | number | SignalLike<string | number | undefined> | undefined';
+export declare function Text(props: ITextProps): h.JSX.Element | null;
+export declare function renderHtmlText(props: ITextProps): h.JSX.Element;
 export default Text;

package/lib/view/shape/Text.js

@@ -27,33 +27,39 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Text = void 0;
+exports.renderHtmlText = exports.Text = void 0;
 var jsx_runtime_1 = require("preact/jsx-runtime");
-var util_1 = require("../../util");
 var constant_1 = require("../../constant");
+var util_1 = require("../../util");
+var lodash_es_1 = require("lodash-es");
 function Text(props) {
-    var _a = props.x, x = _a === void 0 ? 0 : _a, _b = props.y, y = _b === void 0 ? 0 : _b, value = props.value, fontSize = props.fontSize, _c = props.fill, fill = _c === void 0 ? 'currentColor' : _c, _d = props.overflowMode, overflowMode = _d === void 0 ? 'default' : _d, _e = props.textWidth, textWidth = _e === void 0 ? '' : _e, model = props.model;
+    var _a = props.x, x = _a === void 0 ? 0 : _a, _b = props.y, y = _b === void 0 ? 0 : _b, value = props.value, _c = props.fontSize, fontSize = _c === void 0 ? 12 : _c, _d = props.fill, fill = _d === void 0 ? 'currentColor' : _d, _e = props.overflowMode, overflowMode = _e === void 0 ? 'default' : _e, 
+    // TODO: 确认该 textWidth 为 '' 时跟设置什么值一致
+    _f = props.textWidth, 
+    // TODO: 确认该 textWidth 为 '' 时跟设置什么值一致
+    textWidth = _f === void 0 ? undefined : _f, model = props.model;
     var attrs = {
-        textAnchor: 'middle',
-        'dominant-baseline': 'middle',
         x: x,
         y: y,
         fill: fill,
+        fontSize: fontSize,
+        textAnchor: 'middle',
+        dominantBaseline: 'central',
         // ...props,
     };
-    Object.entries(props).forEach(function (_a) {
+    (0, lodash_es_1.forEach)((0, lodash_es_1.toPairs)(props), function (_a) {
         var _b = __read(_a, 2), k = _b[0], v = _b[1];
-        var valueType = typeof v;
-        if (valueType !== 'object') {
+        if (typeof v !== 'object') {
             attrs[k] = v;
         }
     });
     if (value) {
-        // String(value),兼容纯数字的文案
+        // String(value)，兼容纯数字的文案
+        // TODO: 将 value 转为纯文本，移除其中 \n \r 等特殊字符，看是否应该丰富该功能
         var rows = String(value).split(/[\r\n]/g);
         var rowsLength_1 = rows.length;
         if (overflowMode !== 'default') {
-            // 非文本节点设置了自动换行，或边设置了自动换行并且设置了textWidth
+            // 非文本节点设置了自动换行，或者边设置了自动换行并且设置了 textWidth
             var BaseType = model.BaseType, modelType = model.modelType;
             if ((BaseType === constant_1.ElementType.NODE && modelType !== constant_1.ModelType.TEXT_NODE) ||
                 (BaseType === constant_1.ElementType.EDGE && textWidth)) {
@@ -61,10 +67,10 @@ function Text(props) {
             }
         }
         if (rowsLength_1 > 1) {
-            var tSpans = rows.map(function (row, i) {
-                // 保证文字居中，文字Y轴偏移为当前行数对应中心行数的偏移行 * 行高
-                var tspanLineHeight = fontSize + 2;
-                var offsetY = (i - (rowsLength_1 - 1) / 2) * tspanLineHeight;
+            var tSpans = rows.map(function (row, idx) {
+                // 保证文字居中，文字 Y 轴偏移为当前行数对应中心行数的偏移行 * 行高
+                var tSpanLineHeight = fontSize + 2;
+                var offsetY = (idx - (rowsLength_1 - 1) / 2) * tSpanLineHeight;
                 return ((0, jsx_runtime_1.jsx)("tspan", { className: "lf-text-tspan", x: x, y: y + offsetY, children: row }));
             });
             return (0, jsx_runtime_1.jsx)("text", __assign({}, attrs, { children: tSpans }));
@@ -75,9 +81,10 @@ function Text(props) {
 }
 exports.Text = Text;
 function renderHtmlText(props) {
-    var value = props.value, fontSize = props.fontSize, model = props.model, _a = props.fontFamily, fontFamily = _a === void 0 ? '' : _a, lineHeight = props.lineHeight, _b = props.wrapPadding, wrapPadding = _b === void 0 ? '0, 0' : _b, overflowMode = props.overflowMode, x = props.x, y = props.y;
-    var width = model.width, textHeight = model.textHeight;
-    var textRealWidth = props.textWidth || width;
+    var x = props.x, y = props.y, value = props.value, model = props.model, textWidth = props.textWidth, _a = props.fontSize, fontSize = _a === void 0 ? 12 : _a, lineHeight = props.lineHeight, _b = props.fontFamily, fontFamily = _b === void 0 ? '' : _b, _c = props.wrapPadding, wrapPadding = _c === void 0 ? '0, 0' : _c, overflowMode = props.overflowMode;
+    var width = model.width, height = model.height, textHeight = model.textHeight;
+    // TODO: 设置文本宽度为 textWidth 或 节点的宽度
+    var textRealWidth = textWidth || width;
     var rows = String(value).split(/[\r\n]/g);
     var rowsLength = rows.length;
     var textRealHeight = (0, util_1.getHtmlTextHeight)({
@@ -93,8 +100,8 @@ function renderHtmlText(props) {
         className: 'lf-get-text-height',
     });
     // 当文字超过边框时，取文字高度的实际值，也就是文字可以超过边框
-    var foreignObjectHeight = model.height > textRealHeight ? model.height : textRealHeight;
-    // 如果设置了文字高度，取设置的高度
+    var foreignObjectHeight = height > textRealHeight ? height : textRealHeight;
+    // 如果设置了文本高度，取设置的高度
     if (textHeight) {
         foreignObjectHeight = textHeight;
     }
@@ -102,13 +109,14 @@ function renderHtmlText(props) {
     if (isEllipsis) {
         foreignObjectHeight = fontSize + 2;
     }
-    return ((0, jsx_runtime_1.jsx)("g", { children: (0, jsx_runtime_1.jsx)("foreignObject", { width: textRealWidth, height: foreignObjectHeight, x: x - textRealWidth / 2, y: y - foreignObjectHeight / 2, children: (0, jsx_runtime_1.jsx)("div", { className: "lf-node-text-auto-wrap", style: {
+    return ((0, jsx_runtime_1.jsx)("g", { children: (0, jsx_runtime_1.jsx)("foreignObject", { width: textRealWidth, height: foreignObjectHeight, x: x - textRealWidth / 2, y: y - foreignObjectHeight / 2, style: { overflow: 'visible', textAlign: 'left' }, children: (0, jsx_runtime_1.jsx)("div", { className: "lf-node-text-auto-wrap", style: {
                     minHeight: foreignObjectHeight,
                     width: textRealWidth,
                     padding: wrapPadding,
                 }, children: (0, jsx_runtime_1.jsx)("div", { className: isEllipsis
                         ? 'lf-node-text-ellipsis-content'
-                        : 'lf-node-text-auto-wrap-content', title: isEllipsis ? rows.join('') : '', style: __assign({}, props), children: rows.map(function (item) { return ((0, jsx_runtime_1.jsx)("div", { className: "lf-node-text--auto-wrap-inner", children: item })); }) }) }) }) }));
+                        : 'lf-node-text-auto-wrap-content', title: isEllipsis ? rows.join('') : '', style: __assign({}, props), children: rows.map(function (row) { return ((0, jsx_runtime_1.jsx)("div", { className: "lf-node-text--auto-wrap-inner", children: row })); }) }) }) }) }));
 }
+exports.renderHtmlText = renderHtmlText;
 exports.default = Text;
 //# sourceMappingURL=Text.js.map

package/lib/view/shape/Text.js.map

@@ -1 +1 @@
-{"version":3,"file":"Text.js","sourceRoot":"","sources":["../../../src/view/shape/Text.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Text.js","sourceRoot":"","sources":["../../../src/view/shape/Text.tsx"],"names":[],"mappings":"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"}

package/lib/view/text/BaseText.d.ts

@@ -1,25 +1,22 @@
-import { Component, createElement as h } from 'preact/compat';
-import { StepDrag } from '../../util';
-import { GraphModel, Model } from '../../model';
-type IProps = {
-    model: Model.BaseModel;
+import { createElement as h, Component } from 'preact/compat';
+import { GraphModel, BaseNodeModel, BaseEdgeModel } from '../../model';
+import { IDragParams, StepDrag } from '../../util';
+export type IBaseTextProps = {
+    model: BaseNodeModel | BaseEdgeModel;
     graphModel: GraphModel;
     draggable: boolean;
     editable: boolean;
 };
-type IState = {
+export type IBaseTextState = {
     isHovered: boolean;
 };
-export declare class BaseText extends Component<IProps, IState> {
-    stepDrag: StepDrag;
-    constructor(config: any);
+export declare class BaseText<P extends IBaseTextProps, S extends IBaseTextState> extends Component<P, S> {
+    stepperDrag: StepDrag;
+    constructor(props: P);
     getShape(): h.JSX.Element | null;
-    onDragging: ({ deltaX, deltaY }: {
-        deltaX: any;
-        deltaY: any;
-    }) => void;
-    dblClickHandler: () => void;
-    mouseDownHandle: (ev: MouseEvent) => void;
+    mouseDownHandler: (e: MouseEvent) => void;
+    onDragging: ({ deltaX, deltaY }: IDragParams) => void;
+    dbClickHandler: () => void;
     render(): h.JSX.Element | undefined;
 }
 export default BaseText;

package/lib/view/text/BaseText.js

@@ -41,24 +41,38 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseText = void 0;
 var jsx_runtime_1 = require("preact/jsx-runtime");
+var classnames_1 = __importDefault(require("classnames"));
 var compat_1 = require("preact/compat");
+var constant_1 = require("../../constant");
 var shape_1 = require("../shape");
 var util_1 = require("../../util");
-var constant_1 = require("../../constant");
 var BaseText = /** @class */ (function (_super) {
     __extends(BaseText, _super);
-    function BaseText(config) {
+    function BaseText(props) {
         var _this = _super.call(this) || this;
+        _this.mouseDownHandler = function (e) {
+            var _a = _this.props, draggable = _a.draggable, model = _a.model, graphModel = _a.graphModel;
+            var nodeTextDraggable = graphModel.editConfigModel.nodeTextDraggable;
+            if (draggable || nodeTextDraggable) {
+                _this.stepperDrag.model = model;
+                _this.stepperDrag.handleMouseDown(e);
+            }
+        };
         _this.onDragging = function (_a) {
             var deltaX = _a.deltaX, deltaY = _a.deltaY;
             var _b = _this.props, model = _b.model, transformModel = _b.graphModel.transformModel;
-            var _c = __read(transformModel.fixDeltaXY(deltaX, deltaY), 2), curDeltaX = _c[0], curDeltaY = _c[1];
-            model.moveText(curDeltaX, curDeltaY);
+            if (deltaX && deltaY) {
+                var _c = __read(transformModel.fixDeltaXY(deltaX, deltaY), 2), curDeltaX = _c[0], curDeltaY = _c[1];
+                model.moveText(curDeltaX, curDeltaY);
+            }
         };
-        _this.dblClickHandler = function () {
+        _this.dbClickHandler = function () {
             // 静默模式下，双击不更改状态，不可编辑
             var editable = _this.props.editable;
             if (editable) {
@@ -66,48 +80,47 @@ var BaseText = /** @class */ (function (_super) {
                 model.setElementState(constant_1.ElementState.TEXT_EDIT);
             }
         };
-        _this.mouseDownHandle = function (ev) {
-            var _a = _this.props, draggable = _a.draggable, model = _a.model, nodeTextDraggable = _a.graphModel.editConfigModel.nodeTextDraggable;
-            if (draggable || nodeTextDraggable) {
-                _this.stepDrag.model = model;
-                _this.stepDrag.handleMouseDown(ev);
-            }
-        };
-        var draggable = config.draggable;
-        _this.stepDrag = new util_1.StepDrag({
+        var draggable = props.draggable;
+        // TODO: 确认为什么不在 new 的时候传入 model，而在下面使用的时候赋值
+        _this.stepperDrag = new util_1.StepDrag({
             onDragging: _this.onDragging,
             step: 1,
+            // model,
             isStopPropagation: draggable,
         });
         return _this;
     }
     BaseText.prototype.getShape = function () {
         var _a = this.props, model = _a.model, graphModel = _a.graphModel;
-        var text = model.text;
         var editConfigModel = graphModel.editConfigModel;
-        var value = text.value, x = text.x, y = text.y, editable = text.editable, draggable = text.draggable;
+        var _b = model.text, value = _b.value, x = _b.x, y = _b.y, editable = _b.editable, draggable = _b.draggable;
         var attr = {
             x: x,
             y: y,
             className: '',
             value: value,
         };
-        if (editable) {
-            attr.className = 'lf-element-text';
-        }
-        else if (draggable || editConfigModel.nodeTextDraggable) {
-            attr.className = 'lf-text-draggable';
-        }
-        else {
-            attr.className = 'lf-text-disabled';
-        }
+        // DONE: 代码优化，看是否可以引入 classnames
+        // TODO: 确认下面逻辑是否正确，确认正确后删除下面注释
+        // if (editable) {
+        //   attr.className = 'lf-element-text';
+        // } else if (draggable || editConfigModel.nodeTextDraggable) {
+        //   attr.className = 'lf-text-draggable';
+        // } else {
+        //   attr.className = 'lf-text-disabled';
+        // }
         var style = model.getTextStyle();
-        return (0, jsx_runtime_1.jsx)(shape_1.Text, __assign({}, attr, style, { model: model }));
+        var isDraggable = editConfigModel.nodeTextDraggable || draggable;
+        return ((0, jsx_runtime_1.jsx)(shape_1.Text, __assign({}, attr, style, { className: (0, classnames_1.default)({
+                'lf-element-text': editable,
+                'lf-text-draggable': !editable && isDraggable,
+                'lf-text-disabled': !editable && !isDraggable,
+            }), model: model })));
     };
     BaseText.prototype.render = function () {
         var text = this.props.model.text;
         if (text) {
-            return ((0, jsx_runtime_1.jsx)("g", { onMouseDown: this.mouseDownHandle, onDblClick: this.dblClickHandler, children: this.getShape() }));
+            return ((0, jsx_runtime_1.jsx)("g", { onMouseDown: this.mouseDownHandler, onDblClick: this.dbClickHandler, children: this.getShape() }));
         }
     };
     return BaseText;

package/lib/view/text/BaseText.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseText.js","sourceRoot":"","sources":["../../../src/view/text/BaseText.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseText.js","sourceRoot":"","sources":["../../../src/view/text/BaseText.tsx"],"names":[],"mappings":"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"}

package/lib/view/text/LineText.d.ts

@@ -1,9 +1,21 @@
-import BaseText from './BaseText';
-export declare class LineText extends BaseText {
-    constructor(config: any);
-    getBackground(): import("preact").JSX.Element | undefined;
-    setHoverON: () => void;
-    setHoverOFF: () => void;
-    getShape(): import("preact").JSX.Element | null;
+import { createElement as h } from 'preact/compat';
+import { BaseText } from '.';
+import { BaseEdgeModel, GraphModel } from '../../model';
+export type ILineTextProps = {
+    model: BaseEdgeModel;
+    graphModel: GraphModel;
+    draggable: boolean;
+    editable: boolean;
+    [key: string]: unknown;
+};
+export type ILineTextState = {
+    isHovered: boolean;
+};
+export declare class LineText extends BaseText<ILineTextProps, ILineTextState> {
+    constructor(props: ILineTextProps);
+    setHoverOn: () => void;
+    setHoverOff: () => void;
+    getBackground(): h.JSX.Element | null;
+    getShape(): h.JSX.Element | null;
 }
 export default LineText;

package/lib/view/text/LineText.js

@@ -25,26 +25,39 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LineText = void 0;
 var jsx_runtime_1 = require("preact/jsx-runtime");
-var Text_1 = __importDefault(require("../shape/Text"));
-var Rect_1 = __importDefault(require("../shape/Rect"));
-var BaseText_1 = __importDefault(require("./BaseText"));
+var __1 = require("..");
+var _1 = require(".");
 var util_1 = require("../../util");
 var LineText = /** @class */ (function (_super) {
     __extends(LineText, _super);
-    function LineText(config) {
-        var _this = _super.call(this, config) || this;
-        _this.setHoverON = function () {
+    function LineText(props) {
+        var _this = _super.call(this, props) || this;
+        // Hover 状态相关
+        _this.setHoverOn = function () {
             _this.setState({
                 isHovered: true,
             });
         };
-        _this.setHoverOFF = function () {
+        _this.setHoverOff = function () {
             _this.setState({
                 isHovered: false,
             });
@@ -55,23 +68,22 @@ var LineText = /** @class */ (function (_super) {
         return _this;
     }
     LineText.prototype.getBackground = function () {
+        var isHovered = this.state.isHovered;
         var model = this.props.model;
+        var text = model.text;
         var style = model.getTextStyle();
-        var text = model.text, modelWidth = model.width;
         var backgroundStyle = style.background || {};
-        var isHovered = this.state.isHovered;
-        if (isHovered && (style === null || style === void 0 ? void 0 : style.hover) && (style === null || style === void 0 ? void 0 : style.hover.background)) {
-            backgroundStyle = __assign(__assign({}, backgroundStyle), style === null || style === void 0 ? void 0 : style.hover.background);
+        if (isHovered && style.hover && style.hover.background) {
+            backgroundStyle = __assign(__assign({}, backgroundStyle), style.hover.background);
         }
-        // 存在文本并且文本背景不为透明时计算背景框
-        if (text && text.value && backgroundStyle.fill !== 'transparent') {
-            var _a = style !== null && style !== void 0 ? style : {}, fontSize = _a.fontSize, overflowMode = _a.overflowMode, lineHeight = _a.lineHeight, wrapPadding = _a.wrapPadding, textWidth = _a.textWidth;
-            var value = text.value;
-            var x = text.x, y = text.y;
-            var rows = String(value).split(/[\r\n]/g);
-            // 计算行数
+        // 当存在文本并且文本背景不为透明时，计算背景框
+        if ((text === null || text === void 0 ? void 0 : text.value) && (backgroundStyle === null || backgroundStyle === void 0 ? void 0 : backgroundStyle.fill) !== 'transparent') {
+            var fontSize = style.fontSize, textWidth = style.textWidth, lineHeight = style.lineHeight, overflowMode = style.overflowMode;
+            var wrapPadding = backgroundStyle.wrapPadding;
+            var rows = text === null || text === void 0 ? void 0 : text.value.split(/[\r\n]/g);
             var rowsLength = rows.length;
-            var rectAttr = void 0;
+            var x = text.x, y = text.y;
+            var rectAttr = {};
             if (overflowMode === 'autoWrap' && textWidth) {
                 var textHeight = (0, util_1.getHtmlTextHeight)({
                     rows: rows,
@@ -84,72 +96,65 @@ var LineText = /** @class */ (function (_super) {
                     rowsLength: rowsLength,
                     className: 'lf-get-text-height',
                 });
-                rectAttr = __assign(__assign({}, backgroundStyle), { x: x - 1, y: y - 1, width: textWidth, height: textHeight });
+                rectAttr = __assign(__assign({}, backgroundStyle), { x: x, y: y, width: textWidth, height: textHeight });
             }
             else {
-                // 计算文本中最长的一行的字节数
-                var longestBytes_1 = 0;
-                rows &&
-                    rows.forEach(function (item) {
-                        var rowByteLength = (0, util_1.getBytesLength)(item);
-                        longestBytes_1 =
-                            rowByteLength > longestBytes_1 ? rowByteLength : longestBytes_1;
-                    });
-                // 背景框宽度，最长一行字节数/2 * fontsize + 2
-                // 背景框宽度， 行数 * fontsize + 2
-                var _b = (0, util_1.getSvgTextWidthHeight)({
-                    rows: rows,
-                    fontSize: fontSize,
-                    rowsLength: rowsLength,
-                }), width = _b.width, height = _b.height;
+                // 背景框宽度，最长一行字节数 / 2 * fontSize + 2
+                // 背景框宽度，行数 * fontSize + 2
+                var _a = (0, util_1.getSvgTextSize)({ rows: rows, rowsLength: rowsLength, fontSize: fontSize }), width = _a.width, height = _a.height;
                 if (overflowMode === 'ellipsis') {
                     // https://github.com/didi/LogicFlow/issues/1151
                     // 边上的文字过长（使用"ellipsis"模式）出现省略号，背景也需要进行宽度的重新计算
                     // 跟Text.tsx保持同样的计算逻辑(overflowMode === 'ellipsis')
                     // Text.tsx使用textRealWidth=textWidth || width
                     // Text.tsx使用foreignObjectHeight = fontSize + 2;
-                    width = textWidth || modelWidth;
+                    width = textWidth;
                     height = fontSize + 2;
                 }
-                // 根据设置的padding调整width, height, x, y的值
+                // 根据设置的 padding 调整 width, height, x, y 的值
+                // TODO: 下面方法感觉可以提取成工具方法
                 if (typeof backgroundStyle.wrapPadding === 'string') {
-                    var paddings = backgroundStyle.wrapPadding
+                    var padding = backgroundStyle.wrapPadding
                         .split(',')
                         .filter(function (padding) { return padding.trim(); })
                         .map(function (padding) { return parseFloat(padding.trim()); });
-                    if (paddings.length > 0 && paddings.length <= 4) {
-                        if (paddings.length === 1) {
-                            paddings = [paddings[0], paddings[0], paddings[0], paddings[0]];
+                    if (padding.length > 0 && padding.length <= 4) {
+                        if (padding.length === 1) {
+                            var _b = __read(padding, 1), allSides = _b[0];
+                            padding = [allSides, allSides, allSides, allSides];
                         }
-                        else if (paddings.length === 2) {
-                            paddings = [paddings[0], paddings[1], paddings[0], paddings[1]];
+                        else if (padding.length === 2) {
+                            var _c = __read(padding, 2), vertical = _c[0], horizontal = _c[1];
+                            padding = [vertical, horizontal, vertical, horizontal];
                         }
-                        else if (paddings.length === 3) {
-                            paddings = [paddings[0], paddings[1], paddings[2], paddings[1]];
+                        else if (padding.length === 3) {
+                            var _d = __read(padding, 3), top_1 = _d[0], horizontal = _d[1], bottom_1 = _d[2];
+                            padding = [top_1, horizontal, bottom_1, horizontal];
                         }
-                        width += paddings[1] + paddings[3];
-                        height += paddings[0] + paddings[2];
-                        x = x + (paddings[1] - paddings[3]) / 2;
-                        y = y + (paddings[2] - paddings[0]) / 2;
+                        var _e = __read(padding, 4), top_2 = _e[0], right = _e[1], bottom = _e[2], left = _e[3];
+                        width += right + left;
+                        height += top_2 + bottom;
+                        x = x + (right - left) / 2;
+                        y = y + (bottom - top_2) / 2;
                     }
                 }
                 rectAttr = __assign(__assign({}, backgroundStyle), { x: x - 1, y: y - 1, width: width, height: height });
             }
-            return (0, jsx_runtime_1.jsx)(Rect_1.default, __assign({}, rectAttr));
+            return (0, jsx_runtime_1.jsx)(__1.Rect, __assign({}, rectAttr));
         }
+        return null;
     };
     LineText.prototype.getShape = function () {
         var model = this.props.model;
-        var text = model.text;
-        var value = text.value, x = text.x, y = text.y;
+        var _a = model.text, x = _a.x, y = _a.y, value = _a.value;
         if (!value)
             return null;
         var style = model.getTextStyle();
-        var attr = __assign({ x: x, y: y, className: 'lf-element-text', value: value }, style);
-        return ((0, jsx_runtime_1.jsxs)("g", { className: "lf-line-text", onMouseEnter: this.setHoverON, onMouseLeave: this.setHoverOFF, children: [this.getBackground(), (0, jsx_runtime_1.jsx)(Text_1.default, __assign({}, attr, { model: model }))] }));
+        var attrs = __assign({ x: x, y: y, value: value, model: model, className: 'lf-element-text' }, style);
+        return ((0, jsx_runtime_1.jsxs)("g", { className: "lf-line-text", onMouseEnter: this.setHoverOn, onMouseLeave: this.setHoverOff, children: [this.getBackground(), (0, jsx_runtime_1.jsx)(__1.Text, __assign({}, attrs))] }));
     };
     return LineText;
-}(BaseText_1.default));
+}(_1.BaseText));
 exports.LineText = LineText;
 exports.default = LineText;
 //# sourceMappingURL=LineText.js.map