Skip to content

[stable32] fix(comment): improve comment form behavior in firefox #7409

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
backportbot wants to merge 1 commit into
base: stable32
Choose a base branch
from
Draft

[stable32] fix(comment): improve comment form behavior in firefox #7409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 26 additions & 68 deletions src/components/card/CommentForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,11 @@

<template>
<div class="comment-form">
<form @submit.prevent="submit">
<At ref="at"
v-model="commentText"
:members="members"
name-key="displayname"
:tab-select="true">
<template #item="s">
<NcAvatar class="atwho-li--avatar" :user="s.item.uid" :size="24" />
<span class="atwho-li--name" v-text="s.item.displayname" />
</template>
<template #embeddedItem="scope">
<span>
<NcUserBubble v-if="scope.current.uid"
:data-mention-id="scope.current.uid"
:user="scope.current.uid"
:display-name="scope.current.displayname" />
</span>
</template>
<div ref="contentEditable"
dir="auto"
class="comment-form__contenteditable"
contenteditable
@keydown.enter="handleKeydown"
@paste="onPaste"
@blur="error = null"
@input="validate()" />
</At>
<input :title="t('deck', 'Save')"
class="icon-confirm"
type="submit"
value=""
:disabled="commentText.length === null || error">
<slot />
</form>
<NcRichContenteditable v-model="commentText"
:auto-complete="autoComplete"
:maxlength="1000"
:user-data="members"
@submit="submit" />
<p v-if="error">
{{ error }}
</p>
Expand All @@ -47,16 +18,12 @@

<script>
import { mapState } from 'vuex'
import { NcUserBubble, NcAvatar } from '@nextcloud/vue'
import At from 'vue-at'
import { rawToParsed } from '../../helpers/mentions.js'
import { NcRichContenteditable } from '@nextcloud/vue'

export default {
name: 'CommentForm',
components: {
At,
NcAvatar,
NcUserBubble,
NcRichContenteditable,
},
props: {
value: {
Expand All @@ -75,7 +42,16 @@ export default {
currentBoard: state => state.currentBoard,
}),
members() {
return this.currentBoard.users
const obj = {}
this.currentBoard.users.forEach(user => {
obj[user.uid] = {
icon: 'icon-user',
id: user.uid,
label: user.displayname,
source: 'users',
}
})
return obj
},
},
watch: {
Expand All @@ -84,9 +60,12 @@ export default {
},
},
methods: {
autoComplete(search, callback) {
callback(Object.values(this.members))
},
validate(submit) {
this.error = null
const content = this.contentEditableToParsed()
const content = this.commentText
if (submit && content.length === 0) {
this.error = t('deck', 'The comment cannot be empty.')
}
Expand Down Expand Up @@ -167,33 +146,12 @@ export default {
}
</script>

<style scoped lang="scss">
<style lang="scss">
@import '../../css/comments';

.comment-form__contenteditable {
word-break: break-word;
border-radius: var(--border-radius-large);
padding: var(--default-grid-baseline);
max-height: 200px;
overflow: auto;
}

.atwho-wrap {
width: 100%;
& > div[contenteditable] {
width: 100%;

&:deep > span > div {
vertical-align: middle;
}
}
}

.comment-form:deep(.atwho-li) {
height: 32px;
}

.atwho-li--avatar {
margin-right: 10px;
[class^="_tribute-container-autocomplete_"],
[class*=" _tribute-container-autocomplete_"],
[class*="_tribute-container-autocomplete_"] {
z-index: 9999 !important;
}
</style>