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

Commit 79b2425

Browse files
fix(#69): override slide width programmatically
1 parent 6919574 commit 79b2425

File tree

2 files changed

+52
-11
lines changed

2 files changed

+52
-11
lines changed

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

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class DeckdeckgoDeck {
5959
}
6060

6161
async componentDidLoad() {
62-
await this.initEmbeddedSlideWidth();
62+
await this.initSlideWidth();
6363

6464
this.initWindowResize();
6565
this.initKeyboardAssist();
@@ -79,7 +79,7 @@ export class DeckdeckgoDeck {
7979
private initWindowResize() {
8080
if (window) {
8181
window.addEventListener('resize', DeckdeckgoUtils.debounce(async () => {
82-
await this.initEmbeddedSlideWidth();
82+
await this.initSlideWidth();
8383
await this.slideTo(this.activeIndex);
8484

8585
const toggleFullscreen: boolean = DeckdeckgoUtils.isFullscreen();
@@ -89,26 +89,57 @@ export class DeckdeckgoDeck {
8989
}
9090
}
9191

92-
private initEmbeddedSlideWidth(): Promise<void> {
93-
return new Promise<void>((resolve) => {
94-
if (!this.embedded) {
92+
private initSlideWidth(): Promise<void> {
93+
return new Promise<void>(async (resolve) => {
94+
const slider: HTMLElement = this.el.shadowRoot.querySelector('div.deckgo-deck');
95+
96+
if (!slider) {
9597
resolve();
9698
return;
9799
}
98100

99-
const slider: HTMLElement = this.el.shadowRoot.querySelector('div.deckgo-deck');
101+
if (!this.embedded) {
102+
await this.initSlideWidthStandard(slider);
103+
} else {
104+
await this.initSlideWidthEmbedded(slider);
105+
}
106+
107+
resolve();
108+
});
109+
}
100110

101-
if (!slider || !slider.offsetParent) {
111+
private initSlideWidthStandard(slider: HTMLElement): Promise<void> {
112+
return new Promise<void>((resolve) => {
113+
if (!window || !screen) {
102114
resolve();
103115
return;
104116
}
105117

106-
if (slider.offsetParent.clientWidth > 0) {
107-
slider.style.setProperty('--slide-width', '' + slider.offsetParent.clientWidth + 'px');
118+
if (DeckdeckgoUtils.isIOS()) {
119+
slider.style.setProperty('--slide-width', '' + screen.width + 'px');
120+
} else {
121+
slider.style.setProperty('--slide-width', '' + window.innerWidth + 'px');
122+
}
123+
124+
resolve();
125+
});
126+
}
127+
128+
private initSlideWidthEmbedded(slider: HTMLElement): Promise<void> {
129+
return new Promise<void>((resolve) => {
130+
if (!slider.offsetParent) {
131+
resolve();
132+
return;
108133
}
109134

110-
if (slider.offsetParent.clientHeight) {
111-
slider.style.setProperty('--slide-height', '' + slider.offsetParent.clientHeight + 'px');
135+
if (slider.offsetParent) {
136+
if (slider.offsetParent.clientWidth > 0) {
137+
slider.style.setProperty('--slide-width', '' + slider.offsetParent.clientWidth + 'px');
138+
}
139+
140+
if (slider.offsetParent.clientHeight) {
141+
slider.style.setProperty('--slide-height', '' + slider.offsetParent.clientHeight + 'px');
142+
}
112143
}
113144

114145
resolve();

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,16 @@ export class DeckdeckgoUtils {
8787
return (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|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)));
8888
}
8989

90+
static isIOS(): boolean {
91+
if (!window || !navigator) {
92+
return false;
93+
}
94+
95+
const a: string = navigator.userAgent || navigator.vendor || (window as any).opera;
96+
97+
return /iPad|iPhone|iPod/i.test(a);
98+
}
99+
90100
static isFullscreen(): boolean {
91101
if (!window || !screen) {
92102
return false;

0 commit comments

Comments
 (0)