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

package/declaration/CrossFlicking.d.ts

@@ -5,6 +5,7 @@ export interface CrossFlickingOptions {
     verticalOptions: FlickingOptions | undefined;
 }
 export interface VerticalState {
+    key: string;
     start: number;
     end: number;
     element: HTMLElement;
@@ -15,9 +16,14 @@ export declare class CrossFlicking extends Flicking {
     private _verticalState;
     private _moveDirection;
     private _nextIndex;
+    get verticalFlicking(): Flicking[];
+    get verticalState(): VerticalState[];
     get verticalOptions(): FlickingOptions;
     constructor(root: HTMLElement | string, { verticalOptions }?: Partial<CrossFlickingOptions>);
     init(): Promise<void>;
+    private _addComponentEvents;
+    private _createVerticalState;
+    private _createVerticalFlicking;
     private _syncToCategory;
     private _onHorizontalHoldStart;
     private _onHorizontalMove;

package/declaration/const/external.d.ts

@@ -34,6 +34,8 @@ export declare const MOVE_TYPE: {
     readonly STRICT: "strict";
 };
 export declare const CLASS: {
+    VIEWPORT: string;
+    CAMERA: string;
     VERTICAL: string;
     HIDDEN: string;
     DEFAULT_VIRTUAL: string;

package/declaration/utils.d.ts

@@ -43,3 +43,5 @@ export declare const getElementSize: ({ el, horizontal, useFractionalSize, useOf
     style: CSSStyleDeclaration;
 }) => number;
 export declare const setPrototypeOf: (o: any, proto: object) => any;
+export declare const camelize: (str: string) => string;
+export declare const getDataAttributes: (element: HTMLElement, attributePrefix: string) => Record<string, string>;

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.3
 */
 '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.
@@ -7873,7 +7895,7 @@ var Flicking = /*#__PURE__*/function (_super) {
    * Flicking.VERSION;  // ex) 4.0.0
    * ```
    */
-  Flicking.VERSION = "4.12.0-beta.1";
+  Flicking.VERSION = "4.12.0-beta.3";
   return Flicking;
 }(Component);
 
@@ -7890,7 +7912,6 @@ var Flicking = /*#__PURE__*/function (_super) {
 var CrossFlicking = /*#__PURE__*/function (_super) {
   __extends(CrossFlicking, _super);
   // Options Setter
-  // UI / LAYOUT
   // public set align(val: FlickingOptions["align"]) {
   //   this._align = val;
   // }
@@ -7963,18 +7984,53 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
       }
     };
     // Internal states
-    _this._verticalState = [];
+    _this._verticalState = _this._createVerticalState();
     _this._moveDirection = null;
     _this._nextIndex = 0;
     // Bind options
     _this._verticalOptions = verticalOptions;
-    return _this;
     // Create core components
-    // this._viewport = new Viewport(this, getElement(root));
+    _this._verticalFlicking = _this._createVerticalFlicking();
+    return _this;
   }
   var __proto = CrossFlicking.prototype;
-  Object.defineProperty(__proto, "verticalOptions", {
+  Object.defineProperty(__proto, "verticalFlicking", {
     // 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._verticalFlicking;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  Object.defineProperty(__proto, "verticalState", {
+    // 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._verticalState;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  Object.defineProperty(__proto, "verticalOptions", {
+    // Options Getter
     /**
      * Change active panel index on mouse/touch hold while animating.
      * `index` of the `willChange`/`willRestore` event will be used as new index.
@@ -8001,37 +8057,102 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
   __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) {
+      return _this._addComponentEvents();
+    });
+  };
+  __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._verticalFlicking.forEach(function (flicking) {
+      flicking.on(EVENTS.HOLD_START, _this._onVerticalHoldStart);
+      flicking.on(EVENTS.MOVE, _this._onVerticalMove);
+      flicking.on(EVENTS.MOVE_END, _this._onVerticalMoveEnd);
+      flicking.on(EVENTS.CHANGED, _this._onVerticalChanged);
+    });
+  };
+  __proto._createVerticalState = function () {
+    var _this = this;
+    // data-index로 분류하기 전에 임시로 모든 children에 대해 vertical flicking으로 해보자.
+    // panels에 data-attributes가 붙어있을 때와 안 붙어있을 때를 다르게 처리
+    // 붙어있다면 가상의 viewport들을 index 갯수만큼 만들어줘야 한다
+    var cameraEl = this.camera.element;
+    var panels = toArray(cameraEl.children);
+    var verticalState;
+    var verticalPanels = "";
+    // check data attribute exists
+    var groupKeys = [];
+    var groupPanels = {};
+    var verticalCamera = document.createElement("div");
+    verticalCamera.classList.add(CLASS.CAMERA);
+    panels.forEach(function (panel) {
+      var groupKey = getDataAttributes(panel, "data-flicking-").groupkey;
+      if (groupKey && !includes(groupKeys, groupKey)) {
+        groupKeys.push(groupKey);
+        groupPanels[groupKey] = [panel];
+      } else if (groupKey) {
+        groupPanels[groupKey].push(panel);
+      }
+      return groupKey;
+    });
+    if (groupKeys.length) {
+      panels.forEach(function () {
+        return _this.remove(0);
+      });
+      verticalState = groupKeys.reduce(function (state, key) {
         var start = state.length ? +state[state.length - 1].end + 1 : 0;
-        verticalPanels += child.children[0].innerHTML;
+        var element = groupPanels[key].reduce(function (el, panel) {
+          verticalPanels += panel.outerHTML;
+          el.appendChild(panel);
+          return el;
+        }, document.createElement("div"));
         return __spread(state, [{
+          key: key,
           start: start,
-          end: start + child.children[0].children.length - 1,
-          element: child
+          end: start + groupPanels[key].length - 1,
+          element: element
         }]);
       }, []);
-      _this.camera.children.forEach(function (child) {
-        child.children[0].innerHTML = verticalPanels;
+      verticalCamera.innerHTML = verticalPanels;
+      cameraEl.innerHTML = "";
+      groupKeys.forEach(function () {
+        var panel = document.createElement("div");
+        panel.classList.add(CLASS.VIEWPORT, CLASS.VERTICAL);
+        panel.innerHTML = verticalCamera.outerHTML;
+        _this.append(panel);
       });
-      _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
-        }));
-      });
-      _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);
+    } else {
+      verticalState = panels.reduce(function (state, panel, i) {
+        var start = state.length ? +state[state.length - 1].end + 1 : 0;
+        verticalPanels += panel.innerHTML;
+        return __spread(state, [{
+          key: i.toString(),
+          start: start,
+          end: start + panel.children.length - 1,
+          element: panel
+        }]);
+      }, []);
+      verticalCamera.innerHTML = verticalPanels;
+      panels.forEach(function (panel) {
+        [CLASS.VIEWPORT, CLASS.VERTICAL].forEach(function (className) {
+          if (!panel.classList.contains(className)) {
+            panel.classList.add(className);
+          }
+        });
+        panel.innerHTML = verticalCamera.outerHTML;
       });
+    }
+    return verticalState;
+  };
+  __proto._createVerticalFlicking = function () {
+    var _this = this;
+    return this.camera.children.map(function (panel, i) {
+      return new Flicking(panel, __assign(__assign({}, _this.verticalOptions), {
+        horizontal: false,
+        panelsPerView: 1,
+        defaultIndex: _this._verticalState[i].start
+      }));
     });
   };
   __proto._syncToCategory = function (index, outerIndex) {
@@ -8339,7 +8460,9 @@ var modules = {
     circulateIndex: circulateIndex,
     range: range,
     getElementSize: getElementSize,
-    setPrototypeOf: setPrototypeOf
+    setPrototypeOf: setPrototypeOf,
+    camelize: camelize,
+    getDataAttributes: getDataAttributes
 };
 
 /*
@@ -8390,6 +8513,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 +8522,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;