@egjs/flicking 4.12.0-beta.8 → 4.12.0-beta.9

package/declaration/CrossFlicking.d.ts

@@ -1,5 +1,25 @@
-import Flicking, { FlickingOptions } from "./Flicking";
-export interface CrossFlickingEvents {
+import Flicking, { FlickingEvents, FlickingOptions } from "./Flicking";
+import { ChangedEvent, HoldEndEvent, HoldStartEvent, MoveEndEvent, MoveEvent, MoveStartEvent, WillChangeEvent } from "./type/event";
+export declare const SIDE_EVENTS: {
+    readonly HOLD_START: "sideHoldStart";
+    readonly HOLD_END: "sideHoldEnd";
+    readonly MOVE_START: "sideMoveStart";
+    readonly MOVE: "sideMove";
+    readonly MOVE_END: "sideMoveEnd";
+    readonly WILL_CHANGE: "sideWillChange";
+    readonly CHANGED: "sideChanged";
+};
+export declare type CrossFlickingEvent<T> = {
+    mainIndex: number;
+} & T;
+export interface CrossFlickingEvents extends FlickingEvents {
+    [SIDE_EVENTS.HOLD_START]: CrossFlickingEvent<HoldStartEvent>;
+    [SIDE_EVENTS.HOLD_END]: CrossFlickingEvent<HoldEndEvent>;
+    [SIDE_EVENTS.MOVE_START]: CrossFlickingEvent<MoveStartEvent>;
+    [SIDE_EVENTS.MOVE]: CrossFlickingEvent<MoveEvent>;
+    [SIDE_EVENTS.MOVE_END]: CrossFlickingEvent<MoveEndEvent>;
+    [SIDE_EVENTS.WILL_CHANGE]: CrossFlickingEvent<WillChangeEvent>;
+    [SIDE_EVENTS.CHANGED]: CrossFlickingEvent<ChangedEvent>;
 }
 export interface CrossFlickingOptions extends FlickingOptions {
     sideOptions: Partial<FlickingOptions> | undefined;
@@ -32,16 +52,20 @@ export declare class CrossFlicking extends Flicking {
     set preserveIndex(val: CrossFlickingOptions["preserveIndex"]);
     set disableSlideOnHold(val: CrossFlickingOptions["disableSlideOnHold"]);
     set disableIndexSync(val: CrossFlickingOptions["disableIndexSync"]);
-    constructor(root: HTMLElement | string, options?: Partial<CrossFlickingOptions>);
+    constructor(root: HTMLElement | string, options: Partial<CrossFlickingOptions>);
     init(): Promise<void>;
     destroy(): void;
     private _addComponentEvents;
-    private _getGroupFromAttribute;
     private _createSideState;
+    private _createCrossStructure;
+    private _getGroupFromAttribute;
     private _getSideStateFromGroup;
     private _getSideStateFromPanels;
+    private _getSideStateFromCrossStructure;
     private _createSideFlicking;
     private _syncToCategory;
+    private _setDraggable;
+    private _setPreviousSideIndex;
     private _onHorizontalHoldStart;
     private _onHorizontalMove;
     private _onHorizontalMoveEnd;

package/declaration/camera/Camera.d.ts

@@ -12,6 +12,7 @@ declare class Camera {
     private _mode;
     private _el;
     private _transform;
+    private _lookedOffset;
     private _position;
     private _alignPos;
     private _offset;

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.8
+version: 4.12.0-beta.9
 */
 'use strict';
 
@@ -3746,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"];
@@ -4105,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;
@@ -4115,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();
     }
@@ -4290,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>
@@ -4301,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
     });
   };
   /**
@@ -4374,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;
@@ -7895,103 +7912,139 @@ var Flicking = /*#__PURE__*/function (_super) {
    * Flicking.VERSION;  // ex) 4.0.0
    * ```
    */
-  Flicking.VERSION = "4.12.0-beta.8";
+  Flicking.VERSION = "4.12.0-beta.9";
   return Flicking;
 }(Component);
 
-/*
- * Copyright (c) 2015 NAVER Corp.
- * egjs projects are licensed under the MIT license
- */
+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);
   function CrossFlicking(root, options) {
-    if (options === void 0) {
-      options = {
-        sideOptions: {},
-        preserveIndex: false,
-        disableSlideOnHold: false,
-        disableIndexSync: false
-      };
-    }
     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 threshold = draggable ? _this.dragThreshold && _this.dragThreshold >= 10 ? _this.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._sideFlicking.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._sideFlicking.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._setDraggable(MOVE_DIRECTION.VERTICAL, true);
+      _this._moveDirection = null;
       // _syncToCategory에서 완전히 가로 이동이 이루어지기 전에 세로 방향 index가 변하는 경우가 있어 requestAnimationFrame 처리
       requestAnimationFrame(function () {
-        _this._sideFlicking.forEach(function (child, i) {
-          if (_this._nextIndex !== i) {
-            var _a = _this._sideState[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);
-            }
-          }
-        });
+        return _this._setPreviousSideIndex();
       });
       if (e.isTrusted) {
         _this._syncToCategory(_this._sideFlicking[_this._nextIndex].index, _this._nextIndex);
       }
     };
     _this._onSideHoldStart = function () {
-      _this._sideFlicking.forEach(function (child) {
-        child.dragThreshold = 10;
-      });
+      _this._setDraggable(MOVE_DIRECTION.VERTICAL, true);
       _this._moveDirection = null;
     };
     _this._onSideMove = function (e) {
       if (e.isTrusted && !_this._moveDirection) {
-        _this.dragThreshold = Infinity;
+        _this._setDraggable(MOVE_DIRECTION.HORIZONTAL, false);
         _this._moveDirection = MOVE_DIRECTION.VERTICAL;
       }
     };
     _this._onSideMoveEnd = function () {
-      _this.dragThreshold = 10;
+      _this._setDraggable(MOVE_DIRECTION.HORIZONTAL, true);
       _this._moveDirection = null;
     };
     _this._onSideChanged = function (e) {
-      // this.visiblePanels.length 가 2보다 크다면 가로 방향 Flicking이 조작 중이라는 것을 의미합니다.
-      // 이 경우 가로 방향 Flicking의 이동이 완전히 끝난 뒤 _onHorizontalMoveEnd 에서 syncToCategory할 것이므로 여기서는 하지 않습니다.
+      // 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._moveDirection = null;
     _this._nextIndex = 0;
     // Bind options
-    _this._sideOptions = options.sideOptions;
-    _this._preserveIndex = options.preserveIndex;
-    _this._disableSlideOnHold = options.disableSlideOnHold;
-    _this._disableIndexSync = options.disableIndexSync;
+    _this._sideOptions = sideOptions;
+    _this._preserveIndex = preserveIndex;
+    _this._disableSlideOnHold = disableSlideOnHold;
+    _this._disableIndexSync = disableIndexSync;
     return _this;
-    // Create core components
   }
   var __proto = CrossFlicking.prototype;
   Object.defineProperty(__proto, "sideFlicking", {
@@ -8060,7 +8113,9 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
     });
   };
   __proto.destroy = function () {
-    // TODO 모든 child flicking destroy
+    this._sideFlicking.forEach(function (flicking) {
+      flicking.destroy();
+    });
     _super.prototype.destroy.call(this);
   };
   __proto._addComponentEvents = function () {
@@ -8068,80 +8123,80 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
     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) {
+    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)));
+        });
+      });
     });
   };
-  __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._createSideState = function () {
-    var _this = this;
     var viewportEl = this.element;
     var cameraEl = this.camera.element;
     var panels = toArray(cameraEl.children);
-    var sideState = [];
-    var sidePanels = "";
-    // check data attribute exists
-    var sideCamera = document.createElement("div");
-    sideCamera.classList.add(CLASS.CAMERA);
     var isCrossStructure = getDataAttributes(viewportEl, "data-cross-").structure;
+    var sideState = [];
     if (!isCrossStructure) {
-      viewportEl.setAttribute("data-cross-structure", "true");
       var groupPanels = this._getGroupFromAttribute(panels);
       var groupKeys = Object.keys(groupPanels);
       if (groupKeys.length) {
         sideState = this._getSideStateFromGroup(groupPanels);
         this.remove(0, this.panelCount - groupKeys.length);
-        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);
-          });
-        });
       } else {
-        sideState = panels.reduce(function (state, panel, i) {
-          var start = state.length ? +state[state.length - 1].end + 1 : 0;
-          sidePanels += panel.innerHTML;
-          return __spread(state, [{
-            key: i.toString(),
-            start: start,
-            end: start + panel.children.length - 1,
-            element: panel
-          }]);
-        }, []);
+        sideState = this._getSideStateFromPanels(panels);
       }
-      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._createCrossStructure(sideState);
     } else {
-      sideState = this._getSideStateFromPanels(panels);
+      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);
+      });
+    });
+    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._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;
@@ -8158,6 +8213,17 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
     }, []);
   };
   __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);
   };
@@ -8167,25 +8233,10 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
       return new Flicking(_this.camera.children[i], __assign(__assign({}, _this.sideOptions), {
         horizontal: false,
         panelsPerView: 1,
-        defaultIndex: state.start,
-        moveType: "strict"
+        defaultIndex: state.start
       }));
     });
   };
-  __proto._syncToCategory = function (index, outerIndex) {
-    var _this = this;
-    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);
-      }
-    });
-  };
   return CrossFlicking;
 }(Flicking);
 
@@ -8406,6 +8457,7 @@ var parseAlign = function (alignVal) {
 var modules = {
     __proto__: null,
     'default': Flicking,
+    SIDE_EVENTS: SIDE_EVENTS,
     CrossFlicking: CrossFlicking,
     VanillaElementProvider: VanillaElementProvider,
     VirtualElementProvider: VirtualElementProvider,
@@ -8519,6 +8571,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;