summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components/MkEmojiPickerDialog.vue
diff options
context:
space:
mode:
authorおさむのひと <46447427+samunohito@users.noreply.github.com>2023-12-03 17:25:34 +0900
committerGitHub <noreply@github.com>2023-12-03 17:25:34 +0900
commit5e1d87240426e08858b7fc5ccad5ca235bd3c6e7 (patch)
tree4720b482d224941eb50426514ad43c24a8d99bb9 /packages/frontend/src/components/MkEmojiPickerDialog.vue
parentfix(backend): reject malformed timestamp (#12554) (diff)
downloadmisskey-5e1d87240426e08858b7fc5ccad5ca235bd3c6e7.tar.gz
misskey-5e1d87240426e08858b7fc5ccad5ca235bd3c6e7.tar.bz2
misskey-5e1d87240426e08858b7fc5ccad5ca235bd3c6e7.zip
入力フォームでもリアクション選択時に使用するピッカーを使うようにしたい (#12337)
* 入力フォームでもリアクション選択時に使用するピッカーを使うようにしたい * erase console.log * fix CHANGELOG.md * reaction-picker.ts を戻し、今回の対応を入れた emoji-picker.ts を新たに作成 * fix CHANGELOG.md * tweak --------- Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com> 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.vue19
1 files changed, 11 insertions, 8 deletions
diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue
index 9d3132c540..05b137e335 100644
--- a/packages/frontend/src/components/MkEmojiPickerDialog.vue
+++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue
@@ -31,20 +31,21 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
-import { shallowRef } from 'vue';
import MkModal from '@/components/MkModal.vue';
import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
import { defaultStore } from '@/store.js';
-withDefaults(defineProps<{
+const props = withDefaults(defineProps<{
manualShowing?: boolean | null;
src?: HTMLElement;
showPinned?: boolean;
asReactionPicker?: boolean;
+ choseAndClose?: boolean;
}>(), {
manualShowing: null,
showPinned: true,
asReactionPicker: false,
+ choseAndClose: true,
});
const emit = defineEmits<{
@@ -53,21 +54,23 @@ const emit = defineEmits<{
(ev: 'closed'): void;
}>();
-const modal = shallowRef<InstanceType<typeof MkModal>>();
-const picker = shallowRef<InstanceType<typeof MkEmojiPicker>>();
+const modal = $shallowRef<InstanceType<typeof MkModal>>();
+const picker = $shallowRef<InstanceType<typeof MkEmojiPicker>>();
function chosen(emoji: any) {
emit('done', emoji);
- modal.value?.close();
+ if (props.choseAndClose) {
+ modal?.close();
+ }
}
function opening() {
- picker.value?.reset();
- picker.value?.focus();
+ picker?.reset();
+ picker?.focus();
// 何故かちょっと待たないとフォーカスされない
setTimeout(() => {
- picker.value?.focus();
+ picker?.focus();
}, 10);
}
</script>