@egjs/flicking 4.6.2 → 4.6.3

package/declaration/camera/mode/CameraMode.d.ts

@@ -11,6 +11,7 @@ declare abstract class CameraMode {
     };
     getAnchors(): AnchorPoint[];
     findAnchorIncludePosition(position: number): AnchorPoint | null;
+    findNearestAnchor(position: number): AnchorPoint | null;
     clampToReachablePosition(position: number): number;
     getCircularOffset(): number;
     canReach(panel: Panel): boolean;

package/declaration/camera/mode/CircularCameraMode.d.ts

@@ -8,6 +8,7 @@ declare class CircularCameraMode extends CameraMode {
         max: number;
     };
     getAnchors(): AnchorPoint[];
+    findNearestAnchor(position: number): AnchorPoint | null;
     findAnchorIncludePosition(position: number): AnchorPoint | null;
     getCircularOffset(): number;
     clampToReachablePosition(position: number): number;

package/dist/flicking.esm.js

@@ -4,7 +4,7 @@ name: @egjs/flicking
 license: MIT
 author: NAVER Corp.
 repository: https://github.com/naver/egjs-flicking
-version: 4.6.2
+version: 4.6.3
 */
 import Component, { ComponentEvent } from '@egjs/component';
 import Axes, { PanInput } from '@egjs/axes';
@@ -3569,6 +3569,7 @@ function (_super) {
     var lastAnchor = anchors[anchors.length - 1];
     var shouldBounceToFirst = position <= cameraRange.min && isBetween(firstAnchor.panel.index, indexRange.min, indexRange.max);
     var shouldBounceToLast = position >= cameraRange.max && isBetween(lastAnchor.panel.index, indexRange.min, indexRange.max);
+    var isAdjacent = adjacentAnchor && (indexRange.min <= indexRange.max ? isBetween(adjacentAnchor.index, indexRange.min, indexRange.max) : adjacentAnchor.index >= indexRange.min || adjacentAnchor.index <= indexRange.max);
 
     if (shouldBounceToFirst || shouldBounceToLast) {
       // In bounce area
@@ -3579,7 +3580,7 @@ function (_super) {
       // Move to anchor at position
       targetPanel = anchorAtPosition.panel;
       targetPos = anchorAtPosition.position;
-    } else if (isOverThreshold && adjacentAnchor && isBetween(adjacentAnchor.index, indexRange.min, indexRange.max)) {
+    } else if (isOverThreshold && isAdjacent) {
       // Move to adjacent anchor
       targetPanel = adjacentAnchor.panel;
       targetPos = adjacentAnchor.position;
@@ -3645,6 +3646,27 @@ function () {
     }, null);
   };
 
+  __proto.findNearestAnchor = function (position) {
+    var anchors = this._flicking.camera.anchorPoints;
+    if (anchors.length <= 0) return null;
+    var prevDist = Infinity;
+
+    for (var anchorIdx = 0; anchorIdx < anchors.length; anchorIdx++) {
+      var anchor = anchors[anchorIdx];
+      var dist = Math.abs(anchor.position - position);
+
+      if (dist > prevDist) {
+        // Return previous anchor
+        return anchors[anchorIdx - 1];
+      }
+
+      prevDist = dist;
+    } // Return last anchor
+
+
+    return anchors[anchors.length - 1];
+  };
+
   __proto.clampToReachablePosition = function (position) {
     var camera = this._flicking.camera;
     var range = camera.range;
@@ -3774,6 +3796,28 @@ function (_super) {
     });
   };
 
+  __proto.findNearestAnchor = function (position) {
+    var camera = this._flicking.camera;
+    var anchors = camera.anchorPoints;
+    if (anchors.length <= 0) return null;
+    var camRange = camera.range;
+    var minDist = Infinity;
+    var minDistIndex = -1;
+
+    for (var anchorIdx = 0; anchorIdx < anchors.length; anchorIdx++) {
+      var anchor = anchors[anchorIdx];
+      var dist = Math.min(Math.abs(anchor.position - position), Math.abs(anchor.position - camRange.min + camRange.max - position), Math.abs(position - camRange.min + camRange.max - anchor.position));
+
+      if (dist < minDist) {
+        minDist = dist;
+        minDistIndex = anchorIdx;
+      }
+    } // Return last anchor
+
+
+    return anchors[minDistIndex];
+  };
+
   __proto.findAnchorIncludePosition = function (position) {
     var camera = this._flicking.camera;
     var range = camera.range;
@@ -4542,24 +4586,7 @@ function () {
 
 
   __proto.findNearestAnchor = function (position) {
-    var anchors = this._anchors;
-    if (anchors.length <= 0) return null;
-    var prevDist = Infinity;
-
-    for (var anchorIdx = 0; anchorIdx < anchors.length; anchorIdx++) {
-      var anchor = anchors[anchorIdx];
-      var dist = Math.abs(anchor.position - position);
-
-      if (dist > prevDist) {
-        // Return previous anchor
-        return anchors[anchorIdx - 1];
-      }
-
-      prevDist = dist;
-    } // Return last anchor
-
-
-    return anchors[anchors.length - 1];
+    return this._mode.findNearestAnchor(position);
   };
   /**
    * Return {@link AnchorPoint} that matches {@link Flicking#currentPanel}
@@ -8376,7 +8403,7 @@ function (_super) {
    */
 
 
-  Flicking.VERSION = "4.6.2";
+  Flicking.VERSION = "4.6.3";
   return Flicking;
 }(Component);