fix: Move card create input to the bottom

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2024-09-01 09:25:57 +02:00
parent a0fc1bbeb8
commit a9b65de341
2 changed files with 71 additions and 34 deletions

View File

@@ -88,15 +88,33 @@
</div> </div>
</NcModal> </NcModal>
<transition name="slide-top" appear> <Container :get-child-payload="payloadForCard(stack.id)"
<div v-if="showAddCard" class="stack__card-add"> group-name="stack"
data-click-closes-sidebar="true"
non-drag-area-selector=".dragDisabled"
:drag-handle-selector="dragHandleSelector"
data-dragscroll-enabled
@should-accept-drop="canEdit"
@drag-start="draggingCard = true"
@drag-end="draggingCard = false"
@drop="($event) => onDropCard(stack.id, $event)">
<Draggable v-for="card in cardsByStack" :key="card.id">
<transition :appear="animate && !card.animated && (card.animated=true)"
:appear-class="'zoom-appear-class'"
:appear-active-class="'zoom-appear-active-class'">
<CardItem :id="card.id" ref="card" :dragging="draggingCard" />
</transition>
</Draggable>
</Container>
<transition name="slide-bottom" appear>
<div v-show="showAddCard" class="stack__card-add">
<form :class="{ 'icon-loading-small': stateCardCreating }" <form :class="{ 'icon-loading-small': stateCardCreating }"
@submit.prevent.stop="clickAddCard()"> @submit.prevent.stop="clickAddCard()">
<label for="new-stack-input-main" class="hidden-visually">{{ t('deck', 'Add a new card') }}</label> <label for="new-stack-input-main" class="hidden-visually">{{ t('deck', 'Add a new card') }}</label>
<input id="new-stack-input-main" <input id="new-stack-input-main"
ref="newCardInput" ref="newCardInput"
v-model="newCardTitle" v-model="newCardTitle"
v-focus
type="text" type="text"
class="no-close" class="no-close"
:disabled="stateCardCreating" :disabled="stateCardCreating"
@@ -112,25 +130,6 @@
</form> </form>
</div> </div>
</transition> </transition>
<Container :get-child-payload="payloadForCard(stack.id)"
group-name="stack"
data-click-closes-sidebar="true"
non-drag-area-selector=".dragDisabled"
:drag-handle-selector="dragHandleSelector"
data-dragscroll-enabled
@should-accept-drop="canEdit"
@drag-start="draggingCard = true"
@drag-end="draggingCard = false"
@drop="($event) => onDropCard(stack.id, $event)">
<Draggable v-for="card in cardsByStack" :key="card.id">
<transition :appear="animate && !card.animated && (card.animated=true)"
:appear-class="'zoom-appear-class'"
:appear-active-class="'zoom-appear-active-class'">
<CardItem :id="card.id" :dragging="draggingCard" />
</transition>
</Draggable>
</Container>
</div> </div>
</template> </template>
@@ -221,6 +220,10 @@ export default {
showAddCard(newValue) { showAddCard(newValue) {
if (!newValue) { if (!newValue) {
this.$store.dispatch('toggleShortcutLock', false) this.$store.dispatch('toggleShortcutLock', false)
} else {
this.$nextTick(() => {
this.$refs.newCardInput.focus()
})
} }
}, },
}, },
@@ -303,6 +306,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.newCardInput.focus() this.$refs.newCardInput.focus()
this.animate = false this.animate = false
this.$refs.card[(this.$refs.card.length - 1)].scrollIntoView()
}) })
if (!this.cardDetailsInModal) { if (!this.cardDetailsInModal) {
this.$router.push({ name: 'card', params: { cardId: newCard.id } }) this.$router.push({ name: 'card', params: { cardId: newCard.id } })
@@ -338,6 +342,7 @@ export default {
padding-left: $card-spacing; padding-left: $card-spacing;
padding-right: $card-spacing; padding-right: $card-spacing;
margin: 6px; margin: 6px;
margin-top: 0;
cursor: grab; cursor: grab;
background-color: var(--color-main-background); background-color: var(--color-main-background);
@@ -359,14 +364,6 @@ export default {
} }
} }
&--add:before {
height: 78px;
background-image: linear-gradient(180deg, var(--color-main-background) 68px, rgba(255, 255, 255, 0) 100%);
body.theme--dark & {
background-image: linear-gradient(180deg, var(--color-main-background) 68px, rgba(0, 0, 0, 0) 100%);
}
}
& > * { & > * {
position: relative; position: relative;
z-index: 100; z-index: 100;
@@ -422,13 +419,14 @@ export default {
flex-shrink: 0; flex-shrink: 0;
z-index: 100; z-index: 100;
display: flex; display: flex;
margin-top: 5px; margin-bottom: 5px;
padding-top: var(--default-grid-baseline);
background-color: var(--color-main-background); background-color: var(--color-main-background);
form { form {
display: flex; display: flex;
margin-left: $stack-spacing; margin-left: $stack-spacing;
margin-right: $card-spacing + $stack-spacing + 4px; margin-right: $stack-spacing;
width: 100%; width: 100%;
border: 2px solid var(--color-border-maxcontrast); border: 2px solid var(--color-border-maxcontrast);
border-radius: var(--border-radius-large); border-radius: var(--border-radius-large);
@@ -464,7 +462,16 @@ export default {
.slide-top-enter, .slide-top-leave-to { .slide-top-enter, .slide-top-leave-to {
transform: translateY(-10px); transform: translateY(-10px);
opacity: 0; opacity: 0;
height: 0px; }
.slide-bottom-enter-active,
.slide-bottom-leave-active {
transition: all 100ms ease;
}
.slide-bottom-enter, .slide-bottom-leave-to {
transform: translateY(20px);
opacity: 0;
} }
.modal__content { .modal__content {

View File

@@ -6,7 +6,7 @@
<template> <template>
<AttachmentDragAndDrop v-if="card" :card-id="card.id" class="drop-upload--card"> <AttachmentDragAndDrop v-if="card" :card-id="card.id" class="drop-upload--card">
<div :ref="`card${card.id}`" <div :ref="`card${card.id}`"
:class="{'compact': compactMode, 'current-card': currentCard, 'has-labels': card.labels && card.labels.length > 0, 'card__editable': canEdit, 'card__archived': card.archived }" :class="{'compact': compactMode, 'current-card': currentCard, 'has-labels': card.labels && card.labels.length > 0, 'card__editable': canEdit, 'card__archived': card.archived, 'card__highlight': highlight}"
tag="div" tag="div"
:tabindex="0" :tabindex="0"
class="card" class="card"
@@ -103,6 +103,11 @@ export default {
default: false, default: false,
}, },
}, },
data() {
return {
highlight: false,
}
},
computed: { computed: {
...mapState({ ...mapState({
compactMode: state => state.compactMode, compactMode: state => state.compactMode,
@@ -270,6 +275,14 @@ export default {
}, },
}) })
}, },
scrollIntoView() {
this.$el.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'center' })
this.focus()
this.highlight = true
setTimeout(() => {
this.highlight = false
}, 2000)
},
}, },
} }
</script> </script>
@@ -359,6 +372,23 @@ export default {
&.card__archived { &.card__archived {
background-color: var(--color-background-dark); background-color: var(--color-background-dark);
} }
@keyframes highlight {
0% {
border-color: var(--color-border-dark);
}
20% {
border-color: var(--color-primary-element);
}
70% {
border-color: var(--color-primary-element);
}
100% {
border-color: var(--color-border-dark);
}
}
&.card__highlight {
animation: highlight 2s;
}
.card-labels { .card-labels {
display: flex; display: flex;
align-items: end; align-items: end;