fabric-vectr 6.7.1 → 6.7.3

package/dist/index.js

@@ -366,7 +366,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.7.1";
+  var version = "6.7.3";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -5002,8 +5002,9 @@
         withShadow,
         additionalTransform
       } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var skipShadow = true;
       let clipPath = this.clipPath;
-      const styleInfo = noStyle ? '' : `style="${this.getSvgStyles()}" `,
+      const styleInfo = noStyle ? '' : `style="${this.getSvgStyles(skipShadow)}" `,
         shadowInfo = withShadow ? `style="${this.getSvgFilter()}" ` : '',
         vectorEffect = this.strokeUniform ? 'vector-effect="non-scaling-stroke" ' : '',
         absoluteClipPath = clipPath && clipPath.absolutePositioned,
@@ -13710,18 +13711,20 @@
        * @default
        */
       /**
-       * 启用双击锁定组对象，锁定后只能选择对象的子节点，无论group中interative和subTargetCheck是否启用
+       * Enable double-click to lock the group node. After locking,
+       * you can select the child nodes in the group node,
+       * regardless of whether interative and subTargetCheck are enabled in the group.
        * @type Boolean
        * @default
        */
       /**
-       * 双击锁定的节点, 目前只支持组节点
+       * Double-click the locked node. Currently only group nodes are supported.
        * @type Group | null
        * @default
        */
       _defineProperty(this, "isolatedObject", void 0);
       /**
-       * 指定的搜索对象
+       * Specified search objects
        * @type Boolean
        * @default null
        */
@@ -14131,7 +14134,7 @@
     }
 
     /**
-     * 双击选择
+     * Double-click to lock the group
      * @param e
      * @returns
      */
@@ -14142,19 +14145,20 @@
         const obj = this.searchPossibleTargets(objects, pointer);
         if (obj) {
           if (obj instanceof Group) {
-            // 组才修改锁定
+            // Let text in group can be edited after isolation
+            obj.interactive = true;
             this.isolatedObject = obj;
             this.discardActiveObject();
-            // 新创建的组对象，子节点coords初始化，否则无法选中
+            // The newly created group object has its child node coords initialized, otherwise it cannot be selected.
             obj._objects.forEach(o => {
               o.setCoords();
             });
           } else {
-            // 非组对象不处理锁定，返回false继续对象自己的双击事件
+            // Non-group objects do not handle locking, return false to continue the object's own double-click event
             return false;
           }
         } else {
-          // 取消锁定
+          // cancel isolation
           this.isolatedObject = null;
           this.discardActiveObject();
         }
@@ -14164,8 +14168,7 @@
     }
 
     /**
-     * 设置搜索对象
-     * 如当编辑path时，设置点为可搜索对象
+     * Manually set the search object
      * @param objects
      */
     setSearchTargets(objects) {
@@ -14173,7 +14176,7 @@
     }
 
     /**
-     * 返回搜索对象
+     * Returns the search object
      * @returns
      */
     getSearchTargets() {
@@ -14296,7 +14299,7 @@
       while (i--) {
         const target = objects[i];
         if (this._checkTarget(target, pointer)) {
-          // 没有开启双击锁定节点才搜索子节点
+          // Double-clicking to lock a node before searching for its child nodes is not enabled
           if (!this.dblClickIsolateObject && isCollection(target) && target.subTargetCheck) {
             const subTarget = this._searchPossibleTargets(target._objects, pointer);
             subTarget && this.targets.push(subTarget);
@@ -15320,12 +15323,13 @@
     }
 
     /**
-     * 双击选择锁定组的子节点
+     * Double-click to select the child nodes of the locked group
      * @param e
      */
     _onDblClick(e) {
       if (this.dblClickLock(e)) {
-        // 锁定后立即选中点击子对象
+        // Immediately select the clicked child object after locking
+        this._resetTransformEventData();
         this.__onMouseDown(e);
         this.__onMouseUp(e);
         return;
@@ -15679,6 +15683,51 @@
       this._handleEvent(e, 'up');
     }
 
+    /**
+     * Change to other isolated object when click on current group's parent
+     * When click empty space or other object, cancel isolated state
+     * @param e
+     * @returns
+     */
+    switchIsolateObject(e) {
+      if (!this.isolatedObject || this._searchTargets) return false;
+      let isolatedObject = null;
+      if (this.isolatedObject.parent) {
+        const parents = [];
+        let currentObj = this.isolatedObject;
+        while (currentObj.parent) {
+          parents.push(currentObj.parent);
+          currentObj = currentObj.parent;
+        }
+        // check topmost parent, if it was clicked, find the nearest child object to isolate
+        const topmostParent = parents[parents.length - 1];
+        this.setSearchTargets([topmostParent]);
+        let target = this.findTarget(e);
+        // parent was clicked
+        if (target) {
+          parents.some(parent => {
+            this.setSearchTargets(parent.getObjects());
+            target = this.findTarget(e);
+            if (target) {
+              isolatedObject = parent;
+              // The newly created group object has its child node coords initialized, otherwise it cannot be selected.
+              parent.getObjects().forEach(o => {
+                o.setCoords();
+              });
+              return true;
+            }
+            return false;
+          });
+        }
+        this.setSearchTargets(null);
+      }
+      this.isolatedObject = isolatedObject;
+      // use __onMouseDown select other object immediately after unlocking
+      this._resetTransformEventData();
+      this.__onMouseDown(e);
+      return true;
+    }
+
     /**
      * Method that defines the actions when mouse is clicked on canvas.
      * The method inits the currentTransform parameters and renders all the
@@ -15725,18 +15774,7 @@
         shouldRender = true;
       } else if (this._shouldClearSelection(e, target)) {
         this.discardActiveObject(e);
-
-        // 锁定对象时且没有指定选中时，如果点击组外空白或对象，取消锁定
-        if (this.isolatedObject && !this._searchTargets) {
-          this.setSearchTargets([this.isolatedObject]);
-          const target = this.findTarget(e);
-          // 没有选中任何对象，或者选中的是锁定对象以外的对象
-          if (target !== this.isolatedObject) {
-            this.isolatedObject = null;
-          }
-          this.setSearchTargets(null);
-          // 在此执行__onMouseDown选中对象
-          this.__onMouseDown(e);
+        if (this.switchIsolateObject(e)) {
           return;
         }
       }