@egjs/flicking-plugins 4.2.2 → 4.2.3

package/dist/plugins.js

@@ -4,7 +4,7 @@ name: @egjs/flicking-plugins
 license: MIT
 author: NAVER Corp.
 repository: https://github.com/naver/egjs-flicking-plugins
-version: 4.2.2
+version: 4.2.3
 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@egjs/flicking')) :
@@ -723,46 +723,52 @@ version: 4.2.2
 
       this._flicking = null;
 
-      this._addEvents = function (synchronizedFlickingOptions) {
-        synchronizedFlickingOptions.forEach(function (_a) {
+      this._addEvents = function () {
+        var type = _this._type;
+        var synced = _this._synchronizedFlickingOptions;
+        synced.forEach(function (_a) {
           var flicking$1 = _a.flicking,
               isSlidable = _a.isSlidable,
               isClickable = _a.isClickable;
 
-          if (_this._type === "camera") {
+          if (type === SYNC.TYPE.CAMERA) {
             flicking$1.on(flicking.EVENTS.MOVE, _this._onMove);
             flicking$1.on(flicking.EVENTS.MOVE_START, _this._onMoveStart);
             flicking$1.on(flicking.EVENTS.MOVE_END, _this._onMoveEnd);
           }
 
-          if (_this._type === "index" && isSlidable) {
+          if (type === SYNC.TYPE.INDEX && isSlidable) {
             flicking$1.on(flicking.EVENTS.WILL_CHANGE, _this._onIndexChange);
+            flicking$1.on(flicking.EVENTS.WILL_RESTORE, _this._onIndexChange);
           }
 
           if (isClickable) {
-            flicking$1.on(flicking.EVENTS.SELECT, _this._onIndexChange);
+            flicking$1.on(flicking.EVENTS.SELECT, _this._onSelect);
           }
         });
       };
 
-      this._removeEvents = function (synchronizedFlickingOptions) {
-        synchronizedFlickingOptions.forEach(function (_a) {
+      this._removeEvents = function () {
+        var type = _this._type;
+        var synced = _this._synchronizedFlickingOptions;
+        synced.forEach(function (_a) {
           var flicking$1 = _a.flicking,
               isSlidable = _a.isSlidable,
               isClickable = _a.isClickable;
 
-          if (_this._type === "camera") {
+          if (type === SYNC.TYPE.CAMERA) {
             flicking$1.off(flicking.EVENTS.MOVE, _this._onMove);
             flicking$1.off(flicking.EVENTS.MOVE_START, _this._onMoveStart);
             flicking$1.off(flicking.EVENTS.MOVE_END, _this._onMoveEnd);
           }
 
-          if (_this._type === "index" && isSlidable) {
+          if (type === SYNC.TYPE.INDEX && isSlidable) {
             flicking$1.off(flicking.EVENTS.WILL_CHANGE, _this._onIndexChange);
+            flicking$1.off(flicking.EVENTS.WILL_RESTORE, _this._onIndexChange);
           }
 
           if (isClickable) {
-            flicking$1.off(flicking.EVENTS.SELECT, _this._onIndexChange);
+            flicking$1.off(flicking.EVENTS.SELECT, _this._onSelect);
           }
         });
       };
@@ -783,16 +789,18 @@ version: 4.2.2
 
         _this._synchronizedFlickingOptions.forEach(function (_a) {
           var flicking = _a.flicking;
+          if (flicking === e.currentTarget) return;
+          var targetPosition = 0;
 
-          if (flicking !== e.currentTarget) {
-            if (camera.position < camera.range.min) {
-              void flicking.camera.lookAt(camera.position);
-            } else if (camera.position > camera.range.max) {
-              void flicking.camera.lookAt(flicking.camera.range.max + camera.position - camera.range.max);
-            } else {
-              void flicking.camera.lookAt(flicking.camera.range.min + flicking.camera.rangeDiff * progress);
-            }
+          if (camera.position < camera.range.min) {
+            targetPosition = camera.position;
+          } else if (camera.position > camera.range.max) {
+            targetPosition = flicking.camera.range.max + camera.position - camera.range.max;
+          } else {
+            targetPosition = flicking.camera.range.min + flicking.camera.rangeDiff * progress;
           }
+
+          void flicking.camera.lookAt(targetPosition);
         });
       };
 
@@ -817,59 +825,53 @@ version: 4.2.2
         });
       };
 
-      this._synchronizeByIndex = function (activeFlicking, index) {
-        var synchronizedFlickingOptions = _this._synchronizedFlickingOptions;
-        var activePanel = activeFlicking.panels.find(function (panel) {
-          return panel.index === index;
+      this._onSelect = function (e) {
+        void e.currentTarget.moveTo(e.index).catch(function () {
+          return void 0;
         });
-        var lastPanel = activeFlicking.panels[activeFlicking.panels.length - 1];
-
-        if (!activePanel) {
-          return;
-        }
 
-        _this._preventEvent(function () {
-          synchronizedFlickingOptions.forEach(function (_a) {
-            var flicking = _a.flicking,
-                activeClass = _a.activeClass; // calculate new target flicking position with active flicking size and target flicking size
+        _this._synchronizeByIndex(e.currentTarget, e.index);
+      };
 
-            var targetLastPanel = flicking.panels[flicking.panels.length - 1];
-            var targetPos = activePanel.position / (lastPanel.position + lastPanel.size / 2) * (targetLastPanel.position + targetLastPanel.size / 2);
-            flicking.control.moveToPosition(targetPos, 500).catch(function () {
-              return void 0;
-            });
+      this._synchronizeByIndex = function (activeFlicking, index) {
+        var synchronizedFlickingOptions = _this._synchronizedFlickingOptions;
 
-            if (activeClass) {
-              _this._updateClass({
-                flicking: flicking,
-                activeClass: activeClass
-              }, targetPos);
+        _this._preventEvent(function () {
+          synchronizedFlickingOptions.forEach(function (options) {
+            // Active class should be applied same to the Flicking which triggered event
+            _this._updateClass(options, index);
+
+            var flicking$1 = options.flicking;
+            if (flicking$1 === activeFlicking) return;
+            var targetIndex = flicking.clamp(index, 0, flicking$1.panels.length);
+
+            if (flicking$1.animating) {
+              // Reserve moveTo once previous animation is finished
+              flicking$1.once(flicking.EVENTS.MOVE_END, function () {
+                void flicking$1.moveTo(targetIndex).catch(function () {
+                  return void 0;
+                });
+              });
+            } else {
+              void flicking$1.moveTo(targetIndex);
             }
           });
         });
       };
 
-      this._updateClass = function (synchronizedFlickingOption, pos) {
-        var target = _this._findNearsetPanel(synchronizedFlickingOption.flicking, pos);
-
-        synchronizedFlickingOption.flicking.panels.forEach(function (panel) {
-          return panel.index === target.index ? addClass(panel.element, synchronizedFlickingOption.activeClass) : removeClass(panel.element, synchronizedFlickingOption.activeClass);
+      this._updateClass = function (_a, index) {
+        var flicking = _a.flicking,
+            activeClass = _a.activeClass;
+        if (!activeClass) return;
+        flicking.panels.forEach(function (panel) {
+          if (panel.index === index) {
+            addClass(panel.element, activeClass);
+          } else {
+            removeClass(panel.element, activeClass);
+          }
         });
       };
 
-      this._findNearsetPanel = function (flicking, pos) {
-        var nearsetIndex = flicking.panels.reduce(function (nearest, panel, index) {
-          return Math.abs(panel.position - pos) <= nearest.range ? {
-            index: index,
-            range: Math.abs(panel.position - pos)
-          } : nearest;
-        }, {
-          index: 0,
-          range: Infinity
-        }).index;
-        return flicking.panels[nearsetIndex];
-      };
-
       this._type = type;
       this._synchronizedFlickingOptions = synchronizedFlickingOptions;
     }
@@ -880,11 +882,7 @@ version: 4.2.2
         return this._type;
       },
       set: function (val) {
-        var _this = this;
-
-        this._preventEvent(function () {
-          _this._type = val;
-        });
+        this._type = val;
       },
       enumerable: false,
       configurable: true
@@ -894,11 +892,7 @@ version: 4.2.2
         return this._synchronizedFlickingOptions;
       },
       set: function (val) {
-        var _this = this;
-
-        this._preventEvent(function () {
-          _this._synchronizedFlickingOptions = val;
-        });
+        this._synchronizedFlickingOptions = val;
       },
       enumerable: false,
       configurable: true
@@ -907,16 +901,20 @@ version: 4.2.2
     __proto.init = function (flicking) {
       var _this = this;
 
+      var synced = this._synchronizedFlickingOptions;
+
       if (this._flicking) {
         this.destroy();
       }
 
       this._flicking = flicking;
 
-      this._addEvents(this._synchronizedFlickingOptions);
+      this._addEvents();
 
-      this._synchronizedFlickingOptions.forEach(function (synchronizedFlickingOption) {
-        _this._updateClass(synchronizedFlickingOption, 0);
+      synced.forEach(function (options) {
+        var syncedFlicking = options.flicking;
+
+        _this._updateClass(options, syncedFlicking.defaultIndex);
       });
     };
 
@@ -927,7 +925,7 @@ version: 4.2.2
         return;
       }
 
-      this._removeEvents(this._synchronizedFlickingOptions);
+      this._removeEvents();
 
       this._flicking = null;
     };
@@ -935,23 +933,17 @@ version: 4.2.2
     __proto.update = function () {
       var _this = this;
 
-      this._synchronizedFlickingOptions.forEach(function (_a) {
-        var flicking = _a.flicking,
-            activeClass = _a.activeClass;
-
-        _this._updateClass({
-          flicking: flicking,
-          activeClass: activeClass
-        }, flicking.camera.position);
+      this._synchronizedFlickingOptions.forEach(function (options) {
+        _this._updateClass(options, options.flicking.index);
       });
     };
 
     __proto._preventEvent = function (fn) {
-      this._removeEvents(this._synchronizedFlickingOptions);
+      this._removeEvents();
 
       fn();
 
-      this._addEvents(this._synchronizedFlickingOptions);
+      this._addEvents();
     };
 
     return Sync;