Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
app-actions-element {
display: block;

aside {
pointer-events: none;
}

button {
pointer-events: all;

&.hidden {
display: none;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,16 @@ export class AppActionsEditor {
}
}

private async selectDeckOnClick($event: MouseEvent | TouchEvent) {
const src: HTMLElement = $event.composedPath()[0] as HTMLElement;

if (!this.actionsElementRef.isEqualNode(src)) {
return;
}

await this.selectDeck();
}

render() {
return (
<Host
Expand Down Expand Up @@ -215,6 +225,7 @@ export class AppActionsEditor {
private renderEditActions() {
return (
<app-actions-element
onClick={($event: MouseEvent | TouchEvent) => this.selectDeckOnClick($event)}
ref={(el) => (this.actionsElementRef = el as HTMLAppActionsElementElement)}
class={editorStore.state.step === BreadcrumbsStep.DECK ? 'hidden' : undefined}
slideCopy={this.slideCopy}
Expand Down
18 changes: 16 additions & 2 deletions studio/src/app/pages/editor/app-editor/app-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export class AppEditor {
private actionsEditorRef!: HTMLAppActionsEditorElement;
private contentRef!: HTMLElement;
private mainRef!: HTMLElement;
private breadCrumbsRef!: HTMLAppBreadcrumbsElement;

private mainResizeObserver: ResizeObserver;
private slideResizeObserver: ResizeObserver;
Expand Down Expand Up @@ -516,6 +517,16 @@ export class AppEditor {
await this.actionsEditorRef.touch(element);
}

private async selectDeck($event: MouseEvent | TouchEvent) {
const src: HTMLElement = $event.composedPath()[0] as HTMLElement;

if (!this.contentRef.isEqualNode(src) && !this.breadCrumbsRef.isEqualNode(src)) {
return;
}

await this.actionsEditorRef.selectDeck();
}

@Listen('toggleFullScreen', {target: 'window'})
async onToggleFullScreen() {
if (!this.deckRef) {
Expand Down Expand Up @@ -737,7 +748,7 @@ export class AppEditor {

return [
<app-navigation publish={true} class={this.hideNavigation ? 'hidden' : undefined}></app-navigation>,
<ion-content class="ion-no-padding">
<ion-content class="ion-no-padding" onClick={($event: MouseEvent | TouchEvent) => this.selectDeck($event)}>
<div class="grid">
<div class="deck" ref={(el) => (this.contentRef = el as HTMLElement)}>
<main
Expand Down Expand Up @@ -769,7 +780,10 @@ export class AppEditor {
</main>
</div>

<app-breadcrumbs slideNumber={this.activeIndex} onStepTo={($event: CustomEvent<HTMLElement>) => this.selectStep($event)}></app-breadcrumbs>
<app-breadcrumbs
ref={(el) => (this.breadCrumbsRef = el as HTMLAppBreadcrumbsElement)}
slideNumber={this.activeIndex}
onStepTo={($event: CustomEvent<HTMLElement>) => this.selectStep($event)}></app-breadcrumbs>

<app-actions-editor
ref={(el) => (this.actionsEditorRef = el as HTMLAppActionsEditorElement)}
Expand Down