menu behaviors #6

Merged
gator merged 3 commits from dev into master 2022-12-11 08:53:18 +01:00
4 changed files with 46 additions and 30 deletions
Showing only changes of commit 9b83b88c54 - Show all commits

View File

@ -1,9 +1,9 @@
<template>
<div id="main-menu">
<MenuGeneralOptions :active="active" @update-active="updateActive" />
<MenuCellProperties :active="active" @update-active="updateActive" />
<MenuElementaryCA :active="active" @update-active="updateActive" />
<Menu2dCA :active="active" @update-active="updateActive" />
<MenuGeneralOptions />
<MenuCellProperties />
<MenuElementaryCA />
<Menu2dCA />
</div>
</template>
@ -20,21 +20,6 @@
MenuElementaryCA,
Menu2dCA,
},
data() {
return {
active: "",
};
},
methods: {
// set the opened submenu. If already active, reset it so it can close
updateActive(menu) {
if (menu === this.active) {
this.active = "";
} else {
this.active = menu;
}
},
},
};
</script>
@ -43,7 +28,6 @@
display: flex;
flex-direction: row;
width: 100%;
flex: 1;
}

View File

@ -38,7 +38,7 @@
import { globalStore } from "../stores/index.js";
import MenuRow from "./MenuRow.vue";
export default {
name: "MainMenu",
name: "MenuCellProperties",
components: {
MenuRow,
},

View File

@ -1,15 +1,17 @@
<template>
<div class="menu-row">
<h2 :id="rowTitle" @click="$emit('update-active', rowTitle)">
<h2 :id="rowTitle" @click.stop="storeActiveSubMenu">
{{ rowTitle }}
</h2>
<div v-if="isActive" class="menu-row-content">
<div v-if="isActive" ref="content" class="menu-row-content">
<slot />
</div>
</div>
</template>
<script>
import { mapActions, mapState } from "pinia";
import { globalStore } from "../stores/index.js";
export default {
name: "MenuRow",
props: {
@ -17,15 +19,37 @@
type: String,
default: "",
},
active: {
type: String,
default: "",
},
computed: {
...mapState(globalStore, ["activeSubMenu"]),
isActive() {
return this.rowTitle == this.activeSubMenu;
},
},
emits: ["update-active"],
computed: {
isActive() {
return this.rowTitle == this.active;
beforeUnmount() {
window.removeEventListener("click", this.onWindowClick);
},
methods: {
...mapActions(globalStore, ["setActiveSubMenu"]),
onKeyDown: function (event) {
// escape
if (event.keyCode == 27) {
this.setActiveSubMenu("");
}
},
storeActiveSubMenu() {
window.addEventListener("click", this.onWindowClick);
this.setActiveSubMenu(this.rowTitle);
},
// hides submenu when click is detected outside from it
onWindowClick(event) {
const form = this.$refs.content;
if (form != null) {
if (!form.contains(event.target)) {
this.setActiveSubMenu("");
}
return;
}
},
},
};

View File

@ -34,6 +34,7 @@ export const globalStore = defineStore("globalStore", {
draw2dLast: false,
reset: false,
canDraw: true,
activeSubMenu: "",
};
},
actions: {
@ -46,14 +47,17 @@ export const globalStore = defineStore("globalStore", {
);
},
toggleDraw1d() {
this.setActiveSubMenu("");
this.draw1d = true;
},
toggleDraw2d() {
this.setActiveSubMenu("");
this.toggleStop();
this.canDraw = true;
this.draw2d = true;
},
toggleDraw2dLast() {
this.setActiveSubMenu("");
this.toggleStop();
this.canDraw = true;
this.draw2dLast = true;
@ -68,5 +72,9 @@ export const globalStore = defineStore("globalStore", {
this.draw2dLast = false;
this.canDraw = false;
},
setActiveSubMenu(data) {
if (this.activeSubMenu == data) this.activeSubMenu = "";
else this.activeSubMenu = data;
},
},
});