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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@egjs/flicking",
-	"version": "4.12.0-beta.1",
+	"version": "4.12.0-beta.10",
 	"description": "Everyday 30 million people experience. It's reliable, flexible and extendable carousel.",
 	"main": "dist/flicking.cjs.js",
 	"module": "dist/flicking.esm.js",
@@ -12,7 +12,8 @@
 	"types": "declaration/index.d.ts",
 	"scripts": {
 		"start": "concurrently \"rollup -w --config ./rollup.config.dev.js\" \"http-serve\"",
-		"build": "run-s build:bundle build:declaration build:css printsizes",
+		"build": "run-s build:bundle build:declaration printsizes",
+    "build-react": "run-s build:bundle build:declaration && pvu --build=react-flicking",
 		"build:bundle": "rm -rf ./dist && rollup -c",
 		"build:declaration": "rm -rf ./declaration && tsc -p tsconfig.declaration.json",
 		"build:css": "run-s build:css-clear build:sass build:css-prefix build:css-min",

package/sass/flicking.sass

@@ -2,9 +2,16 @@
   position: relative
   overflow: hidden
   &.vertical
+    display: -webkit-inline-box
+    display: -ms-inline-flexbox
     display: inline-flex
     >.flicking-camera
+      display: -webkit-inline-box
+      display: -ms-inline-flexbox
       display: inline-flex
+      -webkit-box-orient: vertical
+      -webkit-box-direction: normal
+      -ms-flex-direction: column
       flex-direction: column
   &.flicking-hidden
     >.flicking-camera
@@ -14,10 +21,16 @@
 .flicking-camera
   width: 100%
   height: 100%
+  display: -webkit-box
+  display: -ms-flexbox
   display: flex
   position: relative
+  -webkit-box-orient: horizontal
+  -webkit-box-direction: normal
+  -ms-flex-direction: row
   flex-direction: row
   z-index: 1
   will-change: transform
   >*
+    -ms-flex-negative: 0
     flex-shrink: 0

package/src/CrossFlicking.ts

@@ -2,162 +2,320 @@
  * Copyright (c) 2015 NAVER Corp.
  * egjs projects are licensed under the MIT license
  */
+import { ComponentEvent } from "@egjs/component";
+import { EventKey } from "@egjs/component/declaration/types";
 
-import Flicking, { FlickingOptions } from "./Flicking";
-import { ChangedEvent, MoveEndEvent, MoveEvent } from "./type/event";
+import Flicking, { FlickingEvents, FlickingOptions } from "./Flicking";
+import {
+  ChangedEvent,
+  HoldEndEvent,
+  HoldStartEvent,
+  MoveEndEvent,
+  MoveEvent,
+  MoveStartEvent,
+  WillChangeEvent
+} from "./type/event";
 import { LiteralUnion, ValueOf } from "./type/internal";
-import { EVENTS, MOVE_DIRECTION } from "./const/external";
+import { CLASS, EVENTS, MOVE_DIRECTION } from "./const/external";
+import { getDataAttributes, includes, toArray } from "./utils";
 
-/**
- * @interface
- */
-export interface CrossFlickingEvents {
-  // FlickingEvent 들을 확장하자...
+export const SIDE_EVENTS = {
+  HOLD_START: "sideHoldStart",
+  HOLD_END: "sideHoldEnd",
+  MOVE_START: "sideMoveStart",
+  MOVE: "sideMove",
+  MOVE_END: "sideMoveEnd",
+  WILL_CHANGE: "sideWillChange",
+  CHANGED: "sideChanged"
+} as const;
+
+export 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>;
 }
 
-/**
- * @interface
- */
-export interface CrossFlickingOptions {
-  verticalOptions: FlickingOptions | undefined;
-  // 한쪽 움직이면 다른 한쪽 움직임을 막을지 여부
-  // 이전 패널 기억 여부
+export interface CrossFlickingOptions extends FlickingOptions {
+  sideOptions: Partial<FlickingOptions> | undefined;
+  preserveIndex: boolean | undefined;
+  disableSlideOnHold: boolean | undefined;
+  disableIndexSync: boolean | undefined;
 }
 
-/**
- * Flicking Status returned by {@link Flicking#getStatus}
- * @ko {@link Flicking#getStatus}에 의해 반환된 Flicking 상태 객체
- * @interface
- * @property {number} index An index of the active panel<ko>활성화된 패널의 인덱스</ko>
- * @property {object} position A info to restore camera {@link Camera#position position}<ko>카메라 {@link Camera#position position}을 설정하기 위한 정보들</ko>
- * @property {number} [position.panel] An index of the panel camera is located at<ko>카메라가 위치한 패널의 인덱스</ko>
- * @property {number} [position.progressInPanel] A progress of the camera position inside the panel<ko>패널 내에서의 카메라 위치의 진행도</ko>
- * @property {number} visibleOffset An offset to visible panel's original index. This value is available only when `visiblePanelsOnly` is `true`
- * <ko>현재 보이는 패널들을 저장했을 때, 원래의 인덱스 대비 offset. `visiblePanelsOnly` 옵션을 사용했을 때만 사용 가능합니다</ko>
- * @property {object[]} panels A data array of panels<ko>패널의 정보를 담은 배열</ko>
- * @property {index} [panels.index] An index of the panel<ko>패널의 인덱스</ko>
- * @property {string | undefined} [panels.html] An `outerHTML` of the panel element<ko>패널 엘리먼트의 `outerHTML`</ko>
- */
-export interface VerticalState {
+export interface SideState {
+  key: string;
   start: number;
   end: number;
   element: HTMLElement;
 }
 
-/**
- * @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}
- */
 export class CrossFlicking extends Flicking {
   // Core components
-  private _verticalFlicking: Flicking[];
+  private _sideFlicking: Flicking[];
 
   // Options
-  private _verticalOptions: CrossFlickingOptions["verticalOptions"];
+  private _sideOptions: CrossFlickingOptions["sideOptions"];
+  private _preserveIndex: CrossFlickingOptions["preserveIndex"];
+  private _disableSlideOnHold: CrossFlickingOptions["disableSlideOnHold"];
+  private _disableIndexSync: CrossFlickingOptions["disableIndexSync"];
 
   // Internal State
-  private _verticalState: VerticalState[];
-
+  private _sideState: SideState[];
   private _moveDirection: LiteralUnion<ValueOf<typeof MOVE_DIRECTION>> | null;
+  private _originalDragThreshold: number;
   private _nextIndex: number;
 
   // 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 )}
-   */
-  public get verticalOptions() {
-    return this._verticalOptions;
+  public get sideFlicking() {
+    return this._sideFlicking;
+  }
+
+  public get sideState() {
+    return this._sideState;
   }
 
+  // Options Getter
+  public get sideOptions() { return this._sideOptions; }
+
+  public get preserveIndex() { return this._preserveIndex; }
+
+  public get disableSlideOnHold() { return this._disableSlideOnHold; }
+
+  public get disableIndexSync() { return this._disableIndexSync; }
+
   // Options Setter
-  // UI / LAYOUT
-  // public set align(val: FlickingOptions["align"]) {
-  //   this._align = val;
-  // }
+  public set sideOptions(val: CrossFlickingOptions["sideOptions"]) {
+    this._sideOptions = val;
+  }
+
+  public set preserveIndex(val: CrossFlickingOptions["preserveIndex"]) {
+    this._preserveIndex = val;
+  }
+
+  public set disableSlideOnHold(val: CrossFlickingOptions["disableSlideOnHold"]) {
+    this._disableSlideOnHold = val;
+  }
+
+  public set disableIndexSync(val: CrossFlickingOptions["disableIndexSync"]) {
+    this._disableIndexSync = val;
+  }
 
   public constructor(
     root: HTMLElement | string,
-    { verticalOptions = undefined }: Partial<CrossFlickingOptions> = {}
+    options: Partial<CrossFlickingOptions>
   ) {
-    super(root);
+    super(root, options);
+    const {
+      sideOptions = {},
+      preserveIndex = true,
+      disableSlideOnHold = true,
+      disableIndexSync = false
+    } = options;
 
     // Internal states
-    this._verticalState = [];
     this._moveDirection = null;
     this._nextIndex = 0;
+    this._originalDragThreshold = this.dragThreshold;
 
     // Bind options
-    this._verticalOptions = verticalOptions;
-
-    // Create core components
-    // this._viewport = new Viewport(this, getElement(root));
+    this._sideOptions = sideOptions;
+    this._preserveIndex = preserveIndex;
+    this._disableSlideOnHold = disableSlideOnHold;
+    this._disableIndexSync = disableIndexSync;
   }
 
-  /**
-   * 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>}
-   */
   public init(): Promise<void> {
     return super.init().then(() => {
-      // data-index로 분류하기 전에 임시로 모든 children에 대해 vertical flicking으로 해보자.
-      // camera.children들에 대해 갯수 세기
-      let verticalPanels = ``;
-      this._verticalState = this.camera.children.reduce(
-        (state: VerticalState[], child: HTMLElement) => {
-          const start = state.length ? +state[state.length - 1].end + 1 : 0;
-          verticalPanels += child.children[0].innerHTML;
-          return [
-            ...state,
-            {
-              start,
-              end: start + child.children[0].children.length - 1,
-              element: child,
-            },
-          ];
-        },
-        []
-      );
-      this.camera.children.forEach((child) => {
-        child.children[0].innerHTML = verticalPanels;
-      });
-      this._verticalFlicking = this.camera.children.map((child, i) => {
-        return new Flicking(child, {
-          ...this.verticalOptions,
-          horizontal: false,
-          panelsPerView: 1,
-          defaultIndex: this._verticalState[i].start,
+      this._sideState = this._createSideState();
+      this._sideFlicking = this._createSideFlicking();
+      this._addComponentEvents();
+    });
+  }
+
+  public destroy(): void {
+    this._sideFlicking.forEach((flicking) => {
+      flicking.destroy();
+    });
+    super.destroy();
+  }
+
+  private _addComponentEvents(): void {
+    this.on(EVENTS.HOLD_START, this._onHorizontalHoldStart);
+    this.on(EVENTS.MOVE, this._onHorizontalMove);
+    this.on(EVENTS.MOVE_END, this._onHorizontalMoveEnd);
+
+    this._sideFlicking.forEach((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((name: EventKey<FlickingEvents>) => {
+        flicking.on(EVENTS[name], (event) => {
+          this.trigger(
+            new ComponentEvent(SIDE_EVENTS[name], {
+              mainIndex,
+              ...event
+            })
+          );
         });
       });
+    });
+  }
+
+  private _createSideState(): SideState[] {
+    const viewportEl = this.element;
+    const cameraEl = this.camera.element;
+    const panels = toArray(cameraEl.children) as HTMLElement[];
+    const isCrossStructure = getDataAttributes(
+      viewportEl,
+      "data-cross-"
+    ).structure;
+    let sideState: SideState[] = [];
+
+    if (!isCrossStructure) {
+      const groupPanels = this._getGroupFromAttribute(panels);
+      const 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;
+  }
+
+  private _createCrossStructure(sideState: SideState[]) {
+    const sideCamera = document.createElement("div");
+    let sidePanels: string = "";
+
+    sideCamera.classList.add(CLASS.CAMERA);
+    sideState.forEach((state, i) => {
+      const panel = this.camera.children[i];
+      sidePanels += state.element.innerHTML;
+      Array.from(panel.attributes).forEach((attribute) =>
+        panel.removeAttribute(attribute.name)
+      );
+    });
+
+    sideCamera.innerHTML = sidePanels;
+
+    sideState.forEach((_, i) => {
+      const panel = this.camera.children[i];
+      [CLASS.VIEWPORT, CLASS.VERTICAL].forEach((className) => {
+        if (!panel.classList.contains(className)) {
+          panel.classList.add(className);
+        }
+      });
+      panel.innerHTML = sideCamera.outerHTML;
+    });
+
+    this.element.setAttribute("data-cross-structure", "true");
+  }
+
+  private _getGroupFromAttribute(
+    panels: HTMLElement[]
+  ): Record<string, HTMLElement[]> {
+    const groupKeys: string[] = [];
+    const groupPanels: Record<string, HTMLElement[]> = {};
+
+    panels.forEach((panel) => {
+      const 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;
+  }
+
+  private _getSideStateFromGroup(
+    groupPanels: Record<string, HTMLElement[]>
+  ): SideState[] {
+    return Object.keys(groupPanels).reduce(
+      (state: SideState[], key: string) => {
+        const start = state.length ? +state[state.length - 1].end + 1 : 0;
+        const element = groupPanels[key].reduce(
+          (el: HTMLElement, panel: HTMLElement) => {
+            el.innerHTML += panel.outerHTML;
+            return el;
+          },
+          document.createElement("div")
+        );
+        return [
+          ...state,
+          {
+            key,
+            start,
+            end: start + groupPanels[key].length - 1,
+            element: element
+          }
+        ];
+      },
+      []
+    );
+  }
 
-      this.on(EVENTS.HOLD_START, this._onHorizontalHoldStart);
-      this.on(EVENTS.MOVE, this._onHorizontalMove);
-      this.on(EVENTS.MOVE_END, this._onHorizontalMoveEnd);
+  private _getSideStateFromPanels(panels: HTMLElement[]): SideState[] {
+    return panels.reduce(
+      (state: SideState[], panel: HTMLElement, i: number) => {
+        const start = state.length ? +state[state.length - 1].end + 1 : 0;
+        return [
+          ...state,
+          {
+            key: i.toString(),
+            start,
+            end: start + panel.children.length - 1,
+            element: panel
+          }
+        ];
+      },
+      []
+    );
+  }
+
+  private _getSideStateFromCrossStructure(panels: HTMLElement[]): SideState[] {
+    const groupPanels = this._getGroupFromAttribute(panels);
+    return this._getSideStateFromGroup(groupPanels);
+  }
 
-      this._verticalFlicking.forEach((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);
+  private _createSideFlicking(): Flicking[] {
+    return this.sideState.map((state, i) => {
+      return new Flicking(this.camera.children[i], {
+        ...this.sideOptions,
+        horizontal: false,
+        panelsPerView: 1,
+        defaultIndex: state.start
       });
     });
   }
 
-  private _syncToCategory(index: number, outerIndex: number): void {
+  private _syncToCategory = (index: number, outerIndex: number): void => {
+    if (this._disableIndexSync) {
+      return;
+    }
+
     this.stopAnimation();
-    this._verticalFlicking.forEach((child, i) => {
-      const { start, end } = this._verticalState[i];
+    this._sideFlicking.forEach((child, i) => {
+      const { start, end } = this._sideState[i];
 
       if (start <= index && end >= index && outerIndex !== i) {
         child.stopAnimation();
@@ -165,18 +323,62 @@ export class CrossFlicking extends Flicking {
         void this.moveTo(i, 0);
       }
     });
-  }
+  };
+
+  private _setDraggable = (
+    direction: ValueOf<typeof MOVE_DIRECTION>,
+    draggable: boolean
+  ): void => {
+    if (!this._disableSlideOnHold) {
+      return;
+    }
+
+    const dragThreshold = this._originalDragThreshold;
+    const 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((child) => {
+        child.dragThreshold = threshold;
+      });
+    }
+  };
+
+  private _setPreviousSideIndex = () => {
+    this._sideFlicking.forEach((child, i) => {
+      const { start, end } = this._sideState[i];
+
+      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);
+        }
+      }
+    });
+  };
 
   private _onHorizontalHoldStart = (): void => {
-    this.dragThreshold = 10;
+    this._setDraggable(MOVE_DIRECTION.HORIZONTAL, true);
     this._moveDirection = null;
   };
 
   private _onHorizontalMove = (e: MoveEvent): void => {
     if (e.isTrusted && !this._moveDirection) {
-      this._verticalFlicking.forEach((child) => {
-        child.dragThreshold = Infinity;
-      });
+      this._setDraggable(MOVE_DIRECTION.VERTICAL, false);
       this._moveDirection = MOVE_DIRECTION.HORIZONTAL;
     }
   };
@@ -184,11 +386,6 @@ export class CrossFlicking extends Flicking {
   private _onHorizontalMoveEnd = (e: MoveEndEvent): void => {
     const visiblePanels = this.visiblePanels;
 
-    this._verticalFlicking.forEach((child) => {
-      child.dragThreshold = 10;
-    });
-    this._moveDirection = null;
-
     if (visiblePanels.length > 1) {
       this._nextIndex =
         e.direction === "NEXT"
@@ -198,53 +395,43 @@ export class CrossFlicking extends Flicking {
       this._nextIndex = visiblePanels[0].index;
     }
 
-    this._verticalFlicking.forEach((child, i) => {
-      if (this._nextIndex !== i) {
-        const { start, end } = this._verticalState[i];
+    this._setDraggable(MOVE_DIRECTION.VERTICAL, true);
+    this._moveDirection = null;
 
-        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(() => this._setPreviousSideIndex());
 
     if (e.isTrusted) {
       this._syncToCategory(
-        this._verticalFlicking[this._nextIndex].index,
+        this._sideFlicking[this._nextIndex].index,
         this._nextIndex
       );
     }
   };
 
-  private _onVerticalHoldStart = (): void => {
-    this._verticalFlicking.forEach((child) => {
-      child.dragThreshold = 10;
-    });
+  private _onSideHoldStart = (): void => {
+    this._setDraggable(MOVE_DIRECTION.VERTICAL, true);
     this._moveDirection = null;
   };
 
-  private _onVerticalMove = (e: MoveEvent): void => {
+  private _onSideMove = (e: MoveEvent): void => {
     if (e.isTrusted && !this._moveDirection) {
-      this.dragThreshold = Infinity;
+      this._setDraggable(MOVE_DIRECTION.HORIZONTAL, false);
       this._moveDirection = MOVE_DIRECTION.VERTICAL;
     }
   };
 
-  private _onVerticalMoveEnd = (): void => {
-    this.dragThreshold = 10;
+  private _onSideMoveEnd = (): void => {
+    this._setDraggable(MOVE_DIRECTION.HORIZONTAL, true);
     this._moveDirection = null;
   };
 
-  private _onVerticalChanged = (e: ChangedEvent): void => {
-    // this.visiblePanels.length 가 2보다 크다면 가로 방향 Flicking이 조작 중이라는 것을 의미합니다.
-    // 이 경우 가로 방향 Flicking의 이동이 완전히 끝난 뒤 _onHorizontalMoveEnd 에서 syncToCategory할 것이므로 여기서는 하지 않습니다.
+  private _onSideChanged = (e: ChangedEvent): void => {
+    // 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._verticalFlicking[this.index] === e.currentTarget
+      this._sideFlicking[this.index] === e.currentTarget
     ) {
       this._syncToCategory(e.index, this.index);
     }