diff options
| author | おさむのひと <46447427+samunohito@users.noreply.github.com> | 2023-12-14 14:11:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-14 14:11:20 +0900 |
| commit | a92795d90f9e55c7b7726725dceea979fd8940a3 (patch) | |
| tree | 48a0b7e34775e0ca796cdc702c5ff153a98f43ee /packages/frontend/src/components/MkEmojiPickerDialog.vue | |
| parent | 2023.12.0-beta.4 (diff) | |
| download | misskey-a92795d90f9e55c7b7726725dceea979fd8940a3.tar.gz misskey-a92795d90f9e55c7b7726725dceea979fd8940a3.tar.bz2 misskey-a92795d90f9e55c7b7726725dceea979fd8940a3.zip | |
feat(frontend): 絵文字ピッカーの実装 (#12617)
* 絵文字デッキの作成
* 細かい不備を修正
* fix lint
* fix
* fix CHANGELOG.md
* fix setTimeout -> nextTick
* fix https://github.com/misskey-dev/misskey/pull/12617#issuecomment-1848952862
* fix bug
* fix CHANGELOG.md
* fix CHANGELOG.md
* wip
* Update CHANGELOG.md
* Update CHANGELOG.md
* wip
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/frontend/src/components/MkEmojiPickerDialog.vue')
| -rw-r--r-- | packages/frontend/src/components/MkEmojiPickerDialog.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue index 2cce1f5520..6660dcf1ed 100644 --- a/packages/frontend/src/components/MkEmojiPickerDialog.vue +++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only ref="modal" v-slot="{ type, maxHeight }" :zPriority="'middle'" - :preferType="asReactionPicker && defaultStore.state.reactionPickerUseDrawerForMobile === false ? 'popup' : 'auto'" + :preferType="defaultStore.state.emojiPickerUseDrawerForMobile === false ? 'popup' : 'auto'" :transparentBg="true" :manualShowing="manualShowing" :src="src" @@ -22,6 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only class="_popup _shadow" :class="{ [$style.drawer]: type === 'drawer' }" :showPinned="showPinned" + :pinnedEmojis="pinnedEmojis" :asReactionPicker="asReactionPicker" :asDrawer="type === 'drawer'" :max-height="maxHeight" @@ -40,11 +41,13 @@ const props = withDefaults(defineProps<{ manualShowing?: boolean | null; src?: HTMLElement; showPinned?: boolean; + pinnedEmojis?: string[], asReactionPicker?: boolean; choseAndClose?: boolean; }>(), { manualShowing: null, showPinned: true, + pinnedEmojis: undefined, asReactionPicker: false, choseAndClose: true, }); |