@egjs/flicking 4.14.1-beta.3 → 4.14.2-beta.0

package/declaration/control/AxesController.d.ts

@@ -35,6 +35,7 @@ declare class AxesController {
     addPreventClickHandler(): this;
     removePreventClickHandler(): this;
     animateTo(position: number, duration: number, axesEvent?: OnRelease): Promise<void>;
+    getCurrentPosition(): number;
     updateDirection(): void;
     private _resetInternalValues;
     private _onAxesHold;

package/dist/flicking.cjs.js

@@ -4,7 +4,7 @@ name: @egjs/flicking
 license: MIT
 author: NAVER Corp.
 repository: https://github.com/naver/egjs-flicking
-version: 4.14.1-beta.3
+version: 4.14.2-beta.0
 */
 'use strict';
 
@@ -955,6 +955,9 @@ var Viewport = /*#__PURE__*/function () {
  * @ko autoResize 옵션을 사용할 때 크기 변화를 감지하고 Flicking의 resize를 호출하는 컴포넌트
  */
 var AutoResizer = /*#__PURE__*/function () {
+  /**
+   * @param flicking
+   */
   function AutoResizer(flicking) {
     var _this = this;
     this._onResizeWrapper = function () {
@@ -2397,7 +2400,7 @@ var AxesController = /*#__PURE__*/function () {
     if (!axes) {
       return Promise.reject(new FlickingError(MESSAGE.NOT_ATTACHED_TO_FLICKING, CODE.NOT_ATTACHED_TO_FLICKING));
     }
-    var startPos = axes.get([POSITION_KEY])[POSITION_KEY];
+    var startPos = this.getCurrentPosition();
     if (startPos === position) {
       var flicking = getFlickingAttached(this._flicking);
       flicking.camera.lookAt(position);
@@ -2441,6 +2444,14 @@ var AxesController = /*#__PURE__*/function () {
       animate();
     });
   };
+  /**
+   * 현재
+   * @returns
+   */
+  __proto.getCurrentPosition = function () {
+    var _a, _b;
+    return (_b = (_a = this._axes) === null || _a === void 0 ? void 0 : _a.get([POSITION_KEY])[POSITION_KEY]) !== null && _b !== void 0 ? _b : 0;
+  };
   __proto.updateDirection = function () {
     var flicking = getFlickingAttached(this._flicking);
     var axes = this._axes;
@@ -2778,16 +2789,20 @@ var Control = /*#__PURE__*/function () {
       newActivePanel = _a.newActivePanel,
       axesEvent = _a.axesEvent;
     return __awaiter(this, void 0, void 0, function () {
-      var flicking, animate, state;
+      var flicking, nextDuration, animate, state;
       var _this = this;
       return __generator(this, function (_b) {
         flicking = getFlickingAttached(this._flicking);
+        nextDuration = duration;
+        if (Math.abs(nextDuration - position) < 0.5) {
+          nextDuration = 0;
+        }
         animate = function () {
-          return _this._controller.animateTo(position, duration, axesEvent);
+          return _this._controller.animateTo(position, nextDuration, axesEvent);
         };
         state = this._controller.state;
         state.targetPanel = newActivePanel;
-        if (duration <= 0) {
+        if (nextDuration <= 0) {
           return [2 /*return*/, animate()];
         } else {
           return [2 /*return*/, animate().then(function () {
@@ -3378,8 +3393,9 @@ var StrictControl = /*#__PURE__*/function (_super) {
     var anchors = camera.anchorPoints;
     var firstAnchor = anchors[0];
     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);
+    // position이 bounce으로 인하여 범위를 넘어가야 동작하도록 변경
+    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
@@ -8096,7 +8112,7 @@ var Flicking = /*#__PURE__*/function (_super) {
    * Flicking.VERSION;  // ex) 4.0.0
    * ```
    */
-  Flicking.VERSION = "4.14.1-beta.3";
+  Flicking.VERSION = "4.14.2-beta.0";
   return Flicking;
 }(Component);