Skip to content

Commit

Permalink
revert tweak
Browse files Browse the repository at this point in the history
  • Loading branch information
samunohito authored and yuriha-chan committed Dec 6, 2023
1 parent 5cd0275 commit 42c9885
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions packages/frontend/src/components/MkEmojiPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</section>

<div v-if="tab === 'index'" class="group index">
<section v-if="showPinned && pinned.length > 0">
<section v-if="showPinned">
<div class="body">
<button
v-for="emoji in pinned"
Expand Down Expand Up @@ -137,15 +137,14 @@ const searchEl = shallowRef<HTMLInputElement>();
const emojisEl = shallowRef<HTMLDivElement>();

const {
reactions: pinnedReactions,
reactions: pinned,
reactionPickerSize,
reactionPickerWidth,
reactionPickerHeight,
disableShowingAnimatedImages,
recentlyUsedEmojis,
} = defaultStore.reactiveState;

const pinned = computed(() => props.asReactionPicker ? pinnedReactions.value : []); // TODO: 非リアクションの絵文字ピッカー用のpinned絵文字を設定可能にする?
const size = computed(() => props.asReactionPicker ? reactionPickerSize.value : 1);
const width = computed(() => props.asReactionPicker ? reactionPickerWidth.value : 3);
const height = computed(() => props.asReactionPicker ? reactionPickerHeight.value : 2);
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/scripts/emoji-picker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class EmojiPicker {
public async init() {
await popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
src: this.src,
asReactionPicker: false,
asReactionPicker: true,
manualShowing: this.manualShowing,
choseAndClose: false,
}, {
Expand Down

0 comments on commit 42c9885

Please sign in to comment.