Skip to content

Improve stack drag and drop behavior #4074

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

Merged
juliusknorr merged 3 commits into from
Nov 7, 2022
Merged

Improve stack drag and drop behavior #4074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ae73b5
allow to cancel stack title edit
shoetten Sep 25, 2022
467a3a4
don't edit stack title when dragging
shoetten Sep 25, 2022
cd5753f
only drag stack by title
shoetten Sep 25, 2022
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
7 changes: 5 additions & 2 deletions src/components/board/Board.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@
<Container lock-axix="y"
orientation="horizontal"
:drag-handle-selector="dragHandleSelector"
@drag-start="draggingStack = true"
@drag-end="draggingStack = false"
@drop="onDropStack">
<Draggable v-for="stack in stacksByBoard" :key="stack.id">
<Stack :stack="stack" />
<Stack :stack="stack" :dragging="draggingStack" />
</Draggable>
</Container>
</div>
Expand Down Expand Up @@ -100,6 +102,7 @@ export default {
},
data() {
return {
draggingStack: false,
loading: true,
newStackTitle: '',
}
Expand All @@ -117,7 +120,7 @@ export default {
return this.$store.getters.stacksByBoard(this.board.id)
},
dragHandleSelector() {
return this.canEdit ? null : '.no-drag'
return this.canEdit ? '.stack__title' : '.no-drag'
},
isEmpty() {
return this.stacksByBoard.length === 0
Expand Down
26 changes: 21 additions & 5 deletions src/components/board/Stack.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="stack">
<div v-click-outside="stopCardCreation"
class="stack__header"
:class="{'stack__header--add': showAddCard }"
:class="{'stack__header--add': showAddCard}"
tabindex="0"
:aria-label="stack.title">
<transition name="fade" mode="out-in">
Expand All @@ -41,7 +41,10 @@
@keydown.enter="startEditing(stack)">
{{ stack.title }}
</h3>
<form v-else @submit.prevent="finishedEdit(stack)">
<form v-else-if="editing"
v-click-outside="cancelEdit"
@submit.prevent="finishedEdit(stack)"
@keyup.esc="cancelEdit">
<input v-model="copiedStack.title"
v-focus
type="text"
Expand Down Expand Up @@ -142,7 +145,7 @@
</template>

<script>

import ClickOutside from 'vue-click-outside'
import { mapGetters, mapState } from 'vuex'
import { Container, Draggable } from 'vue-smooth-dnd'

Expand All @@ -164,8 +167,14 @@ export default {
NcModal,
ArchiveIcon,
},

directives: {
ClickOutside,
},
props: {
dragging: {
type: Boolean,
default: false,
},
stack: {
type: Object,
default: undefined,
Expand Down Expand Up @@ -265,6 +274,10 @@ export default {
this.modalArchivAllCardsShow = false
},
startEditing(stack) {
if (this.dragging) {
return
}

this.copiedStack = Object.assign({}, stack)
this.editing = true
},
Expand All @@ -274,6 +287,9 @@ export default {
}
this.editing = false
},
cancelEdit() {
this.editing = false
},
async clickAddCard() {
this.stateCardCreating = true
try {
Expand Down Expand Up @@ -374,7 +390,7 @@ export default {
margin: 6px;
padding: 4px 4px;

&:focus {
&:focus-visible {
outline: 2px solid var(--color-border-dark);
border-radius: 3px;
}
Expand Down