Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 7a6bf08

Browse files
feat: consider tablets as not mobile devices regarding direction and animation (#1298)
1 parent 4b2dd19 commit 7a6bf08

File tree

9 files changed

+24
-14
lines changed

9 files changed

+24
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Web Components
66

7+
- core: v8.3.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md))
78
- highlight-code: v3.3.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md))
89

910
### Others

remote/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

remote/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"dependencies": {
2020
"@deckdeckgo/charts": "^2.1.0",
21-
"@deckdeckgo/core": "^8.2.1",
21+
"@deckdeckgo/core": "^8.3.0",
2222
"@deckdeckgo/deck-utils": "^4.0.2",
2323
"@deckdeckgo/demo": "^2.1.0",
2424
"@deckdeckgo/drag-resize-rotate": "^2.2.0",

studio/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

studio/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"dependencies": {
2323
"@deckdeckgo/charts": "^2.1.0",
2424
"@deckdeckgo/color": "^4.1.0",
25-
"@deckdeckgo/core": "^8.2.1",
25+
"@deckdeckgo/core": "^8.3.0",
2626
"@deckdeckgo/deck-utils": "^4.1.0",
2727
"@deckdeckgo/demo": "^2.1.0",
2828
"@deckdeckgo/drag-resize-rotate": "^2.2.0",

webcomponents/core/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 8.3.0 (2021-08-19)
2+
3+
### Features
4+
5+
- consider mobile as small devices, not tablets
6+
17
# 8.2.1 (2021-05-29)
28

39
### Fix

webcomponents/core/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webcomponents/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@deckdeckgo/core",
3-
"version": "8.2.1",
3+
"version": "8.3.0",
44
"description": "Add a presentation to your web application using HTML and Web Components",
55
"main": "dist/index.cjs.js",
66
"module": "dist/index.js",

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, Element, Listen, Method, Prop, State, Event, EventEmitter, h, Watch, Host} from '@stencil/core';
22

3-
import {isIOS, unifyEvent, isMobile, isFullscreen, debounce} from '@deckdeckgo/utils';
3+
import {isIOS, unifyEvent, isMobile, isFullscreen, debounce, isAndroidTablet, isIPad} from '@deckdeckgo/utils';
44
import {getSlideDefinition, getAttributesDefinition} from '@deckdeckgo/deck-utils';
55

66
import {DeckdeckgoDeckDefinition, DeckdeckgoSlideDefinition, DeckdeckgoAttributeDefinition} from '@deckdeckgo/types';
@@ -96,6 +96,9 @@ export class DeckdeckgoDeck {
9696
private slideLoopInterval: number;
9797
private idleSlideLoopTimer: number;
9898

99+
// We do not consider iPad and Tablet as "mobile" devices. With mobile we mean smaller devices, phones.
100+
private mobile: boolean = isMobile() && !(isIPad() || isAndroidTablet());
101+
99102
async componentWillLoad() {
100103
await this.initRtl();
101104
await this.initDirection();
@@ -234,7 +237,7 @@ export class DeckdeckgoDeck {
234237
private async initFontSize(slider: HTMLElement, {height, width}: {height: number; width: number}) {
235238
// 576px height = font-size 16px or 1em (relative to the font-size of its direct or nearest parent)
236239
const fontSize: number = height / 576;
237-
const ratioFontSize: number = width / 16 * 9 / 576;
240+
const ratioFontSize: number = ((width / 16) * 9) / 576;
238241

239242
slider.style.setProperty('--slide-auto-font-size', `${fontSize}em`);
240243
slider.style.setProperty('--slide-auto-ratio-font-size', `${ratioFontSize}em`);
@@ -337,7 +340,7 @@ export class DeckdeckgoDeck {
337340
}
338341

339342
private async initDirection() {
340-
this.dir = isMobile() ? this.directionMobile : this.direction;
343+
this.dir = this.mobile ? this.directionMobile : this.direction;
341344
}
342345

343346
/* BEGIN: Handle swipe */
@@ -681,7 +684,7 @@ export class DeckdeckgoDeck {
681684
// 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.
682685
// Or we display also all reveal elements on mobile devices as there is no keyboard on mobile device to reveal elements
683686
// Also, no reveal for papyrus as we can scroll
684-
if (!this.reveal || (!this.revealOnMobile && isMobile()) || this.dir === 'papyrus') {
687+
if (!this.reveal || (!this.revealOnMobile && this.mobile) || this.dir === 'papyrus') {
685688
promises.push(this.revealAllContent());
686689
}
687690

0 commit comments

Comments
 (0)