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

package/es/view/shape/Line.js

@@ -26,6 +26,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { jsx as _jsx } from "preact/jsx-runtime";
+import { forEach, toPairs } from 'lodash-es';
 export function Line(props) {
     var attrs = {
         // default
@@ -34,18 +35,15 @@ export function Line(props) {
         x2: 20,
         y2: 20,
         stroke: 'black',
-        // ...props,
+        // ...props
     };
-    Object.entries(props).forEach(function (_a) {
+    forEach(toPairs(props), function (_a) {
         var _b = __read(_a, 2), k = _b[0], v = _b[1];
         if (k === 'style') {
             attrs[k] = v;
         }
-        else {
-            var valueType = typeof v;
-            if (valueType !== 'object') {
-                attrs[k] = v;
-            }
+        else if (typeof v !== 'object') {
+            attrs[k] = v;
         }
     });
     return _jsx("line", __assign({}, attrs));

package/es/view/shape/Line.js.map

@@ -1 +1 @@
-{"version":3,"file":"Line.js","sourceRoot":"","sources":["../../../src/view/shape/Line.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAM,UAAU,IAAI,CAAC,KAAK;IACxB,IAAM,KAAK,GAAG;QACZ,UAAU;QACV,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,EAAE;QACN,MAAM,EAAE,OAAO;QACf,YAAY;KACb,CAAA;IACD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QAClC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;aAAM,CAAC;YACN,IAAM,SAAS,GAAG,OAAO,CAAC,CAAA;YAC1B,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAC3B,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;YACd,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IACF,OAAO,0BAAU,KAAK,EAAI,CAAA;AAC5B,CAAC;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"Line.js","sourceRoot":"","sources":["../../../src/view/shape/Line.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAe5C,MAAM,UAAU,IAAI,CAAC,KAAiB;IACpC,IAAM,KAAK,GAAe;QACxB,UAAU;QACV,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,EAAE;QACN,MAAM,EAAE,OAAO;QACf,WAAW;KACZ,CAAA;IAED,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,UAAC,EAA2B;YAA3B,KAAA,aAA2B,EAA1B,CAAC,QAAA,EAAE,CAAC,QAAA;QAC5B,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;aAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,0BAAU,KAAK,EAAI,CAAA;AAC5B,CAAC;AAED,eAAe,IAAI,CAAA"}

package/es/view/shape/Path.d.ts

@@ -1,6 +1,7 @@
-type IProps = {
+import { createElement as h } from 'preact/compat';
+export type IPathProps = {
     d: string;
     [key: string]: any;
 };
-export declare function Path(props: IProps): import("preact").JSX.Element;
+export declare function Path(props: IPathProps): h.JSX.Element;
 export default Path;

package/es/view/shape/Path.js

@@ -26,14 +26,14 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { jsx as _jsx } from "preact/jsx-runtime";
+import { forEach, toPairs } from 'lodash-es';
 export function Path(props) {
     var attrs = {
         d: '',
     };
-    Object.entries(props).forEach(function (_a) {
+    forEach(toPairs(props), function (_a) {
         var _b = __read(_a, 2), k = _b[0], v = _b[1];
-        var valueType = typeof v;
-        if (k === 'style' || valueType !== 'object') {
+        if (k === 'style' || typeof v !== 'object') {
             attrs[k] = v;
         }
     });

package/es/view/shape/Path.js.map

@@ -1 +1 @@
-{"version":3,"file":"Path.js","sourceRoot":"","sources":["../../../src/view/shape/Path.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,MAAM,UAAU,IAAI,CAAC,KAAa;IAChC,IAAM,KAAK,GAAG;QACZ,CAAC,EAAE,EAAE;KACN,CAAA;IACD,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,CAAC,KAAK,OAAO,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC5C,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;IACH,CAAC,CAAC,CAAA;IACF,OAAO,0BAAU,KAAK,EAAI,CAAA;AAC5B,CAAC;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"Path.js","sourceRoot":"","sources":["../../../src/view/shape/Path.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAO5C,MAAM,UAAU,IAAI,CAAC,KAAiB;IACpC,IAAM,KAAK,GAAwB;QACjC,CAAC,EAAE,EAAE;KACN,CAAA;IACD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,UAAC,EAA6B;YAA7B,KAAA,aAA6B,EAA5B,CAAC,QAAA,EAAE,CAAC,QAAA;QAC5B,IAAI,CAAC,KAAK,OAAO,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC3C,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,0BAAU,KAAK,EAAI,CAAA;AAC5B,CAAC;AAED,eAAe,IAAI,CAAA"}

package/es/view/shape/Polygon.d.ts

@@ -1,8 +1,10 @@
-import LogicFlow from '../../LogicFlow';
+import { createElement as h } from 'preact/compat';
+import { LogicFlow } from '../..';
 export type IPolygonProps = {
     points: LogicFlow.PointTuple[];
+    x?: number;
+    y?: number;
     className?: string;
-    [key: string]: any;
 };
-export declare function Polygon(props: IPolygonProps): import("preact").JSX.Element;
+export declare function Polygon(props: IPolygonProps): h.JSX.Element;
 export default Polygon;

package/es/view/shape/Polygon.js

@@ -26,8 +26,9 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { jsx as _jsx } from "preact/jsx-runtime";
+import { forEach, toPairs } from 'lodash-es';
 export function Polygon(props) {
-    var points = props.points, className = props.className;
+    var _a = props.points, points = _a === void 0 ? [] : _a, className = props.className;
     var attrs = {
         fill: 'transparent',
         fillOpacity: 1,
@@ -36,18 +37,17 @@ export function Polygon(props) {
         strokeOpacity: 1,
         points: '',
     };
-    Object.entries(props).forEach(function (_a) {
+    forEach(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 (className) {
-        attrs.className = "lf-basic-shape ".concat(className);
+        attrs.classNmae = "lf-basic-shape ".concat(className);
     }
     else {
-        attrs.className = 'lf-shape';
+        attrs.className = 'lf-basic-shape';
     }
     attrs.points = points.map(function (point) { return point.join(','); }).join(' ');
     return _jsx("polygon", __assign({}, attrs));

package/es/view/shape/Polygon.js.map

@@ -1 +1 @@
-{"version":3,"file":"Polygon.js","sourceRoot":"","sources":["../../../src/view/shape/Polygon.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,MAAM,UAAU,OAAO,CAAC,KAAoB;IAClC,IAAA,MAAM,GAAgB,KAAK,OAArB,EAAE,SAAS,GAAK,KAAK,UAAV,CAAU;IACnC,IAAM,KAAK,GAAwB;QACjC,IAAI,EAAE,aAAa;QACnB,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;QACd,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,CAAC;QAChB,MAAM,EAAE,EAAE;KACX,CAAA;IACD,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;IACF,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,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAf,CAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE/D,OAAO,6BAAa,KAAK,EAAI,CAAA;AAC/B,CAAC;AAED,eAAe,OAAO,CAAA"}
+{"version":3,"file":"Polygon.js","sourceRoot":"","sources":["../../../src/view/shape/Polygon.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAU5C,MAAM,UAAU,OAAO,CAAC,KAAoB;IAClC,IAAA,KAA2B,KAAK,OAArB,EAAX,MAAM,mBAAG,EAAE,KAAA,EAAE,SAAS,GAAK,KAAK,UAAV,CAAU;IACxC,IAAM,KAAK,GAAwB;QACjC,IAAI,EAAE,aAAa;QACnB,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;QACd,MAAM,EAAE,MAAM;QACd,aAAa,EAAE,CAAC;QAChB,MAAM,EAAE,EAAE;KACX,CAAA;IAED,OAAO,CAAC,OAAO,CAAC,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;IACD,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAf,CAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE/D,OAAO,6BAAa,KAAK,EAAI,CAAA;AAC/B,CAAC;AAED,eAAe,OAAO,CAAA"}

package/es/view/shape/Polyline.d.ts

@@ -1,2 +1,8 @@
-export declare function Polyline(props: any): import("preact").JSX.Element;
+import { createElement as h } from 'preact/compat';
+export type IPolylineProps = {
+    points: string;
+    pathLength?: number | 'none';
+    className?: string;
+};
+export declare function Polyline(props: IPolylineProps): h.JSX.Element;
 export default Polyline;

package/es/view/shape/Polyline.js

@@ -26,23 +26,25 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { jsx as _jsx } from "preact/jsx-runtime";
+import { forEach, toPairs } from 'lodash-es';
 export function Polyline(props) {
+    var className = props.className;
     var attrs = {
         points: '',
         fill: 'none',
     };
-    Object.entries(props).forEach(function (_a) {
+    forEach(toPairs(props), function (_a) {
         var _b = __read(_a, 2), k = _b[0], v = _b[1];
         if (k === 'style') {
             attrs[k] = v;
         }
-        else {
-            var valueType = typeof v;
-            if (valueType !== 'object') {
-                attrs[k] = v;
-            }
+        else if (typeof v !== 'object') {
+            attrs[k] = v;
         }
     });
+    if (className) {
+        attrs.className = "".concat(className);
+    }
     return _jsx("polyline", __assign({}, attrs));
 }
 export default Polyline;

package/es/view/shape/Polyline.js.map

@@ -1 +1 @@
-{"version":3,"file":"Polyline.js","sourceRoot":"","sources":["../../../src/view/shape/Polyline.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAM,UAAU,QAAQ,CAAC,KAAK;IAC5B,IAAM,KAAK,GAAG;QACZ,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,MAAM;KACb,CAAA;IACD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QAClC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;aAAM,CAAC;YACN,IAAM,SAAS,GAAG,OAAO,CAAC,CAAA;YAC1B,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAC3B,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;YACd,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IACF,OAAO,8BAAc,KAAK,EAAI,CAAA;AAChC,CAAC;AAED,eAAe,QAAQ,CAAA"}
+{"version":3,"file":"Polyline.js","sourceRoot":"","sources":["../../../src/view/shape/Polyline.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQ5C,MAAM,UAAU,QAAQ,CAAC,KAAqB;IACpC,IAAA,SAAS,GAAK,KAAK,UAAV,CAAU;IAC3B,IAAM,KAAK,GAA4B;QACrC,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,MAAM;KACb,CAAA;IAED,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,UAAC,EAA+B;YAA/B,KAAA,aAA+B,EAA9B,CAAC,QAAA,EAAE,CAAC,QAAA;QAC5B,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;aAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;IACH,CAAC,CAAC,CAAA;IACF,IAAI,SAAS,EAAE,CAAC;QACd,KAAK,CAAC,SAAS,GAAG,UAAG,SAAS,CAAE,CAAA;IAClC,CAAC;IAED,OAAO,8BAAc,KAAK,EAAI,CAAA;AAChC,CAAC;AAED,eAAe,QAAQ,CAAA"}

package/es/view/shape/Rect.d.ts

@@ -1,15 +1,13 @@
-import LogicFlow from '../../LogicFlow';
-import Point = LogicFlow.Point;
-import RectSize = LogicFlow.RectSize;
-type IRectProps = {
+import { createElement as h } from 'preact/compat';
+import LogicFlow from '../..';
+export type IRectProps = {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
     className?: string;
-    radius?: number;
-} & Point & RectSize;
-export declare function Rect(props: IRectProps): import("preact").JSX.Element;
-export declare namespace Rect {
-    var defaultProps: {
-        className: string;
-        radius: string;
-    };
-}
+    radius?: LogicFlow.NumberOrPercent;
+    [key: string]: any;
+};
+export declare function Rect(props: IRectProps): h.JSX.Element;
 export default Rect;

package/es/view/shape/Rect.js

@@ -26,15 +26,16 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { jsx as _jsx } from "preact/jsx-runtime";
+import { forEach, toPairs } from 'lodash-es';
 export 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;
+    forEach(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;
         }
     });
@@ -42,7 +43,7 @@ export 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;
@@ -52,9 +53,5 @@ export function Rect(props) {
     attrs.y = leftTopY;
     return _jsx("rect", __assign({}, attrs));
 }
-Rect.defaultProps = {
-    className: '',
-    radius: '',
-};
 export default Rect;
 //# sourceMappingURL=Rect.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../src/view/shape/Rect.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,MAAM,UAAU,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,0BAAU,KAAK,EAAI,CAAA;AAC5B,CAAC;AAED,IAAI,CAAC,YAAY,GAAG;IAClB,SAAS,EAAE,EAAE;IACb,MAAM,EAAE,EAAE;CACX,CAAA;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../src/view/shape/Rect.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAa5C,MAAM,UAAU,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,OAAO,CAAC,OAAO,CAAC,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,0BAAU,KAAK,EAAI,CAAA;AAC5B,CAAC;AAED,eAAe,IAAI,CAAA"}

package/es/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/es/view/shape/Text.js

@@ -26,31 +26,37 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { jsx as _jsx } from "preact/jsx-runtime";
-import { getHtmlTextHeight } from '../../util';
 import { ElementType, ModelType } from '../../constant';
+import { getHtmlTextHeight } from '../../util';
+import { forEach, toPairs } from 'lodash-es';
 export 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) {
+    forEach(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 === ElementType.NODE && modelType !== ModelType.TEXT_NODE) ||
                 (BaseType === ElementType.EDGE && textWidth)) {
@@ -58,10 +64,10 @@ export 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 (_jsx("tspan", { className: "lf-text-tspan", x: x, y: y + offsetY, children: row }));
             });
             return _jsx("text", __assign({}, attrs, { children: tSpans }));
@@ -70,10 +76,11 @@ export function Text(props) {
     }
     return null;
 }
-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;
+export function renderHtmlText(props) {
+    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 = getHtmlTextHeight({
@@ -89,8 +96,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;
     }
@@ -98,13 +105,13 @@ function renderHtmlText(props) {
     if (isEllipsis) {
         foreignObjectHeight = fontSize + 2;
     }
-    return (_jsx("g", { children: _jsx("foreignObject", { width: textRealWidth, height: foreignObjectHeight, x: x - textRealWidth / 2, y: y - foreignObjectHeight / 2, children: _jsx("div", { className: "lf-node-text-auto-wrap", style: {
+    return (_jsx("g", { children: _jsx("foreignObject", { width: textRealWidth, height: foreignObjectHeight, x: x - textRealWidth / 2, y: y - foreignObjectHeight / 2, style: { overflow: 'visible', textAlign: 'left' }, children: _jsx("div", { className: "lf-node-text-auto-wrap", style: {
                     minHeight: foreignObjectHeight,
                     width: textRealWidth,
                     padding: wrapPadding,
                 }, children: _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 (_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 (_jsx("div", { className: "lf-node-text--auto-wrap-inner", children: row })); }) }) }) }) }));
 }
 export default Text;
 //# sourceMappingURL=Text.js.map

package/es/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/es/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/es/view/text/BaseText.js

@@ -41,70 +41,84 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { jsx as _jsx } from "preact/jsx-runtime";
+import classNames from 'classnames';
 import { Component } from 'preact/compat';
+import { ElementState, EventType } from '../../constant';
 import { Text } from '../shape';
 import { StepDrag } from '../../util';
-import { ElementState } from '../../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 !== null && draggable !== void 0 ? 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;
+            var _a = _this.props, editable = _a.editable, eventCenter = _a.graphModel.eventCenter, model = _a.model;
             if (editable) {
-                var model = _this.props.model;
                 model.setElementState(ElementState.TEXT_EDIT);
             }
+            eventCenter.emit(EventType.TEXT_DBCLICK, {
+                data: model.text,
+                model: model,
+            });
         };
-        _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 StepDrag({
+        var draggable = props.draggable;
+        // TODO: 确认为什么不在 new 的时候传入 model，而在下面使用的时候赋值
+        _this.stepperDrag = new StepDrag({
             onDragging: _this.onDragging,
             step: 1,
+            // model,
+            eventType: 'TEXT',
             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 _jsx(Text, __assign({}, attr, style, { model: model }));
+        var isDraggable = editConfigModel.nodeTextDraggable || draggable;
+        return (_jsx(Text, __assign({}, attr, style, { className: classNames({
+                '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 (_jsx("g", { onMouseDown: this.mouseDownHandle, onDblClick: this.dblClickHandler, children: this.getShape() }));
+            return (_jsx("g", { onMouseDown: this.mouseDownHandler, onDblClick: this.dbClickHandler, children: this.getShape() }));
         }
     };
     return BaseText;

package/es/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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,UAAU,MAAM,YAAY,CAAA;AACnC,OAAO,EAAsB,SAAS,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAA;AAalD;IAGU,4BAAe;IAGvB,kBAAY,KAAQ;QAClB,YAAA,MAAK,WAAE,SAAA;QAkDT,sBAAgB,GAAG,UAAC,CAAa;YACzB,IAAA,KAAmC,KAAI,CAAC,KAAK,EAA3C,SAAS,eAAA,EAAE,KAAK,WAAA,EAAE,UAAU,gBAAe,CAAA;YAE9B,IAAA,iBAAiB,GAClC,UAAU,kCADwB,CACxB;YAEd,IAAI,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,iBAAiB,EAAE,CAAC;gBACnC,KAAI,CAAC,WAAW,CAAC,KAAK,GAAG,KAAK,CAAA;gBAC9B,KAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACrC,CAAC;QACH,CAAC,CAAA;QAED,gBAAU,GAAG,UAAC,EAA+B;gBAA7B,MAAM,YAAA,EAAE,MAAM,YAAA;YACtB,IAAA,KAGF,KAAI,CAAC,KAAK,EAFZ,KAAK,WAAA,EACS,cAAc,+BAChB,CAAA;YAEd,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;gBACf,IAAA,KAAA,OAAyB,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,IAAA,EAAjE,SAAS,QAAA,EAAE,SAAS,QAA6C,CAAA;gBACxE,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;YACtC,CAAC;QACH,CAAC,CAAA;QAED,oBAAc,GAAG;YACf,qBAAqB;YACf,IAAA,KAIF,KAAI,CAAC,KAAK,EAHZ,QAAQ,cAAA,EACM,WAAW,4BAAA,EACzB,KAAK,WACO,CAAA;YACd,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;YAC/C,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE;gBACvC,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,OAAA;aACN,CAAC,CAAA;QACJ,CAAC,CAAA;QAvFS,IAAA,SAAS,GAAK,KAAK,UAAV,CAAU;QAC3B,4CAA4C;QAC5C,KAAI,CAAC,WAAW,GAAG,IAAI,QAAQ,CAAC;YAC9B,UAAU,EAAE,KAAI,CAAC,UAAU;YAC3B,IAAI,EAAE,CAAC;YACP,SAAS;YACT,SAAS,EAAE,MAAM;YACjB,iBAAiB,EAAE,SAAS;SAC7B,CAAC,CAAA;;IACJ,CAAC;IAED,2BAAQ,GAAR;QACQ,IAAA,KAAwB,IAAI,CAAC,KAAK,EAAhC,KAAK,WAAA,EAAE,UAAU,gBAAe,CAAA;QAChC,IAAA,eAAe,GAAK,UAAU,gBAAf,CAAe;QAEpC,IAAA,KACE,KAAK,KADmC,EAAlC,KAAK,WAAA,EAAE,CAAC,OAAA,EAAE,CAAC,OAAA,EAAE,QAAQ,cAAA,EAAE,SAAS,eAAE,CACnC;QACT,IAAM,IAAI,GAAG;YACX,CAAC,GAAA;YACD,CAAC,GAAA;YACD,SAAS,EAAE,EAAE;YACb,KAAK,OAAA;SACN,CAAA;QACD,gCAAgC;QAChC,+BAA+B;QAC/B,kBAAkB;QAClB,wCAAwC;QACxC,+DAA+D;QAC/D,0CAA0C;QAC1C,WAAW;QACX,yCAAyC;QACzC,IAAI;QACJ,IAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAA;QAClC,IAAM,WAAW,GAAG,eAAe,CAAC,iBAAiB,IAAI,SAAS,CAAA;QAElE,OAAO,CACL,KAAC,IAAI,eACC,IAAI,EACJ,KAAK,IACT,SAAS,EAAE,UAAU,CAAC;gBACpB,iBAAiB,EAAE,QAAQ;gBAC3B,mBAAmB,EAAE,CAAC,QAAQ,IAAI,WAAW;gBAC7C,kBAAkB,EAAE,CAAC,QAAQ,IAAI,CAAC,WAAW;aAC9C,CAAC,EACF,KAAK,EAAE,KAAK,IACZ,CACH,CAAA;IACH,CAAC;IA0CD,yBAAM,GAAN;QAEa,IAAA,IAAI,GACX,IAAI,CAAC,KAAK,WADC,CACD;QACd,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CACL,YAAG,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,cAAc,YACnE,IAAI,CAAC,QAAQ,EAAE,GACd,CACL,CAAA;QACH,CAAC;IACH,CAAC;IACH,eAAC;AAAD,CAAC,AA7GD,CAGU,SAAS,GA0GlB;;AAED,eAAe,QAAQ,CAAA"}

package/es/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;