diff --git a/CHANGELOG.md b/CHANGELOG.md index 194fb90a8..ffe3b18d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Web Components +- core: v8.3.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md)) - highlight-code: v3.3.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md)) ### Others diff --git a/remote/package-lock.json b/remote/package-lock.json index 37cc3ea8f..9fa5a5547 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -1123,9 +1123,9 @@ } }, "@deckdeckgo/core": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@deckdeckgo/core/-/core-8.2.1.tgz", - "integrity": "sha512-6s5LU8vhLXvooIP+J+ocxNkAucKGKqfgxbJMrT7S6xnrzx6w+1N+YWqPMPMQqhVJK8kOo7EJ1xs/LUT3TDlOcw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@deckdeckgo/core/-/core-8.3.0.tgz", + "integrity": "sha512-UFfIl3t1l1x059wv1RMfRpy/x1uIRPnfMm4UxdLzsFwE1AkLNi04x8aLpcUkAISS67c3q4UVEIfNqs3wKNXl7A==", "requires": { "@deckdeckgo/deck-utils": "^4.0.2", "@deckdeckgo/utils": "^2.0.1" diff --git a/remote/package.json b/remote/package.json index df6d0cbac..ea87fe012 100644 --- a/remote/package.json +++ b/remote/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@deckdeckgo/charts": "^2.1.0", - "@deckdeckgo/core": "^8.2.1", + "@deckdeckgo/core": "^8.3.0", "@deckdeckgo/deck-utils": "^4.0.2", "@deckdeckgo/demo": "^2.1.0", "@deckdeckgo/drag-resize-rotate": "^2.2.0", diff --git a/studio/package-lock.json b/studio/package-lock.json index 3bccbd79d..debc59680 100644 --- a/studio/package-lock.json +++ b/studio/package-lock.json @@ -1149,9 +1149,9 @@ } }, "@deckdeckgo/core": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@deckdeckgo/core/-/core-8.2.1.tgz", - "integrity": "sha512-6s5LU8vhLXvooIP+J+ocxNkAucKGKqfgxbJMrT7S6xnrzx6w+1N+YWqPMPMQqhVJK8kOo7EJ1xs/LUT3TDlOcw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@deckdeckgo/core/-/core-8.3.0.tgz", + "integrity": "sha512-UFfIl3t1l1x059wv1RMfRpy/x1uIRPnfMm4UxdLzsFwE1AkLNi04x8aLpcUkAISS67c3q4UVEIfNqs3wKNXl7A==", "requires": { "@deckdeckgo/deck-utils": "^4.0.2", "@deckdeckgo/utils": "^2.0.1" diff --git a/studio/package.json b/studio/package.json index 40ef8f3ec..ccacf0762 100644 --- a/studio/package.json +++ b/studio/package.json @@ -22,7 +22,7 @@ "dependencies": { "@deckdeckgo/charts": "^2.1.0", "@deckdeckgo/color": "^4.1.0", - "@deckdeckgo/core": "^8.2.1", + "@deckdeckgo/core": "^8.3.0", "@deckdeckgo/deck-utils": "^4.1.0", "@deckdeckgo/demo": "^2.1.0", "@deckdeckgo/drag-resize-rotate": "^2.2.0", diff --git a/webcomponents/core/CHANGELOG.md b/webcomponents/core/CHANGELOG.md index fa7048da5..c7781ea59 100644 --- a/webcomponents/core/CHANGELOG.md +++ b/webcomponents/core/CHANGELOG.md @@ -1,3 +1,9 @@ +# 8.3.0 (2021-08-19) + +### Features + +- consider mobile as small devices, not tablets + # 8.2.1 (2021-05-29) ### Fix diff --git a/webcomponents/core/package-lock.json b/webcomponents/core/package-lock.json index ee57d63e6..8bd907fa9 100644 --- a/webcomponents/core/package-lock.json +++ b/webcomponents/core/package-lock.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/core", - "version": "8.2.1", + "version": "8.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/webcomponents/core/package.json b/webcomponents/core/package.json index 7feaf0268..e85223b87 100644 --- a/webcomponents/core/package.json +++ b/webcomponents/core/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/core", - "version": "8.2.1", + "version": "8.3.0", "description": "Add a presentation to your web application using HTML and Web Components", "main": "dist/index.cjs.js", "module": "dist/index.js", diff --git a/webcomponents/core/src/components/deck/deckdeckgo-deck/deckdeckgo-deck.tsx b/webcomponents/core/src/components/deck/deckdeckgo-deck/deckdeckgo-deck.tsx index cea1b7ad0..ec3603d3c 100644 --- a/webcomponents/core/src/components/deck/deckdeckgo-deck/deckdeckgo-deck.tsx +++ b/webcomponents/core/src/components/deck/deckdeckgo-deck/deckdeckgo-deck.tsx @@ -1,6 +1,6 @@ import {Component, Element, Listen, Method, Prop, State, Event, EventEmitter, h, Watch, Host} from '@stencil/core'; -import {isIOS, unifyEvent, isMobile, isFullscreen, debounce} from '@deckdeckgo/utils'; +import {isIOS, unifyEvent, isMobile, isFullscreen, debounce, isAndroidTablet, isIPad} from '@deckdeckgo/utils'; import {getSlideDefinition, getAttributesDefinition} from '@deckdeckgo/deck-utils'; import {DeckdeckgoDeckDefinition, DeckdeckgoSlideDefinition, DeckdeckgoAttributeDefinition} from '@deckdeckgo/types'; @@ -96,6 +96,9 @@ export class DeckdeckgoDeck { private slideLoopInterval: number; private idleSlideLoopTimer: number; + // We do not consider iPad and Tablet as "mobile" devices. With mobile we mean smaller devices, phones. + private mobile: boolean = isMobile() && !(isIPad() || isAndroidTablet()); + async componentWillLoad() { await this.initRtl(); await this.initDirection(); @@ -234,7 +237,7 @@ export class DeckdeckgoDeck { private async initFontSize(slider: HTMLElement, {height, width}: {height: number; width: number}) { // 576px height = font-size 16px or 1em (relative to the font-size of its direct or nearest parent) const fontSize: number = height / 576; - const ratioFontSize: number = width / 16 * 9 / 576; + const ratioFontSize: number = ((width / 16) * 9) / 576; slider.style.setProperty('--slide-auto-font-size', `${fontSize}em`); slider.style.setProperty('--slide-auto-ratio-font-size', `${ratioFontSize}em`); @@ -337,7 +340,7 @@ export class DeckdeckgoDeck { } private async initDirection() { - this.dir = isMobile() ? this.directionMobile : this.direction; + this.dir = this.mobile ? this.directionMobile : this.direction; } /* BEGIN: Handle swipe */ @@ -681,7 +684,7 @@ export class DeckdeckgoDeck { // In standard case, we want to be able to reveal elements or not, as we wish but if we set reveal to false, we want to display everything straight at the begin. // Or we display also all reveal elements on mobile devices as there is no keyboard on mobile device to reveal elements // Also, no reveal for papyrus as we can scroll - if (!this.reveal || (!this.revealOnMobile && isMobile()) || this.dir === 'papyrus') { + if (!this.reveal || (!this.revealOnMobile && this.mobile) || this.dir === 'papyrus') { promises.push(this.revealAllContent()); }