@logicflow/core 2.2.0-alpha.4 → 2.2.0-alpha.5

package/es/LogicFlow.js

@@ -1217,7 +1217,6 @@ var LogicFlow = /** @class */ (function () {
         this.graphModel.destroy();
         this.tool.destroy();
         this.history.destroy();
-        clearThemeMode();
         for (var extensionName in this.extension) {
             var extensionInstance = this.extension[extensionName];
             if ('destroy' in extensionInstance) {

package/es/model/GraphModel.js

@@ -503,7 +503,7 @@ var GraphModel = /** @class */ (function () {
                 edgeDragging = true;
                 break;
             }
-            else {
+            if (!edgeMode.virtual) {
                 edges.push(edgeMode.getHistoryData());
             }
         }

package/es/view/node/BaseNode.js

@@ -54,7 +54,7 @@ var __read = (this && this.__read) || function (o, n) {
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
 import { Component } from 'preact/compat';
 import { reaction } from 'mobx';
-import { map } from 'lodash-es';
+import { map, isFunction, isNil } from 'lodash-es';
 import Anchor from '../Anchor';
 import { BaseText } from '../text';
 import { ElementState, EventType, TextMode } from '../../constant';
@@ -244,8 +244,7 @@ var BaseNode = /** @class */ (function (_super) {
                 graphModel.eventCenter.emit(EventType.NODE_CLICK, eventOptions);
                 // 复制粘贴后会出现点击节点时，节点会失去焦点的问题，这里手动让节点获焦以解决这个问题
                 var el_1 = e.currentTarget;
-                var rAF = typeof window !== 'undefined' &&
-                    typeof window.requestAnimationFrame === 'function'
+                var rAF = !isNil(window) && isFunction(window.requestAnimationFrame)
                     ? window.requestAnimationFrame.bind(window)
                     : function (fn) { return setTimeout(fn, 0); };
                 rAF(function () {

package/es/view/overlay/OutlineOverlay.js

@@ -57,7 +57,7 @@ var OutlineOverlay = /** @class */ (function (_super) {
                 var isHovered = element.isHovered, isSelected = element.isSelected, x = element.x, y = element.y, width = element.width, height = element.height;
                 if ((nodeSelectedOutline && isSelected) ||
                     (hoverOutline && isHovered)) {
-                    var style_1 = element.getOutlineStyle();
+                    var style_1 = element.getOutlineStyle() || {};
                     var attributes_1 = {};
                     Object.keys(style_1).forEach(function (key) {
                         if (key !== 'hover') {

package/lib/LogicFlow.js

@@ -1246,7 +1246,6 @@ var LogicFlow = /** @class */ (function () {
         this.graphModel.destroy();
         this.tool.destroy();
         this.history.destroy();
-        (0, util_1.clearThemeMode)();
         for (var extensionName in this.extension) {
             var extensionInstance = this.extension[extensionName];
             if ('destroy' in extensionInstance) {

package/lib/model/GraphModel.js

@@ -509,7 +509,7 @@ var GraphModel = /** @class */ (function () {
                 edgeDragging = true;
                 break;
             }
-            else {
+            if (!edgeMode.virtual) {
                 edges.push(edgeMode.getHistoryData());
             }
         }

package/lib/view/node/BaseNode.js

@@ -248,8 +248,7 @@ var BaseNode = /** @class */ (function (_super) {
                 graphModel.eventCenter.emit(constant_1.EventType.NODE_CLICK, eventOptions);
                 // 复制粘贴后会出现点击节点时，节点会失去焦点的问题，这里手动让节点获焦以解决这个问题
                 var el_1 = e.currentTarget;
-                var rAF = typeof window !== 'undefined' &&
-                    typeof window.requestAnimationFrame === 'function'
+                var rAF = !(0, lodash_es_1.isNil)(window) && (0, lodash_es_1.isFunction)(window.requestAnimationFrame)
                     ? window.requestAnimationFrame.bind(window)
                     : function (fn) { return setTimeout(fn, 0); };
                 rAF(function () {

package/lib/view/overlay/OutlineOverlay.js

@@ -60,7 +60,7 @@ var OutlineOverlay = /** @class */ (function (_super) {
                 var isHovered = element.isHovered, isSelected = element.isSelected, x = element.x, y = element.y, width = element.width, height = element.height;
                 if ((nodeSelectedOutline && isSelected) ||
                     (hoverOutline && isHovered)) {
-                    var style_1 = element.getOutlineStyle();
+                    var style_1 = element.getOutlineStyle() || {};
                     var attributes_1 = {};
                     Object.keys(style_1).forEach(function (key) {
                         if (key !== 'hover') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicflow/core",
-  "version": "2.2.0-alpha.4",
+  "version": "2.2.0-alpha.5",
   "description": "LogicFlow, help you quickly create flowcharts",
   "main": "lib/index.js",
   "module": "es/index.js",

package/src/LogicFlow.tsx

@@ -1445,7 +1445,6 @@ export class LogicFlow {
     this.graphModel.destroy()
     this.tool.destroy()
     this.history.destroy()
-    clearThemeMode()
     for (const extensionName in this.extension) {
       const extensionInstance = this.extension[extensionName]
       if ('destroy' in extensionInstance) {

package/src/model/GraphModel.ts

@@ -576,7 +576,8 @@ export class GraphModel {
       if (edgeMode.isDragging) {
         edgeDragging = true
         break
-      } else {
+      }
+      if (!edgeMode.virtual) {
         edges.push(edgeMode.getHistoryData())
       }
     }

package/src/view/node/BaseNode.tsx

@@ -1,6 +1,6 @@
 import { createElement as h, Component } from 'preact/compat'
 import { reaction, IReactionDisposer } from 'mobx'
-import { map } from 'lodash-es'
+import { map, isFunction, isNil } from 'lodash-es'
 import Anchor from '../Anchor'
 import { BaseText } from '../text'
 import LogicFlow from '../../LogicFlow'
@@ -410,8 +410,7 @@ export abstract class BaseNode<P extends IProps = IProps> extends Component<
       // 复制粘贴后会出现点击节点时，节点会失去焦点的问题，这里手动让节点获焦以解决这个问题
       const el = e.currentTarget as HTMLElement
       const rAF =
-        typeof window !== 'undefined' &&
-        typeof window.requestAnimationFrame === 'function'
+        !isNil(window) && isFunction(window.requestAnimationFrame)
           ? window.requestAnimationFrame.bind(window)
           : (fn: () => void) => setTimeout(fn, 0)
       rAF(() => {

package/src/view/overlay/OutlineOverlay.tsx

@@ -51,7 +51,7 @@ export class OutlineOverlay extends Component<IProps> {
           (nodeSelectedOutline && isSelected) ||
           (hoverOutline && isHovered)
         ) {
-          const style = element.getOutlineStyle()
+          const style = element.getOutlineStyle() || {}
           let attributes = {}
           Object.keys(style).forEach((key) => {
             if (key !== 'hover') {