@egjs/flicking-plugins 4.2.2 → 4.2.3

package/declaration/Sync.d.ts

@@ -1,9 +1,11 @@
-import Flicking, { Plugin } from "@egjs/flicking";
-interface SyncOptions {
-    type: "camera" | "index";
+import Flicking from "@egjs/flicking";
+import type { Plugin } from "@egjs/flicking";
+import { SYNC } from "./const";
+export interface SyncOptions {
+    type: typeof SYNC.TYPE.CAMERA | typeof SYNC.TYPE.INDEX;
     synchronizedFlickingOptions: SychronizableFlickingOptions[];
 }
-interface SychronizableFlickingOptions {
+export interface SychronizableFlickingOptions {
     flicking: Flicking;
     isClickable?: boolean;
     isSlidable?: boolean;
@@ -28,8 +30,8 @@ declare class Sync implements Plugin {
     private _onMove;
     private _onMoveStart;
     private _onMoveEnd;
+    private _onSelect;
     private _synchronizeByIndex;
     private _updateClass;
-    private _findNearsetPanel;
 }
 export default Sync;

package/declaration/index.d.ts

@@ -2,7 +2,8 @@ import Parallax from "./Parallax";
 import Fade from "./Fade";
 import AutoPlay from "./AutoPlay";
 import Arrow from "./Arrow";
-import Sync from "./Sync";
+import Sync, { SyncOptions, SychronizableFlickingOptions } from "./Sync";
 export * from "./pagination";
 export { Parallax, Fade, AutoPlay, Arrow, Sync };
+export type { SyncOptions, SychronizableFlickingOptions };
 export * from "./const";

package/dist/plugins.esm.js

@@ -4,9 +4,9 @@ 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
 */
-import { EVENTS, DIRECTION, FlickingError } from '@egjs/flicking';
+import { EVENTS, DIRECTION, FlickingError, clamp } from '@egjs/flicking';
 
 /**
  * You can apply parallax effect while panel is moving.
@@ -719,46 +719,52 @@ function () {
 
     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 = _a.flicking,
             isSlidable = _a.isSlidable,
             isClickable = _a.isClickable;
 
-        if (_this._type === "camera") {
+        if (type === SYNC.TYPE.CAMERA) {
           flicking.on(EVENTS.MOVE, _this._onMove);
           flicking.on(EVENTS.MOVE_START, _this._onMoveStart);
           flicking.on(EVENTS.MOVE_END, _this._onMoveEnd);
         }
 
-        if (_this._type === "index" && isSlidable) {
+        if (type === SYNC.TYPE.INDEX && isSlidable) {
           flicking.on(EVENTS.WILL_CHANGE, _this._onIndexChange);
+          flicking.on(EVENTS.WILL_RESTORE, _this._onIndexChange);
         }
 
         if (isClickable) {
-          flicking.on(EVENTS.SELECT, _this._onIndexChange);
+          flicking.on(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 = _a.flicking,
             isSlidable = _a.isSlidable,
             isClickable = _a.isClickable;
 
-        if (_this._type === "camera") {
+        if (type === SYNC.TYPE.CAMERA) {
           flicking.off(EVENTS.MOVE, _this._onMove);
           flicking.off(EVENTS.MOVE_START, _this._onMoveStart);
           flicking.off(EVENTS.MOVE_END, _this._onMoveEnd);
         }
 
-        if (_this._type === "index" && isSlidable) {
+        if (type === SYNC.TYPE.INDEX && isSlidable) {
           flicking.off(EVENTS.WILL_CHANGE, _this._onIndexChange);
+          flicking.off(EVENTS.WILL_RESTORE, _this._onIndexChange);
         }
 
         if (isClickable) {
-          flicking.off(EVENTS.SELECT, _this._onIndexChange);
+          flicking.off(EVENTS.SELECT, _this._onSelect);
         }
       });
     };
@@ -779,16 +785,18 @@ function () {
 
       _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);
       });
     };
 
@@ -813,59 +821,53 @@ function () {
       });
     };
 
-    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 = options.flicking;
+          if (flicking === activeFlicking) return;
+          var targetIndex = clamp(index, 0, flicking.panels.length);
+
+          if (flicking.animating) {
+            // Reserve moveTo once previous animation is finished
+            flicking.once(EVENTS.MOVE_END, function () {
+              void flicking.moveTo(targetIndex).catch(function () {
+                return void 0;
+              });
+            });
+          } else {
+            void flicking.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;
   }
@@ -876,11 +878,7 @@ function () {
       return this._type;
     },
     set: function (val) {
-      var _this = this;
-
-      this._preventEvent(function () {
-        _this._type = val;
-      });
+      this._type = val;
     },
     enumerable: false,
     configurable: true
@@ -890,11 +888,7 @@ function () {
       return this._synchronizedFlickingOptions;
     },
     set: function (val) {
-      var _this = this;
-
-      this._preventEvent(function () {
-        _this._synchronizedFlickingOptions = val;
-      });
+      this._synchronizedFlickingOptions = val;
     },
     enumerable: false,
     configurable: true
@@ -903,16 +897,20 @@ function () {
   __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);
     });
   };
 
@@ -923,7 +921,7 @@ function () {
       return;
     }
 
-    this._removeEvents(this._synchronizedFlickingOptions);
+    this._removeEvents();
 
     this._flicking = null;
   };
@@ -931,23 +929,17 @@ function () {
   __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;