feat(#41): slide code, on mobile, active scrolling-y on click

Author: peterpeterparker

src/components.d.ts

@@ -165,7 +165,7 @@ export namespace Components {
     'anchorZoom'?: string;
     'hideAnchor'?: boolean;
     'language'?: string;
-    'onScrolling'?: (event: CustomEvent<void>) => void;
+    'onScrolling'?: (event: CustomEvent<boolean>) => void;
     'onSlideDidLoad'?: (event: CustomEvent<void>) => void;
     'src'?: string;
   }

src/components/deck/deckdeckgo-deck/deckdeckgo-deck.tsx

@@ -121,8 +121,8 @@ export class DeckdeckgoDeck {
   }
 
   @Listen('scrolling')
-  scrolling() {
-    this.blockSlide = true;
+  scrolling($event: CustomEvent) {
+    this.blockSlide = $event ? $event.detail : false;
   }
 
   private start(e: Event) {
@@ -152,7 +152,6 @@ export class DeckdeckgoDeck {
 
   private async stop(e: Event) {
     if (this.blockSlide) {
-      this.blockSlide = false;
       return;
     }
 

src/components/slides/deckdeckgo-slide-code/deckdeckgo-slide-code.scss

@@ -7,8 +7,12 @@ div.deckgo-slide {
 }
 
 div.deckgo-slide-code-container {
-  overflow-y: auto;
   width: 100%;
+  overflow-y: auto;
+
+  &.deckgo-slide-code-container-mobile {
+    overflow-y: hidden;
+  }
 }
 
 ::slotted([slot="title"]) {

src/components/slides/deckdeckgo-slide-code/deckdeckgo-slide-code.tsx

@@ -1,4 +1,4 @@
-import {Component, Element, Event, EventEmitter, Method, Prop} from '@stencil/core';
+import {Component, Element, Event, EventEmitter, Method, Prop, State} from '@stencil/core';
 
 import {DeckdeckgoSlide, DeckdeckgoSlideUtils} from '../deckdeckgo-slide';
 import {DeckdeckgoUtils} from '../../utils/deckdeckgo-utils';
@@ -19,7 +19,7 @@ export class DeckdeckgoSlideCode implements DeckdeckgoSlide {
 
   @Event() slideDidLoad: EventEmitter<void>;
 
-  @Event() scrolling: EventEmitter<void>;
+  @Event() scrolling: EventEmitter<boolean>;
 
   @Prop() src: string;
 
@@ -29,8 +29,14 @@ export class DeckdeckgoSlideCode implements DeckdeckgoSlide {
 
   @Prop() language: string = 'javascript';
 
-  private startX: number = null;
-  private action: DeckdeckgoSlideCodeAction = null;
+  @State()
+  private mobile: boolean = false;
+
+  private action: DeckdeckgoSlideCodeAction = DeckdeckgoSlideCodeAction.SWIPE;
+
+  componentWillLoad() {
+    this.mobile = DeckdeckgoSlideUtils.isMobile();
+  }
 
   async componentDidLoad() {
     await DeckdeckgoUtils.hideLazyLoadImages(this.el);
@@ -75,7 +81,7 @@ export class DeckdeckgoSlideCode implements DeckdeckgoSlide {
   private scrollToNext(swipeLeft: boolean): Promise<boolean> {
     const element: HTMLElement = this.el.shadowRoot.querySelector('deckgo-highlight-code');
 
-    if (element) {
+    if (element && element.hasOwnProperty('scrollToNext')) {
       return (element as any).scrollToNext(swipeLeft);
     } else {
       return new Promise<boolean>((resolve) => {
@@ -88,7 +94,7 @@ export class DeckdeckgoSlideCode implements DeckdeckgoSlide {
     return new Promise<void>(async (resolve) => {
       const element: HTMLElement = this.el.shadowRoot.querySelector('deckgo-highlight-code');
 
-      if (element) {
+      if (element && element.hasOwnProperty('zoomCode')) {
         await (element as any).zoomCode(zoom);
       }
 
@@ -106,34 +112,26 @@ export class DeckdeckgoSlideCode implements DeckdeckgoSlide {
     return DeckdeckgoSlideUtils.lazyLoadContent(this.el);
   }
 
-  private touchScrollStart(event: TouchEvent) {
-    this.startX = DeckdeckgoUtils.unifyEvent(event).clientX;
-  }
-
-  private touchScrollMove(event: TouchEvent) {
-    if (this.action) {
-      return;
-    }
-
-    const currentX: number = DeckdeckgoUtils.unifyEvent(event).clientX;
-
-    const swipeLeft: boolean = this.startX > currentX;
-    const swipeRight: boolean = this.startX < currentX;
+  private switchAction(): Promise<void> {
+    return new Promise<void>((resolve) => {
+      if (!this.mobile) {
+        // Scrolling is allowed on not mobile devices
+        resolve();
+        return;
+      }
 
-    this.action = swipeLeft || swipeRight ? DeckdeckgoSlideCodeAction.SWIPE : DeckdeckgoSlideCodeAction.SCROLL;
+      this.action = this.action === DeckdeckgoSlideCodeAction.SWIPE ? DeckdeckgoSlideCodeAction.SCROLL : DeckdeckgoSlideCodeAction.SWIPE;
 
-    if (!swipeLeft && !swipeRight) {
-      this.scrolling.emit();
-      this.unlockScroll();
-    } else {
-      this.lockScroll();
-    }
-  }
+      this.scrolling.emit(this.action === DeckdeckgoSlideCodeAction.SCROLL);
 
-  private touchScrollEnd() {
-    this.action = null;
+      if (this.action === DeckdeckgoSlideCodeAction.SCROLL) {
+        this.unlockScroll();
+      } else {
+        this.lockScroll();
+      }
 
-    this.unlockScroll();
+      resolve();
+    });
   }
 
   private lockScroll() {
@@ -143,23 +141,21 @@ export class DeckdeckgoSlideCode implements DeckdeckgoSlide {
 
   private unlockScroll() {
     const container: HTMLElement = this.el.shadowRoot.querySelector('div.deckgo-slide-code-container');
-    container.style.removeProperty('overflow-y');
-  }
-
-  private emitScrolling() {
-    if (this.action === DeckdeckgoSlideCodeAction.SCROLL) {
-      this.scrolling.emit();
-    }
+    container.style.setProperty('overflow-y', 'auto');
   }
 
   // DeckDeckGo
   render() {
+
+    let containerStyle: string = 'deckgo-slide-code-container';
+    if (this.mobile) {
+      containerStyle += ' deckgo-slide-code-container-mobile';
+    }
+
     return <div class="deckgo-slide"
-                onTouchStart={(event: TouchEvent) => this.touchScrollStart(event)}
-                onTouchMove={(event: TouchEvent) => this.touchScrollMove(event)}
-                onTouchEnd={() => this.touchScrollEnd()}>
+                onClick={() => this.switchAction()}>
       <slot name="title"></slot>
-      <div class="deckgo-slide-code-container" onScroll={() => this.emitScrolling()}>
+      <div class={containerStyle}>
         <deckgo-highlight-code src={this.src} anchor={this.anchor} anchorZoom={this.anchorZoom} hideAnchor={this.hideAnchor} language={this.language}></deckgo-highlight-code>
       </div>
       <slot name="code"></slot>

src/components/slides/deckdeckgo-slide.tsx

@@ -99,6 +99,7 @@ export class DeckdeckgoSlideUtils {
     }
 
     const a: string = navigator.userAgent || navigator.vendor || (window as any).opera;
+
     return (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4)));
   }
 

src/index.html

@@ -7,8 +7,10 @@
 
   <script src="/build/deckdeckgo.js"></script>
 
+  <script src="https://unpkg.com/deckdeckgo-highlight-code@latest/dist/deckdeckgo-highlight-code.js"></script>
+
 </head>
-<body style="margin: 0;">
+<body style="margin: 0; overflow: hidden;">
 
 <deckgo-deck id="slider">
   <deckgo-slide-title>