drag-drop-stage-component - npm Package Compare versions

Comparing version 1.0.31 to 1.0.32

package.json

 {
   "name": "drag-drop-stage-component",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "A component to \"drag'n drop\"-enable your projects, maintained and simple, light on dependencies",
@@ -5,0 +5,0 @@ "main": "src/ts/index.ts",

pub/js/index.js

@@ -97,5 +97,8 @@ define(["require", "exports", "./Types", "./utils/Polyfill", "./utils/DomMetrics", "./Keyboard", "./Mouse", "./flux/SelectionState", "./flux/UiState", "./observers/SelectablesObserver", "./observers/DomObserver", "./observers/MouseObserver", "./observers/UiObserver", "./flux/StageStore", "./flux/SelectableState", "./flux/MouseState", "./Ui", "./utils/Events"], function (require, exports, types, Polyfill, DomMetrics, Keyboard_1, Mouse_1, selectionState, UiAction, SelectablesObserver_1, DomObserver_1, MouseObserver_1, UiObserver_1, StageStore_1, SelectableState_1, MouseState_1, Ui_1, Events_1) {
             if (states.length > 0) {
-                this.store.dispatch(UiAction.setRefreshing(true));
+                const isRefreshing = this.store.getState().ui.refreshing;
+                if (!isRefreshing)
+                    this.store.dispatch(UiAction.setRefreshing(true));
                 this.store.dispatch(SelectableState_1.updateSelectables(states.map(selectable => (Object.assign(Object.assign({}, selectable), { metrics: DomMetrics.getMetrics(selectable.el) })))));
-                this.store.dispatch(UiAction.setRefreshing(false));
+                if (!isRefreshing)
+                    this.store.dispatch(UiAction.setRefreshing(false));
                 //this.ui.update(states, this.getScroll())
@@ -199,6 +202,13 @@ }
         reset(elements) {
-            this.store.dispatch(UiAction.setRefreshing(true));
+            const isRefreshing = this.store.getState().ui.refreshing;
+            if (!isRefreshing)
+                this.store.dispatch(UiAction.setRefreshing(true));
             this.store.dispatch(SelectableState_1.resetSelectables());
             Array.from(elements).forEach(el => this.addElement(el, false));
-            this.store.dispatch(UiAction.setRefreshing(false));
+            if (!isRefreshing)
+                this.store.dispatch(UiAction.setRefreshing(false));
+            // update after reset (FIXME: should be called in the objects by listening to the store changes but it fails because isRefreshing is turned on and off many times)
+            this.ui.update(this.store.getState().selectables);
+            // bug, why?: this.selectablesObserver.onStateChanged()
+            this.domObserver.onStateChanged();
         }
@@ -246,5 +256,7 @@ /**
             };
+            const isRefreshing = this.store.getState().ui.refreshing;
             if (preventDispatch) {
                 // do not apply style change to this element
-                this.store.dispatch(UiAction.setRefreshing(true));
+                if (!isRefreshing)
+                    this.store.dispatch(UiAction.setRefreshing(true));
                 // still add it to the dom observer
@@ -258,3 +270,4 @@ // FIXME: prevent the prenvent dispatch is not smart, event prevent a dispatch is not smart
             if (preventDispatch) {
-                this.store.dispatch(UiAction.setRefreshing(false));
+                if (!isRefreshing)
+                    this.store.dispatch(UiAction.setRefreshing(false));
             }
@@ -349,2 +362,2 @@ }
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ts/index.ts"],"names":[],"mappings":";;;;IAmBA;;;;OAIG;IACH,MAAa,KAAK;QAehB;;;;;WAKG;QACH,YAAY,MAAyB,EAAE,QAAgC,EAAE,UAAqB,EAAE;YAhBtF,mBAAc,GAAsB,EAAE,CAAC;YAkNjD,qBAAgB,GAAsB,EAAE,CAAC;YAjMvC,wBAAwB;YACxB,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;YAExB,mBAAmB;YACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC/C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACnD,IAAI,CAAC,KAAK,mCACL,OAAO,KACV,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC,EAAE;oBAC5B,IAAG,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC;wBAAE,OAAO,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;oBAC7E,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;oBACzD,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;oBACrC,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,EACF,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,EACjF,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EAC9E,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,EAC9E,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,EACnF,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EACpD,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,GACrD,CAAA;YAED,sBAAsB;YACtB,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAEzC,mBAAmB;YACnB,IAAI,CAAC,KAAK,GAAG,IAAI,uBAAU,EAAE,CAAC;YAE9B,2BAA2B;YAC3B,OAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC;iBAC9B,IAAI,CAAC,CAAC,EAAM,EAAE,EAAE;gBACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;gBAEb,kBAAkB;gBAClB,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAClI,IAAI,CAAC,WAAW,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC7G,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChH,IAAI,CAAC,aAAa,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAEtH,cAAc;gBACd,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAClG,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAErF,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,EACxC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAChC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAC/B,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,EAClC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAC1B,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,EACxB,iBAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CACvD,CAAC;gBAEF,qBAAqB;gBACrB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAErB,cAAc;gBACd,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACxC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;YAC7B,CAAC,CAAC,CAAA;QACJ,CAAC;QAED;;;WAGG;QACH,mBAAmB,CAAC,KAAsB,EAAE,OAAO;YACjD,0CAA0C;YAC1C,wCAAwC;YACxC,qCAAqC;YACrC,+BAA+B;YAC/B,sCAAsC;YACtC,qDAAqD;YACrD,wEAAwE;YACxE,0DAA0D;YAC1D,iCAAiC;YACjC,aAAa;YACb,kCAAkC;YAClC,kCAAkC;YAClC,MAAM;YACN,KAAK;YACL,+BAA+B;YAC/B,IAAI,CAAC,aAAa,CAChB,OAAO,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAqB,CAAC;iBACvD,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAClB,CAAA;QACH,CAAC;QAED;;WAEG;QACH,aAAa,CAAC,UAAyB,IAAI;YACzC,MAAM,YAAY,GAAsB,OAAO,CAAC,CAAC,CAAC,OAAO;iBACtD,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;iBAC9B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;gBAC3B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC;YAEtC,eAAe;YACf,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW;iBAC/C,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;iBACzC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY;iBAC7B,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAA;YAE3D,oBAAoB;YACpB,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;YAE1D,uCAAuC;YACvC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;gBAClD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mCAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,iCAC1D,UAAU,KACb,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,IAC7C,CAAC,CAAC,CAAC,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;gBACnD,0CAA0C;aAC3C;QACH,CAAC;QAED;;WAEG;QACH,UAAU,CAAC,EAAe;YACxB,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9F,CAAC,CAAC,EAAE,CAAA;QACR,CAAC;QAED;;WAEG;QACH,SAAS;YACP,0DAA0D;YAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;YACrC,MAAM,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;YAC/C,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,iBAAS,CAAC,QAAQ,CAAC;YAC1C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACzD,4EAA4E;YAC3E,IAAI,CAAC,UAAU,CAAC,OAAuB,CAAC,YAAY,GAAG;gBACtD,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO;gBAC/D,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO;aAChE,CAAA;QACH,CAAC;QAED;;WAEG;QACH,OAAO;YACL,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACtC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;QACjB,CAAC;QAED;;WAEG;QACH,IAAI,cAAc;YAChB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC;QACjD,CAAC;QACD,IAAI,cAAc,CAAC,GAAY;YAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,CAAC;QACD;;WAEG;QACH,IAAI,OAAO;YACT,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;QAC7D,CAAC;QACD,IAAI,OAAO,CAAC,GAAY;YACtB,0BAA0B;YAC1B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACnF,0BAA0B;YAC1B,IAAI,CAAC,SAAS,CAAC;gBACb,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO;gBACpC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO;aACrC,CAAC,CAAC;QACL,CAAC;QACD;;WAEG;QACH,IAAI,YAAY;YACd,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC;QAC/C,CAAC;QACD,IAAI,YAAY,CAAC,GAAY;YAC3B,0BAA0B;YAC1B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;QACrD,CAAC;QACD;;WAEG;QACH,YAAY;YACV,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;QAC1B,CAAC;QAGD;;;;WAIG;QACH,mBAAmB,CAAC,IAAY,EAAE,GAAgB;YAChD,IAAI,KAAK,CAAC;YACV,IAAG,CAAC,IAAI,CAAC,KAAK,EAAE;gBACd,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC9B,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;gBAC7C,CAAC,CAAC,CAAC;gBACH,OAAO,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;aACtB;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC;QAED;;WAEG;QACH,MAAM,CAAC,IAAa;YAClB,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QAED,mDAAmD;QACnD,uBAAuB;QACvB,mDAAmD;QAEnD,KAAK,CAAC,QAAgC;YACpC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;YAClD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,kCAAgB,EAAE,CAAC,CAAC;YACxC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;YAC/D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QACrD,CAAC;QAED;;WAEG;QACH,YAAY;YACV,OAAO,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;QAED;;WAEG;QACH,YAAY,CAAC,QAA4B;YACvC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACjF,CAAC;QAED;;WAEG;QACH,QAAQ,CAAC,EAAe;YACtB,OAAO,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvD,CAAC;QAED;;WAEG;QACH,QAAQ,CAAC,EAAe,EAAE,QAQzB;YACC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mCAAiB,CAAC,iCACjC,KAAK,GACL,QAAQ,EACX,CAAC,CAAC,CAAC;QACP,CAAC;QAED;;WAEG;QACH,UAAU,CAAC,EAAe,EAAE,eAAe,GAAG,IAAI;YAChD,MAAM,KAAK,GAAoB;gBAC7B,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxB,EAAE;gBACF,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;gBACvC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;gBACrC,UAAU,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACzC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;gBACrC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;gBACzC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;aACnC,CAAA;YAED,IAAG,eAAe,EAAE;gBAClB,4CAA4C;gBAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;gBAClD,mCAAmC;gBACnC,2FAA2F;gBAC3F,iFAAiF;gBACjF,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;aACjC;YAED,iCAAiC;YACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,kCAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;YAE7C,IAAG,eAAe,EAAE;gBAClB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;aACpD;QACH,CAAC;QAES,oBAAoB,CAAC,EAAe;YAC5C,MAAM,SAAS,GAA8B,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACzE,OAAO,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACjD,GAAG,EAAE,SAAoB;gBACzB,IAAI,EAAE,SAAoB;gBAC1B,MAAM,EAAE,SAAoB;gBAC5B,KAAK,EAAE,SAAoB;aAC5B,CAAA;QACH,CAAC;QAED;;WAEG;QACH,aAAa,CAAC,EAAU;YACtB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,kCAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAClG,CAAC;QAGD;;;WAGG;QACH,WAAW,CAAC,CAAS,EAAE,CAAS,EAAE,KAAiB,IAAI;YACrD,MAAM,SAAS,GAAG,UAAU,CAAC,uBAAuB,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACzG,IAAG,CAAC,CAAC,EAAE;gBAAE,OAAO,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;;gBAC7E,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QAED,cAAc,CAAC,QAA4B;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpC,OAAO,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACnH,CAAC;QAED,eAAe;YACb,OAAO,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,mDAAmD;QACnD,SAAS;QACT,mDAAmD;QAEnD;;WAEG;QACH,IAAI,CAAC,QAA4B;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACrH,MAAM,aAAa,GAAqB,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/D,MAAM,MAAM,GAAqB,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YACtF,IAAG,MAAM,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE;gBAC/D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,sBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;aACxC;QACH,CAAC;QAGD;;WAEG;QACH,MAAM,CAAC,QAA4B;YACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,EAAE,GAAG,UAAU,CAAC,cAAc,CAClC,QAAQ;iBACP,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;iBACrE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAClB,CAAC;YACF,MAAM,aAAa,GAAqB,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/D,MAAM,UAAU,GAAG;gBACjB,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU;gBAChC,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;aAClC,CAAC;YACF,MAAM,MAAM,GAAqB;gBAC/B,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,KAAK,GAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACvE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,MAAM,GAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACxE,CAAC;YACF,IAAG,MAAM,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE;gBAC/D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,sBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;aACxC;QACH,CAAC;QAGD;;WAEG;QACH,SAAS,CAAC,MAAwB;YAChC,MAAM,aAAa,GAAqB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/E,IAAG,MAAM,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE;gBAC/D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,sBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;aACxC;QACH,CAAC;QAGD;;WAEG;QACH,SAAS;YACP,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;QAChD,CAAC;KACF;IAraD,sBAqaC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ts/index.ts"],"names":[],"mappings":"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"}

pub/js/observers/DomObserver.js

@@ -65,5 +65,15 @@ define(["require", "exports"], function (require, exports) {
             this.cbk = cbk;
+            this.isRefreshing = false;
+            this.state = [];
+            this.prevState = [];
             this.unsubscribeAll = [];
-            this.unsubscribeAll.push(store.subscribe((state, prevState) => this.onStateChanged(state, prevState), (state) => state.selectables));
+            this.unsubscribeAll.push(store.subscribe((state, prevState) => this.onStateChanged(state, prevState), (state) => state.selectables), store.subscribe((state, prevState) => this.onUiChanged(state, prevState), (state) => state.ui));
         }
+        onUiChanged(state, prevState) {
+            this.isRefreshing = state.refreshing;
+            // // update after refresh (bug because isRefreshing is turned on and off many times)
+            // if (state.refreshing !== prevState.refreshing && state.refreshing === false) {
+            //   this.onStateChanged()
+            // }
+        }
         cleanup() {
@@ -87,7 +97,11 @@ this.unsubscribeAll.forEach(u => u());
          */
-        onStateChanged(state, prevState) {
-            const added = state.filter(s => !prevState.find(s2 => s2.el === s.el));
-            added.forEach((state) => this.onAdded(state));
-            const removed = prevState.filter(s => !state.find(s2 => s2.el === s.el));
-            removed.forEach((state) => this.onRemoved(state));
+        onStateChanged(state = this.state, prevState = this.prevState) {
+            this.state = state;
+            if (!this.isRefreshing) {
+                this.prevState = prevState;
+                const added = state.filter(s => !prevState.find(s2 => s2.el === s.el));
+                added.forEach((state) => this.onAdded(state));
+                const removed = prevState.filter(s => !state.find(s2 => s2.el === s.el));
+                removed.forEach((state) => this.onRemoved(state));
+            }
         }
@@ -97,2 +111,2 @@ }
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRG9tT2JzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHMvb2JzZXJ2ZXJzL0RvbU9ic2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7SUFTQyxDQUFDO0lBRUYsa0RBQWtEO0lBQ3JDLFFBQUEsWUFBWSxHQUFHLElBQUksR0FBRyxFQUFxRixDQUFDO0lBQ3pILFNBQWdCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxTQUFTO1FBQ2xELGlCQUFpQixFQUFFLENBQUM7UUFDcEIsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsY0FBYyxDQUFDLEVBQUUsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQzFELENBQUM7SUFIRCw0Q0FHQztJQUFBLENBQUM7SUFFRixTQUFnQixpQkFBaUI7UUFDL0IsS0FBSyxDQUFDLElBQUksQ0FBQyxvQkFBWSxDQUFDLElBQUksRUFBRSxDQUFDO2FBQzlCLE9BQU8sQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBSEQsOENBR0M7SUFBQSxDQUFDO0lBRUYsU0FBZ0IsY0FBYyxDQUFDLEVBQWUsRUFBRSxTQUF3QztRQUN0RixJQUFJLE9BQU8sY0FBYyxLQUFLLFdBQVcsRUFBRTtZQUN6QyxNQUFNLElBQUksS0FBSyxDQUFDLG9HQUFvRyxDQUFDLENBQUM7U0FDdkg7UUFDRCxJQUFJLG9CQUFZLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFO1lBQ3hCLGlCQUFpQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1NBQ3ZCO1FBQ0QsTUFBTSxjQUFjLEdBQUcsSUFBSSxjQUFjLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDckQsY0FBYyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFL0IsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLGdCQUFn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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRG9tT2JzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdHMvb2JzZXJ2ZXJzL0RvbU9ic2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7SUFTQyxDQUFDO0lBRUYsa0RBQWtEO0lBQ3JDLFFBQUEsWUFBWSxHQUFHLElBQUksR0FBRyxFQUFxRixDQUFDO0lBQ3pILFNBQWdCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxTQUFTO1FBQ2xELGlCQUFpQixFQUFFLENBQUM7UUFDcEIsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsY0FBYyxDQUFDLEVBQUUsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQzFELENBQUM7SUFIRCw0Q0FHQztJQUFBLENBQUM7SUFFRixTQUFnQixpQkFBaUI7UUFDL0IsS0FBSyxDQUFDLElBQUksQ0FBQyxvQkFBWSxDQUFDLElBQUksRUFBRSxDQUFDO2FBQzlCLE9BQU8sQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsaUJBQWlCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBSEQsOENBR0M7SUFBQSxDQUFDO0lBRUYsU0FBZ0IsY0FBYyxDQUFDLEVBQWUsRUFBRSxTQUF3QztRQUN0RixJQUFJLE9BQU8sY0FBYyxLQUFLLFdBQVcsRUFBRTtZQUN6QyxNQUFNLElBQUksS0FBSyxDQUFDLG9HQUFvRyxDQUFDLENBQUM7U0FDdkg7UUFDRCxJQUFJLG9CQUFZLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFO1lBQ3hCLGlCQUFpQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1NBQ3ZCO1FBQ0QsTUFBTSxjQUFjLEdBQUcsSUFBSSxjQUFjLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDckQsY0FBYyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFL0IsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLGdCQUFn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

pub/js/observers/SelectablesObserver.js

@@ -16,7 +16,13 @@ define(["require", "exports", "../utils/DomMetrics"], function (require, exports, DomMetrics) {
             this.isRefreshing = false;
+            this.state = [];
+            this.prevState = [];
             this.unsubscribeAll = [];
-            this.unsubscribeAll.push(store.subscribe((state, prevState) => this.onStateChanged(state, prevState), (state) => state.selectables), store.subscribe((state, prevState) => this.onUiChanged(state), (state) => state.ui));
+            this.unsubscribeAll.push(store.subscribe((state, prevState) => this.onStateChanged(state, prevState), (state) => state.selectables), store.subscribe((state, prevState) => this.onUiChanged(state, prevState), (state) => state.ui));
         }
-        onUiChanged(state) {
+        onUiChanged(state, prevState) {
             this.isRefreshing = state.refreshing;
+            // // update after refresh (bug because isRefreshing is turned on and off many times)
+            // if (state.refreshing !== prevState.refreshing && state.refreshing === false) {
+            //   this.onStateChanged(this.state, this.prevState)
+            // }
         }
@@ -31,40 +37,42 @@ cleanup() {
          */
-        onStateChanged(state, prevState) {
-            // select selectables which have changed
-            const filterBy = (propName, selectable) => {
-                const oldSelectable = prevState.find(old => selectable.el === old.el);
-                // FIXME: use JSON.stringify to compare?
-                return !oldSelectable || JSON.stringify(oldSelectable[propName]) !== JSON.stringify(selectable[propName]);
-                // return !oldSelectable || oldSelectable[propName] !== selectable[propName];
-            };
-            const removed = prevState.filter(s => !state.find(s2 => s2.el === s.el));
-            const metrics = state.filter(selectable => filterBy('metrics', selectable));
-            if (removed.length + metrics.length > 0)
-                this.onMetrics(metrics, removed);
-            const selection = state.filter(selectable => filterBy('selected', selectable));
-            if (selection.length > 0)
-                this.onSelection(selection);
-            // const draggable = state.filter(selectable => filterBy('draggable', selectable));
-            // if(draggable.length > 0) this.onDraggable(draggable);
-            // const resizeable = state.filter(selectable => filterBy('resizeable', selectable));
-            // if(resizeable.length > 0) this.onResizeable(resizeable);
-            // const isDropZone = state.filter(selectable => filterBy('isDropZone', selectable));
-            // if(isDropZone.length > 0) this.onDropZone(isDropZone);
-            const translation = state.filter(selectable => filterBy('translation', selectable));
-            if (translation.length > 0)
-                this.onTranslation(translation);
+        onStateChanged(state = this.state, prevState = this.prevState) {
+            this.state = state;
+            if (!this.isRefreshing) {
+                this.prevState = prevState;
+                // select selectables which have changed
+                const filterBy = (propName, selectable) => {
+                    const oldSelectable = prevState.find(old => selectable.el === old.el);
+                    // FIXME: use JSON.stringify to compare?
+                    return !oldSelectable || JSON.stringify(oldSelectable[propName]) !== JSON.stringify(selectable[propName]);
+                    // return !oldSelectable || oldSelectable[propName] !== selectable[propName];
+                };
+                const removed = prevState.filter(s => !state.find(s2 => s2.el === s.el));
+                const metrics = state.filter(selectable => filterBy('metrics', selectable));
+                if (removed.length + metrics.length > 0)
+                    this.onMetrics(metrics, removed);
+                const selection = state.filter(selectable => filterBy('selected', selectable));
+                if (selection.length > 0)
+                    this.onSelection(selection);
+                // const draggable = state.filter(selectable => filterBy('draggable', selectable));
+                // if(draggable.length > 0) this.onDraggable(draggable);
+                // const resizeable = state.filter(selectable => filterBy('resizeable', selectable));
+                // if(resizeable.length > 0) this.onResizeable(resizeable);
+                // const isDropZone = state.filter(selectable => filterBy('isDropZone', selectable));
+                // if(isDropZone.length > 0) this.onDropZone(isDropZone);
+                const translation = state.filter(selectable => filterBy('translation', selectable));
+                if (translation.length > 0)
+                    this.onTranslation(translation);
+            }
         }
         // update elements position and size
         onMetrics(selectables, removed) {
-            if (!this.isRefreshing) {
-                selectables.forEach(selectable => {
-                    // while being dragged, elements are out of the flow, do not apply styles
-                    if (!selectable.preventMetrics) {
-                        DomMetrics.setMetrics(selectable.el, selectable.metrics, selectable.useMinHeight);
-                    }
-                });
-                // notify the app
-                if (this.hooks.onChange)
-                    this.hooks.onChange(selectables.concat(removed));
-            }
+            selectables.forEach(selectable => {
+                // while being dragged, elements are out of the flow, do not apply styles
+                if (!selectable.preventMetrics) {
+                    DomMetrics.setMetrics(selectable.el, selectable.metrics, selectable.useMinHeight);
+                }
+            });
+            // notify the app
+            if (this.hooks.onChange)
+                this.hooks.onChange(selectables.concat(removed));
         }
@@ -100,2 +108,2 @@ onSelection(selectables) {
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VsZWN0YWJsZXNPYnNlcnZlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90cy9vYnNlcnZlcnMvU2VsZWN0YWJsZXNPYnNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBS0E7OztPQUdHO0lBQ0gsTUFBYSxtQkFBbUI7UUFDOUIsWUFBb0IsYUFBMkIsRUFBVSxlQUE2QixFQUFVLEtBQWlCLEVBQVUsS0FBa0I7WUFBekgsa0JBQWEsR0FBYixhQUFhLENBQWM7WUFBVSxvQkFBZSxHQUFmLGVBQWUsQ0FBYztZQUFVLFVBQUssR0FBTCxLQUFLLENBQVk7WUFBVSxVQUFLLEdBQUwsS0FBSyxDQUFhO1lBYXJJLGlCQUFZLEdBQVksS0FBSyxDQUFDO1lBSzlCLG1CQUFjLEdBQXNCLEVBQUUsQ0FBQztZQWpCN0MsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQ3RCLEtBQUssQ0FBQyxTQUFTLENBQ2IsQ0FBQyxLQUE2QixFQUFFLFNBQWlDLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxFQUMzRyxDQUFDLEtBQWlCLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQ3pDLEVBQ0QsS0FBSyxDQUFDLFNBQVMsQ0FDYixDQUFDLEtBQW9CLEVBQUUsU0FBd0IsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsRUFDM0UsQ0FBQyxLQUFpQixFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUNoQyxDQUNGLENBQUM7UUFDSixDQUFDO1FBR0QsV0FBVyxDQUFDLEtBQW9CO1lBQzlCLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBQztRQUN2QyxDQUFDO1FBR0QsT0FBTztZQUNMLElBQUksQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VsZWN0YWJsZXNPYnNlcnZlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90cy9vYnNlcnZlcnMvU2VsZWN0YWJsZXNPYnNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBS0E7OztPQUdHO0lBQ0gsTUFBYSxtQkFBbUI7UUFDOUIsWUFBb0IsYUFBMkIsRUFBVSxlQUE2QixFQUFVLEtBQWlCLEVBQVUsS0FBa0I7WUFBekgsa0JBQWEsR0FBYixhQUFhLENBQWM7WUFBVSxvQkFBZSxHQUFmLGVBQWUsQ0FBYztZQUFVLFVBQUssR0FBTCxLQUFLLENBQVk7WUFBVSxVQUFLLEdBQUwsS0FBSyxDQUFhO1lBYXJJLGlCQUFZLEdBQVksS0FBSyxDQUFDO1lBQzlCLFVBQUssR0FBMkIsRUFBRSxDQUFBO1lBQ2xDLGNBQVMsR0FBMkIsRUFBRSxDQUFBO1lBU3RDLG1CQUFjLEdBQXNCLEVBQUUsQ0FBQztZQXZCN0MsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQ3RCLEtBQUssQ0FBQyxTQUFTLENBQ2IsQ0FBQyxLQUE2QixFQUFFLFNBQWlDLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxFQUMzRyxDQUFDLEtBQWlCLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQ3pDLEVBQ0QsS0FBSyxDQUFDLFNBQVMsQ0FDYixDQUFDLEtBQW9CLEVBQUUsU0FBd0IsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsU0FBUyxDQUFDLEVBQ3RGLENBQUMsS0FBaUIsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FDaEMsQ0FDRixDQUFDO1FBQ0osQ0FBQztRQUtELFdBQVcsQ0FBQyxLQUFvQixFQUFFLFNBQXdCO1lBQ3hELElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBQztZQUNyQyxxRkFBcUY7WUFD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

pub/js/Ui.js

@@ -21,2 +21,3 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
             this.unsubscribeAll = [];
+            this.isRefreshing = false;
             // listen to events
@@ -140,2 +141,7 @@ this.unsubscribeAll.push(
         onUiChanged(state, prevState) {
+            this.isRefreshing = state.refreshing;
+            // // update after refresh (fail because isRefreshing is turned on and off many times)
+            // if (state.refreshing !== prevState.refreshing && state.refreshing === false) {
+            //   this.update(this.store.getState().selectables)
+            // }
             if (state.catchingEvents !== prevState.catchingEvents || state.mode !== prevState.mode) {
@@ -173,29 +179,31 @@ // this is to give the focus on the UI, and not prevent the user from pressing tab again
         update(selectables) {
-            //  update scroll
-            const { scrollWidth, scrollHeight } = this.iframe.contentWindow.document.scrollingElement;
-            this.overlay.contentDocument.body.style.width = scrollWidth + 'px';
-            this.overlay.contentDocument.body.style.height = scrollHeight + 'px';
-            // remove the UIs that have no corresponding element in the stage
-            this.boxes
-                .filter(r => !selectables.find(s => r.selectable.el === s.el))
-                .forEach(r => r.ui.parentElement.removeChild(r.ui));
-            // remove the boxes
-            this.boxes = this.boxes
-                .filter(r => selectables.find(s => r.selectable.el === s.el));
-            // add the missing boxes
-            this.boxes = this.boxes.concat(selectables
-                // only the missing ones
-                .filter(s => !this.boxes.find(r => r.selectable.el === s.el))
-                // create a box object
-                .map(s => ({
-                selectable: s,
-                // append a new div to the overlay
-                ui: this.overlay.contentDocument.body.appendChild(this.createBoxUi()),
-            })));
-            // update the view
-            const mode = this.store.getState().ui.mode;
-            const dropZones = mode === Types_1.UiMode.DRAG ? selectables.filter(s => s.dropZone && s.dropZone.parent).map(s => s.dropZone.parent)
-                : [];
-            this.boxes
-                .map(r => this.updateBox(r, selectables.find(s => s.el === r.selectable.el), dropZones));
+            if (!this.isRefreshing) {
+                //  update scroll
+                const { scrollWidth, scrollHeight } = this.iframe.contentWindow.document.scrollingElement;
+                this.overlay.contentDocument.body.style.width = scrollWidth + 'px';
+                this.overlay.contentDocument.body.style.height = scrollHeight + 'px';
+                // remove the UIs that have no corresponding element in the stage
+                this.boxes
+                    .filter(r => !selectables.find(s => r.selectable.el === s.el))
+                    .forEach(r => r.ui.parentElement.removeChild(r.ui));
+                // remove the boxes
+                this.boxes = this.boxes
+                    .filter(r => selectables.find(s => r.selectable.el === s.el));
+                // add the missing boxes
+                this.boxes = this.boxes.concat(selectables
+                    // only the missing ones
+                    .filter(s => !this.boxes.find(r => r.selectable.el === s.el))
+                    // create a box object
+                    .map(s => ({
+                    selectable: s,
+                    // append a new div to the overlay
+                    ui: this.overlay.contentDocument.body.appendChild(this.createBoxUi()),
+                })));
+                // update the view
+                const mode = this.store.getState().ui.mode;
+                const dropZones = mode === Types_1.UiMode.DRAG ? selectables.filter(s => s.dropZone && s.dropZone.parent).map(s => s.dropZone.parent)
+                    : [];
+                this.boxes
+                    .map(r => this.updateBox(r, selectables.find(s => s.el === r.selectable.el), dropZones));
+            }
         }
@@ -264,2 +272,2 @@ createBoxUi() {
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Ui.js","sourceRoot":"","sources":["../../src/ts/Ui.ts"],"names":[],"mappings":";;;;;;;;;;;;;IAUA,MAAa,EAAE;QAuBb,YAA4B,MAAyB,EAAS,OAA0B,EAAU,KAAiB;YAAvF,WAAM,GAAN,MAAM,CAAmB;YAAS,YAAO,GAAP,OAAO,CAAmB;YAAU,UAAK,GAAL,KAAK,CAAY;YAtBzG,UAAK,GAAe,EAAE,CAAC;YAsHzB,mBAAc,GAAsB,EAAE,CAAC;YA/F7C,mBAAmB;YACnB,IAAI,CAAC,cAAc,CAAC,IAAI;YACtB,uDAAuD;YACvD,iBAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,EACtD,KAAK,CAAC,SAAS,CACb,CAAC,WAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EACjE,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CACpC,EACD,KAAK,CAAC,SAAS,CACb,CAAC,KAAiB,EAAE,SAAqB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC,EACnF,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAC7B,EACD,KAAK,CAAC,SAAS,CACb,CAAC,KAAc,EAAE,SAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,EAC1E,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAC1B,CACF,CAAC;YAEF,eAAe;YACf,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC1D,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,8EAA8E;YAErI,gBAAgB;YAChB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgE7C,CAAC;QACJ,CAAC;QA9GD,MAAM,CAAO,QAAQ,CAAC,MAAyB,EAAE,KAAiB;;gBAChE,OAAO,IAAI,OAAO,CAAK,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACzC,MAAM,GAAG,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;oBAE3C,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAC5C,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;oBAE9B,IAAG,OAAO,CAAC,eAAe,CAAC,UAAU,KAAK,UAAU,EAAE;wBACpD,SAAS;wBACT,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;qBACzC;yBACI;wBACH,UAAU;wBACV,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,GAAG,EAAE;4BAClC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;wBAC1C,CAAC,CAAA;qBACF;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SAAA;QA8FD,aAAa;YACX,IAAI,CAAC,MAAM,EAAE,CAAA;QACf,CAAC;QAGD,OAAO;YACL,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACtC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC;QAED,iEAAiE;QACjE,aAAa;QACb,qEAAqE;QACrE,sEAAsE;QACtE,OAAO;QACP,IAAI;QACI,MAAM;YACZ,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACnG,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC;YAC9B,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,GAAG,aAAa,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACrE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;QACrC,CAAC;QACO,WAAW,CAAC,KAAc,EAAE,SAAkB;YACpD,IAAG,KAAK,CAAC,cAAc,KAAK,SAAS,CAAC,cAAc,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE;gBACrF,wFAAwF;gBACxF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;gBAEtE,IAAG,KAAK,CAAC,IAAI,KAAK,cAAM,CAAC,IAAI,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,WAAW,CAAC;oBACrC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,WAAW,CAAC;oBACtC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,CAAC;oBAC/B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC;iBACjC;qBACI;oBACH,IAAI,CAAC,aAAa,EAAE,CAAC;iBACtB;aACF;QACH,CAAC;QACO,cAAc,CAAC,KAAiB,EAAE,SAAqB;YAC7D,IAAG,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE;gBACjG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;gBAErE,sFAAsF;gBACtF,IAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,cAAM,CAAC,IAAI,EAAE;oBAChD,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;oBACpE,MAAM,aAAa,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;oBACxE,IAAG,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE;wBACnF,6BAA6B;wBAC7B,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;qBACnE;iBACF;aACF;YACD,IAAG,KAAK,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,CAAC,UAAU,EAAE;gBAClE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC;aAC9E;QACH,CAAC;QAED,MAAM,CAAC,WAAmC;YACxC,iBAAiB;YACjB,MAAM,EAAE,WAAW,EAAE,YAAY,EAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACzF,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,WAAW,GAAG,IAAI,CAAC;YACnE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;YAErE,iEAAiE;YACjE,IAAI,CAAC,KAAK;iBACT,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;iBAC7D,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAEpD,mBAAmB;YACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK;iBACtB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAE7D,wBAAwB;YACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAC5B,WAAW;gBACX,wBAAwB;iBACvB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC7D,sBAAsB;iBACrB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACT,UAAU,EAAE,CAAC;gBACb,kCAAkC;gBAClC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;aACtE,CAAC,CAAC,CACJ,CAAC;YAEF,kBAAkB;YAClB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC3C,MAAM,SAAS,GAAG,IAAI,KAAK,cAAM,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC3H,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,CAAC,KAAK;iBACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QAC3F,CAAC;QACO,WAAW;YACjB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC9D,GAAG,CAAC,SAAS,GAAG;;;;;KAKf,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC;QACO,SAAS,CAAC,GAAQ,EAAE,UAA2B,EAAE,SAAwB;YAC/E,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC;YAC1H,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE,CAAC,CAAC;YACjE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAElF,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC;YAC5B,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,kCACvB,GAAG,CAAC,UAAU,CAAC,OAAO,KACzB,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC,EAC/C,MAAM,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC,EAC9C,MAAM,EAAE,EAAC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC,KAC7C,KAAK,EAAE,IAAI,CAAC,CAAC;YAChB,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG;gBACzB,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc;gBACtD,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB;gBAC5D,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe;gBACzD,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;gBAC/C,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY;gBACjC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBAC3G,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBAC5G,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBAC9G,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBAC/G,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB;gBAC5D,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB;gBAChD,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB;gBAC7C,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB;gBACnD,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBACtD,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB;aACjD,CAAC,CAAC;YACH,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG;gBACtB,KAAK;gBACL,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc;gBACrD,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB;gBAC3D,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe;gBACxD,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;gBAC9C,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY;gBAChC,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBACzG,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBAC1G,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBAC5G,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBAC7G,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB;gBAC3D,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB;gBAC/C,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB;gBAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB;gBAClD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;gBACrD,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,iBAAiB;aAChD,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACb,CAAC;QACD;;WAEG;QACH,MAAM,CAAC,IAAa;YAClB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,CAAC;KACF;IArRD,gBAqRC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Ui.js","sourceRoot":"","sources":["../../src/ts/Ui.ts"],"names":[],"mappings":"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"}

src/ts/index.ts

@@ -156,3 +156,4 @@ import * as types from './Types';
     if (states.length > 0) {
-      this.store.dispatch(UiAction.setRefreshing(true));
+      const isRefreshing = this.store.getState().ui.refreshing
+      if (!isRefreshing) this.store.dispatch(UiAction.setRefreshing(true));
       this.store.dispatch(updateSelectables(states.map(selectable => ({
@@ -162,3 +163,3 @@ ...selectable,
       }))));
-      this.store.dispatch(UiAction.setRefreshing(false));
+      if (!isRefreshing) this.store.dispatch(UiAction.setRefreshing(false));
       //this.ui.update(states, this.getScroll())
@@ -271,6 +272,11 @@ }
   reset(elements: ArrayLike<HTMLElement>) {
-    this.store.dispatch(UiAction.setRefreshing(true));
+    const isRefreshing = this.store.getState().ui.refreshing
+    if (!isRefreshing) this.store.dispatch(UiAction.setRefreshing(true));
     this.store.dispatch(resetSelectables());
     Array.from(elements).forEach(el => this.addElement(el, false));
-    this.store.dispatch(UiAction.setRefreshing(false));
+    if (!isRefreshing) this.store.dispatch(UiAction.setRefreshing(false));
+    // update after reset (FIXME: should be called in the objects by listening to the store changes but it fails because isRefreshing is turned on and off many times)
+    this.ui.update(this.store.getState().selectables)
+    // bug, why?: this.selectablesObserver.onStateChanged()
+    this.domObserver.onStateChanged()
   }
@@ -335,5 +341,6 @@
 
+    const isRefreshing = this.store.getState().ui.refreshing
     if(preventDispatch) {
       // do not apply style change to this element
-      this.store.dispatch(UiAction.setRefreshing(true));
+      if (!isRefreshing) this.store.dispatch(UiAction.setRefreshing(true));
       // still add it to the dom observer
@@ -349,3 +356,3 @@ // FIXME: prevent the prenvent dispatch is not smart, event prevent a dispatch is not smart
     if(preventDispatch) {
-      this.store.dispatch(UiAction.setRefreshing(false));
+      if (!isRefreshing) this.store.dispatch(UiAction.setRefreshing(false));
     }
@@ -352,0 +359,0 @@ }

src/ts/observers/DomObserver.ts

@@ -72,5 +72,20 @@ import {StageStore} from '../flux/StageStore';
       ),
+      store.subscribe(
+        (state: types.UiState, prevState: types.UiState) => this.onUiChanged(state, prevState),
+        (state:types.State) => state.ui
+      ),
     );
   }
 
+  private isRefreshing: boolean = false;
+  private state: Array<SelectableState> = []
+  private prevState: Array<SelectableState> = []
+  onUiChanged(state: types.UiState, prevState: types.UiState) {
+    this.isRefreshing = state.refreshing;
+    // // update after refresh (bug because isRefreshing is turned on and off many times)
+    // if (state.refreshing !== prevState.refreshing && state.refreshing === false) {
+    //   this.onStateChanged()
+    // }
+  }
+
   private unsubscribeAll: Array<() => void> = [];
@@ -99,9 +114,13 @@ cleanup() {
    */
-  onStateChanged(state: Array<SelectableState>, prevState: Array<SelectableState>) {
-    const added = state.filter(s => !prevState.find(s2 => s2.el === s.el));
-    added.forEach((state) => this.onAdded(state))
+  onStateChanged(state: Array<SelectableState> = this.state, prevState: Array<SelectableState> = this.prevState) {
+    this.state = state
+    if(!this.isRefreshing) {
+      this.prevState = prevState
+      const added = state.filter(s => !prevState.find(s2 => s2.el === s.el));
+      added.forEach((state) => this.onAdded(state))
 
-    const removed = prevState.filter(s => !state.find(s2 => s2.el === s.el));
-    removed.forEach((state) => this.onRemoved(state))
+      const removed = prevState.filter(s => !state.find(s2 => s2.el === s.el));
+      removed.forEach((state) => this.onRemoved(state))
+    }
   }
 }

src/ts/observers/SelectablesObserver.ts

@@ -18,3 +18,3 @@ import * as DomMetrics from '../utils/DomMetrics';
       store.subscribe(
-        (state: types.UiState, prevState: types.UiState) => this.onUiChanged(state),
+        (state: types.UiState, prevState: types.UiState) => this.onUiChanged(state, prevState),
         (state:types.State) => state.ui
@@ -26,4 +26,10 @@ ),
   private isRefreshing: boolean = false;
-  onUiChanged(state: types.UiState) {
+  private state: Array<SelectableState> = []
+  private prevState: Array<SelectableState> = []
+  onUiChanged(state: types.UiState, prevState: types.UiState) {
     this.isRefreshing = state.refreshing;
+    // // update after refresh (bug because isRefreshing is turned on and off many times)
+    // if (state.refreshing !== prevState.refreshing && state.refreshing === false) {
+    //   this.onStateChanged(this.state, this.prevState)
+    // }
   }
@@ -41,33 +47,36 @@
    */
-  onStateChanged(state: Array<SelectableState>, prevState: Array<SelectableState>) {
-    // select selectables which have changed
-    const filterBy = (propName, selectable) => {
-      const oldSelectable = prevState.find(old => selectable.el === old.el);
-      // FIXME: use JSON.stringify to compare?
-      return !oldSelectable || JSON.stringify(oldSelectable[propName]) !== JSON.stringify(selectable[propName]);
-      // return !oldSelectable || oldSelectable[propName] !== selectable[propName];
-    }
+  onStateChanged(state: Array<SelectableState> = this.state, prevState: Array<SelectableState> = this.prevState) {
+    this.state = state
+    if(!this.isRefreshing) {
+      this.prevState = prevState
+      // select selectables which have changed
+      const filterBy = (propName, selectable) => {
+        const oldSelectable = prevState.find(old => selectable.el === old.el);
+        // FIXME: use JSON.stringify to compare?
+        return !oldSelectable || JSON.stringify(oldSelectable[propName]) !== JSON.stringify(selectable[propName]);
+        // return !oldSelectable || oldSelectable[propName] !== selectable[propName];
+      }
 
-    const removed = prevState.filter(s => !state.find(s2 => s2.el === s.el));
-    const metrics = state.filter(selectable => filterBy('metrics', selectable));
-    if(removed.length + metrics.length > 0) this.onMetrics(metrics, removed);
+      const removed = prevState.filter(s => !state.find(s2 => s2.el === s.el));
+      const metrics = state.filter(selectable => filterBy('metrics', selectable));
+      if(removed.length + metrics.length > 0) this.onMetrics(metrics, removed);
 
-    const selection = state.filter(selectable => filterBy('selected', selectable));
-    if(selection.length > 0) this.onSelection(selection);
+      const selection = state.filter(selectable => filterBy('selected', selectable));
+      if(selection.length > 0) this.onSelection(selection);
 
-    // const draggable = state.filter(selectable => filterBy('draggable', selectable));
-    // if(draggable.length > 0) this.onDraggable(draggable);
+      // const draggable = state.filter(selectable => filterBy('draggable', selectable));
+      // if(draggable.length > 0) this.onDraggable(draggable);
 
-    // const resizeable = state.filter(selectable => filterBy('resizeable', selectable));
-    // if(resizeable.length > 0) this.onResizeable(resizeable);
+      // const resizeable = state.filter(selectable => filterBy('resizeable', selectable));
+      // if(resizeable.length > 0) this.onResizeable(resizeable);
 
-    // const isDropZone = state.filter(selectable => filterBy('isDropZone', selectable));
-    // if(isDropZone.length > 0) this.onDropZone(isDropZone);
+      // const isDropZone = state.filter(selectable => filterBy('isDropZone', selectable));
+      // if(isDropZone.length > 0) this.onDropZone(isDropZone);
 
-    const translation = state.filter(selectable => filterBy('translation', selectable));
-    if(translation.length > 0) this.onTranslation(translation);
+      const translation = state.filter(selectable => filterBy('translation', selectable));
+      if(translation.length > 0) this.onTranslation(translation);
+    }
   }
   // update elements position and size
   onMetrics(selectables: Array<SelectableState>, removed: Array<SelectableState>) {
-    if(!this.isRefreshing) {
       selectables.forEach(selectable => {
@@ -81,3 +90,2 @@ // while being dragged, elements are out of the flow, do not apply styles
       if(this.hooks.onChange) this.hooks.onChange(selectables.concat(removed));
-    }
   }
@@ -84,0 +92,0 @@ onSelection(selectables: Array<SelectableState>) {

src/ts/Ui.ts

@@ -152,3 +152,9 @@ import {StageStore} from './flux/StageStore';
   }
+  private isRefreshing: boolean = false;
   private onUiChanged(state: UiState, prevState: UiState) {
+    this.isRefreshing = state.refreshing;
+    // // update after refresh (fail because isRefreshing is turned on and off many times)
+    // if (state.refreshing !== prevState.refreshing && state.refreshing === false) {
+    //   this.update(this.store.getState().selectables)
+    // }
     if(state.catchingEvents !== prevState.catchingEvents || state.mode !== prevState.mode) {
@@ -189,35 +195,37 @@ // this is to give the focus on the UI, and not prevent the user from pressing tab again
   update(selectables: Array<SelectableState>) {
-    //  update scroll
-    const { scrollWidth, scrollHeight} = this.iframe.contentWindow.document.scrollingElement;
-    this.overlay.contentDocument.body.style.width = scrollWidth + 'px';
-    this.overlay.contentDocument.body.style.height = scrollHeight + 'px';
+    if(!this.isRefreshing) {
+      //  update scroll
+      const { scrollWidth, scrollHeight} = this.iframe.contentWindow.document.scrollingElement;
+      this.overlay.contentDocument.body.style.width = scrollWidth + 'px';
+      this.overlay.contentDocument.body.style.height = scrollHeight + 'px';
 
-    // remove the UIs that have no corresponding element in the stage
-    this.boxes
-    .filter(r => !selectables.find(s => r.selectable.el === s.el))
-    .forEach(r => r.ui.parentElement.removeChild(r.ui));
+      // remove the UIs that have no corresponding element in the stage
+      this.boxes
+      .filter(r => !selectables.find(s => r.selectable.el === s.el))
+      .forEach(r => r.ui.parentElement.removeChild(r.ui));
 
-    // remove the boxes
-    this.boxes = this.boxes
-    .filter(r => selectables.find(s => r.selectable.el === s.el))
+      // remove the boxes
+      this.boxes = this.boxes
+      .filter(r => selectables.find(s => r.selectable.el === s.el))
 
-    // add the missing boxes
-    this.boxes = this.boxes.concat(
-      selectables
-      // only the missing ones
-      .filter(s => !this.boxes.find(r => r.selectable.el === s.el))
-      // create a box object
-      .map(s => ({
-        selectable: s,
-        // append a new div to the overlay
-        ui: this.overlay.contentDocument.body.appendChild(this.createBoxUi()),
-      }))
-    );
+      // add the missing boxes
+      this.boxes = this.boxes.concat(
+        selectables
+        // only the missing ones
+        .filter(s => !this.boxes.find(r => r.selectable.el === s.el))
+        // create a box object
+        .map(s => ({
+          selectable: s,
+          // append a new div to the overlay
+          ui: this.overlay.contentDocument.body.appendChild(this.createBoxUi()),
+        }))
+      );
 
-    // update the view
-    const mode = this.store.getState().ui.mode;
-    const dropZones = mode === UiMode.DRAG ? selectables.filter(s => s.dropZone && s.dropZone.parent).map(s => s.dropZone.parent)
-      : [];
-    this.boxes
-    .map(r => this.updateBox(r, selectables.find(s => s.el === r.selectable.el), dropZones));
+      // update the view
+      const mode = this.store.getState().ui.mode;
+      const dropZones = mode === UiMode.DRAG ? selectables.filter(s => s.dropZone && s.dropZone.parent).map(s => s.dropZone.parent)
+        : [];
+        this.boxes
+        .map(r => this.updateBox(r, selectables.find(s => s.el === r.selectable.el), dropZones));
+    }
   }
@@ -224,0 +232,0 @@ private createBoxUi(): HTMLElement {

No alert changes

Improved metrics

Total package byte prevSize

2211627

increased by0.31%

Lines of code

14155

increased by0.6%

No dependency changes