Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions l10n/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,7 @@ msgstr ""
#: src/components/SettingsSelectGroup/SettingsSelectGroup.vue:143
msgid "Unable to search the group"
msgstr ""

#: src/components/RichContenteditable/RichContenteditable.vue:126
msgid "Write message, @ to mention someone …"
msgstr ""
30 changes: 28 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@
"core-js": "^3.6.5",
"debounce": "1.2.0",
"emoji-mart-vue-fast": "^7.0.4",
"escape-html": "^1.0.3",
"hammerjs": "^2.0.8",
"linkifyjs": "~2.1.9",
"md5": "^2.2.1",
"regenerator-runtime": "^0.13.5",
"striptags": "^3.1.1",
"tributejs": "^5.1.3",
"v-click-outside": "^3.0.1",
"v-tooltip": "^2.0.3",
"vue": "^2.6.11",
Expand All @@ -72,6 +75,7 @@
"babel-eslint": "^10.1.0",
"babel-jest": "^26.3.0",
"babel-loader": "^8.1.0",
"babel-loader-exclude-node-modules-except": "^1.0.3",
"css-loader": "^3.5.2",
"cypress": "^5.0.0",
"cypress-visual-regression": "^1.5.0",
Expand Down
181 changes: 181 additions & 0 deletions src/components/RichContenteditable/AutoCompleteResult.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
<!--
- @copyright Copyright (c) 2020 John Molakvoæ <[email protected]>
-
- @author John Molakvoæ <[email protected]>
-
- @license GNU AGPL version 3 or any later version
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<template>
<div class="autocomplete-result">
<!-- Avatar or icon -->
<div :class="[icon, `autocomplete-result__icon--${avatarUrl ? 'with-avatar' : ''}`]"
:style="avatarUrl ? { backgroundImage: `url(${avatarUrl})` } : null "
class="autocomplete-result__icon">
<div v-if="haveStatus"
:class="[`autocomplete-result__status--${status && status.icon ? 'icon' : status.status}`]"
class="autocomplete-result__status">
{{ status && status.icon || '' }}
</div>
</div>

<!-- Title and subtitle -->
<span class="autocomplete-result__content">
<span class="autocomplete-result__title">
{{ label }}
</span>
<span v-if="subline" class="autocomplete-result__subline">
{{ subline }}
</span>
</span>
</div>
</template>

<script>
import { generateUrl } from '@nextcloud/router'

export default {
name: 'AutoCompleteResult',

props: {
label: {
type: String,
required: true,
},
subline: {
type: String,
default: null,
},
id: {
type: String,
default: null,
},
icon: {
type: String,
required: true,
},
source: {
type: String,
required: true,
},
status: {
type: [Object, Array],
default: () => ({}),
},
},
computed: {
avatarUrl() {
return this.id && this.source === 'users'
? this.getAvatarUrl(this.id, 44)
: null
},
haveStatus() {
return this.status?.icon || this.status?.status
},
},

methods: {
getAvatarUrl(user, size) {
return generateUrl('/avatar/{user}/{size}', {
user,
size,
})
},
},
}
</script>

<style lang="scss" scoped>
@import '../../fonts/scss/iconfont-vue';

$autocomplete-padding: 10px;

.autocomplete-result {
display: flex;
height: $clickable-area;
padding: $autocomplete-padding;

.highlight & {
color: var(--color-main-text);
background: var(--color-primary-light);
&, * {
cursor: pointer;
}
}

&__icon {
position: relative;
width: $clickable-area;
height: $clickable-area;
border-radius: $clickable-area;
background-color: var(--color-background-darker);
background-repeat: no-repeat;
background-position: center;
background-size: $clickable-area - 2 * $autocomplete-padding;
&--with-avatar {
color: inherit;
background-size: cover;
}
}

&__status {
position: absolute;
right: -4px;
bottom: -4px;
box-sizing: border-box;
width: 18px;
height: 18px;
border: 2px solid var(--color-main-background);
border-radius: 50%;
background-color: var(--color-main-background);
font-size: 14px;
line-height: 14px;
&--online {
color: #49b382;

@include iconfont('user-status-online');
}
&--dnd {
color: #ed484c;
background-color: #fff;

@include iconfont('user-status-dnd');
}
&--away {
color: #f4a331;

@include iconfont('user-status-away');
}
&--offline,
&--icon {
border: none;
background-color: transparent;
}
}

&__content {
display: flex;
flex: 1 1;
flex-direction: column;
justify-content: center;
padding-left: $autocomplete-padding;
}

&__subline {
color: var(--color-text-lighter);
}
}
</style>
Loading