usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve usability

This commit is contained in:
syuilo 2021-08-08 12:45:44 +09:00
parent 65858dab3e
commit b3c5c3f0ea
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/components/ui/popup.vue
View File

@ -7,7 +7,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent, PropType } from 'vue';
function getFixedContainer(el: Element | null): Element | null { function getFixedContainer(el: Element | null): Element | null {
if (el == null || el.tagName === 'BODY') return null; if (el == null || el.tagName === 'BODY') return null;
@ -31,6 +31,7 @@ export default defineComponent({
required: false required: false
}, },
src: { src: {
type: Object as PropType<HTMLElement>,
required: false, required: false,
}, },
position: { position: {
@ -56,6 +57,9 @@ export default defineComponent({
mounted() { mounted() {
this.$watch('src', () => { this.$watch('src', () => {
if (this.src) {
this.src.style.pointerEvents = 'none';
}
this.fixed = getFixedContainer(this.src) != null; this.fixed = getFixedContainer(this.src) != null;
this.$nextTick(() => { this.$nextTick(() => {
this.align(); this.align();
@ -69,7 +73,7 @@ export default defineComponent({
}).observe(popover); }).observe(popover);
}); });
document.addEventListener('mousedown', this.onDocumentClick); document.addEventListener('mousedown', this.onDocumentClick, { passive: true });
}, },
beforeUnmount() { beforeUnmount() {
@ -155,6 +159,7 @@ export default defineComponent({
}, },
close() { close() {
if (this.src) this.src.style.pointerEvents = 'auto';
this.showing = false; this.showing = false;
this.$emit('close'); this.$emit('close');
}, },