fix(Happy Hare): Fixes display of gate-context menus with right-click action #1757
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,13 +5,15 @@ | |
| v-for="(g, index) in unitGateRange" | ||
| :key="`gate_${g}`" | ||
| class="gate" | ||
| @contextmenu.prevent="openContextMenu(g, $event)" | ||
| @click="selectGate(g)" | ||
| > | ||
| <div :class="clipSpoolClass"> | ||
| <v-menu | ||
| v-model="gateMenuVisible[g]" | ||
| :disabled="g === gate" | ||
| :close-on-content-click="false" | ||
| :open-on-click="false" | ||
| transition="slide-y-transition" | ||
| offset-y | ||
| > | ||
|
|
@@ -54,46 +56,21 @@ | |
| Gate {{ g }} | ||
| </v-subheader> | ||
| <v-divider /> | ||
| <v-list-item | ||
| v-for="(item, i) in contextMenuItems" | ||
| :key="i" | ||
| > | ||
| <v-btn | ||
| small | ||
| class="width: 100%" | ||
| :disabled="!klippyReady || !canSend" | ||
| :loading="hasWait(item.loading)" | ||
| @click="contextMenuCommand(item.command, item.loading, g)" | ||
| > | ||
| <v-icon left> | ||
| {{ item.icon }} | ||
| </v-icon> | ||
| {{ item.label }} | ||
| </v-btn> | ||
| </v-list-item> | ||
| </v-list> | ||
|
|
@@ -155,6 +132,7 @@ | |
| <div | ||
| v-if="showBypass" | ||
| class="gate" | ||
| @contextmenu.prevent="openContextMenu(-2, $event)" | ||
| @click="selectBypass()" | ||
| > | ||
| <div :class="clipSpoolClass"> | ||
|
|
@@ -278,10 +256,14 @@ export default class MmuUnit extends Mixins(BrowserMixin, StateMixin, MmuMixin) | |
| @Prop({ required: false, default: -1 }) | ||
| readonly editGateSelected!: number | ||
|
|
||
| @Prop({ required: false, default: true }) | ||
| readonly showContextMenu!: boolean | ||
|
|
||
| gateMenuVisible: Record<number, boolean> = {} | ||
| gateMenuTimer: ReturnType<typeof setTimeout> | null = null | ||
pedrolamas marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| vendorLogo = '' | ||
| closeTimeout: number | null = null | ||
pedrolamas marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| @Watch('unit', { immediate: true }) | ||
| onUnit (value: number) { | ||
|
|
@@ -428,22 +410,7 @@ export default class MmuUnit extends Mixins(BrowserMixin, StateMixin, MmuMixin) | |
| if (this.editGateMap) { | ||
| this.$emit('select-gate', gate) | ||
| } else if (!this.isPrinting) { | ||
| this.sendGcode('MMU_SELECT GATE=' + gate) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -454,6 +421,55 @@ export default class MmuUnit extends Mixins(BrowserMixin, StateMixin, MmuMixin) | |
| this.sendGcode('MMU_SELECT BYPASS=1') | ||
| } | ||
| } | ||
|
|
||
| // Gate context menu handling... | ||
|
|
||
| get contextMenuItems () { | ||
| return [ | ||
| { icon: '$mmuSelectGate', command: 'MMU_SELECT', label: this.$t('app.mmu.btn.select'), loading: '$waits.onMmuSelect`' }, | ||
pedrolamas marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| { icon: '$mmuPreload', command: 'MMU_PRELOAD', label: this.$t('app.mmu.btn.preload'), loading: '$waits.onMmuPreload' }, | ||
| { icon: '$mmuEject', command: 'MMU_EJECT', label: this.$t('app.mmu.btn.eject'), loading: '$waits.onMmuEject' }, | ||
pedrolamas marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ] | ||
| } | ||
|
|
||
| contextMenuCommand (command: string, loading: string, gate: number) { | ||
| this.sendGcode(`${command} GATE=${gate}`, loading) | ||
| } | ||
|
Comment on lines
+457
to
+459
There was a problem hiding this comment. After executing a command, the context menu should close but there's no call to closeContextMenu in contextMenuCommand. This means the menu stays open after clicking a button, which is counterintuitive. Add a call to this.closeContextMenu() at the end of contextMenuCommand to close the menu after executing the command.
Member
There was a problem hiding this comment. This seems to be the expected behavior, so ignore. |
||
|
|
||
| openContextMenu (gate: number, e: MouseEvent) { | ||
| e.preventDefault() | ||
pedrolamas marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if (gate < 0 || gate === this.gate || !this.showContextMenu) { | ||
| this.closeContextMenu() | ||
| return | ||
| } | ||
| this.closeContextMenu() | ||
| this.$set(this.gateMenuVisible, gate, true) | ||
| this.closeTimeout = window.setTimeout(() => { | ||
| this.closeContextMenu() | ||
| }, 6000) | ||
|
There was a problem hiding this comment. The magic number 6000 (6 seconds timeout) is unexplained. Extract this to a named constant with a descriptive name to improve code maintainability and make the timeout duration clear and easily configurable. |
||
| } | ||
|
|
||
| closeContextMenu () { | ||
| this.clearCloseTimeout() | ||
| Object.keys(this.gateMenuVisible).forEach(key => { | ||
| this.$set(this.gateMenuVisible, Number(key), false) | ||
| }) | ||
| } | ||
|
|
||
| clearCloseTimeout () { | ||
| if (this.closeTimeout === null) return | ||
| clearTimeout(this.closeTimeout) | ||
| this.closeTimeout = null | ||
| } | ||
|
|
||
| mounted () { | ||
| addEventListener('mmu-close-gate-context-menus', this.closeContextMenu) | ||
| } | ||
|
|
||
| beforeDestroy () { | ||
| removeEventListener('mmu-close-gate-context-menus', this.closeContextMenu) | ||
moggieuk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
moggieuk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| this.clearCloseTimeout() | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.