@logicflow/extension 1.2.9 → 1.2.11

package/cjs/NodeResize/Control/Control.js

@@ -139,6 +139,35 @@ var Control = /** @class */ (function (_super) {
             }
             return resize;
         };
+        _this.updateEdgePointByAnchors = function () {
+            // https://github.com/didi/LogicFlow/issues/807
+            // https://github.com/didi/LogicFlow/issues/875
+            // 之前的做法，比如Rect是使用getRectResizeEdgePoint()计算边的point缩放后的位置
+            // getRectResizeEdgePoint()考虑了瞄点在四条边以及在4个圆角的情况
+            // 使用的是一种等比例缩放的模式，比如：
+            // const pct = (y - beforeNode.y) / (beforeNode.height / 2 - radius)
+            // afterPoint.y = afterNode.y + (afterNode.height / 2 - radius) * pct
+            // 但是用户自定义的getDefaultAnchor()不一定是按照比例编写的
+            // 它可能是 x: x + 20：每次缩放都会保持在x右边20的位置，因此用户自定义瞄点时，然后产生无法跟随的问题
+            // 现在的做法是：直接获取用户自定义瞄点的位置，然后用这个位置作为边的新的起点，而不是自己进行计算
+            var _a = _this.nodeModel, id = _a.id, anchors = _a.anchors;
+            var edges = _this.getNodeEdges(id);
+            // 更新边
+            edges.sourceEdges.forEach(function (item) {
+                var anchorItem = anchors.find(function (anchor) { return anchor.id === item.sourceAnchorId; });
+                item.updateStartPoint({
+                    x: anchorItem.x,
+                    y: anchorItem.y,
+                });
+            });
+            edges.targetEdges.forEach(function (item) {
+                var anchorItem = anchors.find(function (anchor) { return anchor.id === item.targetAnchorId; });
+                item.updateEndPoint({
+                    x: anchorItem.x,
+                    y: anchorItem.y,
+                });
+            });
+        };
         // 矩形更新
         _this.updateRect = function (_a) {
             var deltaX = _a.deltaX, deltaY = _a.deltaY;
@@ -189,23 +218,8 @@ var Control = /** @class */ (function (_super) {
                 height: _this.nodeModel.height,
                 radius: radius,
             };
-            var params = {
-                point: '',
-                beforeNode: beforeNode,
-                afterNode: afterNode,
-            };
             // 更新边
-            var afterPoint;
-            edges.sourceEdges.forEach(function (item) {
-                params.point = item.startPoint;
-                afterPoint = Util_1.getRectResizeEdgePoint(params);
-                item.updateStartPoint(afterPoint);
-            });
-            edges.targetEdges.forEach(function (item) {
-                params.point = item.endPoint;
-                afterPoint = Util_1.getRectResizeEdgePoint(params);
-                item.updateEndPoint(afterPoint);
-            });
+            _this.updateEdgePointByAnchors();
             _this.eventEmit({ beforeNode: beforeNode, afterNode: afterNode });
         };
         // 椭圆更新
@@ -254,23 +268,8 @@ var Control = /** @class */ (function (_super) {
                 x: _this.nodeModel.x,
                 y: _this.nodeModel.y,
             };
-            var params = {
-                point: {},
-                beforeNode: beforeNode,
-                afterNode: afterNode,
-            };
             // 更新边
-            var afterPoint;
-            edges.sourceEdges.forEach(function (item) {
-                params.point = item.startPoint;
-                afterPoint = Util_1.getEllipseResizeEdgePoint(params);
-                item.updateStartPoint(afterPoint);
-            });
-            edges.targetEdges.forEach(function (item) {
-                params.point = item.endPoint;
-                afterPoint = Util_1.getEllipseResizeEdgePoint(params);
-                item.updateEndPoint(afterPoint);
-            });
+            _this.updateEdgePointByAnchors();
             _this.eventEmit({ beforeNode: __assign(__assign({}, beforeNode), { rx: rx, ry: ry }), afterNode: afterNode });
         };
         // 菱形更新
@@ -318,24 +317,8 @@ var Control = /** @class */ (function (_super) {
                 x: _this.nodeModel.x,
                 y: _this.nodeModel.y,
             };
-            var params = {
-                point: {},
-                beforeNode: beforeNode,
-                afterNode: afterNode,
-            };
             // 更新边
-            var afterPoint;
-            var edges = _this.getNodeEdges(id);
-            edges.sourceEdges.forEach(function (item) {
-                params.point = item.startPoint;
-                afterPoint = Util_1.getDiamondResizeEdgePoint(params);
-                item.updateStartPoint(afterPoint);
-            });
-            edges.targetEdges.forEach(function (item) {
-                params.point = item.endPoint;
-                afterPoint = Util_1.getDiamondResizeEdgePoint(params);
-                item.updateEndPoint(afterPoint);
-            });
+            _this.updateEdgePointByAnchors();
             _this.eventEmit({ beforeNode: beforeNode, afterNode: afterNode });
         };
         _this.eventEmit = function (_a) {
@@ -367,6 +350,9 @@ var Control = /** @class */ (function (_super) {
          * 由于将拖拽放大缩小改成丝滑模式，这个时候需要在拖拽结束的时候，将节点的位置更新到grid上.
          */
         _this.onDragEnd = function () {
+            // 先触发onDragging()->更新边->再触发用户自定义的getDefaultAnchor()，所以onDragging()拿到的anchors是滞后的
+            // 为了正确设置最终的位置，应该在拖拽结束的时候，再设置一次边的Point位置，此时拿到的anchors是最新的
+            _this.updateEdgePointByAnchors();
             var _a = _this.graphModel.gridSize, gridSize = _a === void 0 ? 1 : _a;
             var x = gridSize * Math.round(_this.nodeModel.x / gridSize);
             var y = gridSize * Math.round(_this.nodeModel.y / gridSize);

package/cjs/bpmn/getBpmnId.js

@@ -1,8 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBpmnId = void 0;
-var ids_1 = require("ids");
-var ids = new ids_1.default([32, 32, 1]);
+/* eslint-disable no-bitwise */
+var IDS = /** @class */ (function () {
+    function IDS() {
+        globalThis._ids = this;
+        this._ids = new Set();
+    }
+    IDS.prototype.generateId = function () {
+        var id = 'xxxxxxxx'.replace(/[x]/g, function (c) {
+            var r = (Math.random() * 16) | 0;
+            var v = c === 'x' ? r : (r & 0x3) | 0x8;
+            return v.toString(16);
+        });
+        return id;
+    };
+    IDS.prototype.next = function () {
+        var id = this.generateId();
+        while (this._ids.has(id)) {
+            id = this.generateId();
+        }
+        this._ids.add(id);
+        return id;
+    };
+    return IDS;
+}());
+var ids = (globalThis === null || globalThis === void 0 ? void 0 : globalThis._ids) || new IDS();
 function getBpmnId() {
     return ids.next();
 }

package/cjs/bpmn-elements/index.js

@@ -0,0 +1,102 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
+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.BPMNElements = exports.useDefinition = void 0;
+/* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable react-hooks/rules-of-hooks */
+var Event_1 = require("./presets/Event");
+var Gateway_1 = require("./presets/Gateway");
+var Task_1 = require("./presets/Task");
+// import { registerPoolNodes } from './presets/Pool';
+var Flow_1 = require("./presets/Flow");
+var icons_1 = require("./presets/icons");
+var definitionConfig = [
+    {
+        nodes: ['startEvent', 'intermediateCatchEvent', 'boundaryEvent'],
+        definition: [
+            {
+                type: 'bpmn:timerEventDefinition',
+                icon: icons_1.timerIcon,
+                properties: {
+                    definitionType: 'bpmn:timerEventDefinition',
+                    timerValue: '',
+                    timerType: '',
+                },
+            },
+        ],
+    },
+];
+function useDefinition(definition) {
+    function setDefinition(config) {
+        function set(nodes, definitions) {
+            nodes.forEach(function (name) {
+                if (!(definition === null || definition === void 0 ? void 0 : definition[name])) {
+                    definition[name] = new Map();
+                }
+                var map = definition === null || definition === void 0 ? void 0 : definition[name];
+                definitions.forEach(function (define) {
+                    map.set(define.type, define);
+                });
+            });
+            return definition;
+        }
+        config.forEach(function (define) {
+            set(define.nodes, define.definition);
+        });
+    }
+    return function () { return [definition, setDefinition]; };
+}
+exports.useDefinition = useDefinition;
+var BPMNElements = /** @class */ (function () {
+    function BPMNElements(_a) {
+        var lf = _a.lf;
+        lf.definition = {};
+        lf.useDefinition = useDefinition(lf.definition);
+        var _b = __read(lf.useDefinition(), 2), _definition = _b[0], setDefinition = _b[1];
+        setDefinition(definitionConfig);
+        Event_1.registerEventNodes(lf);
+        Gateway_1.registerGatewayNodes(lf);
+        Flow_1.registerFlows(lf);
+        Task_1.registerTaskNodes(lf);
+        lf.setDefaultEdgeType('bpmn:sequenceFlow');
+    }
+    BPMNElements.pluginName = 'BpmnElementsPlugin';
+    return BPMNElements;
+}());
+exports.BPMNElements = BPMNElements;
+__exportStar(require("./presets/Event/EndEventFactory"), exports);
+__exportStar(require("./presets/Event/IntermediateCatchEvent"), exports);
+__exportStar(require("./presets/Event/StartEventFactory"), exports);
+__exportStar(require("./presets/Event/boundaryEventFactory"), exports);
+__exportStar(require("./presets/Event/IntermediateThrowEvent"), exports);
+__exportStar(require("./presets/Flow/sequenceFlow"), exports);
+__exportStar(require("./presets/Task/task"), exports);
+__exportStar(require("./presets/Task/subProcess"), exports);
+__exportStar(require("./presets/Gateway/gateway"), exports);
+exports.icons = require("./presets/icons");
+exports.bpmnUtils = require("./utils");

package/cjs/bpmn-elements/presets/Event/EndEventFactory.js

@@ -0,0 +1,134 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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;
+};
+var __spread = (this && this.__spread) || function () {
+    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EndEventFactory = void 0;
+/* eslint-disable @typescript-eslint/naming-convention */
+var core_1 = require("@logicflow/core");
+var utils_1 = require("../../utils");
+function EndEventFactory(lf) {
+    var _a = __read(lf.useDefinition(), 1), definition = _a[0];
+    var view = /** @class */ (function (_super) {
+        __extends(view, _super);
+        function view() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        view.prototype.getAnchorStyle = function () {
+            return {
+                visibility: 'hidden',
+            };
+        };
+        view.prototype.getShape = function () {
+            var _a;
+            var model = this.props.model;
+            var style = model.getNodeStyle();
+            var x = model.x, y = model.y, r = model.r, width = model.width, height = model.height, properties = model.properties;
+            var outCircle = _super.prototype.getShape.call(this);
+            var definitionType = properties.definitionType;
+            var icon = (((_a = definition.endEvent) === null || _a === void 0 ? void 0 : _a.get(definitionType)) || {}).icon;
+            var i = Array.isArray(icon)
+                ? core_1.h.apply(void 0, __spread(['g', {
+                        transform: "matrix(1 0 0 1 " + (x - width / 2) + " " + (y - height / 2) + ")",
+                    }], icon)) : core_1.h('path', {
+                transform: "matrix(1 0 0 1 " + (x - width / 2) + " " + (y - height / 2) + ")",
+                d: icon,
+                style: 'fill: black; stroke-linecap: round; stroke-linejoin: round; stroke: white; stroke-width: 1px;',
+            });
+            return core_1.h('g', {}, outCircle, core_1.h('circle', __assign(__assign({}, style), { strokeWidth: 2, cx: x, cy: y, r: r - 2 })), i);
+        };
+        return view;
+    }(core_1.CircleNode));
+    var model = /** @class */ (function (_super) {
+        __extends(model, _super);
+        function model(data, graphModel) {
+            var _a, _b, _c;
+            var _this = this;
+            if (!data.id) {
+                data.id = "Event_" + utils_1.genBpmnId();
+            }
+            if (!data.text) {
+                data.text = '';
+            }
+            if (data.text && typeof data.text === 'string') {
+                data.text = {
+                    value: data.text,
+                    x: data.x,
+                    y: data.y + 40,
+                };
+            }
+            var _d = (((_a = definition.endEvent) === null || _a === void 0 ? void 0 : _a.get((_b = data.properties) === null || _b === void 0 ? void 0 : _b.definitionType)) || {}).properties, properties = _d === void 0 ? {} : _d;
+            data.properties = __assign(__assign({}, properties), data.properties);
+            ((_c = data.properties) === null || _c === void 0 ? void 0 : _c.definitionType) && (data.properties.definitionId = "Definition_" + utils_1.genBpmnId());
+            _this = _super.call(this, data, graphModel) || this;
+            utils_1.groupRule.call(_this);
+            return _this;
+        }
+        model.prototype.setAttributes = function () {
+            this.r = 18;
+        };
+        model.prototype.getConnectedSourceRules = function () {
+            var _this = this;
+            var rules = _super.prototype.getConnectedSourceRules.call(this);
+            var notAsSource = {
+                message: '结束节点不能作为边的起点',
+                validate: function (source, _target) {
+                    if (source === _this) {
+                        return false;
+                    }
+                    return true;
+                },
+            };
+            rules.push(notAsSource);
+            return rules;
+        };
+        return model;
+    }(core_1.CircleNodeModel));
+    return {
+        type: 'bpmn:endEvent',
+        view: view,
+        model: model,
+    };
+}
+exports.EndEventFactory = EndEventFactory;

package/cjs/bpmn-elements/presets/Event/IntermediateCatchEvent.js

@@ -0,0 +1,118 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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;
+};
+var __spread = (this && this.__spread) || function () {
+    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntermediateCatchEventFactory = void 0;
+/* eslint-disable @typescript-eslint/naming-convention */
+var core_1 = require("@logicflow/core");
+var utils_1 = require("../../utils");
+function IntermediateCatchEventFactory(lf) {
+    var _a = __read(lf.useDefinition(), 1), definition = _a[0];
+    var view = /** @class */ (function (_super) {
+        __extends(view, _super);
+        function view() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        view.prototype.getAnchorStyle = function () {
+            return {
+                visibility: 'hidden',
+            };
+        };
+        view.prototype.getShape = function () {
+            var _a;
+            // @ts-ignore
+            var model = this.props.model;
+            var style = model.getNodeStyle();
+            var x = model.x, y = model.y, r = model.r, width = model.width, height = model.height, properties = model.properties;
+            var definitionType = properties.definitionType;
+            var icon = (((_a = definition.intermediateCatchEvent) === null || _a === void 0 ? void 0 : _a.get(definitionType)) || {}).icon;
+            var i = Array.isArray(icon)
+                ? core_1.h.apply(void 0, __spread(['g', {
+                        transform: "matrix(1 0 0 1 " + (x - width / 2) + " " + (y - height / 2) + ")",
+                    }], icon)) : core_1.h('path', {
+                transform: "matrix(1 0 0 1 " + (x - width / 2) + " " + (y - height / 2) + ")",
+                d: icon,
+            });
+            return core_1.h('g', {}, core_1.h('circle', __assign(__assign({}, style), { cx: x, cy: y, r: r, strokeWidth: 1.5 })), core_1.h('circle', __assign(__assign({}, style), { cx: x, cy: y, r: r - 3, strokeWidth: 1.5 })), i);
+        };
+        return view;
+    }(core_1.CircleNode));
+    var model = /** @class */ (function (_super) {
+        __extends(model, _super);
+        function model(data, graphModel) {
+            var _a, _b, _c;
+            var _this = this;
+            if (!data.id) {
+                data.id = "Event_" + utils_1.genBpmnId();
+            }
+            if (!data.text) {
+                data.text = '';
+            }
+            if (data.text && typeof data.text === 'string') {
+                data.text = {
+                    value: data.text,
+                    x: data.x,
+                    y: data.y + 40,
+                };
+            }
+            var _d = (((_a = definition.intermediateCatchEvent) === null || _a === void 0 ? void 0 : _a.get((_b = data.properties) === null || _b === void 0 ? void 0 : _b.definitionType)) || {}).properties, properties = _d === void 0 ? {} : _d;
+            data.properties = __assign(__assign({}, properties), data.properties);
+            ((_c = data.properties) === null || _c === void 0 ? void 0 : _c.definitionType) && (data.properties.definitionId = "Definition_" + utils_1.genBpmnId());
+            _this = _super.call(this, data, graphModel) || this;
+            utils_1.groupRule.call(_this);
+            return _this;
+        }
+        model.prototype.setAttributes = function () {
+            this.r = 18;
+        };
+        return model;
+    }(core_1.CircleNodeModel));
+    return {
+        type: 'bpmn:intermediateCatchEvent',
+        view: view,
+        model: model,
+    };
+}
+exports.IntermediateCatchEventFactory = IntermediateCatchEventFactory;

package/cjs/bpmn-elements/presets/Event/IntermediateThrowEvent.js

@@ -0,0 +1,119 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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;
+};
+var __spread = (this && this.__spread) || function () {
+    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntermediateThrowEventFactory = void 0;
+/* eslint-disable @typescript-eslint/naming-convention */
+var core_1 = require("@logicflow/core");
+var utils_1 = require("../../utils");
+function IntermediateThrowEventFactory(lf) {
+    var _a = __read(lf.useDefinition(), 1), definition = _a[0];
+    var view = /** @class */ (function (_super) {
+        __extends(view, _super);
+        function view() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        view.prototype.getAnchorStyle = function () {
+            return {
+                visibility: 'hidden',
+            };
+        };
+        view.prototype.getShape = function () {
+            var _a;
+            // @ts-ignore
+            var model = this.props.model;
+            var style = model.getNodeStyle();
+            var x = model.x, y = model.y, r = model.r, width = model.width, height = model.height, properties = model.properties;
+            var definitionType = properties.definitionType;
+            var icon = (((_a = definition.intermediateThrowEvent) === null || _a === void 0 ? void 0 : _a.get(definitionType)) || {}).icon;
+            var i = Array.isArray(icon)
+                ? core_1.h.apply(void 0, __spread(['g', {
+                        transform: "matrix(1 0 0 1 " + (x - width / 2) + " " + (y - height / 2) + ")",
+                    }], icon)) : core_1.h('path', {
+                transform: "matrix(1 0 0 1 " + (x - width / 2) + " " + (y - height / 2) + ")",
+                d: icon,
+                style: 'fill: black',
+            });
+            return core_1.h('g', {}, core_1.h('circle', __assign(__assign({}, style), { cx: x, cy: y, r: r, strokeWidth: 1.5 })), core_1.h('circle', __assign(__assign({}, style), { cx: x, cy: y, r: r - 3, strokeWidth: 1.5 })), i);
+        };
+        return view;
+    }(core_1.CircleNode));
+    var model = /** @class */ (function (_super) {
+        __extends(model, _super);
+        function model(data, graphModel) {
+            var _a, _b, _c;
+            var _this = this;
+            if (!data.id) {
+                data.id = "Event_" + utils_1.genBpmnId();
+            }
+            if (!data.text) {
+                data.text = '';
+            }
+            if (data.text && typeof data.text === 'string') {
+                data.text = {
+                    value: data.text,
+                    x: data.x,
+                    y: data.y + 40,
+                };
+            }
+            var _d = (((_a = definition.intermediateThrowEvent) === null || _a === void 0 ? void 0 : _a.get((_b = data.properties) === null || _b === void 0 ? void 0 : _b.definitionType)) || {}).properties, properties = _d === void 0 ? {} : _d;
+            data.properties = __assign(__assign({}, properties), data.properties);
+            ((_c = data.properties) === null || _c === void 0 ? void 0 : _c.definitionType) && (data.properties.definitionId = "Definition_" + utils_1.genBpmnId());
+            _this = _super.call(this, data, graphModel) || this;
+            utils_1.groupRule.call(_this);
+            return _this;
+        }
+        model.prototype.setAttributes = function () {
+            this.r = 18;
+        };
+        return model;
+    }(core_1.CircleNodeModel));
+    return {
+        type: 'bpmn:intermediateThrowEvent',
+        view: view,
+        model: model,
+    };
+}
+exports.IntermediateThrowEventFactory = IntermediateThrowEventFactory;