Skip to content

Feature/fit viewport #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
akhuoa wants to merge 9 commits into
base: main
Choose a base branch
from
+57 −0
Draft

Feature/fit viewport #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0e2f79
Add fit viewport button toggle for map area
akhuoa May 21, 2024
9830ecb
Merge branch 'ABI-Software:main' into feature/fit-viewport
akhuoa Jun 27, 2024
2958158
Merge branch 'main' into feature/fit-viewport
akhuoa Jul 12, 2024
475a9ef
Update fit to viewport function
akhuoa Jul 12, 2024
6bd3e53
Merge branch 'main' into feature/fit-viewport
akhuoa Aug 14, 2024
3a10add
Merge branch 'main' into feature/fit-viewport
akhuoa Aug 18, 2024
63e4a89
Merge branch 'main' into feature/fit-viewport
akhuoa Nov 14, 2024
167a052
Add exit fit viewport by Esc key
akhuoa Nov 15, 2024
6cd4a20
Hide fit viewport tooltip after clicking
akhuoa Nov 15, 2024
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
48 changes: 48 additions & 0 deletions src/components/DialogToolbarContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,23 @@
</div>

<el-row class="icon-group">
<el-popover
class="tooltip"
:content="isFitViewport ? 'Exit fit viewport' : 'Fit to viewport'"
placement="bottom-end"
:teleported=false
trigger="hover"
ref="fitViewPopover"
popper-class="header-popper"
>
<template #reference>
<map-svg-icon
:icon="isFitViewport ? 'undock' : 'dock'"
class="header-icon"
@click="toggleMapFitView"
/>
</template>
</el-popover>
<el-popover
v-if="activeViewRef"
:virtual-ref="activeViewRef"
Expand Down Expand Up @@ -259,6 +276,7 @@ export default {
data: function() {
return {
isFullscreen: false,
isFitViewport: false,
loadingLink: true,
shareLinkDisplay: false,
independent: true,
Expand All @@ -279,6 +297,34 @@ export default {
this.$emit("onFullscreen");
this.isFullscreen = !this.isFullscreen;
},
toggleMapFitView: function (exitFitView = false) {
const toolbarEl = this.$el;
const mapContainerEl = toolbarEl.closest('.mapcontent');
if (mapContainerEl) {
if (this.isFitViewport || exitFitView === true) {
this.isFitViewport = false;
mapContainerEl.classList.remove('fit-screen');
document.body.classList.remove('el-popup-parent--hidden');
} else {
this.isFitViewport = true;
mapContainerEl.classList.add('fit-screen');
document.body.classList.add('el-popup-parent--hidden');
}
}
// hide tooltip
if (this.$refs.fitViewPopover) {
this.$refs.fitViewPopover.hide();
}
},
onKeydown: function (event) {
if (event.defaultPrevented) {
return; // Do nothing if the event was already processed
}

if (event.key === 'Escape') {
this.toggleMapFitView(true);
}
},
onFullscreenEsc: function () {
if (!document.fullscreenElement) {
this.isFullscreen = false;
Expand Down Expand Up @@ -313,9 +359,11 @@ export default {
this.permalinkRef = shallowRef(this.$refs.permalinkRef);

document.addEventListener('fullscreenchange', this.onFullscreenEsc);
window.addEventListener('keydown', this.onKeydown);
},
unmounted: function () {
document.removeEventListener('fullscreenchange', this.onFullscreenEsc);
window.removeEventListener('keydown', this.onKeydown);
},
};
</script>
Expand Down
9 changes: 9 additions & 0 deletions src/components/MapContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,15 @@ export default {
height: 100%;
width:100%;
z-index:1;

&.fit-screen {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
margin: 0;
}
}

</style>
Expand Down