@postermywall/fabricjs-2 6.4.3-pmw-34 → 6.4.3-pmw-36

package/dist/index.js

@@ -428,7 +428,7 @@
   }
   const cache = new Cache();
 
-  var version = "6.4.3-pmw-34";
+  var version = "6.4.3-pmw-36";
 
   // use this syntax so babel plugin see this import here
   const VERSION = version;
@@ -3469,7 +3469,6 @@
       if (this.destroyed) {
         return;
       }
-      const t1 = performance.now();
       const v = this.viewportTransform,
         path = this.clipPath;
       this.calcViewportBoundaries();
@@ -3480,20 +3479,15 @@
       this.fire('before:render', {
         ctx
       });
-      const t2 = performance.now();
       this._renderBackground(ctx);
-      const t3 = performance.now();
       ctx.save();
       //apply viewport transform once for all rendering process
       ctx.transform(v[0], v[1], v[2], v[3], v[4], v[5]);
-      const t4 = performance.now();
       this._renderObjects(ctx, objects);
-      const t5 = performance.now();
       ctx.restore();
       if (!this.controlsAboveOverlay && !this.skipControlsDrawing) {
         this.drawControls(ctx);
       }
-      const t6 = performance.now();
       if (path) {
         path._set('canvas', this);
         // needed to setup a couple of variables
@@ -3505,13 +3499,10 @@
         });
         this.drawClipPathOnCanvas(ctx, path);
       }
-      const t7 = performance.now();
       this._renderOverlay(ctx);
-      const t8 = performance.now();
       if (this.controlsAboveOverlay && !this.skipControlsDrawing) {
         this.drawControls(ctx);
       }
-      const t9 = performance.now();
       this.fire('after:render', {
         ctx
       });
@@ -3519,24 +3510,6 @@
         this.__cleanupTask();
         this.__cleanupTask = undefined;
       }
-      const t10 = performance.now();
-      const times = {
-        randomStartTime: t2 - t1,
-        renderBackground: t3 - t2,
-        transform: t4 - t3,
-        renderObjects: t5 - t4,
-        drawControls: t6 - t5,
-        pathThingy: t7 - t6,
-        renderOverlay: t8 - t7,
-        drawControlsOverlay: t9 - t8,
-        cleanup: t10 - t9,
-        totalTime: t10 - t1
-      };
-      let logMessage = '';
-      for (const [key, value] of Object.entries(times)) {
-        logMessage += "".concat(key, " ").concat(String(Math.round(value)), "ms ");
-      }
-      console.log(logMessage);
     }
 
     /**
@@ -7126,41 +7099,19 @@
         return;
       }
       ctx.save();
-      const t1 = performance.now();
       this._setupCompositeOperation(ctx);
       this.drawSelectionBackground(ctx);
-      const t2 = performance.now();
       this.transform(ctx);
       this._setOpacity(ctx);
       this._setShadow(ctx);
-      const t3 = performance.now();
-      let t4 = performance.now();
-      let t5 = performance.now();
       if (this.shouldCache()) {
         this.renderCache();
-        t4 = performance.now();
         this.drawCacheOnCanvas(ctx);
-        t5 = performance.now();
       } else {
         this._removeCacheCanvas();
-        t4 = performance.now();
         this.drawObject(ctx, false, {});
-        t5 = performance.now();
         this.dirty = false;
       }
-      const times = {
-        drawSelectonBackground: t2 - t1,
-        setBackgroundShadow: t3 - t2,
-        shoudCache: this.shouldCache() ? 1 : 0,
-        rendercacheOrRemoveCache: t4 - t3,
-        drawObject: t5 - t4,
-        total: t5 - t1
-      };
-      let logMessage = '';
-      for (const [key, value] of Object.entries(times)) {
-        logMessage += "".concat(key, " ").concat(String(Math.round(value)), "ms ");
-      }
-      console.log(logMessage);
       ctx.restore();
     }
     drawSelectionBackground(_ctx) {
@@ -11999,6 +11950,9 @@
       }
       return false;
     }
+    isGroup() {
+      return true;
+    }
 
     /**
      * Check if instance or its group are caching, recursively up
@@ -15254,29 +15208,19 @@
      * @param {Event} e Event object fired on mousedown
      */
     _onTouchStart(e) {
-      // we will prevent scrolling if allowTouchScrolling is not enabled and
-      let shouldPreventScrolling = !this.allowTouchScrolling;
-      const currentActiveObject = this._activeObject;
+      //*PMW* Multiple changes in 6.4.3 reverted from this function to fix contextual menu opening on mobile on touch hold. Investigate and add those back
+      e.preventDefault();
       if (this.mainTouchId === undefined) {
         this.mainTouchId = this.getPointerId(e);
       }
       this.__onMouseDown(e);
-      // after executing fabric logic for mouse down let's see
-      // if we didn't change target or if we are drawing
-      // we want to prevent scrolling anyway
-      if (this.isDrawingMode || currentActiveObject && this._target === currentActiveObject) {
-        shouldPreventScrolling = true;
-      }
-      // prevent default, will block scrolling from start
-      shouldPreventScrolling && e.preventDefault();
       this._resetTransformEventData();
       const canvasElement = this.upperCanvasEl,
         eventTypePrefix = this._getEventPrefix();
       const doc = getDocumentFromElement(canvasElement);
       addListener(doc, 'touchend', this._onTouchEnd, addEventOptions);
       // *PMW* modified code. calling onTouchMove instead of _onMouseMove to handle drift deviance
-      // if we scroll don't register the touch move event
-      shouldPreventScrolling && addListener(doc, 'touchmove', this._onTouchMove, addEventOptions);
+      addListener(doc, 'touchmove', this._onTouchMove, addEventOptions);
       // Unbind mousedown to prevent double triggers from touch devices
       removeListener(canvasElement, "".concat(eventTypePrefix, "down"), this._onMouseDown);
       //*PMW* added line
@@ -25564,10 +25508,7 @@
       if (this._element.nodeName === 'VIDEO') {
         elementToDraw = this._applyVideoFilter(this._element);
       }
-      const t1 = performance.now();
       elementToDraw && ctx.drawImage(elementToDraw, sX, sY, sW, sH, x, y, maxDestW, maxDestH);
-      const t2 = performance.now();
-      console.log('Draw image ctx', t2 - t1);
     }
 
     /**