fix: on iPad move preview

peterpeterparker · peterpeterparker · commit 1971b2af5781 · 2020-11-20T18:51:33.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,7 +46,7 @@
 - slide-utils: v2.6.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/utils/slide/CHANGELOG.md))
 - starter kit: v7.1.2 ([CHANGELOG](https://github.com/deckgo/starter-kit/blob/master/CHANGELOG.md))
 - studio kit: v7.1.2 ([CHANGELOG](https://github.com/deckgo/studio-kit/blob/master/CHANGELOG.md))
-- utils: v1.5.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/utils/utils/CHANGELOG.md))
+- utils: v1.6.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/utils/utils/CHANGELOG.md))
 
 <a name="3.0.0"></a>
 
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -44,7 +44,7 @@
     "@deckdeckgo/slide-video": "^2.2.2",
     "@deckdeckgo/slide-youtube": "^2.2.2",
     "@deckdeckgo/social": "^4.0.0",
-    "@deckdeckgo/utils": "^1.5.0",
+    "@deckdeckgo/utils": "^1.6.0",
     "@deckdeckgo/word-cloud": "^1.0.5",
     "@deckdeckgo/youtube": "^2.0.1",
     "@ionic/core": "^5.4.4",
diff --git a/remote/package-lock.json b/remote/package-lock.json
diff --git a/remote/package.json b/remote/package.json
@@ -44,7 +44,7 @@
     "@deckdeckgo/slide-video": "^2.2.2",
     "@deckdeckgo/slide-youtube": "^2.2.2",
     "@deckdeckgo/social": "^4.0.0",
-    "@deckdeckgo/utils": "^1.5.0",
+    "@deckdeckgo/utils": "^1.6.0",
     "@deckdeckgo/word-cloud": "^1.0.5",
     "@deckdeckgo/youtube": "^2.0.1",
     "@ionic/core": "^5.4.4",
diff --git a/studio/package-lock.json b/studio/package-lock.json
diff --git a/studio/package.json b/studio/package.json
@@ -45,7 +45,7 @@
     "@deckdeckgo/slide-utils": "^2.6.1",
     "@deckdeckgo/slide-youtube": "^2.2.2",
     "@deckdeckgo/social": "^4.0.0",
-    "@deckdeckgo/utils": "^1.5.0",
+    "@deckdeckgo/utils": "^1.6.0",
     "@deckdeckgo/word-cloud": "^1.0.5",
     "@deckdeckgo/youtube": "^2.0.1",
     "@ionic/core": "^5.4.4",
diff --git a/studio/src/app/components/editor/slide/app-slide-preview/app-slide-preview.scss b/studio/src/app/components/editor/slide/app-slide-preview/app-slide-preview.scss
@@ -2,7 +2,6 @@
 
 app-slide-preview {
   position: absolute;
-  top: 8px;
   right: 8px;
 
   transition: opacity 0.5s;
diff --git a/studio/src/app/components/editor/slide/app-slide-preview/app-slide-preview.tsx b/studio/src/app/components/editor/slide/app-slide-preview/app-slide-preview.tsx
@@ -1,7 +1,8 @@
 import {Component, h, Host, Listen, State, Event, EventEmitter, Element, Prop} from '@stencil/core';
 
 import {cleanContent} from '@deckdeckgo/deck-utils';
-import {debounce} from '@deckdeckgo/utils';
+import {debounce, isIPad} from '@deckdeckgo/utils';
+
 import {SlotUtils} from '../../../../utils/editor/slot.utils';
 
 @Component({
@@ -17,6 +18,9 @@ export class AppSlidePreview {
   @State()
   private preview: boolean = false;
 
+  @State()
+  private top: string = '8px';
+
   private deckPreviewRef!: HTMLDeckgoDeckElement;
 
   @Event({bubbles: false}) private previewAttached: EventEmitter<void>;
@@ -29,6 +33,14 @@ export class AppSlidePreview {
     }, 500);
   }
 
+  @Listen('ionKeyboardDidShow', {target: 'window'})
+  onKeyboardDidShow($event: CustomEvent<{keyboardHeight: number}>) {
+    if (!isIPad()) {
+      return;
+    }
+    this.top = `calc(100vh - ${$event.detail.keyboardHeight}px)`;
+  }
+
   componentDidUpdate() {
     if (this.preview) {
       this.previewAttached.emit();
@@ -112,6 +124,7 @@ export class AppSlidePreview {
   render() {
     return (
       <Host
+        style={{top: this.top}}
         class={{
           preview: this.preview,
         }}>
diff --git a/utils/utils/CHANGELOG.md b/utils/utils/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="1.6.0"></a>
+
+# 1.6.0 (2020-11-20)
+
+### Fix
+
+- is mobile based on matchMedia
+- isIos including new iPads
+
 <a name="1.5.0"></a>
 
 # 1.5.0 (2020-11-20)
diff --git a/utils/utils/package-lock.json b/utils/utils/package-lock.json
diff --git a/utils/utils/package.json b/utils/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deckdeckgo/utils",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "author": "David Dal Busco",
   "description": "A collection of utils methods and functions developed for DeckDeckGo",
   "license": "MIT",
diff --git a/utils/utils/src/utils/utils.ts b/utils/utils/src/utils/utils.ts
@@ -16,22 +16,12 @@ export function debounce(func: Function, timeout?: number) {
   };
 }
 
-// Source: http://detectmobilebrowsers.com
 export function isMobile(): boolean {
-  if (!window || !navigator) {
+  if (!window) {
     return false;
   }
 
-  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|g1o(\.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)
-    )
-  );
+  return window.matchMedia('(any-pointer:coarse)').matches;
 }
 
 export function isIOS(): boolean {
@@ -41,7 +31,7 @@ export function isIOS(): boolean {
 
   const a: string = navigator.userAgent || navigator.vendor || (window as any).opera;
 
-  return /iPad|iPhone|iPod/i.test(a);
+  return /iPhone|iPod/i.test(a) || isIPad();
 }
 
 export function isIPad(): boolean {
