@daybrush/drag - npm Package Compare versions

Comparing version 0.18.0 to 0.18.1

dist/drag.cjs.js

@@ -7,3 +7,3 @@ /*
 repository: git+https://github.com/daybrush/drag.git
-version: 0.18.0
+version: 0.18.1
 */
@@ -191,6 +191,7 @@ 'use strict';
       if (!_this.flag && checkInput) {
+        var activeElement = document.activeElement;
         var target = e.target;
         var tagName = target.tagName.toLowerCase();
 
-        if (INPUT_TAGNAMES.indexOf(tagName) > -1 || target.isContentEditable) {
+        if (INPUT_TAGNAMES.indexOf(tagName) > -1 && activeElement === target || activeElement && target.isContentEditable && activeElement.isContentEditable && (activeElement === target || activeElement.contains(target))) {
           return false;
@@ -197,0 +198,0 @@ }

dist/drag.esm.js

@@ -7,3 +7,3 @@ /*
 repository: git+https://github.com/daybrush/drag.git
-version: 0.18.0
+version: 0.18.1
 */
@@ -189,6 +189,7 @@ import { removeEvent, addEvent, now } from '@daybrush/utils';
       if (!_this.flag && checkInput) {
+        var activeElement = document.activeElement;
         var target = e.target;
         var tagName = target.tagName.toLowerCase();
 
-        if (INPUT_TAGNAMES.indexOf(tagName) > -1 || target.isContentEditable) {
+        if (INPUT_TAGNAMES.indexOf(tagName) > -1 && activeElement === target || activeElement && target.isContentEditable && activeElement.isContentEditable && (activeElement === target || activeElement.contains(target))) {
           return false;
@@ -195,0 +196,0 @@ }

dist/drag.js

@@ -7,3 +7,3 @@ /*
 repository: git+https://github.com/daybrush/drag.git
-version: 0.18.0
+version: 0.18.1
 */
@@ -251,6 +251,7 @@ (function (global, factory) {
           if (!_this.flag && checkInput) {
+            var activeElement = document.activeElement;
             var target = e.target;
             var tagName = target.tagName.toLowerCase();
 
-            if (INPUT_TAGNAMES.indexOf(tagName) > -1 || target.isContentEditable) {
+            if (INPUT_TAGNAMES.indexOf(tagName) > -1 && activeElement === target || activeElement && target.isContentEditable && activeElement.isContentEditable && (activeElement === target || activeElement.contains(target))) {
               return false;
@@ -257,0 +258,0 @@ }

dist/drag.min.js

@@ -7,5 +7,5 @@ /*
 repository: git+https://github.com/daybrush/drag.git
-version: 0.18.0
+version: 0.18.1
 */
-!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):(t=t||self).Dragger=i()}(this,function(){"use strict";var p=function(){return(p=Object.assign||function(t){for(var i,n=1,e=arguments.length;n<e;n++)for(var s in i=arguments[n])Object.prototype.hasOwnProperty.call(i,s)&&(t[s]=i[s]);return t}).apply(this,arguments)};function l(t){return function(t,i){var n=i[0]-t[0],e=i[1]-t[1],s=Math.atan2(e,n);return 0<=s?s:s+2*Math.PI}([t[0].clientX,t[0].clientY],[t[1].clientX,t[1].clientY])/Math.PI*180}function u(t,i,n,e){var s=m(t),a=m(i),r=m(e);return d(h(e[0],o(s,r)),h(e[0],o(a,r)),n[0])}function v(t){return t.touches?D(t.touches):[s(t)]}function d(t,i,n){var e=t.clientX,s=t.clientY;return{clientX:e,clientY:s,deltaX:e-i.clientX,deltaY:s-i.clientY,distX:e-n.clientX,distY:s-n.clientY}}function f(t){return Math.sqrt(Math.pow(t[0].clientX-t[1].clientX,2)+Math.pow(t[0].clientY-t[1].clientY,2))}function g(t,n,e){return t.map(function(t,i){return d(t,n[i],e[i])})}function D(t){for(var i=Math.min(t.length,2),n=[],e=0;e<i;++e)n.push(s(t[e]));return n}function s(t){return{clientX:t.clientX,clientY:t.clientY}}function m(t){return 1===t.length?t[0]:{clientX:(t[0].clientX+t[1].clientX)/2,clientY:(t[0].clientY+t[1].clientY)/2}}function h(t,i){return{clientX:t.clientX+i.clientX,clientY:t.clientY+i.clientY}}function o(t,i){return{clientX:t.clientX-i.clientX,clientY:t.clientY-i.clientY}}function C(){return Date.now?Date.now():(new Date).getTime()}function E(t,i,n,e){t.addEventListener(i,n,e)}function X(t,i,n){t.removeEventListener(i,n)}var Y=["textarea","input"],n=function(){function t(t,i){var g=this;void 0===i&&(i={}),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.movement=0,this.startPinchClients=[],this.startDistance=0,this.customDist=[0,0],this.targets=[],this.prevTime=0,this.isDouble=!1,this.startRotate=0,this.onDragStart=function(t){if(g.flag||!1!==t.cancelable){var i=g.options,n=i.container,e=i.pinchOutside,s=i.dragstart,a=i.preventRightClick,r=i.preventDefault,h=i.checkInput,o=g.isTouch;if(!g.flag&&h){var c=t.target,l=c.tagName.toLowerCase();if(-1<Y.indexOf(l)||c.isContentEditable)return!1}if(!g.flag&&o&&e&&setTimeout(function(){E(n,"touchstart",g.onDragStart)}),g.flag&&o&&e&&X(n,"touchstart",g.onDragStart),function(t){return t.touches&&2<=t.touches.length}(t)){if(!g.flag&&t.touches.length!==t.changedTouches.length)return;g.pinchFlag||g.onPinchStart(t)}if(!g.flag){var u=g.startClients[0]?g.startClients:v(t);g.customDist=[0,0],g.flag=!0,g.isDrag=!1,g.startClients=u,g.prevClients=u,g.datas={};var f=d(u[g.movement=0],g.prevClients[0],g.startClients[0]);if(a&&(3===t.which||2===t.button))return g.initDrag(),!1;!1===(s&&s(p({type:"dragstart",datas:g.datas,inputEvent:t},f)))&&g.initDrag(),g.isDouble=C()-g.prevTime<200,g.flag&&r&&t.preventDefault()}}},this.onDrag=function(t,i){if(g.flag){var n=v(t);g.pinchFlag&&g.onPinch(t,n);var e=g.move([0,0],t,n);if(e&&(e.deltaX||e.deltaY)){var s=g.options.drag;s&&s(p({},e,{isScroll:!!i,inputEvent:t}))}}},this.onDragEnd=function(t){if(g.flag){var i=g.options,n=i.dragend,e=i.pinchOutside,s=i.container;g.isTouch&&e&&X(s,"touchstart",g.onDragStart),g.pinchFlag&&g.onPinchEnd(t),g.flag=!1;var a=g.prevClients,r=g.startClients,h=g.pinchFlag?u(a,a,r,g.startPinchClients):d(a[0],a[0],r[0]),o=C(),c=!g.isDrag&&g.isDouble;g.prevTime=g.isDrag||c?0:o,g.startClients=[],g.prevClients=[],n&&n(p({type:"dragend",datas:g.datas,isDouble:c,isDrag:g.isDrag,inputEvent:t},h))}};var n=[].concat(t);this.options=p({checkInput:!0,container:1<n.length?window:n[0],preventRightClick:!0,preventDefault:!0,pinchThreshold:0,events:["touch","mouse"]},i);var e=this.options,s=e.container,a=e.events;if(this.isTouch=-1<a.indexOf("touch"),this.isMouse=-1<a.indexOf("mouse"),this.customDist=[0,0],this.targets=n,this.isMouse&&(n.forEach(function(t){E(t,"mousedown",g.onDragStart)}),E(s,"mousemove",this.onDrag),E(s,"mouseup",this.onDragEnd),E(s,"contextmenu",this.onDragEnd)),this.isTouch){var r={passive:!1};n.forEach(function(t){E(t,"touchstart",g.onDragStart,r)}),E(s,"touchmove",this.onDrag,r),E(s,"touchend",this.onDragEnd,r),E(s,"touchcancel",this.onDragEnd,r)}}var i=t.prototype;return i.isDragging=function(){return this.isDrag},i.isFlag=function(){return this.flag},i.isPinchFlag=function(){return this.pinchFlag},i.isPinching=function(){return this.isPinch},i.scrollBy=function(i,n,t,e){void 0===e&&(e=!0),this.flag&&(this.startClients.forEach(function(t){t.clientX-=i,t.clientY-=n}),this.prevClients.forEach(function(t){t.clientX-=i,t.clientY-=n}),e&&this.onDrag(t,!0))},i.move=function(t,i,n){var e=t[0],s=t[1];void 0===n&&(n=this.prevClients);var a=this.customDist,r=this.prevClients,h=this.startClients,o=this.pinchFlag?u(n,r,h,this.startPinchClients):d(n[0],r[0],h[0]);a[0]+=e,a[1]+=s,o.deltaX+=e,o.deltaY+=s;var c=o.deltaX,l=o.deltaY;return o.distX+=a[0],o.distY+=a[1],this.movement+=Math.sqrt(c*c+l*l),this.prevClients=n,this.isDrag=!0,p({type:"drag",datas:this.datas},o,{movement:this.movement,isDrag:this.isDrag,isPinch:this.isPinch,isScroll:!1,inputEvent:i})},i.onPinchStart=function(t){var i,n,e=this.options,s=e.pinchstart,a=e.pinchThreshold;if(!(this.isDrag&&this.movement>a)){var r=D(t.changedTouches);if(this.pinchFlag=!0,(i=this.startClients).push.apply(i,r),(n=this.prevClients).push.apply(n,r),this.startDistance=f(this.prevClients),this.startPinchClients=this.prevClients.slice(),s){var h=this.prevClients,o=m(h),c=d(o,o,o);this.startRotate=l(h),s(p({type:"pinchstart",datas:this.datas,angle:this.startRotate,touches:g(h,h,h)},c,{inputEvent:t}))}}},i.onPinch=function(t,i){if(this.flag&&this.pinchFlag&&!(i.length<2)){this.isPinch=!0;var n=this.options.pinch;if(n){var e=this.prevClients,s=this.startClients,a=d(m(i),m(e),m(s)),r=l(i),h=f(i);n(p({type:"pinch",datas:this.datas,movement:this.movement,angle:r,rotation:r-this.startRotate,touches:g(i,e,s),scale:h/this.startDistance,distance:h},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 e=this.prevClients,s=this.startClients,a=d(m(e),m(e),m(s));n(p({type:"pinchend",datas:this.datas,isPinch:i,touches:g(e,e,s)},a,{inputEvent:t})),this.isPinch=!1,this.pinchFlag=!1}}},i.unset=function(){var i=this,t=this.targets,n=this.options.container;this.isMouse&&(t.forEach(function(t){X(t,"mousedown",i.onDragStart)}),X(n,"mousemove",this.onDrag),X(n,"mouseup",this.onDragEnd),X(n,"contextmenu",this.onDragEnd)),this.isTouch&&(t.forEach(function(t){X(t,"touchstart",i.onDragStart)}),X(n,"touchstart",this.onDragStart),X(n,"touchmove",this.onDrag),X(n,"touchend",this.onDragEnd),X(n,"touchcancel",this.onDragEnd))},i.initDrag=function(){this.startClients=[],this.prevClients=[],this.flag=!1},t}();var t={default:n,drag:function(t,i){return new n(t,i)}};for(var i in t)n[i]=t[i];return n});
+!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):(t=t||self).Dragger=i()}(this,function(){"use strict";var v=function(){return(v=Object.assign||function(t){for(var i,n=1,e=arguments.length;n<e;n++)for(var s in i=arguments[n])Object.prototype.hasOwnProperty.call(i,s)&&(t[s]=i[s]);return t}).apply(this,arguments)};function l(t){return function(t,i){var n=i[0]-t[0],e=i[1]-t[1],s=Math.atan2(e,n);return 0<=s?s:s+2*Math.PI}([t[0].clientX,t[0].clientY],[t[1].clientX,t[1].clientY])/Math.PI*180}function u(t,i,n,e){var s=m(t),a=m(i),r=m(e);return D(o(e[0],h(s,r)),o(e[0],h(a,r)),n[0])}function d(t){return t.touches?p(t.touches):[s(t)]}function D(t,i,n){var e=t.clientX,s=t.clientY;return{clientX:e,clientY:s,deltaX:e-i.clientX,deltaY:s-i.clientY,distX:e-n.clientX,distY:s-n.clientY}}function f(t){return Math.sqrt(Math.pow(t[0].clientX-t[1].clientX,2)+Math.pow(t[0].clientY-t[1].clientY,2))}function g(t,n,e){return t.map(function(t,i){return D(t,n[i],e[i])})}function p(t){for(var i=Math.min(t.length,2),n=[],e=0;e<i;++e)n.push(s(t[e]));return n}function s(t){return{clientX:t.clientX,clientY:t.clientY}}function m(t){return 1===t.length?t[0]:{clientX:(t[0].clientX+t[1].clientX)/2,clientY:(t[0].clientY+t[1].clientY)/2}}function o(t,i){return{clientX:t.clientX+i.clientX,clientY:t.clientY+i.clientY}}function h(t,i){return{clientX:t.clientX-i.clientX,clientY:t.clientY-i.clientY}}function C(){return Date.now?Date.now():(new Date).getTime()}function E(t,i,n,e){t.addEventListener(i,n,e)}function X(t,i,n){t.removeEventListener(i,n)}var Y=["textarea","input"],n=function(){function t(t,i){var p=this;void 0===i&&(i={}),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.movement=0,this.startPinchClients=[],this.startDistance=0,this.customDist=[0,0],this.targets=[],this.prevTime=0,this.isDouble=!1,this.startRotate=0,this.onDragStart=function(t){if(p.flag||!1!==t.cancelable){var i=p.options,n=i.container,e=i.pinchOutside,s=i.dragstart,a=i.preventRightClick,r=i.preventDefault,o=i.checkInput,h=p.isTouch;if(!p.flag&&o){var c=document.activeElement,l=t.target,u=l.tagName.toLowerCase();if(-1<Y.indexOf(u)&&c===l||c&&l.isContentEditable&&c.isContentEditable&&(c===l||c.contains(l)))return!1}if(!p.flag&&h&&e&&setTimeout(function(){E(n,"touchstart",p.onDragStart)}),p.flag&&h&&e&&X(n,"touchstart",p.onDragStart),function(t){return t.touches&&2<=t.touches.length}(t)){if(!p.flag&&t.touches.length!==t.changedTouches.length)return;p.pinchFlag||p.onPinchStart(t)}if(!p.flag){var f=p.startClients[0]?p.startClients:d(t);p.customDist=[0,0],p.flag=!0,p.isDrag=!1,p.startClients=f,p.prevClients=f,p.datas={};var g=D(f[p.movement=0],p.prevClients[0],p.startClients[0]);if(a&&(3===t.which||2===t.button))return p.initDrag(),!1;!1===(s&&s(v({type:"dragstart",datas:p.datas,inputEvent:t},g)))&&p.initDrag(),p.isDouble=C()-p.prevTime<200,p.flag&&r&&t.preventDefault()}}},this.onDrag=function(t,i){if(p.flag){var n=d(t);p.pinchFlag&&p.onPinch(t,n);var e=p.move([0,0],t,n);if(e&&(e.deltaX||e.deltaY)){var s=p.options.drag;s&&s(v({},e,{isScroll:!!i,inputEvent:t}))}}},this.onDragEnd=function(t){if(p.flag){var i=p.options,n=i.dragend,e=i.pinchOutside,s=i.container;p.isTouch&&e&&X(s,"touchstart",p.onDragStart),p.pinchFlag&&p.onPinchEnd(t),p.flag=!1;var a=p.prevClients,r=p.startClients,o=p.pinchFlag?u(a,a,r,p.startPinchClients):D(a[0],a[0],r[0]),h=C(),c=!p.isDrag&&p.isDouble;p.prevTime=p.isDrag||c?0:h,p.startClients=[],p.prevClients=[],n&&n(v({type:"dragend",datas:p.datas,isDouble:c,isDrag:p.isDrag,inputEvent:t},o))}};var n=[].concat(t);this.options=v({checkInput:!0,container:1<n.length?window:n[0],preventRightClick:!0,preventDefault:!0,pinchThreshold:0,events:["touch","mouse"]},i);var e=this.options,s=e.container,a=e.events;if(this.isTouch=-1<a.indexOf("touch"),this.isMouse=-1<a.indexOf("mouse"),this.customDist=[0,0],this.targets=n,this.isMouse&&(n.forEach(function(t){E(t,"mousedown",p.onDragStart)}),E(s,"mousemove",this.onDrag),E(s,"mouseup",this.onDragEnd),E(s,"contextmenu",this.onDragEnd)),this.isTouch){var r={passive:!1};n.forEach(function(t){E(t,"touchstart",p.onDragStart,r)}),E(s,"touchmove",this.onDrag,r),E(s,"touchend",this.onDragEnd,r),E(s,"touchcancel",this.onDragEnd,r)}}var i=t.prototype;return i.isDragging=function(){return this.isDrag},i.isFlag=function(){return this.flag},i.isPinchFlag=function(){return this.pinchFlag},i.isPinching=function(){return this.isPinch},i.scrollBy=function(i,n,t,e){void 0===e&&(e=!0),this.flag&&(this.startClients.forEach(function(t){t.clientX-=i,t.clientY-=n}),this.prevClients.forEach(function(t){t.clientX-=i,t.clientY-=n}),e&&this.onDrag(t,!0))},i.move=function(t,i,n){var e=t[0],s=t[1];void 0===n&&(n=this.prevClients);var a=this.customDist,r=this.prevClients,o=this.startClients,h=this.pinchFlag?u(n,r,o,this.startPinchClients):D(n[0],r[0],o[0]);a[0]+=e,a[1]+=s,h.deltaX+=e,h.deltaY+=s;var c=h.deltaX,l=h.deltaY;return h.distX+=a[0],h.distY+=a[1],this.movement+=Math.sqrt(c*c+l*l),this.prevClients=n,this.isDrag=!0,v({type:"drag",datas:this.datas},h,{movement:this.movement,isDrag:this.isDrag,isPinch:this.isPinch,isScroll:!1,inputEvent:i})},i.onPinchStart=function(t){var i,n,e=this.options,s=e.pinchstart,a=e.pinchThreshold;if(!(this.isDrag&&this.movement>a)){var r=p(t.changedTouches);if(this.pinchFlag=!0,(i=this.startClients).push.apply(i,r),(n=this.prevClients).push.apply(n,r),this.startDistance=f(this.prevClients),this.startPinchClients=this.prevClients.slice(),s){var o=this.prevClients,h=m(o),c=D(h,h,h);this.startRotate=l(o),s(v({type:"pinchstart",datas:this.datas,angle:this.startRotate,touches:g(o,o,o)},c,{inputEvent:t}))}}},i.onPinch=function(t,i){if(this.flag&&this.pinchFlag&&!(i.length<2)){this.isPinch=!0;var n=this.options.pinch;if(n){var e=this.prevClients,s=this.startClients,a=D(m(i),m(e),m(s)),r=l(i),o=f(i);n(v({type:"pinch",datas:this.datas,movement:this.movement,angle:r,rotation:r-this.startRotate,touches:g(i,e,s),scale:o/this.startDistance,distance:o},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 e=this.prevClients,s=this.startClients,a=D(m(e),m(e),m(s));n(v({type:"pinchend",datas:this.datas,isPinch:i,touches:g(e,e,s)},a,{inputEvent:t})),this.isPinch=!1,this.pinchFlag=!1}}},i.unset=function(){var i=this,t=this.targets,n=this.options.container;this.isMouse&&(t.forEach(function(t){X(t,"mousedown",i.onDragStart)}),X(n,"mousemove",this.onDrag),X(n,"mouseup",this.onDragEnd),X(n,"contextmenu",this.onDragEnd)),this.isTouch&&(t.forEach(function(t){X(t,"touchstart",i.onDragStart)}),X(n,"touchstart",this.onDragStart),X(n,"touchmove",this.onDrag),X(n,"touchend",this.onDragEnd),X(n,"touchcancel",this.onDragEnd))},i.initDrag=function(){this.startClients=[],this.prevClients=[],this.flag=!1},t}();var t={default:n,drag:function(t,i){return new n(t,i)}};for(var i in t)n[i]=t[i];return n});
 //# sourceMappingURL=drag.min.js.map

package.json

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

src/Dragger.ts

@@ -35,3 +35,3 @@ import { DragOptions, Client, Position, OnDrag } from "./types";
     constructor(targets: Array<Element | Window> | Element | Window, options: DragOptions = {}) {
-        const elements = [].concat(targets as any) as Array<Element | Window> ;
+        const elements = [].concat(targets as any) as Array<Element | Window>;
         this.options = {
@@ -126,6 +126,11 @@ checkInput: true,
         if (!this.flag && checkInput) {
+            const activeElement = document.activeElement as HTMLElement;
             const target = e.target as HTMLElement;
             const tagName = target.tagName.toLowerCase();
 
-            if (INPUT_TAGNAMES.indexOf(tagName) > -1 || target.isContentEditable) {
+            if (
+                (INPUT_TAGNAMES.indexOf(tagName) > -1 && activeElement === target)
+                || (activeElement && target.isContentEditable && activeElement.isContentEditable
+                    && (activeElement === target || activeElement.contains(target)))
+            ) {
                 return false;
@@ -132,0 +137,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

216201

increased by1.37%

Lines of code

2540

increased by0.32%

No dependency changes