@egjs/flicking 4.12.0-beta.1 → 4.12.0-beta.10

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.12.0-beta.1
+version: 4.12.0-beta.10
 */
 'use strict';
 
@@ -387,6 +387,8 @@ var MOVE_TYPE = {
   STRICT: "strict"
 };
 var CLASS = {
+  VIEWPORT: "flicking-viewport",
+  CAMERA: "flicking-camera",
   VERTICAL: "vertical",
   HIDDEN: "flicking-hidden",
   DEFAULT_VIRTUAL: "flicking-panel"
@@ -738,6 +740,26 @@ var setPrototypeOf = Object.setPrototypeOf || function (obj, proto) {
   obj.__proto__ = proto;
   return obj;
 };
+var camelize = function (str) {
+  return str.replace(/[\s-_]([a-z])/g, function (all, letter) {
+    return letter.toUpperCase();
+  });
+};
+var getDataAttributes = function (element, attributePrefix) {
+  var dataAttributes = {};
+  var attributes = element.attributes;
+  var length = attributes.length;
+  for (var i = 0; i < length; ++i) {
+    var attribute = attributes[i];
+    var name_1 = attribute.name,
+      value = attribute.value;
+    if (name_1.indexOf(attributePrefix) === -1) {
+      continue;
+    }
+    dataAttributes[camelize(name_1.replace(attributePrefix, ""))] = value;
+  }
+  return dataAttributes;
+};
 
 /*
  * Copyright (c) 2015 NAVER Corp.
@@ -3724,6 +3746,7 @@ var Camera = /*#__PURE__*/function () {
     var _this = this;
     var _b = (_a === void 0 ? {} : _a).align,
       align = _b === void 0 ? ALIGN.CENTER : _b;
+    this._lookedOffset = 0;
     this._checkTranslateSupport = function () {
       var e_1, _a;
       var transforms = ["webkitTransform", "msTransform", "MozTransform", "OTransform", "transform"];
@@ -4083,6 +4106,8 @@ var Camera = /*#__PURE__*/function () {
    */
   __proto.lookAt = function (pos) {
     var _this = this;
+    var prevOffset = this._offset;
+    var isChangedOffset = this._lookedOffset !== prevOffset;
     var flicking = getFlickingAttached(this._flicking);
     var prevPos = this._position;
     this._position = pos;
@@ -4093,7 +4118,12 @@ var Camera = /*#__PURE__*/function () {
     if (toggled) {
       void flicking.renderer.render().then(function () {
         _this.updateOffset();
+        _this._lookedOffset = _this._offset;
       });
+    } else if (isChangedOffset) {
+      // sync offset for renderOnlyVisible on resize
+      this.updateOffset();
+      this._lookedOffset = this._offset;
     } else {
       this.applyTransform();
     }
@@ -4268,8 +4298,8 @@ var Camera = /*#__PURE__*/function () {
     return this;
   };
   /**
-   * Update Viewport's height to active panel's height
-   * @ko 현재 선택된 패널의 높이와 동일하도록 뷰포트의 높이를 업데이트합니다
+   * Update Viewport's height to visible panel's max height
+   * @ko 현재 활성화된 패널과 보이는 패널의 최대 높이와 동일하도록 뷰포트의 높이를 업데이트합니다
    * @throws {FlickingError}
    * {@link ERROR_CODE NOT_ATTACHED_TO_FLICKING} When {@link Camera#init init} is not called before
    * <ko>{@link ERROR_CODE NOT_ATTACHED_TO_FLICKING} {@link Camera#init init}이 이전에 호출되지 않은 경우</ko>
@@ -4279,9 +4309,17 @@ var Camera = /*#__PURE__*/function () {
   __proto.updateAdaptiveHeight = function () {
     var flicking = getFlickingAttached(this._flicking);
     var activePanel = flicking.control.activePanel;
-    if (!flicking.horizontal || !flicking.adaptive || !activePanel) return;
+    var visiblePanels = flicking.visiblePanels;
+    var selectedPanels = __spread(visiblePanels);
+    if (activePanel) {
+      selectedPanels.push(activePanel);
+    }
+    if (!flicking.horizontal || !flicking.adaptive || !selectedPanels.length) return;
+    var maxHeight = Math.max.apply(Math, __spread(selectedPanels.map(function (panel) {
+      return panel.height;
+    })));
     flicking.viewport.setSize({
-      height: activePanel.height
+      height: maxHeight
     });
   };
   /**
@@ -4352,6 +4390,7 @@ var Camera = /*#__PURE__*/function () {
   };
   __proto._resetInternalValues = function () {
     this._position = 0;
+    this._lookedOffset = 0;
     this._alignPos = 0;
     this._offset = 0;
     this._circularOffset = 0;
@@ -7873,180 +7912,332 @@ var Flicking = /*#__PURE__*/function (_super) {
    * Flicking.VERSION;  // ex) 4.0.0
    * ```
    */
-  Flicking.VERSION = "4.12.0-beta.1";
+  Flicking.VERSION = "4.12.0-beta.10";
   return Flicking;
 }(Component);
 
-/*
- * Copyright (c) 2015 NAVER Corp.
- * egjs projects are licensed under the MIT license
- */
-/**
- * @extends Component
- * @support {"ie": "9+(with polyfill)", "ch" : "latest", "ff" : "latest",  "sf" : "latest", "edge" : "latest", "ios" : "7+", "an" : "4.X+"}
- * @requires {@link https://github.com/naver/egjs-component|@egjs/component}
- * @requires {@link https://github.com/naver/egjs-axes|@egjs/axes}
- */
+var SIDE_EVENTS = {
+  HOLD_START: "sideHoldStart",
+  HOLD_END: "sideHoldEnd",
+  MOVE_START: "sideMoveStart",
+  MOVE: "sideMove",
+  MOVE_END: "sideMoveEnd",
+  WILL_CHANGE: "sideWillChange",
+  CHANGED: "sideChanged"
+};
 var CrossFlicking = /*#__PURE__*/function (_super) {
   __extends(CrossFlicking, _super);
-  // Options Setter
-  // UI / LAYOUT
-  // public set align(val: FlickingOptions["align"]) {
-  //   this._align = val;
-  // }
-  function CrossFlicking(root, _a) {
-    var _b = (_a === void 0 ? {} : _a).verticalOptions,
-      verticalOptions = _b === void 0 ? undefined : _b;
-    var _this = _super.call(this, root) || this;
+  function CrossFlicking(root, options) {
+    var _this = _super.call(this, root, options) || this;
+    _this._syncToCategory = function (index, outerIndex) {
+      if (_this._disableIndexSync) {
+        return;
+      }
+      _this.stopAnimation();
+      _this._sideFlicking.forEach(function (child, i) {
+        var _a = _this._sideState[i],
+          start = _a.start,
+          end = _a.end;
+        if (start <= index && end >= index && outerIndex !== i) {
+          child.stopAnimation();
+          void child.moveTo(index, 0);
+          void _this.moveTo(i, 0);
+        }
+      });
+    };
+    _this._setDraggable = function (direction, draggable) {
+      if (!_this._disableSlideOnHold) {
+        return;
+      }
+      var dragThreshold = _this._originalDragThreshold;
+      var threshold = draggable ? dragThreshold && dragThreshold >= 10 ? dragThreshold : 10 : Infinity;
+      if (direction === MOVE_DIRECTION.HORIZONTAL === _this.horizontal) {
+        _this.dragThreshold = threshold;
+      } else if (direction === MOVE_DIRECTION.VERTICAL === _this.horizontal) {
+        _this._sideFlicking.forEach(function (child) {
+          child.dragThreshold = threshold;
+        });
+      }
+    };
+    _this._setPreviousSideIndex = function () {
+      _this._sideFlicking.forEach(function (child, i) {
+        var _a = _this._sideState[i],
+          start = _a.start,
+          end = _a.end;
+        if (_this._preserveIndex) {
+          if (_this._nextIndex !== i) {
+            if (child.index < start) {
+              child.stopAnimation();
+              void child.moveTo(start, 0);
+            } else if (child.index > end) {
+              child.stopAnimation();
+              void child.moveTo(end, 0);
+            }
+          }
+        } else {
+          if (_this._nextIndex !== i) {
+            void child.moveTo(start, 0);
+          }
+        }
+      });
+    };
     _this._onHorizontalHoldStart = function () {
-      _this.dragThreshold = 10;
+      _this._setDraggable(MOVE_DIRECTION.HORIZONTAL, true);
       _this._moveDirection = null;
     };
     _this._onHorizontalMove = function (e) {
       if (e.isTrusted && !_this._moveDirection) {
-        _this._verticalFlicking.forEach(function (child) {
-          child.dragThreshold = Infinity;
-        });
+        _this._setDraggable(MOVE_DIRECTION.VERTICAL, false);
         _this._moveDirection = MOVE_DIRECTION.HORIZONTAL;
       }
     };
     _this._onHorizontalMoveEnd = function (e) {
       var visiblePanels = _this.visiblePanels;
-      _this._verticalFlicking.forEach(function (child) {
-        child.dragThreshold = 10;
-      });
-      _this._moveDirection = null;
       if (visiblePanels.length > 1) {
         _this._nextIndex = e.direction === "NEXT" ? visiblePanels[1].index : visiblePanels[0].index;
       } else {
         _this._nextIndex = visiblePanels[0].index;
       }
-      _this._verticalFlicking.forEach(function (child, i) {
-        if (_this._nextIndex !== i) {
-          var _a = _this._verticalState[i],
-            start = _a.start,
-            end = _a.end;
-          if (child.index < start) {
-            child.stopAnimation();
-            void child.moveTo(start, 0);
-          } else if (child.index > end) {
-            child.stopAnimation();
-            void child.moveTo(end, 0);
-          }
-        }
+      _this._setDraggable(MOVE_DIRECTION.VERTICAL, true);
+      _this._moveDirection = null;
+      // _syncToCategory에서 완전히 가로 이동이 이루어지기 전에 세로 방향 index가 변하는 경우가 있어 requestAnimationFrame 처리
+      requestAnimationFrame(function () {
+        return _this._setPreviousSideIndex();
       });
       if (e.isTrusted) {
-        _this._syncToCategory(_this._verticalFlicking[_this._nextIndex].index, _this._nextIndex);
+        _this._syncToCategory(_this._sideFlicking[_this._nextIndex].index, _this._nextIndex);
       }
     };
-    _this._onVerticalHoldStart = function () {
-      _this._verticalFlicking.forEach(function (child) {
-        child.dragThreshold = 10;
-      });
+    _this._onSideHoldStart = function () {
+      _this._setDraggable(MOVE_DIRECTION.VERTICAL, true);
       _this._moveDirection = null;
     };
-    _this._onVerticalMove = function (e) {
+    _this._onSideMove = function (e) {
       if (e.isTrusted && !_this._moveDirection) {
-        _this.dragThreshold = Infinity;
+        _this._setDraggable(MOVE_DIRECTION.HORIZONTAL, false);
         _this._moveDirection = MOVE_DIRECTION.VERTICAL;
       }
     };
-    _this._onVerticalMoveEnd = function () {
-      _this.dragThreshold = 10;
+    _this._onSideMoveEnd = function () {
+      _this._setDraggable(MOVE_DIRECTION.HORIZONTAL, true);
       _this._moveDirection = null;
     };
-    _this._onVerticalChanged = function (e) {
-      // this.visiblePanels.length 가 2보다 크다면 가로 방향 Flicking이 조작 중이라는 것을 의미합니다.
-      // 이 경우 가로 방향 Flicking의 이동이 완전히 끝난 뒤 _onHorizontalMoveEnd 에서 syncToCategory할 것이므로 여기서는 하지 않습니다.
-      if (_this.visiblePanels.length < 2 && _this._verticalFlicking[_this.index] === e.currentTarget) {
+    _this._onSideChanged = function (e) {
+      // If this.visiblePanels.length >= 2, it means that horizontal flicking is being dragged.
+      // In this case, syncToCategory in _onHorizontalMoveEnd will fire after moving finishes, so we don't fire it here.
+      if (_this.visiblePanels.length < 2 && _this._sideFlicking[_this.index] === e.currentTarget) {
         _this._syncToCategory(e.index, _this.index);
       }
     };
+    var _a = options.sideOptions,
+      sideOptions = _a === void 0 ? {} : _a,
+      _b = options.preserveIndex,
+      preserveIndex = _b === void 0 ? true : _b,
+      _c = options.disableSlideOnHold,
+      disableSlideOnHold = _c === void 0 ? true : _c,
+      _d = options.disableIndexSync,
+      disableIndexSync = _d === void 0 ? false : _d;
     // Internal states
-    _this._verticalState = [];
     _this._moveDirection = null;
     _this._nextIndex = 0;
+    _this._originalDragThreshold = _this.dragThreshold;
     // Bind options
-    _this._verticalOptions = verticalOptions;
+    _this._sideOptions = sideOptions;
+    _this._preserveIndex = preserveIndex;
+    _this._disableSlideOnHold = disableSlideOnHold;
+    _this._disableIndexSync = disableIndexSync;
     return _this;
-    // Create core components
-    // this._viewport = new Viewport(this, getElement(root));
   }
   var __proto = CrossFlicking.prototype;
-  Object.defineProperty(__proto, "verticalOptions", {
+  Object.defineProperty(__proto, "sideFlicking", {
     // Components
-    /**
-     * Change active panel index on mouse/touch hold while animating.
-     * `index` of the `willChange`/`willRestore` event will be used as new index.
-     * @ko 애니메이션 도중 마우스/터치 입력시 현재 활성화된 패널의 인덱스를 변경합니다.
-     * `willChange`/`willRestore` 이벤트의 `index`값이 새로운 인덱스로 사용될 것입니다.
-     * @type {FlickingOptions}
-     * @default undefined
-     * @see {@link https://naver.github.io/egjs-flicking/Options#changeonhold changeOnHold ( Options )}
-     */
     get: function () {
-      return this._verticalOptions;
+      return this._sideFlicking;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  Object.defineProperty(__proto, "sideState", {
+    get: function () {
+      return this._sideState;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  Object.defineProperty(__proto, "sideOptions", {
+    // Options Getter
+    get: function () {
+      return this._sideOptions;
+    },
+    // Options Setter
+    set: function (val) {
+      this._sideOptions = val;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  Object.defineProperty(__proto, "preserveIndex", {
+    get: function () {
+      return this._preserveIndex;
+    },
+    set: function (val) {
+      this._preserveIndex = val;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  Object.defineProperty(__proto, "disableSlideOnHold", {
+    get: function () {
+      return this._disableSlideOnHold;
+    },
+    set: function (val) {
+      this._disableSlideOnHold = val;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  Object.defineProperty(__proto, "disableIndexSync", {
+    get: function () {
+      return this._disableIndexSync;
+    },
+    set: function (val) {
+      this._disableIndexSync = val;
     },
     enumerable: false,
     configurable: true
   });
-  /**
-   * Initialize Flicking and move to the default index
-   * This is automatically called on Flicking's constructor when `autoInit` is true(default)
-   * @ko Flicking을 초기화하고, 디폴트 인덱스로 이동합니다
-   * 이 메소드는 `autoInit` 옵션이 true(default)일 경우 Flicking이 생성될 때 자동으로 호출됩니다
-   * @fires Flicking#ready
-   * @return {Promise<void>}
-   */
   __proto.init = function () {
     var _this = this;
     return _super.prototype.init.call(this).then(function () {
-      // data-index로 분류하기 전에 임시로 모든 children에 대해 vertical flicking으로 해보자.
-      // camera.children들에 대해 갯수 세기
-      var verticalPanels = "";
-      _this._verticalState = _this.camera.children.reduce(function (state, child) {
-        var start = state.length ? +state[state.length - 1].end + 1 : 0;
-        verticalPanels += child.children[0].innerHTML;
-        return __spread(state, [{
-          start: start,
-          end: start + child.children[0].children.length - 1,
-          element: child
-        }]);
-      }, []);
-      _this.camera.children.forEach(function (child) {
-        child.children[0].innerHTML = verticalPanels;
+      _this._sideState = _this._createSideState();
+      _this._sideFlicking = _this._createSideFlicking();
+      _this._addComponentEvents();
+    });
+  };
+  __proto.destroy = function () {
+    this._sideFlicking.forEach(function (flicking) {
+      flicking.destroy();
+    });
+    _super.prototype.destroy.call(this);
+  };
+  __proto._addComponentEvents = function () {
+    var _this = this;
+    this.on(EVENTS.HOLD_START, this._onHorizontalHoldStart);
+    this.on(EVENTS.MOVE, this._onHorizontalMove);
+    this.on(EVENTS.MOVE_END, this._onHorizontalMoveEnd);
+    this._sideFlicking.forEach(function (flicking, mainIndex) {
+      flicking.on(EVENTS.HOLD_START, _this._onSideHoldStart);
+      flicking.on(EVENTS.MOVE, _this._onSideMove);
+      flicking.on(EVENTS.MOVE_END, _this._onSideMoveEnd);
+      flicking.on(EVENTS.CHANGED, _this._onSideChanged);
+      Object.keys(SIDE_EVENTS).forEach(function (name) {
+        flicking.on(EVENTS[name], function (event) {
+          _this.trigger(new Component.ComponentEvent(SIDE_EVENTS[name], __assign({
+            mainIndex: mainIndex
+          }, event)));
+        });
       });
-      _this._verticalFlicking = _this.camera.children.map(function (child, i) {
-        return new Flicking(child, __assign(__assign({}, _this.verticalOptions), {
-          horizontal: false,
-          panelsPerView: 1,
-          defaultIndex: _this._verticalState[i].start
-        }));
+    });
+  };
+  __proto._createSideState = function () {
+    var viewportEl = this.element;
+    var cameraEl = this.camera.element;
+    var panels = toArray(cameraEl.children);
+    var isCrossStructure = getDataAttributes(viewportEl, "data-cross-").structure;
+    var sideState = [];
+    if (!isCrossStructure) {
+      var groupPanels = this._getGroupFromAttribute(panels);
+      var groupKeys = Object.keys(groupPanels);
+      if (groupKeys.length) {
+        sideState = this._getSideStateFromGroup(groupPanels);
+        this.remove(0, this.panelCount - groupKeys.length);
+      } else {
+        sideState = this._getSideStateFromPanels(panels);
+      }
+      this._createCrossStructure(sideState);
+    } else {
+      sideState = this._getSideStateFromCrossStructure(panels);
+    }
+    void this.resize();
+    return sideState;
+  };
+  __proto._createCrossStructure = function (sideState) {
+    var _this = this;
+    var sideCamera = document.createElement("div");
+    var sidePanels = "";
+    sideCamera.classList.add(CLASS.CAMERA);
+    sideState.forEach(function (state, i) {
+      var panel = _this.camera.children[i];
+      sidePanels += state.element.innerHTML;
+      Array.from(panel.attributes).forEach(function (attribute) {
+        return panel.removeAttribute(attribute.name);
       });
-      _this.on(EVENTS.HOLD_START, _this._onHorizontalHoldStart);
-      _this.on(EVENTS.MOVE, _this._onHorizontalMove);
-      _this.on(EVENTS.MOVE_END, _this._onHorizontalMoveEnd);
-      _this._verticalFlicking.forEach(function (child) {
-        child.on(EVENTS.HOLD_START, _this._onVerticalHoldStart);
-        child.on(EVENTS.MOVE, _this._onVerticalMove);
-        child.on(EVENTS.MOVE_END, _this._onVerticalMoveEnd);
-        child.on(EVENTS.CHANGED, _this._onVerticalChanged);
+    });
+    sideCamera.innerHTML = sidePanels;
+    sideState.forEach(function (_, i) {
+      var panel = _this.camera.children[i];
+      [CLASS.VIEWPORT, CLASS.VERTICAL].forEach(function (className) {
+        if (!panel.classList.contains(className)) {
+          panel.classList.add(className);
+        }
       });
+      panel.innerHTML = sideCamera.outerHTML;
     });
+    this.element.setAttribute("data-cross-structure", "true");
   };
-  __proto._syncToCategory = function (index, outerIndex) {
-    var _this = this;
-    this.stopAnimation();
-    this._verticalFlicking.forEach(function (child, i) {
-      var _a = _this._verticalState[i],
-        start = _a.start,
-        end = _a.end;
-      if (start <= index && end >= index && outerIndex !== i) {
-        child.stopAnimation();
-        void child.moveTo(index, 0);
-        void _this.moveTo(i, 0);
+  __proto._getGroupFromAttribute = function (panels) {
+    var groupKeys = [];
+    var groupPanels = {};
+    panels.forEach(function (panel) {
+      var groupKey = getDataAttributes(panel, "data-cross-").groupkey;
+      if (groupKey && !includes(groupKeys, groupKey)) {
+        groupKeys.push(groupKey);
+        groupPanels[groupKey] = [panel];
+      } else if (groupKey) {
+        groupPanels[groupKey].push(panel);
       }
     });
+    return groupPanels;
+  };
+  __proto._getSideStateFromGroup = function (groupPanels) {
+    return Object.keys(groupPanels).reduce(function (state, key) {
+      var start = state.length ? +state[state.length - 1].end + 1 : 0;
+      var element = groupPanels[key].reduce(function (el, panel) {
+        el.innerHTML += panel.outerHTML;
+        return el;
+      }, document.createElement("div"));
+      return __spread(state, [{
+        key: key,
+        start: start,
+        end: start + groupPanels[key].length - 1,
+        element: element
+      }]);
+    }, []);
+  };
+  __proto._getSideStateFromPanels = function (panels) {
+    return panels.reduce(function (state, panel, i) {
+      var start = state.length ? +state[state.length - 1].end + 1 : 0;
+      return __spread(state, [{
+        key: i.toString(),
+        start: start,
+        end: start + panel.children.length - 1,
+        element: panel
+      }]);
+    }, []);
+  };
+  __proto._getSideStateFromCrossStructure = function (panels) {
+    var groupPanels = this._getGroupFromAttribute(panels);
+    return this._getSideStateFromGroup(groupPanels);
+  };
+  __proto._createSideFlicking = function () {
+    var _this = this;
+    return this.sideState.map(function (state, i) {
+      return new Flicking(_this.camera.children[i], __assign(__assign({}, _this.sideOptions), {
+        horizontal: false,
+        panelsPerView: 1,
+        defaultIndex: state.start
+      }));
+    });
   };
   return CrossFlicking;
 }(Flicking);
@@ -8268,6 +8459,7 @@ var parseAlign = function (alignVal) {
 var modules = {
     __proto__: null,
     'default': Flicking,
+    SIDE_EVENTS: SIDE_EVENTS,
     CrossFlicking: CrossFlicking,
     VanillaElementProvider: VanillaElementProvider,
     VirtualElementProvider: VirtualElementProvider,
@@ -8339,7 +8531,9 @@ var modules = {
     circulateIndex: circulateIndex,
     range: range,
     getElementSize: getElementSize,
-    setPrototypeOf: setPrototypeOf
+    setPrototypeOf: setPrototypeOf,
+    camelize: camelize,
+    getDataAttributes: getDataAttributes
 };
 
 /*
@@ -8379,6 +8573,7 @@ exports.NormalRenderingStrategy = NormalRenderingStrategy;
 exports.ORDER = ORDER;
 exports.Panel = Panel;
 exports.Renderer = Renderer;
+exports.SIDE_EVENTS = SIDE_EVENTS;
 exports.SnapControl = SnapControl;
 exports.State = State;
 exports.StateMachine = StateMachine;
@@ -8390,6 +8585,7 @@ exports.VirtualElementProvider = VirtualElementProvider;
 exports.VirtualManager = VirtualManager;
 exports.VirtualPanel = VirtualPanel;
 exports.VirtualRenderingStrategy = VirtualRenderingStrategy;
+exports.camelize = camelize;
 exports.checkExistence = checkExistence;
 exports.circulateIndex = circulateIndex;
 exports.circulatePosition = circulatePosition;
@@ -8398,6 +8594,7 @@ exports["default"] = Flicking;
 exports.find = find;
 exports.findIndex = findIndex;
 exports.findRight = findRight;
+exports.getDataAttributes = getDataAttributes;
 exports.getDefaultCameraTransform = getDefaultCameraTransform;
 exports.getDirection = getDirection;
 exports.getElement = getElement;