fabric-vectr 6.6.2 → 6.6.4

package/dist/index.js

@@ -366,7 +366,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.6.2";
+  var version = "6.6.4";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -9537,7 +9537,7 @@
      */
     findControl(pointer) {
       let forTouch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      if (!this.hasControls || !this.canvas) {
+      if (!this.hasControls || !this.canvas || !this.oCoords) {
         return undefined;
       }
       this.__corner = undefined;
@@ -13618,7 +13618,23 @@
        * @type Boolean
        * @default
        */
-      // event config
+      /**
+       * 启用双击锁定组对象，锁定后只能选择对象的子节点，无论group中interative和subTargetCheck是否启用
+       * @type Boolean
+       * @default
+       */
+      /**
+       * 双击锁定的节点, 目前只支持组节点
+       * @type Group | null
+       * @default
+       */
+      _defineProperty(this, "isolatedObject", void 0);
+      /**
+       * 指定的搜索对象
+       * @type Boolean
+       * @default null
+       */
+      _defineProperty(this, "_searchTargets", void 0);
       /**
        * Keep track of the subTargets for Mouse Events, ordered bottom up from innermost nested subTarget
        * @type FabricObject[]
@@ -14023,6 +14039,56 @@
       ctx.strokeRect(minX, minY, maxX - minX, maxY - minY);
     }
 
+    /**
+     * 双击选择
+     * @param e
+     * @returns
+     */
+    dblClickLock(e) {
+      if (this.dblClickIsolateObject) {
+        const pointer = this.getViewportPoint(e);
+        const objects = this.isolatedObject ? this.isolatedObject.getObjects() : this.getObjects();
+        const obj = this.searchPossibleTargets(objects, pointer);
+        if (obj) {
+          if (obj instanceof Group) {
+            // 组才修改锁定
+            this.isolatedObject = obj;
+            this.discardActiveObject();
+            // 新创建的组对象，子节点coords初始化，否则无法选中
+            obj._objects.forEach(o => {
+              o.setCoords();
+            });
+          } else {
+            // 非组对象不处理锁定，返回false继续对象自己的双击事件
+            return false;
+          }
+        } else {
+          // 取消锁定
+          this.isolatedObject = null;
+          this.discardActiveObject();
+        }
+        return true;
+      }
+      return false;
+    }
+
+    /**
+     * 设置搜索对象
+     * 如当编辑path时，设置点为可搜索对象
+     * @param objects
+     */
+    setSearchTargets(objects) {
+      this._searchTargets = objects;
+    }
+
+    /**
+     * 返回搜索对象
+     * @returns
+     */
+    getSearchTargets() {
+      return this._searchTargets || (this.isolatedObject ? this.isolatedObject._objects : this._objects);
+    }
+
     /**
      * Method that determines what object we are clicking on
      * 11/09/2018 TODO: would be cool if findTarget could discern between being a full target
@@ -14054,7 +14120,7 @@
           } else {
             const subTargets = this.targets;
             this.targets = [];
-            const target = this.searchPossibleTargets(this._objects, pointer);
+            const target = this.searchPossibleTargets(this.getSearchTargets(), pointer);
             if (e[this.altSelectionKey] && target && target !== activeObject) {
               // alt selection: select active object even though it is not the top most target
               // restore targets
@@ -14065,7 +14131,7 @@
           }
         }
       }
-      return this.searchPossibleTargets(this._objects, pointer);
+      return this.searchPossibleTargets(this.getSearchTargets(), pointer);
     }
 
     /**
@@ -14139,7 +14205,8 @@
       while (i--) {
         const target = objects[i];
         if (this._checkTarget(target, pointer)) {
-          if (isCollection(target) && target.subTargetCheck) {
+          // 没有开启双击锁定节点才搜索子节点
+          if (!this.dblClickIsolateObject && isCollection(target) && target.subTargetCheck) {
             const subTarget = this._searchPossibleTargets(target._objects, pointer);
             subTarget && this.targets.push(subTarget);
           }
@@ -15156,11 +15223,20 @@
       const clicks = e.detail;
       if (clicks > 3 || clicks < 2) return;
       this._cacheTransformEventData(e);
-      clicks == 2 && e.type === 'dblclick' && this._handleEvent(e, 'dblclick');
+      clicks == 2 && e.type === 'dblclick' && this._onDblClick(e);
       clicks == 3 && this._handleEvent(e, 'tripleclick');
       this._resetTransformEventData();
     }
 
+    /**
+     * 双击选择锁定组的子节点
+     * @param e
+     */
+    _onDblClick(e) {
+      if (this.dblClickLock(e)) return;
+      this._handleEvent(e, 'dblclick');
+    }
+
     /**
      * Return a the id of an event.
      * returns either the pointerId or the identifier or 0 for the mouse event