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

Commit b7ccf9c

Browse files
feat: sticky footer in fullscreen and hide pager when toolbar displayed in fullscreen
1 parent 9c0a038 commit b7ccf9c

File tree

8 files changed

+29
-13
lines changed

8 files changed

+29
-13
lines changed

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
@@ -15,7 +15,7 @@
1515
},
1616
"dependencies": {
1717
"@ionic/core": "4.1.1",
18-
"deckdeckgo": "^1.0.0-beta.30",
18+
"deckdeckgo": "^1.0.0-beta.31",
1919
"deckdeckgo-inline-editor": "^1.0.0-alpha.4",
2020
"deckdeckgo-qrcode": "^1.0.0-alpha.6",
2121
"deckdeckgo-remote": "^1.0.0-alpha.8",

studio/src/app/pages/editor/app-editor/app-editor.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "../../../../global/theme/editor/editor-fullscreen";
2+
13
app-editor {
24
@import "../../../../global/theme/editor/editor-deck";
35
@import "../../../../global/theme/editor/editor-deck-fonts";

studio/src/app/pages/editor/app-editor/app-editor.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class AppEditor {
4343
private slideIndex: number = 0;
4444

4545
@State()
46-
private displaying: boolean = false;
46+
private presenting: boolean = false;
4747

4848
private deckEventsHandler: DeckEventsHandler = new DeckEventsHandler();
4949
private removeEventsHandler: RemoteEventsHandler = new RemoteEventsHandler();
@@ -208,7 +208,7 @@ export class AppEditor {
208208

209209
@Listen('document:mouseInactivity')
210210
async inactivity($event: CustomEvent) {
211-
this.displaying = !$event.detail;
211+
this.presenting = !$event.detail;
212212

213213
// Wait a bit for the display/repaint of the footer
214214
setTimeout(async () => {
@@ -587,11 +587,11 @@ export class AppEditor {
587587
return [
588588
<app-navigation publish={true}></app-navigation>,
589589
<ion-content class="ion-padding">
590-
<main class={this.displaying ? 'idle' : undefined}>
590+
<main class={this.slidesFetched ? (this.presenting ? 'ready idle' : 'ready') : undefined}>
591591

592592
{this.renderLoading()}
593593

594-
<deckgo-deck embedded={true} style={this.deckStyle} pager={this.slidesFetched}
594+
<deckgo-deck embedded={true} style={this.deckStyle}
595595
onMouseDown={(e: MouseEvent) => this.deckTouched(e)}
596596
onTouchStart={(e: TouchEvent) => this.deckTouched(e)}
597597
onSlideNextDidChange={() => this.hideToolbar()}
@@ -603,7 +603,7 @@ export class AppEditor {
603603
<deckgo-remote autoConnect={false}></deckgo-remote>
604604
</main>
605605
</ion-content>,
606-
<ion-footer class={this.displaying ? 'idle' : undefined}>
606+
<ion-footer class={this.presenting ? 'idle' : undefined}>
607607
<ion-toolbar>
608608
<ion-buttons slot="start">
609609
<ion-tab-button onClick={() => this.animatePrevNextSlide(false)} color="primary">

studio/src/components.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
import '@stencil/core';
99

1010
import '@ionic/core';
11+
import 'ionicons';
1112
import 'deckdeckgo';
1213
import 'deckdeckgo-inline-editor';
1314
import 'deckdeckgo-qrcode';
1415
import 'deckdeckgo-remote';
15-
import 'ionicons';
1616
import {
1717
EventEmitter,
1818
} from '@stencil/core';

studio/src/global/app.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,3 @@
3939
@import "theme/content";
4040
@import "theme/popover";
4141
@import "theme/tappable";
42-
@import "theme/fullscreen";

studio/src/global/theme/fullscreen.scss renamed to studio/src/global/theme/editor/editor-fullscreen.scss

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,13 @@
3636
--padding-top: 0;
3737
}
3838

39-
ion-footer.idle {
40-
display: none;
39+
ion-footer {
40+
position: absolute;
41+
bottom: 0;
42+
43+
&.idle {
44+
display: none;
45+
}
4146
}
4247

4348
main {
@@ -51,6 +56,12 @@
5156
}
5257
}
5358

59+
&:not(.idle) {
60+
deckgo-deck {
61+
--pager-display: none;
62+
}
63+
}
64+
5465
// Fonts
5566
deckgo-deck {
5667
font-size: 32px;

studio/src/global/theme/editor/editor-loading.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,8 @@ main {
3737
}
3838
}
3939

40+
&:not(.ready) {
41+
--pager-display: none;
42+
}
43+
4044
}

0 commit comments

Comments
 (0)