@egjs/flicking 4.12.1-beta.2 → 4.12.1-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@egjs/flicking",
-	"version": "4.12.1-beta.2",
+	"version": "4.12.1-beta.4",
 	"description": "Everyday 30 million people experience. It's reliable, flexible and extendable carousel.",
 	"main": "dist/flicking.cjs.js",
 	"module": "dist/flicking.esm.js",

package/src/control/Control.ts

@@ -397,7 +397,7 @@ abstract class Control {
     }
   }
 
-  private _getPosition(panel: Panel, direction: ValueOf<typeof DIRECTION> = DIRECTION.NONE) {
+  protected _getPosition(panel: Panel, direction: ValueOf<typeof DIRECTION> = DIRECTION.NONE) {
     const flicking = getFlickingAttached(this._flicking);
     const camera = flicking.camera;
 

package/src/control/SnapControl.ts

@@ -9,6 +9,7 @@ import AnchorPoint from "../core/AnchorPoint";
 import { circulateIndex, clamp, getFlickingAttached } from "../utils";
 import * as AXES from "../const/axes";
 import * as ERROR from "../const/error";
+import { DIRECTION } from "../const/external";
 
 import Control from "./Control";
 
@@ -111,7 +112,6 @@ class SnapControl extends Control {
       targetAnchor = this._findSnappedAnchor(position, anchorAtCamera);
     } else if (absPosDelta >= flicking.threshold && absPosDelta > 0 && anchorAtCamera === activeAnchor) {
       // Move to the adjacent panel
-    //  console.log("moveToPosition anchorAtCamera activeAnchor absPosDelta", camera.position, anchorAtCamera, activeAnchor, absPosDelta, snapThreshold)
       targetAnchor = this._findAdjacentAnchor(position, posDelta, anchorAtCamera);
     } else {
       // Fallback to nearest panel from current camera
@@ -121,12 +121,16 @@ class SnapControl extends Control {
       });
     }
 
-    this._triggerIndexChangeEvent(targetAnchor.panel, position, axesEvent);
+    const nextPanel = targetAnchor.panel;
+    const direction = (posDelta === 0 || activeAnchor === targetAnchor) ? DIRECTION.NONE : (posDelta > 0 ? DIRECTION.NEXT : DIRECTION.PREV);
+    const nextPosition = this._getPosition(nextPanel, direction);
+
+    this._triggerIndexChangeEvent(nextPanel, position, axesEvent);
 
     return this._animateToPosition({
-      position: camera.clampToReachablePosition(targetAnchor.position),
+      position: camera.clampToReachablePosition(nextPosition),
       duration,
-      newActivePanel: targetAnchor.panel,
+      newActivePanel: nextPanel,
       axesEvent
     });
   }
@@ -139,14 +143,15 @@ class SnapControl extends Control {
     const currentPos = camera.position;
 
     const clampedPosition = camera.clampToReachablePosition(position);
+    const nearestAnchor = camera.findNearestAnchor(clampedPosition);
     const anchorAtPosition = camera.findAnchorIncludePosition(clampedPosition);
 
-    if (!anchorAtCamera || !anchorAtPosition) {
+    if (!anchorAtCamera || !anchorAtPosition || !nearestAnchor) {
       throw new FlickingError(ERROR.MESSAGE.POSITION_NOT_REACHABLE(position), ERROR.CODE.POSITION_NOT_REACHABLE);
     }
 
     if (!isFinite(count)) {
-      return anchorAtPosition;
+      return nearestAnchor;
     }
 
     const panelCount = flicking.panelCount;
@@ -206,7 +211,6 @@ class SnapControl extends Control {
       }
     }
 
- //   console.log("_findAdjacentAnchor", position, posDelta, anchorAtCamera)
     const adjacentAnchor = (posDelta > 0 ? camera.getNextAnchor(anchorAtCamera) : camera.getPrevAnchor(anchorAtCamera)) ?? anchorAtCamera;
 
     return adjacentAnchor;