diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2021-02-28 10:54:03 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2021-02-28 10:54:03 +0900 |
| commit | 06845b3bec60e2e53dc71518746bf5cfddd2884e (patch) | |
| tree | fff16a34e302e5cb6facdfee2ac893ab0a5adde3 /src/client | |
| parent | chore: improve reaction picker behaviour (diff) | |
| download | sharkey-06845b3bec60e2e53dc71518746bf5cfddd2884e.tar.gz sharkey-06845b3bec60e2e53dc71518746bf5cfddd2884e.tar.bz2 sharkey-06845b3bec60e2e53dc71518746bf5cfddd2884e.zip | |
fix modal
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/components/emoji-picker-dialog.vue | 4 | ||||
| -rw-r--r-- | src/client/components/ui/modal.vue | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/client/components/emoji-picker-dialog.vue b/src/client/components/emoji-picker-dialog.vue index 4b165d9f91..528b3f980b 100644 --- a/src/client/components/emoji-picker-dialog.vue +++ b/src/client/components/emoji-picker-dialog.vue @@ -1,6 +1,6 @@ <template> -<MkModal ref="modal" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')"> - <MkEmojiPicker :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen" ref="picker"/> +<MkModal ref="modal" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')" v-slot="{ showing }"> + <MkEmojiPicker v-show="showing" :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen" ref="picker"/> </MkModal> </template> diff --git a/src/client/components/ui/modal.vue b/src/client/components/ui/modal.vue index e9f5645a73..23c153e5f7 100644 --- a/src/client/components/ui/modal.vue +++ b/src/client/components/ui/modal.vue @@ -5,9 +5,7 @@ </transition> <div class="content" :class="{ popup, fixed, top: position === 'top' }" @click.self="onBgClick" ref="content"> <transition :name="$store.state.animation ? popup ? 'modal-popup-content' : 'modal-content' : ''" appear @after-leave="$emit('closed')" @enter="$emit('opening')" @after-enter="childRendered"> - <div v-show="manualShowing != null ? manualShowing : showing"> - <slot></slot> - </div> + <slot v-if="manualShowing != null ? true : showing" v-bind:showing="manualShowing"></slot> </transition> </div> </div> |