@egjs/flicking 4.8.0 → 4.9.1

package/dist/flicking.js

@@ -4,7 +4,7 @@ name: @egjs/flicking
 license: MIT
 author: NAVER Corp.
 repository: https://github.com/naver/egjs-flicking
-version: 4.8.0
+version: 4.9.1
 */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('@egjs/component'), require('@egjs/axes'), require('@egjs/imready')) :
@@ -780,6 +780,29 @@ version: 4.8.0
 
       return arr;
     };
+    var getElementSize = function (_a) {
+      var el = _a.el,
+          horizontal = _a.horizontal,
+          useFractionalSize = _a.useFractionalSize,
+          useOffset = _a.useOffset,
+          style = _a.style;
+
+      if (useFractionalSize) {
+        var baseSize = parseFloat(horizontal ? style.width : style.height);
+        var isBorderBoxSizing = style.boxSizing === "border-box";
+        var border = horizontal ? parseFloat(style.borderLeftWidth || "0") + parseFloat(style.borderRightWidth || "0") : parseFloat(style.borderTopWidth || "0") + parseFloat(style.borderBottomWidth || "0");
+
+        if (isBorderBoxSizing) {
+          return useOffset ? baseSize : baseSize - border;
+        } else {
+          var padding = horizontal ? parseFloat(style.paddingLeft || "0") + parseFloat(style.paddingRight || "0") : parseFloat(style.paddingTop || "0") + parseFloat(style.paddingBottom || "0");
+          return useOffset ? baseSize + padding + border : baseSize + padding;
+        }
+      } else {
+        var sizeStr = horizontal ? "Width" : "Height";
+        return useOffset ? el["offset" + sizeStr] : el["client" + sizeStr];
+      }
+    };
     var setPrototypeOf = Object.setPrototypeOf || function (obj, proto) {
       obj.__proto__ = proto;
       return obj;
@@ -814,6 +837,7 @@ version: 4.8.0
         isBetween: isBetween,
         circulateIndex: circulateIndex,
         range: range,
+        getElementSize: getElementSize,
         setPrototypeOf: setPrototypeOf
     };
 
@@ -862,10 +886,6 @@ version: 4.8.0
       return FlickingError;
     }(Error);
 
-    /*
-     * Copyright (c) 2015 NAVER Corp.
-     * egjs projects are licensed under the MIT license
-     */
     /**
      * A component that manages viewport size
      * @ko 뷰포트 크기 정보를 담당하는 컴포넌트
@@ -877,7 +897,8 @@ version: 4.8.0
       /**
        * @param el A viewport element<ko>뷰포트 엘리먼트</ko>
        */
-      function Viewport(el) {
+      function Viewport(flicking, el) {
+        this._flicking = flicking;
         this._el = el;
         this._width = 0;
         this._height = 0;
@@ -993,8 +1014,21 @@ version: 4.8.0
       __proto.resize = function () {
         var el = this._el;
         var elStyle = getStyle(el);
-        this._width = el.clientWidth;
-        this._height = el.clientHeight;
+        var useFractionalSize = this._flicking.useFractionalSize;
+        this._width = getElementSize({
+          el: el,
+          horizontal: true,
+          useFractionalSize: useFractionalSize,
+          useOffset: false,
+          style: elStyle
+        });
+        this._height = getElementSize({
+          el: el,
+          horizontal: false,
+          useFractionalSize: useFractionalSize,
+          useOffset: false,
+          style: elStyle
+        });
         this._padding = {
           left: elStyle.paddingLeft ? parseFloat(elStyle.paddingLeft) : 0,
           right: elStyle.paddingRight ? parseFloat(elStyle.paddingRight) : 0,
@@ -2200,7 +2234,9 @@ version: 4.8.0
         };
 
         this._onAxesChange = function () {
-          _this._dragged = true;
+          var _a;
+
+          _this._dragged = !!((_a = _this._panInput) === null || _a === void 0 ? void 0 : _a.isEnabled());
         };
 
         this._preventClickWhenDragged = function (e) {
@@ -3181,10 +3217,13 @@ version: 4.8.0
           targetAnchor = this._findSnappedAnchor(position, anchorAtCamera);
         } else if (absPosDelta >= flicking.threshold && absPosDelta > 0) {
           // Move to the adjacent panel
-          targetAnchor = this._findAdjacentAnchor(posDelta, anchorAtCamera);
+          targetAnchor = this._findAdjacentAnchor(position, posDelta, anchorAtCamera);
         } else {
           // Restore to active panel
-          targetAnchor = anchorAtCamera;
+          return this.moveToPanel(activeAnchor.panel, {
+            duration: duration,
+            axesEvent: axesEvent
+          });
         }
 
         this._triggerIndexChangeEvent(targetAnchor.panel, position, axesEvent);
@@ -3255,11 +3294,20 @@ version: 4.8.0
         }
       };
 
-      __proto._findAdjacentAnchor = function (posDelta, anchorAtCamera) {
+      __proto._findAdjacentAnchor = function (position, posDelta, anchorAtCamera) {
         var _a;
 
         var flicking = getFlickingAttached(this._flicking);
         var camera = flicking.camera;
+
+        if (camera.circularEnabled) {
+          var anchorIncludePosition = camera.findAnchorIncludePosition(position);
+
+          if (anchorIncludePosition && anchorIncludePosition.position !== anchorAtCamera.position) {
+            return anchorIncludePosition;
+          }
+        }
+
         var adjacentAnchor = (_a = posDelta > 0 ? camera.getNextAnchor(anchorAtCamera) : camera.getPrevAnchor(anchorAtCamera)) !== null && _a !== void 0 ? _a : anchorAtCamera;
         return adjacentAnchor;
       };
@@ -5514,11 +5562,13 @@ version: 4.8.0
         } : {
           height: panelSize
         };
-        var firstPanelSizeObj = {
+
+        var firstPanelSizeObj = __assign({
           size: panelSize,
-          height: referencePanel.height,
           margin: referencePanel.margin
-        };
+        }, !flicking.horizontal && {
+          height: referencePanel.height
+        });
 
         if (!flicking.noPanelStyleOverride) {
           this._strategy.updatePanelSizes(flicking, panelSizeObj);
@@ -6052,17 +6102,32 @@ version: 4.8.0
 
 
       __proto.resize = function (cached) {
+        var _a;
+
         var el = this.element;
         var flicking = this._flicking;
-        var horizontal = flicking.horizontal;
+        var horizontal = flicking.horizontal,
+            useFractionalSize = flicking.useFractionalSize;
 
         if (cached) {
           this._size = cached.size;
           this._margin = __assign({}, cached.margin);
-          this._height = cached.height;
+          this._height = (_a = cached.height) !== null && _a !== void 0 ? _a : getElementSize({
+            el: el,
+            horizontal: false,
+            useFractionalSize: useFractionalSize,
+            useOffset: true,
+            style: getStyle(el)
+          });
         } else {
           var elStyle = getStyle(el);
-          this._size = horizontal ? el.offsetWidth : el.offsetHeight;
+          this._size = getElementSize({
+            el: el,
+            horizontal: horizontal,
+            useFractionalSize: useFractionalSize,
+            useOffset: true,
+            style: elStyle
+          });
           this._margin = horizontal ? {
             prev: parseFloat(elStyle.marginLeft || "0"),
             next: parseFloat(elStyle.marginRight || "0")
@@ -6070,7 +6135,13 @@ version: 4.8.0
             prev: parseFloat(elStyle.marginTop || "0"),
             next: parseFloat(elStyle.marginBottom || "0")
           };
-          this._height = horizontal ? el.offsetHeight : this._size;
+          this._height = horizontal ? getElementSize({
+            el: el,
+            horizontal: false,
+            useFractionalSize: useFractionalSize,
+            useOffset: true,
+            style: elStyle
+          }) : this._size;
         }
 
         this.updatePosition();
@@ -6780,10 +6851,12 @@ version: 4.8.0
             resizeDebounce = _8 === void 0 ? 0 : _8,
             _9 = _b.maxResizeDebounce,
             maxResizeDebounce = _9 === void 0 ? 100 : _9,
-            _10 = _b.externalRenderer,
-            externalRenderer = _10 === void 0 ? null : _10,
-            _11 = _b.renderExternal,
-            renderExternal = _11 === void 0 ? null : _11;
+            _10 = _b.useFractionalSize,
+            useFractionalSize = _10 === void 0 ? false : _10,
+            _11 = _b.externalRenderer,
+            externalRenderer = _11 === void 0 ? null : _11,
+            _12 = _b.renderExternal,
+            renderExternal = _12 === void 0 ? null : _12;
 
         var _this = _super.call(this) || this; // Internal states
 
@@ -6823,10 +6896,11 @@ version: 4.8.0
         _this._useResizeObserver = useResizeObserver;
         _this._resizeDebounce = resizeDebounce;
         _this._maxResizeDebounce = maxResizeDebounce;
+        _this._useFractionalSize = useFractionalSize;
         _this._externalRenderer = externalRenderer;
         _this._renderExternal = renderExternal; // Create core components
 
-        _this._viewport = new Viewport(getElement(root));
+        _this._viewport = new Viewport(_this, getElement(root));
         _this._autoResizer = new AutoResizer(_this);
         _this._renderer = _this._createRenderer();
         _this._camera = _this._createCamera();
@@ -7739,6 +7813,23 @@ version: 4.8.0
         enumerable: false,
         configurable: true
       });
+      Object.defineProperty(__proto, "useFractionalSize", {
+        /**
+         * By enabling this, Flicking will calculate all internal size with CSS width computed with getComputedStyle.
+         * This can prevent 1px offset issue in some cases where panel size has the fractional part.
+         * All sizes will have the original size before CSS {@link https://developer.mozilla.org/en-US/docs/Web/CSS/transform transform} is applied on the element.
+         * @ko 이 옵션을 활성화할 경우, Flicking은 내부의 모든 크기를 {@link https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect getBoundingClientRect}를 이용하여 계산합니다.
+         * 이를 통해, 패널 크기에 소수점을 포함할 경우에 발생할 수 있는 일부 1px 오프셋 이슈를 해결 가능합니다.
+         * 모든 크기는 CSS {@link https://developer.mozilla.org/en-US/docs/Web/CSS/transform transform}이 엘리먼트에 적용되기 이전의 크기를 사용할 것입니다.
+         * @type {boolean}
+         * @default false
+         */
+        get: function () {
+          return this._useFractionalSize;
+        },
+        enumerable: false,
+        configurable: true
+      });
       Object.defineProperty(__proto, "externalRenderer", {
         /**
          * This is an option for the frameworks(React, Vue, Angular, ...). Don't set it as it's automatically managed by Flicking.
@@ -8487,9 +8578,10 @@ version: 4.8.0
         var renderer = this._renderer;
         var control = this._control;
         var camera = this._camera;
-        var initialPanel = renderer.getPanel(this._defaultIndex) || renderer.getPanel(0);
-        if (!initialPanel) return;
-        var nearestAnchor = camera.findNearestAnchor(initialPanel.position);
+        var defaultPanel = renderer.getPanel(this._defaultIndex) || renderer.getPanel(0);
+        if (!defaultPanel) return;
+        var nearestAnchor = camera.findNearestAnchor(defaultPanel.position);
+        var initialPanel = nearestAnchor && defaultPanel.index !== nearestAnchor.panel.index ? nearestAnchor.panel : defaultPanel;
         control.setActive(initialPanel, null, false);
 
         if (!nearestAnchor) {
@@ -8550,7 +8642,7 @@ version: 4.8.0
        */
 
 
-      Flicking.VERSION = "4.8.0";
+      Flicking.VERSION = "4.9.1";
       return Flicking;
     }(Component);