Skip to content

Commit

Permalink
Merge pull request #4563 from nextcloud-libraries/chore/2154/emoji-pi…
Browse files Browse the repository at this point in the history
…cker
  • Loading branch information
raimund-schluessler authored Oct 2, 2023
2 parents abd20c2 + 5c1510d commit 0c2c612
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 13 deletions.
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const ignorePatterns = [
'comma-separated-tokens',
'decode-named-character-reference',
'devlop', // ESM dependency of unified
'emoji-mart-vue-fast/src',
'escape-string-regexp',
'hast-*',
'is-*',
Expand Down
18 changes: 7 additions & 11 deletions src/components/NcEmojiPicker/NcEmojiPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,8 @@ This component allows the user to pick an emoji.
</docs>

<template>
<NcPopover :shown.sync="open"
<NcPopover v-model:shown="open"
:container="container"
v-bind="$attrs"
v-on="$listeners"
@after-show="afterShow"
@after-hide="afterHide">
<template #trigger>
Expand All @@ -149,8 +147,8 @@ This component allows the user to pick an emoji.
@select="select">
<template #searchTemplate="slotProps">
<NcTextField ref="search"
v-model:value="search"
class="search"
:value.sync="search"
:label="t('Search')"
:label-visible="true"
:placeholder="i18n.search"
Expand All @@ -169,11 +167,13 @@ This component allows the user to pick an emoji.
<Emoji class="emoji-selected"
:data="emojiIndex"
:emoji="selectedEmoji"
:native="true"
:size="32"
@click="unselect" />
<Emoji class="emoji-delete"
:data="emojiIndex"
emoji=":x:"
:native="true"
:size="10"
@click="unselect" />
</template>
Expand All @@ -186,7 +186,7 @@ import NcPopover from '../NcPopover/index.js'
import NcTextField from '../NcTextField/index.js'
import { t } from '../../l10n.js'

import { Picker, Emoji, EmojiIndex } from 'emoji-mart-vue-fast'
import { Picker, Emoji, EmojiIndex } from 'emoji-mart-vue-fast/src'
import data from 'emoji-mart-vue-fast/data/all.json'

// Shared emoji index for all NcEmojiPicker instances
Expand Down Expand Up @@ -393,6 +393,7 @@ export default {
background-color: var(--color-main-background) !important;
border: 0;
color: var(--color-main-text) !important;
display: flex !important;

// default style reset
button {
Expand Down Expand Up @@ -488,12 +489,7 @@ export default {
}

.search {
padding: 0 8px 4px 8px;
.input-field__label {
// Match styles in emoji-mart-vue-fast
padding: 5px 4px;
font-weight: 500;
}
padding: 4px 8px;
}

</style>
Expand Down
3 changes: 1 addition & 2 deletions src/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ export { default as NcDateTimePickerNative } from './NcDateTimePickerNative/inde
// Not exported on purpose
// export { default as NcEllipsisedOption } from './NcEllipsisedOption/index.js'

// Not yet adjusted for vue3
// export { default as NcEmojiPicker } from './NcEmojiPicker/index.js'
export { default as NcEmojiPicker } from './NcEmojiPicker/index.js'
// export { default as NcEmptyContent } from './NcEmptyContent/index.js'
export { default as NcGuestContent } from './NcGuestContent/index.js'
// export { default as NcHeaderMenu } from './NcHeaderMenu/index.js'
Expand Down
1 change: 1 addition & 0 deletions styleguide.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ module.exports = async () => {
components: [
//'src/components/Nc*Picker*/*.vue',
'src/components/NcDateTimePickerNative*/*.vue',
'src/components/NcEmojiPicker/*.vue',
],
},
// {
Expand Down

0 comments on commit 0c2c612

Please sign in to comment.