Merge pull request #1077 from neomjs/dev

v1.3.47

Author: tobiu

package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "1.3.46",
+    "version": "1.3.47",
     "description": "The webworkers driven UI framework",
     "repository": {
         "type": "git",

src/calendar/draggable/WeekEventDragZone.mjs

@@ -54,6 +54,10 @@ class WeekEventDragZone extends DragZone {
          * @member {Neo.calendar.view.WeekComponent} owner=null
          */
         owner: null,
+        /**
+         * @member {Number} scrollFactorLeft=3
+         */
+        scrollFactorLeft: 3,
         /**
          * @member {Number} startTime=0
          */
@@ -72,12 +76,15 @@ class WeekEventDragZone extends DragZone {
      */
     afterSetProxyParentId(value, oldValue) {
         if (value && oldValue !== undefined) {
-            if (this.dragProxy) {
+            let me = this;
+
+            // check if the node did not get removed yet
+            if (me.dragProxy && me.dragProxy.vdom.cn[0].id) {
                 Neo.currentWorker.promiseMessage('main', {
                     action: 'updateDom',
                     deltas: [{
                         action  : 'moveNode',
-                        id      : this.dragProxy.id,
+                        id      : me.dragProxy.id,
                         index   : 0,
                         parentId: value
                     }]
@@ -154,16 +161,19 @@ class WeekEventDragZone extends DragZone {
                 position = me.currentInterval * intervalHeight; // snap to valid intervals
                 position = position / me.columnHeight * 100;
 
-                Neo.currentWorker.promiseMessage('main', {
-                    action: 'updateDom',
-                    deltas: [{
-                        id       : me.dragProxy.vdom.cn[0].id,
-                        innerHTML: startTime
-                    }, {
-                        id   : me.dragProxy.id,
-                        style: {top: `calc(${position}% + 1px)`}
-                    }]
-                });
+                // check if the node did not get removed yet
+                if (me.dragProxy.vdom.cn[0].id) {
+                    Neo.currentWorker.promiseMessage('main', {
+                        action: 'updateDom',
+                        deltas: [{
+                            id       : me.dragProxy.vdom.cn[0].id,
+                            innerHTML: startTime
+                        }, {
+                            id   : me.dragProxy.id,
+                            style: {top: `calc(${position}% + 1px)`}
+                        }]
+                    });
+                }
             }
         }
     }

src/draggable/DragZone.mjs

@@ -64,6 +64,14 @@ class DragZone extends Base {
          * @member {String|null} scrollContainerId_=null
          */
         scrollContainerId_: null,
+        /**
+         * @member {Number} scrollFactorLeft_=1
+         */
+        scrollFactorLeft_: 1,
+        /**
+         * @member {Number} scrollFactorTop_=1
+         */
+        scrollFactorTop_: 1,
         /**
          * True creates a position:absolute wrapper div which contains the cloned element
          * @member {Boolean} useProxyWrapper=true
@@ -97,6 +105,34 @@ class DragZone extends Base {
         }
     }
 
+    /**
+     * Triggered after the scrollFactorLeft config got changed
+     * @param {Number} value
+     * @param {Number} oldValue
+     * @protected
+     */
+    afterSetScrollFactorLeft(value, oldValue) {
+        if (!(value === 1 && oldValue === undefined)) {
+            Neo.main.addon.DragDrop.setScrollFactorLeft({
+                value: value
+            });
+        }
+    }
+
+    /**
+     * Triggered after the scrollFactorTop config got changed
+     * @param {Number} value
+     * @param {Number} oldValue
+     * @protected
+     */
+    afterSetScrollFactorTop(value, oldValue) {
+        if (!(value === 1 && oldValue === undefined)) {
+            Neo.main.addon.DragDrop.setScrollFactorTop({
+                value: value
+            });
+        }
+    }
+
     /**
      *
      * @param {Object} data
@@ -133,12 +169,17 @@ class DragZone extends Base {
      * Override for using custom animations
      */
     destroyDragProxy() {
-        Neo.currentWorker.promiseMessage('main', {
-            action: 'updateDom',
-            deltas: [{action: 'removeNode', id: this.dragProxy.id}]
-        });
+        let me = this,
+            id = me.dragProxy.id;
+
+        setTimeout(() => {
+            Neo.currentWorker.promiseMessage('main', {
+                action: 'updateDom',
+                deltas: [{action: 'removeNode', id: id}]
+            });
+        }, me.moveInMainThread ? 0 : 30);
 
-        this.dragProxy.destroy();
+        me.dragProxy.destroy();
     }
 
     /**

src/main/addon/DragDrop.mjs

@@ -52,7 +52,9 @@ class DragDrop extends Base {
             remote: {
                 app: [
                     'setDragProxyElement',
-                    'setScrollContainer'
+                    'setScrollContainer',
+                    'setScrollFactorLeft',
+                    'setScrollFactorTop'
                 ]
             },
             /**
@@ -63,6 +65,14 @@ class DragDrop extends Base {
              * @member {DOMRect|null} scrollContainerRect=null
              */
             scrollContainerRect: null,
+            /**
+             * @member {Number} scrollFactorLeft=1
+             */
+            scrollFactorLeft: 1,
+            /**
+             * @member {Number} scrollFactorTop=1
+             */
+            scrollFactorTop: 1,
             /**
              * @member {Boolean} singleton=true
              * @protected
@@ -125,7 +135,9 @@ class DragDrop extends Base {
             initialScrollLeft     : 0,
             initialScrollTop      : 0,
             scrollContainerElement: null,
-            scrollContainerRect   : null
+            scrollContainerRect   : null,
+            setScrollFactorLeft   : 1,
+            scrollFactorTop       : 1
         });
 
         DomEvents.sendMessageToApp({
@@ -202,14 +214,14 @@ class DragDrop extends Base {
             (deltaX < 0 && data.clientX < rect.left  + gap) ||
             (deltaX > 0 && data.clientX > rect.right - gap)
         ) {
-            el.scrollLeft += (deltaX * 3); // todo: scrollFactorLeft
+            el.scrollLeft += (deltaX * me.scrollFactorLeft);
         }
 
         if (
             (deltaY < 0 && data.clientY < rect.top    + gap) ||
             (deltaY > 0 && data.clientY > rect.bottom - gap)
         ) {
-            el.scrollTop += deltaY;
+            el.scrollTop += (deltaY * me.scrollFactorTop);
         }
 
         return {
@@ -243,6 +255,24 @@ class DragDrop extends Base {
             initialScrollTop      : node.scrollTop,
         });
     }
+
+    /**
+     *
+     * @param {Object} data
+     * @param {Number} data.value
+     */
+    setScrollFactorLeft(data) {
+        this.scrollFactorLeft = data.value;
+    }
+
+    /**
+     *
+     * @param {Object} data
+     * @param {Number} data.value
+     */
+    setScrollFactorTop(data) {
+        this.scrollFactorTop = data.value;
+    }
 }
 
 Neo.applyClassConfig(DragDrop);