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

package/declaration/CrossFlicking.d.ts

@@ -3,6 +3,9 @@ export interface CrossFlickingEvents {
 }
 export interface CrossFlickingOptions extends FlickingOptions {
     sideOptions: Partial<FlickingOptions> | undefined;
+    preserveIndex: boolean | undefined;
+    disableSlideOnHold: boolean | undefined;
+    disableIndexSync: boolean | undefined;
 }
 export interface SideState {
     key: string;
@@ -13,17 +16,30 @@ export interface SideState {
 export declare class CrossFlicking extends Flicking {
     private _sideFlicking;
     private _sideOptions;
+    private _preserveIndex;
+    private _disableSlideOnHold;
+    private _disableIndexSync;
     private _sideState;
     private _moveDirection;
     private _nextIndex;
     get sideFlicking(): Flicking[];
     get sideState(): SideState[];
-    get sideOptions(): Partial<FlickingOptions>;
+    get sideOptions(): CrossFlickingOptions["sideOptions"];
+    get preserveIndex(): CrossFlickingOptions["preserveIndex"];
+    get disableSlideOnHold(): CrossFlickingOptions["disableSlideOnHold"];
+    get disableIndexSync(): CrossFlickingOptions["disableIndexSync"];
+    set sideOptions(val: CrossFlickingOptions["sideOptions"]);
+    set preserveIndex(val: CrossFlickingOptions["preserveIndex"]);
+    set disableSlideOnHold(val: CrossFlickingOptions["disableSlideOnHold"]);
+    set disableIndexSync(val: CrossFlickingOptions["disableIndexSync"]);
     constructor(root: HTMLElement | string, options?: Partial<CrossFlickingOptions>);
     init(): Promise<void>;
     destroy(): void;
     private _addComponentEvents;
+    private _getGroupFromAttribute;
     private _createSideState;
+    private _getSideStateFromGroup;
+    private _getSideStateFromPanels;
     private _createSideFlicking;
     private _syncToCategory;
     private _onHorizontalHoldStart;

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.7
+version: 4.12.0-beta.8
 */
 'use strict';
 
@@ -7895,7 +7895,7 @@ var Flicking = /*#__PURE__*/function (_super) {
    * Flicking.VERSION;  // ex) 4.0.0
    * ```
    */
-  Flicking.VERSION = "4.12.0-beta.7";
+  Flicking.VERSION = "4.12.0-beta.8";
   return Flicking;
 }(Component);
 
@@ -7903,21 +7903,16 @@ var Flicking = /*#__PURE__*/function (_super) {
  * 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 CrossFlicking = /*#__PURE__*/function (_super) {
   __extends(CrossFlicking, _super);
-  // Options Setter
-  // public set align(val: FlickingOptions["align"]) {
-  //   this._align = val;
-  // }
   function CrossFlicking(root, options) {
     if (options === void 0) {
-      options = {};
+      options = {
+        sideOptions: {},
+        preserveIndex: false,
+        disableSlideOnHold: false,
+        disableIndexSync: false
+      };
     }
     var _this = _super.call(this, root, options) || this;
     _this._onHorizontalHoldStart = function () {
@@ -7943,20 +7938,22 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
       } else {
         _this._nextIndex = visiblePanels[0].index;
       }
-      // _syncToCategory에서 완전히 가로 이동이 이루어지기 전에 세로 방향 index가 변하는 경우가 있어 timeout으로 처리
-      _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);
+      // _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);
+            }
           }
-        }
+        });
       });
       if (e.isTrusted) {
         _this._syncToCategory(_this._sideFlicking[_this._nextIndex].index, _this._nextIndex);
@@ -7986,28 +7983,19 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
       }
     };
     // Internal states
-    _this._sideState = _this._createSideState();
     _this._moveDirection = null;
     _this._nextIndex = 0;
     // Bind options
     _this._sideOptions = options.sideOptions;
-    // Create core components
-    _this._sideFlicking = _this._createSideFlicking();
+    _this._preserveIndex = options.preserveIndex;
+    _this._disableSlideOnHold = options.disableSlideOnHold;
+    _this._disableIndexSync = options.disableIndexSync;
     return _this;
+    // Create core components
   }
   var __proto = CrossFlicking.prototype;
   Object.defineProperty(__proto, "sideFlicking", {
     // Components
-    /**
-     * {@link Control} instance of the Flicking
-     * @ko 현재 Flicking에 활성화된 {@link Control} 인스턴스
-     * @type {Control}
-     * @default SnapControl
-     * @readonly
-     * @see Control
-     * @see SnapControl
-     * @see FreeControl
-     */
     get: function () {
       return this._sideFlicking;
     },
@@ -8015,16 +8003,6 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
     configurable: true
   });
   Object.defineProperty(__proto, "sideState", {
-    // Internal States
-    /**
-     * Whether Flicking's {@link Flicking#init init()} is called.
-     * This is `true` when {@link Flicking#init init()} is called, and is `false` after calling {@link Flicking#destroy destroy()}.
-     * @ko Flicking의 {@link Flicking#init init()}이 호출되었는지를 나타내는 멤버 변수.
-     * 이 값은 {@link Flicking#init init()}이 호출되었으면 `true`로 변하고, {@link Flicking#destroy destroy()}호출 이후에 다시 `false`로 변경됩니다.
-     * @type {boolean}
-     * @default false
-     * @readonly
-     */
     get: function () {
       return this._sideState;
     },
@@ -8033,40 +8011,54 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
   });
   Object.defineProperty(__proto, "sideOptions", {
     // Options Getter
-    /**
-     * 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._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 () {
-      return _this._addComponentEvents();
+      _this._sideState = _this._createSideState();
+      _this._sideFlicking = _this._createSideFlicking();
+      _this._addComponentEvents();
     });
   };
-  /**
-   * Destroy Flicking and remove all event handlers
-   * @ko Flicking과 하위 컴포넌트들을 초기 상태로 되돌리고, 부착된 모든 이벤트 핸들러를 제거합니다
-   * @return {void}
-   */
   __proto.destroy = function () {
     // TODO 모든 child flicking destroy
     _super.prototype.destroy.call(this);
@@ -8083,51 +8075,41 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
       flicking.on(EVENTS.CHANGED, _this._onSideChanged);
     });
   };
+  __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;
-    // data-index로 분류하기 전에 임시로 모든 children에 대해 side flicking으로 해보자.
-    // panels에 data-attributes가 붙어있을 때와 안 붙어있을 때를 다르게 처리
-    // 붙어있다면 가상의 viewport들을 index 갯수만큼 만들어줘야 한다
     var viewportEl = this.element;
     var cameraEl = this.camera.element;
     var panels = toArray(cameraEl.children);
     var sideState = [];
     var sidePanels = "";
     // check data attribute exists
-    var groupKeys = [];
-    var groupPanels = {};
     var sideCamera = document.createElement("div");
     sideCamera.classList.add(CLASS.CAMERA);
     var isCrossStructure = getDataAttributes(viewportEl, "data-cross-").structure;
     if (!isCrossStructure) {
       viewportEl.setAttribute("data-cross-structure", "true");
-      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);
-        }
-      });
+      var groupPanels = this._getGroupFromAttribute(panels);
+      var groupKeys = Object.keys(groupPanels);
       if (groupKeys.length) {
-        sideState = groupKeys.reduce(function (state, key) {
-          var start = state.length ? +state[state.length - 1].end + 1 : 0;
-          var element = groupPanels[key].reduce(function (el, panel) {
-            sidePanels += panel.outerHTML;
-            el.innerHTML += panel.outerHTML;
-            return el;
-          }, document.createElement("div"));
-          return __spread(state, [{
-            key: key,
-            start: start,
-            end: start + groupPanels[key].length - 1,
-            element: element
-          }]);
-        }, []);
+        sideState = this._getSideStateFromGroup(groupPanels);
         this.remove(0, this.panelCount - groupKeys.length);
-        sideState.forEach(function (_, i) {
+        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);
           });
@@ -8155,38 +8137,38 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
         panel.innerHTML = sideCamera.outerHTML;
       });
     } else {
-      toArray(panels[0].children[0].children).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);
-        }
-      });
-      sideState = groupKeys.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
-        }]);
-      }, []);
+      sideState = this._getSideStateFromPanels(panels);
     }
+    void this.resize();
     return sideState;
   };
+  __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) {
+    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
+        defaultIndex: state.start,
+        moveType: "strict"
       }));
     });
   };