Refactor #500 - For Calendar

pull/525/head
mertsincan 2020-09-27 19:04:54 +03:00
parent 78e9678c95
commit 5efcd01077
1 changed files with 24 additions and 1 deletions

View File

@ -1,5 +1,5 @@
<template> <template>
<span :class="containerClass" :style="style"> <span ref="container" :class="containerClass" :style="style">
<CalendarInputText ref="input" v-if="!inline" type="text" v-bind="$attrs" :value="inputFieldValue" @input="onInput" @focus="onFocus" @blur="onBlur" @keydown="onKeyDown" :readonly="!manualInput" inputmode="none" /> <CalendarInputText ref="input" v-if="!inline" type="text" v-bind="$attrs" :value="inputFieldValue" @input="onInput" @focus="onFocus" @blur="onBlur" @keydown="onKeyDown" :readonly="!manualInput" inputmode="none" />
<CalendarButton v-if="showIcon" :icon="icon" tabindex="-1" class="p-datepicker-trigger" :disabled="$attrs.disabled" @click="onButtonClick" type="button" :aria-label="inputFieldValue"/> <CalendarButton v-if="showIcon" :icon="icon" tabindex="-1" class="p-datepicker-trigger" :disabled="$attrs.disabled" @click="onButtonClick" type="button" :aria-label="inputFieldValue"/>
<transition name="p-connected-overlay" @enter="onOverlayEnter($event)" @after-enter="onOverlayEnterComplete" @leave="onOverlayLeave"> <transition name="p-connected-overlay" @enter="onOverlayEnter($event)" @after-enter="onOverlayEnterComplete" @leave="onOverlayLeave">
@ -130,6 +130,7 @@
</template> </template>
<script> <script>
import ConnectedOverlayScrollHandler from '../utils/ConnectedOverlayScrollHandler';
import InputText from '../inputtext/InputText'; import InputText from '../inputtext/InputText';
import Button from '../button/Button'; import Button from '../button/Button';
import DomHandler from '../utils/DomHandler'; import DomHandler from '../utils/DomHandler';
@ -308,6 +309,7 @@ export default {
style: null style: null
}, },
navigationState: null, navigationState: null,
scrollHandler: null,
created() { created() {
this.updateCurrentMetaData(); this.updateCurrentMetaData();
}, },
@ -340,6 +342,8 @@ export default {
this.restoreAppend(); this.restoreAppend();
this.unbindOutsideClickListener(); this.unbindOutsideClickListener();
this.unbindScrollListener();
this.scrollHandler = null;
this.overlay = null; this.overlay = null;
}, },
data() { data() {
@ -537,9 +541,11 @@ export default {
}, },
onOverlayEnterComplete() { onOverlayEnterComplete() {
this.bindOutsideClickListener(); this.bindOutsideClickListener();
this.bindScrollListener();
}, },
onOverlayLeave() { onOverlayLeave() {
this.unbindOutsideClickListener(); this.unbindOutsideClickListener();
this.unbindScrollListener();
this.$emit('hide'); this.$emit('hide');
this.overlay = null; this.overlay = null;
}, },
@ -638,6 +644,23 @@ export default {
this.outsideClickListener = null; this.outsideClickListener = null;
} }
}, },
bindScrollListener() {
if (!this.scrollHandler) {
const { id } = this.$attrs;
this.scrollHandler = new ConnectedOverlayScrollHandler(this.$refs.container, id, () => {
if (this.overlayVisible) {
this.overlayVisible = false;
}
});
}
this.scrollHandler.bindScrollListener();
},
unbindScrollListener() {
if (this.scrollHandler) {
this.scrollHandler.unbindScrollListener();
}
},
isOutsideClicked(event) { isOutsideClicked(event) {
return !(this.$el.isSameNode(event.target) || this.isNavIconClicked(event) || return !(this.$el.isSameNode(event.target) || this.isNavIconClicked(event) ||
this.$el.contains(event.target) || (this.overlay && this.overlay.contains(event.target))); this.$el.contains(event.target) || (this.overlay && this.overlay.contains(event.target)));