@egjs/flicking 4.12.0-beta.2 → 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;

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.2
+version: 4.12.0-beta.3
 */
 'use strict';
 
@@ -740,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.
@@ -7875,7 +7895,7 @@ var Flicking = /*#__PURE__*/function (_super) {
    * Flicking.VERSION;  // ex) 4.0.0
    * ```
    */
-  Flicking.VERSION = "4.12.0-beta.2";
+  Flicking.VERSION = "4.12.0-beta.3";
   return Flicking;
 }(Component);
 
@@ -7963,15 +7983,14 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
         _this._syncToCategory(e.index, _this.index);
       }
     };
-    var horizontalPanels = toArray(getElement(root).children[0].children);
     // Internal states
-    _this._verticalState = _this._createVerticalState(horizontalPanels);
+    _this._verticalState = _this._createVerticalState();
     _this._moveDirection = null;
     _this._nextIndex = 0;
     // Bind options
     _this._verticalOptions = verticalOptions;
     // Create core components
-    _this._verticalFlicking = _this._createVerticalFlicking(horizontalPanels);
+    _this._verticalFlicking = _this._createVerticalFlicking();
     return _this;
   }
   var __proto = CrossFlicking.prototype;
@@ -8053,36 +8072,82 @@ var CrossFlicking = /*#__PURE__*/function (_super) {
       flicking.on(EVENTS.CHANGED, _this._onVerticalChanged);
     });
   };
-  __proto._createVerticalState = function (panels) {
+  __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 = "";
-    var verticalState = panels.reduce(function (state, panel) {
-      var start = state.length ? +state[state.length - 1].end + 1 : 0;
-      verticalPanels += panel.innerHTML;
-      return __spread(state, [{
-        start: start,
-        end: start + panel.children.length - 1,
-        element: panel
-      }]);
-    }, []);
+    // check data attribute exists
+    var groupKeys = [];
+    var groupPanels = {};
     var verticalCamera = document.createElement("div");
     verticalCamera.classList.add(CLASS.CAMERA);
-    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;
+      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;
+        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 + groupPanels[key].length - 1,
+          element: element
+        }]);
+      }, []);
+      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);
+      });
+    } 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 (panels) {
+  __proto._createVerticalFlicking = function () {
     var _this = this;
-    return panels.map(function (panel, i) {
+    return this.camera.children.map(function (panel, i) {
       return new Flicking(panel, __assign(__assign({}, _this.verticalOptions), {
         horizontal: false,
         panelsPerView: 1,
@@ -8395,7 +8460,9 @@ var modules = {
     circulateIndex: circulateIndex,
     range: range,
     getElementSize: getElementSize,
-    setPrototypeOf: setPrototypeOf
+    setPrototypeOf: setPrototypeOf,
+    camelize: camelize,
+    getDataAttributes: getDataAttributes
 };
 
 /*
@@ -8446,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;
@@ -8454,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;