@daybrush/drag - npm Package Compare versions

Comparing version 0.8.1 to 0.8.2

dist/drag.cjs.js

@@ -7,3 +7,3 @@ /*
 repository: git+https://github.com/daybrush/drag.git
-version: 0.8.1
+version: 0.8.2
 */
@@ -146,2 +146,6 @@ 'use strict';
     this.onDragStart = function (e) {
+      if (!_this.flag && e.cancelable === false) {
+        return;
+      }
+
       if (!_this.isDrag && isMultiTouch(e) && !_this.pinchFlag) {
@@ -265,6 +269,2 @@ _this.onPinchStart(e);
 
-    if (!this.flag) {
-      return;
-    }
-
     this.pinchFlag = true;
@@ -271,0 +271,0 @@ var pinchstart = this.options.pinchstart;

dist/drag.esm.js

@@ -7,3 +7,3 @@ /*
 repository: git+https://github.com/daybrush/drag.git
-version: 0.8.1
+version: 0.8.2
 */
@@ -144,2 +144,6 @@ import { removeEvent, addEvent } from '@daybrush/utils';
     this.onDragStart = function (e) {
+      if (!_this.flag && e.cancelable === false) {
+        return;
+      }
+
       if (!_this.isDrag && isMultiTouch(e) && !_this.pinchFlag) {
@@ -263,6 +267,2 @@ _this.onPinchStart(e);
 
-    if (!this.flag) {
-      return;
-    }
-
     this.pinchFlag = true;
@@ -269,0 +269,0 @@ var pinchstart = this.options.pinchstart;

dist/drag.js

@@ -7,3 +7,3 @@ /*
 repository: git+https://github.com/daybrush/drag.git
-version: 0.8.1
+version: 0.8.2
 */
@@ -193,2 +193,6 @@ (function (global, factory) {
         this.onDragStart = function (e) {
+          if (!_this.flag && e.cancelable === false) {
+            return;
+          }
+
           if (!_this.isDrag && isMultiTouch(e) && !_this.pinchFlag) {
@@ -312,6 +316,2 @@ _this.onPinchStart(e);
 
-        if (!this.flag) {
-          return;
-        }
-
         this.pinchFlag = true;
@@ -318,0 +318,0 @@ var pinchstart = this.options.pinchstart;

dist/drag.min.js

@@ -7,5 +7,5 @@ /*
 repository: git+https://github.com/daybrush/drag.git
-version: 0.8.1
+version: 0.8.2
 */
-!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports):"function"==typeof define&&define.amd?define(["exports"],i):i((t=t||self).Dragger={})}(this,function(t){"use strict";var h=function(){return(h=Object.assign||function(t){for(var i,n=1,s=arguments.length;n<s;n++)for(var e in i=arguments[n])Object.prototype.hasOwnProperty.call(i,e)&&(t[e]=i[e]);return t}).apply(this,arguments)};function o(t,i,n){var s=g(t),e=g(i),a=g(n);return l(r(n[0],v(s,a)),r(n[0],v(e,a)),n[0])}function c(t){return t.touches?f(t.touches):[e(t)]}function l(t,i,n){var s=t.clientX,e=t.clientY;return{clientX:s,clientY:e,deltaX:s-i.clientX,deltaY:e-i.clientY,distX:s-n.clientX,distY:e-n.clientY}}function u(t){return Math.sqrt(Math.pow(t[0].clientX-t[1].clientX,2)+Math.pow(t[0].clientY-t[1].clientY,2))}function p(t,n,s){return t.map(function(t,i){return l(t,n[i],s[i])})}function f(t){for(var i=Math.min(t.length,2),n=[],s=0;s<i;++s)n.push(e(t[s]));return n}function e(t){return{clientX:t.clientX,clientY:t.clientY}}function g(t){return{clientX:(t[0].clientX+t[1].clientX)/2,clientY:(t[0].clientY+t[1].clientY)/2}}function r(t,i){return{clientX:t.clientX+i.clientX,clientY:t.clientY+i.clientY}}function v(t,i){return{clientX:t.clientX-i.clientX,clientY:t.clientY-i.clientY}}function a(t,i,n,s){t.addEventListener(i,n,s)}function n(t,i,n){t.removeEventListener(i,n)}var s=function(){function t(t,i){var r=this;void 0===i&&(i={}),this.el=t,this.options={},this.flag=!1,this.pinchFlag=!1,this.datas={},this.isDrag=!1,this.isPinch=!1,this.isMouse=!1,this.isTouch=!1,this.prevClients=[],this.startClients=[],this.onDragStart=function(t){if(r.isDrag||!function(t){return t.touches&&2<=t.touches.length}(t)||r.pinchFlag||r.onPinchStart(t),!r.flag){var i=r.startClients[0]?r.startClients:c(t);r.flag=!0,r.isDrag=!1,r.startClients=i,r.prevClients=i,r.datas={};var n=l(i[0],r.prevClients[0],r.startClients[0]),s=r.options,e=s.dragstart;(s.preventRightClick&&3===t.which||!1===(e&&e(h({datas:r.datas,inputEvent:t},n))))&&(r.flag=!1),r.flag&&t.preventDefault()}},this.onDrag=function(t){if(r.flag){var i=c(t);r.pinchFlag&&r.onPinch(t,i);var n=r.prevClients,s=r.startClients,e=r.pinchFlag?o(i,n,s):l(i[0],n[0],s[0]);if(e.deltaX||e.deltaY){r.isDrag=!0;var a=r.options.drag;a&&a(h({datas:r.datas},e,{inputEvent:t})),r.prevClients=i}}},this.onDragEnd=function(t){if(r.flag){r.pinchFlag&&r.onPinchEnd(t),r.flag=!1;var i=r.options.dragend,n=r.prevClients,s=r.startClients,e=r.pinchFlag?o(n,n,s):l(n[0],n[0],s[0]);r.startClients=[],r.prevClients=[],i&&i(h({datas:r.datas,isDrag:r.isDrag,inputEvent:t},e))}},this.options=h({container:t,preventRightClick:!0,events:["touch","mouse"]},i);var n=this.options,s=n.container,e=n.events;this.isTouch=-1<e.indexOf("touch"),this.isMouse=-1<e.indexOf("mouse"),this.isMouse&&(a(t,"mousedown",this.onDragStart),a(s,"mousemove",this.onDrag),a(s,"mouseup",this.onDragEnd)),this.isTouch&&(a(t,"touchstart",this.onDragStart),a(s,"touchmove",this.onDrag),a(s,"touchend",this.onDragEnd))}var i=t.prototype;return i.isDragging=function(){return this.isDrag},i.isPinching=function(){return this.isPinch},i.onPinchStart=function(t){var i,n;if(this.flag){this.pinchFlag=!0;var s=this.options.pinchstart,e=f(t.changedTouches);if((i=this.startClients).push.apply(i,e),(n=this.prevClients).push.apply(n,e),s){var a=this.startClients,r=g(a),o=l(r,r,r);s(h({datas:this.datas,touches:p(a,a,a)},o,{inputEvent:t}))}}},i.onPinch=function(t,i){if(this.flag&&this.pinchFlag){this.isPinch=!0;var n=this.options.pinch;if(n){var s=this.prevClients,e=this.startClients,a=l(g(i),g(s),g(e)),r=u(i),o=u(e);n(h({datas:this.datas,touches:p(i,s,e),scale:r/o,distance:r},a,{inputEvent:t}))}}},i.onPinchEnd=function(t){if(this.flag&&this.pinchFlag){var i=this.isPinch;this.isPinch=!1,this.pinchFlag=!1;var n=this.options.pinchend;if(n){var s=this.prevClients,e=this.startClients,a=l(g(s),g(s),g(e));n(h({datas:this.datas,isPinch:i,touches:p(s,s,e)},a,{inputEvent:t})),this.isPinch=!1,this.pinchFlag=!1}}},i.unset=function(){var t=this.el,i=this.options.container;this.isMouse&&(n(t,"mousedown",this.onDragStart),n(i,"mousemove",this.onDrag),n(i,"mouseup",this.onDragEnd)),this.isTouch&&(n(t,"touchstart",this.onDragStart),n(i,"touchmove",this.onDrag),n(i,"touchend",this.onDragEnd))},t}();t.default=s,t.drag=function(t,i){return new s(t,i)}});
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n((t=t||self).Dragger={})}(this,function(t){"use strict";var c=function(){return(c=Object.assign||function(t){for(var n,i=1,s=arguments.length;i<s;i++)for(var e in n=arguments[i])Object.prototype.hasOwnProperty.call(n,e)&&(t[e]=n[e]);return t}).apply(this,arguments)};function o(t,n,i){var s=g(t),e=g(n),a=g(i);return l(r(i[0],v(s,a)),r(i[0],v(e,a)),i[0])}function h(t){return t.touches?f(t.touches):[e(t)]}function l(t,n,i){var s=t.clientX,e=t.clientY;return{clientX:s,clientY:e,deltaX:s-n.clientX,deltaY:e-n.clientY,distX:s-i.clientX,distY:e-i.clientY}}function u(t){return Math.sqrt(Math.pow(t[0].clientX-t[1].clientX,2)+Math.pow(t[0].clientY-t[1].clientY,2))}function p(t,i,s){return t.map(function(t,n){return l(t,i[n],s[n])})}function f(t){for(var n=Math.min(t.length,2),i=[],s=0;s<n;++s)i.push(e(t[s]));return i}function e(t){return{clientX:t.clientX,clientY:t.clientY}}function g(t){return{clientX:(t[0].clientX+t[1].clientX)/2,clientY:(t[0].clientY+t[1].clientY)/2}}function r(t,n){return{clientX:t.clientX+n.clientX,clientY:t.clientY+n.clientY}}function v(t,n){return{clientX:t.clientX-n.clientX,clientY:t.clientY-n.clientY}}function a(t,n,i,s){t.addEventListener(n,i,s)}function i(t,n,i){t.removeEventListener(n,i)}var s=function(){function t(t,n){var r=this;void 0===n&&(n={}),this.el=t,this.options={},this.flag=!1,this.pinchFlag=!1,this.datas={},this.isDrag=!1,this.isPinch=!1,this.isMouse=!1,this.isTouch=!1,this.prevClients=[],this.startClients=[],this.onDragStart=function(t){if((r.flag||!1!==t.cancelable)&&(r.isDrag||!function(t){return t.touches&&2<=t.touches.length}(t)||r.pinchFlag||r.onPinchStart(t),!r.flag)){var n=r.startClients[0]?r.startClients:h(t);r.flag=!0,r.isDrag=!1,r.startClients=n,r.prevClients=n,r.datas={};var i=l(n[0],r.prevClients[0],r.startClients[0]),s=r.options,e=s.dragstart;(s.preventRightClick&&3===t.which||!1===(e&&e(c({datas:r.datas,inputEvent:t},i))))&&(r.flag=!1),r.flag&&t.preventDefault()}},this.onDrag=function(t){if(r.flag){var n=h(t);r.pinchFlag&&r.onPinch(t,n);var i=r.prevClients,s=r.startClients,e=r.pinchFlag?o(n,i,s):l(n[0],i[0],s[0]);if(e.deltaX||e.deltaY){r.isDrag=!0;var a=r.options.drag;a&&a(c({datas:r.datas},e,{inputEvent:t})),r.prevClients=n}}},this.onDragEnd=function(t){if(r.flag){r.pinchFlag&&r.onPinchEnd(t),r.flag=!1;var n=r.options.dragend,i=r.prevClients,s=r.startClients,e=r.pinchFlag?o(i,i,s):l(i[0],i[0],s[0]);r.startClients=[],r.prevClients=[],n&&n(c({datas:r.datas,isDrag:r.isDrag,inputEvent:t},e))}},this.options=c({container:t,preventRightClick:!0,events:["touch","mouse"]},n);var i=this.options,s=i.container,e=i.events;this.isTouch=-1<e.indexOf("touch"),this.isMouse=-1<e.indexOf("mouse"),this.isMouse&&(a(t,"mousedown",this.onDragStart),a(s,"mousemove",this.onDrag),a(s,"mouseup",this.onDragEnd)),this.isTouch&&(a(t,"touchstart",this.onDragStart),a(s,"touchmove",this.onDrag),a(s,"touchend",this.onDragEnd))}var n=t.prototype;return n.isDragging=function(){return this.isDrag},n.isPinching=function(){return this.isPinch},n.onPinchStart=function(t){var n,i;this.pinchFlag=!0;var s=this.options.pinchstart,e=f(t.changedTouches);if((n=this.startClients).push.apply(n,e),(i=this.prevClients).push.apply(i,e),s){var a=this.startClients,r=g(a),o=l(r,r,r);s(c({datas:this.datas,touches:p(a,a,a)},o,{inputEvent:t}))}},n.onPinch=function(t,n){if(this.flag&&this.pinchFlag){this.isPinch=!0;var i=this.options.pinch;if(i){var s=this.prevClients,e=this.startClients,a=l(g(n),g(s),g(e)),r=u(n),o=u(e);i(c({datas:this.datas,touches:p(n,s,e),scale:r/o,distance:r},a,{inputEvent:t}))}}},n.onPinchEnd=function(t){if(this.flag&&this.pinchFlag){var n=this.isPinch;this.isPinch=!1,this.pinchFlag=!1;var i=this.options.pinchend;if(i){var s=this.prevClients,e=this.startClients,a=l(g(s),g(s),g(e));i(c({datas:this.datas,isPinch:n,touches:p(s,s,e)},a,{inputEvent:t})),this.isPinch=!1,this.pinchFlag=!1}}},n.unset=function(){var t=this.el,n=this.options.container;this.isMouse&&(i(t,"mousedown",this.onDragStart),i(n,"mousemove",this.onDrag),i(n,"mouseup",this.onDragEnd)),this.isTouch&&(i(t,"touchstart",this.onDragStart),i(n,"touchmove",this.onDrag),i(n,"touchend",this.onDragEnd))},t}();t.default=s,t.drag=function(t,n){return new s(t,n)}});
 //# sourceMappingURL=drag.min.js.map

package.json

 {
   "name": "@daybrush/drag",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "You can set up drag events in any browser.",
@@ -5,0 +5,0 @@ "main": "./dist/drag.cjs.js",

src/Dragger.ts

@@ -52,2 +52,5 @@ import { DragOptions, Client, Position } from "./types";
     public onDragStart = (e: any) => {
+        if (!this.flag && e.cancelable === false) {
+            return;
+        }
         if (!this.isDrag && isMultiTouch(e) && !this.pinchFlag) {
@@ -140,5 +143,2 @@ this.onPinchStart(e);
     public onPinchStart(e: TouchEvent) {
-        if (!this.flag) {
-            return;
-        }
         this.pinchFlag = true;
@@ -145,0 +145,0 @@

No alert changes

Improved metrics

Total package byte prevSize

139469

increased by0.33%

No dependency changes