@logicflow/core 2.0.0-beta.2 → 2.0.0-beta.4

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/core",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "LogicFlow, help you quickly create flowcharts",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -24,6 +24,7 @@
   "author": "Logicflow-Team",
   "license": "Apache-2.0",
   "dependencies": {
+    "lodash-es": "^4.17.21",
     "classnames": "^2.3.2",
     "mobx": "^5.15.7",
     "mobx-preact": "^3.0.0",

package/src/LogicFlow.tsx

@@ -81,19 +81,23 @@ export class LogicFlow {
    * 包括 adapterIn 和 adapterOut 两个方法
    */
   // TODO: 如何让用户执行时定义下面方法参数和返回值的类型
-  private adapterIn?: (data: unknown) => GraphData
-  private adapterOut?: (data: GraphData, ...rest: any) => unknown;
+  adapterIn?: (data: unknown) => GraphData
+  adapterOut?: (data: GraphData, ...rest: any) => unknown;
 
   // 支持插件在 LogicFlow 实例上增加自定义方法
   [propName: string]: any
 
-  private initContainer(container: HTMLElement | HTMLDivElement) {
+  private initContainer(
+    container: HTMLElement | HTMLDivElement,
+    width?: number,
+    height?: number,
+  ) {
     // TODO: 确认是否需要，后续是否只要返回 container 即可（下面方法是为了解决事件绑定问题的）
     // fix: destroy keyboard events while destroy LogicFlow.(#1110)
     const lfContainer = document.createElement('div')
     lfContainer.style.position = 'relative'
-    lfContainer.style.width = '100%'
-    lfContainer.style.height = '100%'
+    lfContainer.style.width = width ? `${width}px` : '100%'
+    lfContainer.style.height = height ? `${height}px` : '100%'
     container.innerHTML = ''
     container.appendChild(lfContainer)
     return lfContainer
@@ -105,8 +109,9 @@ export class LogicFlow {
 
   constructor(options: LFOptions.Common) {
     const initOptions = LFOptions.get(options)
+    const { container, width, height } = initOptions
     this.options = initOptions
-    this.container = this.initContainer(initOptions.container)
+    this.container = this.initContainer(container, width, height)
     this.graphModel = new GraphModel({
       ...initOptions,
       container: this.container, // TODO：测试该部分是否会有问题
@@ -1433,9 +1438,12 @@ export namespace LogicFlow {
   }
   export type TextConfig = {
     value: string
+    x: number
+    y: number
     editable?: boolean
     draggable?: boolean
-  } & Position
+    // overflowMode?: 'default' | 'autoWrap' | 'ellipsis'
+  }
 
   export type AppendConfig = {
     startIndex: number
@@ -1566,6 +1574,8 @@ export namespace LogicFlow {
     radius?: number
     rx?: number
     ry?: number
+    width?: number
+    height?: number
     path?: string
     [key: string]: unknown
   }
@@ -1649,6 +1659,7 @@ export namespace LogicFlow {
      * ellipsis: 超出省略
      */
     overflowMode?: 'default' | 'autoWrap' | 'ellipsis'
+    textWidth?: number
     background?: RectTheme
     /**
      * 背景区域 padding
@@ -1656,6 +1667,7 @@ export namespace LogicFlow {
      */
     wrapPadding?: string
   } & TextTheme
+
   // 边上文本样式
   export type EdgeTextTheme = {
     textWidth: number