primevue 3.8.2 → 3.11.0

package/calendar/calendar.cjs.js

@@ -2,7 +2,6 @@
 
 var utils = require('primevue/utils');
 var OverlayEventBus = require('primevue/overlayeventbus');
-var InputText = require('primevue/inputtext');
 var Button = require('primevue/button');
 var Ripple = require('primevue/ripple');
 var vue = require('vue');
@@ -10,7 +9,6 @@ var vue = require('vue');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var OverlayEventBus__default = /*#__PURE__*/_interopDefaultLegacy(OverlayEventBus);
-var InputText__default = /*#__PURE__*/_interopDefaultLegacy(InputText);
 var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
 var Ripple__default = /*#__PURE__*/_interopDefaultLegacy(Ripple);
 
@@ -52,6 +50,7 @@ var script = {
             type: Number,
             default: 1
         },
+        responsiveOptions: Array,
         view: {
             type: String,
             default: 'date'
@@ -164,40 +163,53 @@ var script = {
             type: String,
             default: 'body'
         },
-        keepInvalid: {
-            type: Boolean,
-            default: false
-        },
         inputClass: null,
         inputStyle: null,
         class: null,
         style: null
     },
     navigationState: null,
+    timePickerChange: false,
     scrollHandler: null,
     outsideClickListener: null,
     maskClickListener: null,
     resizeListener: null,
     overlay: null,
+    input: null,
     mask: null,
     timePickerTimer: null,
-    isKeydown: false,
+    preventFocus: false,
+    typeUpdate: false,
     created() {
         this.updateCurrentMetaData();
     },
     mounted() {
-        if (this.inline && !this.$attrs.disabled) {
-            this.initFocusableCell();
+        this.createResponsiveStyle();
+
+        if (this.inline) {
+            this.overlay && this.overlay.setAttribute(this.attributeSelector, '');
+
+            if (!this.$attrs.disabled) {
+                this.initFocusableCell();
+
+                if (this.numberOfMonths === 1) {
+                    this.overlay.style.width = utils.DomHandler.getOuterWidth(this.$el) + 'px';
+                }
+            }
+        }
+        else {
+            this.input.value = this.formatValue(this.modelValue);
         }
     },
     updated() {
         if (this.overlay) {
+            this.preventFocus = true;
             this.updateFocus();
         }
 
-        if (this.$refs.input && this.selectionStart != null && this.selectionEnd != null) {
-            this.$refs.input.$el.selectionStart = this.selectionStart;
-            this.$refs.input.$el.selectionEnd = this.selectionEnd;
+        if (this.input && this.selectionStart != null && this.selectionEnd != null) {
+            this.input.selectionStart = this.selectionStart;
+            this.input.selectionEnd = this.selectionEnd;
             this.selectionStart = null;
             this.selectionEnd = null;
         }
@@ -208,8 +220,9 @@ var script = {
         }
 
         if (this.mask) {
-            this.destroyMask();
+           this.destroyMask();
         }
+        this.destroyResponsiveStyleElement();
 
         this.unbindOutsideClickListener();
         this.unbindResizeListener();
@@ -233,20 +246,35 @@ var script = {
             currentSecond: null,
             pm: null,
 			focused: false,
-            overlayVisible: false
+            overlayVisible: false,
+            currentView: this.view
         }
     },
     watch: {
-        modelValue() {
+        modelValue(newValue) {
             this.updateCurrentMetaData();
+            if (!this.typeUpdate && !this.inline && this.input) {
+                this.input.value = this.formatValue(newValue);
+            }
+            this.typeUpdate = false;
         },
         showTime() {
             this.updateCurrentMetaData();
         },
         months() {
             if (this.overlay) {
-                setTimeout(this.updateFocus, 0);
+                if (!this.focused) {
+                    setTimeout(this.updateFocus, 0);
+                }
             }
+        },
+        numberOfMonths() {
+            this.destroyResponsiveStyleElement();
+            this.createResponsiveStyle();
+        },
+        responsiveOptions() {
+            this.destroyResponsiveStyleElement();
+            this.createResponsiveStyle();
         }
     },
     methods: {
@@ -286,7 +314,22 @@ var script = {
             return false;
         },
         isMonthSelected(month) {
-            return this.isComparable() ? (this.modelValue.getMonth() === month && this.modelValue.getFullYear() === this.currentYear) : false;
+            if (this.isComparable()) {
+                let value = this.isRangeSelection() ? this.modelValue[0] : this.modelValue;
+
+                return !this.isMultipleSelection() ? (value.getMonth() === month && value.getFullYear() === this.currentYear) : false;
+            }
+
+            return false;
+        },
+        isYearSelected(year) {
+            if (this.isComparable()) {
+                let value = this.isRangeSelection() ? this.modelValue[0] : this.modelValue;
+
+                return !this.isMultipleSelection() && this.isComparable() ? (value.getFullYear() === year) : false;
+            }
+
+            return false;
         },
         isDateEquals(value, dateMeta) {
             if (value)
@@ -412,12 +455,15 @@ var script = {
             return validMin && validMax && validDate && validDay;
         },
         onOverlayEnter(el) {
+            el.setAttribute(this.attributeSelector, '');
+
             if (this.autoZIndex) {
                 if (this.touchUI)
                     utils.ZIndexUtils.set('modal', el, this.baseZIndex || this.$primevue.config.zIndex.modal);
                 else
                     utils.ZIndexUtils.set('overlay', el, this.baseZIndex || this.$primevue.config.zIndex.overlay);
             }
+
             this.alignOverlay();
             this.$emit('show');
         },
@@ -432,6 +478,7 @@ var script = {
             }
         },
         onOverlayLeave() {
+            this.currentView = this.view;
             this.unbindOutsideClickListener();
             this.unbindScrollListener();
             this.unbindResizeListener();
@@ -462,9 +509,12 @@ var script = {
                 return;
             }
 
-            if (this.view === 'month') {
+            if (this.currentView === 'month') {
                 this.decrementYear();
             }
+            else if (this.currentView === 'year') {
+                this.decrementDecade();
+            }
             else {
                 if (this.currentMonth === 0) {
                     this.currentMonth = 11;
@@ -484,9 +534,12 @@ var script = {
                 return;
             }
 
-            if (this.view === 'month') {
+            if (this.currentView === 'month') {
                 this.incrementYear();
             }
+            else if (this.currentView === 'year') {
+                this.incrementDecade();
+            }
             else {
                 if (this.currentMonth === 11) {
                     this.currentMonth = 0;
@@ -502,9 +555,25 @@ var script = {
         decrementYear() {
             this.currentYear--;
         },
+        decrementDecade() {
+            this.currentYear = this.currentYear - 10;
+        },
         incrementYear() {
             this.currentYear++;
         },
+        incrementDecade() {
+            this.currentYear = this.currentYear + 10;
+        },
+        switchToMonthView(event) {
+            this.currentView = 'month';
+            setTimeout(this.updateFocus, 0);
+            event.preventDefault();
+        },
+        switchToYearView(event) {
+            this.currentView = 'year';
+            setTimeout(this.updateFocus, 0);
+            event.preventDefault();
+        },
         isEnabled() {
             return !this.$attrs.disabled && !this.$attrs.readonly;
         },
@@ -589,7 +658,14 @@ var script = {
                     utils.DomHandler.relativePosition(this.overlay, this.$el);
                 }
                 else {
-                    this.overlay.style.minWidth = utils.DomHandler.getOuterWidth(this.$el) + 'px';
+                    if (this.view === 'date') {
+                        this.overlay.style.width = utils.DomHandler.getOuterWidth(this.overlay) + 'px';
+                        this.overlay.style.minWidth = utils.DomHandler.getOuterWidth(this.$el) + 'px';
+                    }
+                    else {
+                        this.overlay.style.width = utils.DomHandler.getOuterWidth(this.$el) + 'px';
+                    }
+
                     utils.DomHandler.absolutePosition(this.overlay, this.$el);
                 }
             }
@@ -597,7 +673,7 @@ var script = {
         onButtonClick() {
             if (this.isEnabled()) {
                 if (!this.overlayVisible) {
-                    this.$refs.input.$el.focus();
+                    this.input.focus();
                     this.overlayVisible = true;
                 }
                 else {
@@ -990,12 +1066,10 @@ var script = {
             }
             return hours;
         },
-         validateTime(hour, minute, second, pm) {
-            let value = this.modelValue;
+        validateTime(hour, minute, second, pm) {
+            let value = this.isComparable() ? this.modelValue : this.viewDate;
             const convertedHour = this.convertTo24Hour(hour, pm);
-            if (!this.isComparable()) {
-                return true;
-            }
+
             if (this.isRangeSelection()) {
                 value = this.modelValue[1] || this.modelValue[0];
             }
@@ -1041,7 +1115,6 @@ var script = {
             let newHour = this.currentHour + this.stepHour;
             let newPM = this.pm;
 
-
             if (this.hourFormat == '24')
                 newHour = (newHour >= 24) ? (newHour - 24) : newHour;
             else if (this.hourFormat == '12') {
@@ -1052,7 +1125,6 @@ var script = {
                 newHour = (newHour >= 13) ? (newHour - 12) : newHour;
             }
 
-
             if (this.validateTime(newHour, this.currentMinute, this.currentSecond, newPM)) {
                 this.currentHour = newHour;
                 this.pm = newPM;
@@ -1112,7 +1184,8 @@ var script = {
             event.preventDefault();
         },
         updateModelTime() {
-            let value = this.isComparable() ? this.modelValue : new Date();
+            this.timePickerChange = true;
+            let value = this.isComparable() ? this.modelValue : this.viewDate;
 
             if (this.isRangeSelection()) {
                 value = this.modelValue[1] || this.modelValue[0];
@@ -1148,6 +1221,7 @@ var script = {
 
             this.updateModel(value);
             this.$emit('date-select', value);
+            setTimeout(() => this.timePickerChange = false, 0);
         },
         toggleAMPM(event) {
             this.pm = !this.pm;
@@ -1160,7 +1234,28 @@ var script = {
             }
         },
         onMonthSelect(event, index) {
-            this.onDateSelect(event, {year: this.currentYear, month: index, day: 1, selectable: true});
+            if (this.view === 'month') {
+                this.onDateSelect(event, {year: this.currentYear, month: index, day: 1, selectable: true});
+            }
+            else {
+                this.currentMonth = index;
+                this.currentView = 'date';
+                this.$emit('month-change', {month: this.currentMonth + 1, year: this.currentYear});
+            }
+
+            setTimeout(this.updateFocus, 0);
+        },
+        onYearSelect(event, year) {
+            if (this.view === 'year') {
+                this.onDateSelect(event, {year: year, month: 0, day: 1, selectable: true});
+            }
+            else {
+                this.currentYear = year;
+                this.currentView = 'month';
+                this.$emit('year-change', {month: this.currentMonth + 1, year: this.currentYear});
+            }
+
+            setTimeout(this.updateFocus, 0);
         },
         enableModality() {
             if (!this.mask) {
@@ -1215,6 +1310,10 @@ var script = {
             }
         },
         isValidSelection(value) {
+            if (value == null) {
+                return true;
+            }
+
             let isValid = true;
             if (this.isSingleSelection()) {
                 if (!this.isSelectable(value.getDate(), value.getMonth(), value.getFullYear(), false)) {
@@ -1383,7 +1482,7 @@ var script = {
                 iValue++;
             };
 
-            if (this.view === 'month') {
+            if (this.currentView === 'month') {
                 day = 1;
             }
 
@@ -1578,7 +1677,9 @@ var script = {
                 }
 
                 //enter
-                case 13: {
+                //space
+                case 13:
+                case 32: {
                     this.onDateSelect(event, date);
                     event.preventDefault();
                     break;
@@ -1608,7 +1709,7 @@ var script = {
                 }
                 else {
                     let prevMonthContainer = this.overlay.children[groupIndex - 1];
-                    let cells = utils.DomHandler.find(prevMonthContainer, '.p-datepicker-calendar td span:not(.p-disabled)');
+                    let cells = utils.DomHandler.find(prevMonthContainer, '.p-datepicker-calendar td span:not(.p-disabled):not(.p-ink)');
                     let focusCell = cells[cells.length - 1];
                     focusCell.tabIndex = '0';
                     focusCell.focus();
@@ -1621,7 +1722,7 @@ var script = {
                 }
                 else {
                     let nextMonthContainer = this.overlay.children[groupIndex + 1];
-                    let focusCell = utils.DomHandler.findSingle(nextMonthContainer, '.p-datepicker-calendar td span:not(.p-disabled)');
+                    let focusCell = utils.DomHandler.findSingle(nextMonthContainer, '.p-datepicker-calendar td span:not(.p-disabled):not(.p-ink)');
                     focusCell.tabIndex = '0';
                     focusCell.focus();
                 }
@@ -1654,6 +1755,10 @@ var script = {
                         prevCell.tabIndex = '0';
                         prevCell.focus();
                     }
+                    else {
+                        this.navigationState = {backward: true};
+                        this.navBackward(event);
+                    }
                     event.preventDefault();
                     break;
                 }
@@ -1666,12 +1771,18 @@ var script = {
                         nextCell.tabIndex = '0';
                         nextCell.focus();
                     }
+                    else {
+                        this.navigationState = {backward: false};
+                        this.navForward(event);
+                    }
                     event.preventDefault();
                     break;
                 }
 
                 //enter
-                case 13: {
+                //space
+                case 13:
+                case 32: {
                     this.onMonthSelect(event, index);
                     event.preventDefault();
                     break;
@@ -1691,8 +1802,83 @@ var script = {
                 }
             }
         },
+        onYearCellKeydown(event, index) {
+            const cell = event.currentTarget;
+
+            switch (event.which) {
+                //arrows
+                case 38:
+                case 40: {
+                    cell.tabIndex = '-1';
+                    var cells = cell.parentElement.children;
+                    var cellIndex = utils.DomHandler.index(cell);
+                    let nextCell = cells[event.which === 40 ? cellIndex + 2 : cellIndex - 2];
+                    if (nextCell) {
+                        nextCell.tabIndex = '0';
+                        nextCell.focus();
+                    }
+                    event.preventDefault();
+                    break;
+                }
+
+                //left arrow
+                case 37: {
+                    cell.tabIndex = '-1';
+                    let prevCell = cell.previousElementSibling;
+                    if (prevCell) {
+                        prevCell.tabIndex = '0';
+                        prevCell.focus();
+                    }
+                    else {
+                        this.navigationState = {backward: true};
+                        this.navBackward(event);
+                    }
+                    event.preventDefault();
+                    break;
+                }
+
+                //right arrow
+                case 39: {
+                    cell.tabIndex = '-1';
+                    let nextCell = cell.nextElementSibling;
+                    if (nextCell) {
+                        nextCell.tabIndex = '0';
+                        nextCell.focus();
+                    }
+                    else {
+                        this.navigationState = {backward: false};
+                        this.navForward(event);
+                    }
+                    event.preventDefault();
+                    break;
+                }
+
+                //enter
+                //space
+                case 13:
+                case 32: {
+                    this.onYearSelect(event, index);
+                    event.preventDefault();
+                    break;
+                }
+
+                //escape
+                case 27: {
+                    this.overlayVisible = false;
+                    event.preventDefault();
+                    break;
+                }
+
+                //tab
+                case 9: {
+                    this.trapFocus(event);
+                    break;
+                }
+            }
+        },
         updateFocus() {
             let cell;
+
             if (this.navigationState) {
                 if (this.navigationState.button) {
                     this.initFocusableCell();
@@ -1704,11 +1890,32 @@ var script = {
                 }
                 else {
                     if (this.navigationState.backward) {
-                        let cells = utils.DomHandler.find(this.overlay, '.p-datepicker-calendar td span:not(.p-disabled)');
-                        cell = cells[cells.length - 1];
+                        let cells;
+
+                        if (this.currentView === 'month') {
+                            cells = utils.DomHandler.find(this.overlay, '.p-monthpicker .p-monthpicker-month:not(.p-disabled)');
+                        }
+                        else if (this.currentView === 'year') {
+                            cells = utils.DomHandler.find(this.overlay, '.p-yearpicker .p-yearpicker-year:not(.p-disabled)');
+                        }
+                        else {
+                            cells = utils.DomHandler.find(this.overlay, '.p-datepicker-calendar td span:not(.p-disabled):not(.p-ink)');
+                        }
+
+                        if (cells && cells.length > 0) {
+                            cell = cells[cells.length - 1];
+                        }
                     }
                     else {
-                        cell = utils.DomHandler.findSingle(this.overlay, '.p-datepicker-calendar td span:not(.p-disabled)');
+                        if (this.currentView === 'month') {
+                            cell = utils.DomHandler.findSingle(this.overlay, '.p-monthpicker .p-monthpicker-month:not(.p-disabled)');
+                        }
+                        else if (this.currentView === 'year') {
+                            cell = utils.DomHandler.findSingle(this.overlay, '.p-yearpicker .p-yearpicker-year:not(.p-disabled)');
+                        }
+                        else {
+                            cell = utils.DomHandler.findSingle(this.overlay, '.p-datepicker-calendar td span:not(.p-disabled):not(.p-ink)');
+                        }
                     }
 
                     if (cell) {
@@ -1726,25 +1933,37 @@ var script = {
         initFocusableCell() {
             let cell;
 
-            if (this.view === 'month') {
+            if (this.currentView === 'month') {
                 let cells = utils.DomHandler.find(this.overlay, '.p-monthpicker .p-monthpicker-month');
                 let selectedCell= utils.DomHandler.findSingle(this.overlay, '.p-monthpicker .p-monthpicker-month.p-highlight');
                 cells.forEach(cell => cell.tabIndex = -1);
                 cell = selectedCell || cells[0];
             }
+            else if (this.currentView === 'year') {
+                let cells = utils.DomHandler.find(this.overlay, '.p-yearpicker .p-yearpicker-year');
+                let selectedCell= utils.DomHandler.findSingle(this.overlay, '.p-yearpicker .p-yearpicker-year.p-highlight');
+                cells.forEach(cell => cell.tabIndex = -1);
+                cell = selectedCell || cells[0];
+            }
             else {
                 cell = utils.DomHandler.findSingle(this.overlay, 'span.p-highlight');
                 if (!cell) {
-                    let todayCell = utils.DomHandler.findSingle(this.overlay, 'td.p-datepicker-today span:not(.p-disabled)');
+                    let todayCell = utils.DomHandler.findSingle(this.overlay, 'td.p-datepicker-today span:not(.p-disabled):not(.p-ink');
                     if (todayCell)
                         cell = todayCell;
                     else
-                        cell = utils.DomHandler.findSingle(this.overlay, '.p-datepicker-calendar td span:not(.p-disabled)');
+                        cell = utils.DomHandler.findSingle(this.overlay, '.p-datepicker-calendar td span:not(.p-disabled):not(.p-ink');
                 }
             }
 
             if (cell) {
                 cell.tabIndex = '0';
+
+                if (!this.preventFocus && (!this.navigationState || !this.navigationState.button) && !this.timePickerChange) {
+                    cell.focus();
+                }
+
+                this.preventFocus = false;
             }
         },
         trapFocus(event) {
@@ -1788,25 +2007,18 @@ var script = {
              }
         },
         onInput(event) {
-            // IE 11 Workaround for input placeholder : https://github.com/primefaces/primeng/issues/2026
-            if (!this.isKeydown) {
-                return;
-            }
-            this.isKeydown = false;
-
             try {
-                this.selectionStart = this.$refs.input.$el.selectionStart;
-                this.selectionEnd = this.$refs.input.$el.selectionEnd;
+                this.selectionStart = this.input.selectionStart;
+                this.selectionEnd = this.input.selectionEnd;
 
                 let value = this.parseValue(event.target.value);
                 if (this.isValidSelection(value)) {
+                    this.typeUpdate = true;
                     this.updateModel(value);
                 }
             }
             catch(err) {
-                // invalid date
-                let value = this.keepInvalid ? event.target.value : null;
-                this.updateModel(value);
+                /* NoOp */
             }
         },
         onFocus() {
@@ -1817,9 +2029,9 @@ var script = {
         },
         onBlur() {
             this.focused = false;
+            this.input.value = this.formatValue(this.modelValue);
         },
-        onKeyDown(event) {
-            this.isKeydown = true;
+        onKeyDown() {
             if (event.keyCode === 40 && this.overlay) {
                 this.trapFocus(event);
             }
@@ -1842,33 +2054,97 @@ var script = {
         overlayRef(el) {
             this.overlay = el;
         },
+        inputRef(el) {
+            this.input = el;
+        },
         getMonthName(index) {
             return this.$primevue.config.locale.monthNames[index];
         },
+        getYear(month) {
+            return this.currentView === 'month' ? this.currentYear : month.year;
+        },
         onOverlayClick(event) {
             if (!this.inline) {
-                OverlayEventBus__default['default'].emit('overlay-click', {
+                OverlayEventBus__default["default"].emit('overlay-click', {
                     originalEvent: event,
                     target: this.$el
                 });
             }
+        },
+        onOverlayMouseUp(event) {
+            this.onOverlayClick(event);
+        },
+        createResponsiveStyle() {
+            if (this.numberOfMonths > 1 && this.responsiveOptions) {
+                if (!this.responsiveStyleElement) {
+                    this.responsiveStyleElement = document.createElement('style');
+                    this.responsiveStyleElement.type = 'text/css';
+                    document.body.appendChild(this.responsiveStyleElement);
+                }
+
+                let innerHTML = '';
+                if (this.responsiveOptions) {
+                    let responsiveOptions = [...this.responsiveOptions]
+                        .filter(o => !!(o.breakpoint && o.numMonths))
+                        .sort((o1, o2) => -1 * o1.breakpoint.localeCompare(o2.breakpoint, undefined, { numeric: true }));
+
+                    for (let i = 0; i < responsiveOptions.length; i++) {
+                        let { breakpoint, numMonths } = responsiveOptions[i];
+                        let styles = `
+                            .p-datepicker[${this.attributeSelector}] .p-datepicker-group:nth-child(${numMonths}) .p-datepicker-next {
+                                display: inline-flex !important;
+                            }
+                        `;
+
+                        for (let j = numMonths; j < this.numberOfMonths; j++) {
+                            styles += `
+                                .p-datepicker[${this.attributeSelector}] .p-datepicker-group:nth-child(${j + 1}) {
+                                    display: none !important;
+                                }
+                            `;
+                        }
+
+                        innerHTML += `
+                            @media screen and (max-width: ${breakpoint}) {
+                                ${styles}
+                            }
+                        `;
+                    }
+                }
+
+                this.responsiveStyleElement.innerHTML = innerHTML;
+            }
+		},
+        destroyResponsiveStyleElement() {
+            if (this.responsiveStyleElement) {
+                this.responsiveStyleElement.remove();
+                this.responsiveStyleElement = null;
+            }
         }
     },
     computed: {
         viewDate() {
             let propValue = this.modelValue;
-            if (typeof propValue === 'string') {
-                return new Date();
-            }
-
             if (propValue && Array.isArray(propValue)) {
                 propValue = propValue[0];
             }
 
-            return propValue || new Date();
+            if (propValue && typeof propValue !== 'string') {
+                return propValue;
+            }
+            else {
+                let today = new Date();
+                if (this.maxDate && this.maxDate < today) {
+                    return this.maxDate;
+                }
+                if (this.minDate && this.minDate > today) {
+                    return this.minDate;
+                }
+                return today;
+            }
         },
         inputFieldValue() {
-            return this.keepInvalid ? this.modelValue : this.formatValue(this.modelValue);
+            return this.formatValue(this.modelValue);
         },
         containerClass() {
             return [
@@ -1887,7 +2163,8 @@ var script = {
                 'p-disabled': this.$attrs.disabled,
                 'p-datepicker-timeonly': this.timeOnly,
                 'p-datepicker-multiple-month': this.numberOfMonths > 1,
-                'p-datepicker-monthpicker': (this.view === 'month'),
+                'p-datepicker-monthpicker': (this.currentView === 'month'),
+                'p-datepicker-yearpicker': (this.currentView === 'year'),
                 'p-datepicker-touch-ui': this.touchUI,
                 'p-input-filled': this.$primevue.config.inputStyle === 'filled',
                 'p-ripple-disabled': this.$primevue.config.ripple === false
@@ -2015,6 +2292,15 @@ var script = {
 
             return monthPickerValues;
         },
+        yearPickerValues() {
+            let yearPickerValues = [];
+            let base = this.currentYear -  (this.currentYear % 10);
+            for (let i = 0; i < 10; i++) {
+                yearPickerValues.push(base + i);
+            }
+
+            return yearPickerValues;
+        },
         formattedCurrentHour() {
             return this.currentHour < 10 ? '0' + this.currentHour : this.currentHour;
         },
@@ -2041,14 +2327,19 @@ var script = {
         },
         appendTarget() {
             return this.appendDisabled ? null : this.appendTo;
+        },
+        attributeSelector() {
+            return utils.UniqueComponentId();
+        },
+        switchViewButtonDisabled() {
+            return this.numberOfMonths > 1 || this.$attrs.disabled;
         }
     },
     components: {
-        'CalendarInputText': InputText__default['default'],
-        'CalendarButton': Button__default['default']
+        'CalendarButton': Button__default["default"]
     },
     directives: {
-        'ripple': Ripple__default['default']
+        'ripple': Ripple__default["default"]
     }
 };
 
@@ -2057,37 +2348,37 @@ const _hoisted_2 = { class: "p-datepicker-header" };
 const _hoisted_3 = /*#__PURE__*/vue.createVNode("span", { class: "p-datepicker-prev-icon pi pi-chevron-left" }, null, -1);
 const _hoisted_4 = { class: "p-datepicker-title" };
 const _hoisted_5 = {
-  key: 0,
-  class: "p-datepicker-month"
-};
-const _hoisted_6 = {
   key: 2,
-  class: "p-datepicker-year"
+  class: "p-datepicker-decade"
 };
-const _hoisted_7 = /*#__PURE__*/vue.createVNode("span", { class: "p-datepicker-next-icon pi pi-chevron-right" }, null, -1);
-const _hoisted_8 = {
+const _hoisted_6 = /*#__PURE__*/vue.createVNode("span", { class: "p-datepicker-next-icon pi pi-chevron-right" }, null, -1);
+const _hoisted_7 = {
   key: 0,
   class: "p-datepicker-calendar-container"
 };
-const _hoisted_9 = { class: "p-datepicker-calendar" };
-const _hoisted_10 = {
+const _hoisted_8 = { class: "p-datepicker-calendar" };
+const _hoisted_9 = {
   key: 0,
   scope: "col",
   class: "p-datepicker-weekheader p-disabled"
 };
-const _hoisted_11 = {
+const _hoisted_10 = {
   key: 0,
   class: "p-datepicker-weeknumber"
 };
-const _hoisted_12 = { class: "p-disabled" };
-const _hoisted_13 = {
+const _hoisted_11 = { class: "p-disabled" };
+const _hoisted_12 = {
   key: 0,
   style: {"visibility":"hidden"}
 };
-const _hoisted_14 = {
+const _hoisted_13 = {
   key: 0,
   class: "p-monthpicker"
 };
+const _hoisted_14 = {
+  key: 1,
+  class: "p-yearpicker"
+};
 const _hoisted_15 = {
   key: 1,
   class: "p-timepicker"
@@ -2125,7 +2416,6 @@ const _hoisted_31 = {
 };
 
 function render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_CalendarInputText = vue.resolveComponent("CalendarInputText");
   const _component_CalendarButton = vue.resolveComponent("CalendarButton");
   const _directive_ripple = vue.resolveDirective("ripple");
 
@@ -2135,21 +2425,20 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
     style: $props.style
   }, [
     (!$props.inline)
-      ? (vue.openBlock(), vue.createBlock(_component_CalendarInputText, vue.mergeProps({
+      ? (vue.openBlock(), vue.createBlock("input", vue.mergeProps({
           key: 0,
-          ref: "input",
-          type: "text"
+          ref: $options.inputRef,
+          type: "text",
+          class: ['p-inputtext p-component', $props.inputClass],
+          style: $props.inputStyle,
+          onInput: _cache[1] || (_cache[1] = (...args) => ($options.onInput && $options.onInput(...args)))
         }, _ctx.$attrs, {
-          value: $options.inputFieldValue,
-          onInput: $options.onInput,
-          onFocus: $options.onFocus,
-          onBlur: $options.onBlur,
-          onKeydown: $options.onKeyDown,
+          onFocus: _cache[2] || (_cache[2] = (...args) => ($options.onFocus && $options.onFocus(...args))),
+          onBlur: _cache[3] || (_cache[3] = (...args) => ($options.onBlur && $options.onBlur(...args))),
+          onKeydown: _cache[4] || (_cache[4] = (...args) => ($options.onKeyDown && $options.onKeyDown(...args))),
           readonly: !$props.manualInput,
-          inputmode: "none",
-          class: $props.inputClass,
-          style: $props.inputStyle
-        }), null, 16, ["value", "onInput", "onFocus", "onBlur", "onKeydown", "readonly", "class", "style"]))
+          inputmode: "none"
+        }), null, 16, ["readonly"]))
       : vue.createCommentVNode("", true),
     ($props.showIcon)
       ? (vue.openBlock(), vue.createBlock(_component_CalendarButton, {
@@ -2169,7 +2458,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
     }, [
       vue.createVNode(vue.Transition, {
         name: "p-connected-overlay",
-        onEnter: _cache[48] || (_cache[48] = $event => ($options.onOverlayEnter($event))),
+        onEnter: _cache[67] || (_cache[67] = $event => ($options.onOverlayEnter($event))),
         onAfterEnter: $options.onOverlayEnterComplete,
         onAfterLeave: $options.onOverlayAfterLeave,
         onLeave: $options.onOverlayLeave
@@ -2181,7 +2470,8 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                 ref: $options.overlayRef,
                 class: $options.panelStyleClass,
                 role: $props.inline ? null : 'dialog',
-                onClick: _cache[47] || (_cache[47] = (...args) => ($options.onOverlayClick && $options.onOverlayClick(...args)))
+                onClick: _cache[65] || (_cache[65] = (...args) => ($options.onOverlayClick && $options.onOverlayClick(...args))),
+                onMouseup: _cache[66] || (_cache[66] = (...args) => ($options.onOverlayMouseUp && $options.onOverlayMouseUp(...args)))
               }, [
                 (!$props.timeOnly)
                   ? (vue.openBlock(), vue.createBlock(vue.Fragment, { key: 0 }, [
@@ -2193,80 +2483,67 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                           }, [
                             vue.createVNode("div", _hoisted_2, [
                               vue.renderSlot(_ctx.$slots, "header"),
-                              (groupIndex === 0)
-                                ? vue.withDirectives((vue.openBlock(), vue.createBlock("button", {
-                                    key: 0,
-                                    class: "p-datepicker-prev p-link",
-                                    onClick: _cache[1] || (_cache[1] = (...args) => ($options.onPrevButtonClick && $options.onPrevButtonClick(...args))),
-                                    type: "button",
-                                    onKeydown: _cache[2] || (_cache[2] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
-                                    disabled: _ctx.$attrs.disabled
-                                  }, [
-                                    _hoisted_3
-                                  ], 40, ["disabled"])), [
-                                    [_directive_ripple]
-                                  ])
-                                : vue.createCommentVNode("", true),
+                              vue.withDirectives(vue.createVNode("button", {
+                                class: "p-datepicker-prev p-link",
+                                onClick: _cache[5] || (_cache[5] = (...args) => ($options.onPrevButtonClick && $options.onPrevButtonClick(...args))),
+                                type: "button",
+                                onKeydown: _cache[6] || (_cache[6] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                                disabled: _ctx.$attrs.disabled
+                              }, [
+                                _hoisted_3
+                              ], 40, ["disabled"]), [
+                                [vue.vShow, groupIndex === 0],
+                                [_directive_ripple]
+                              ]),
                               vue.createVNode("div", _hoisted_4, [
-                                (!$props.monthNavigator && ($props.view !== 'month'))
-                                  ? (vue.openBlock(), vue.createBlock("span", _hoisted_5, vue.toDisplayString($options.getMonthName(month.month)), 1))
+                                ($data.currentView === 'date')
+                                  ? (vue.openBlock(), vue.createBlock("button", {
+                                      key: 0,
+                                      type: "button",
+                                      onClick: _cache[7] || (_cache[7] = (...args) => ($options.switchToMonthView && $options.switchToMonthView(...args))),
+                                      onKeydown: _cache[8] || (_cache[8] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                                      class: "p-datepicker-month p-link",
+                                      disabled: $options.switchViewButtonDisabled
+                                    }, vue.toDisplayString($options.getMonthName(month.month)), 41, ["disabled"]))
                                   : vue.createCommentVNode("", true),
-                                ($props.monthNavigator && ($props.view !== 'month') && $props.numberOfMonths === 1)
-                                  ? (vue.openBlock(), vue.createBlock("select", {
+                                ($data.currentView !== 'year')
+                                  ? (vue.openBlock(), vue.createBlock("button", {
                                       key: 1,
-                                      class: "p-datepicker-month",
-                                      onChange: _cache[3] || (_cache[3] = $event => ($options.onMonthDropdownChange($event.target.value)))
-                                    }, [
-                                      (vue.openBlock(true), vue.createBlock(vue.Fragment, null, vue.renderList($options.monthNames, (monthName, index) => {
-                                        return (vue.openBlock(), vue.createBlock("option", {
-                                          value: index,
-                                          key: monthName,
-                                          selected: index === month.month
-                                        }, vue.toDisplayString(monthName), 9, ["value", "selected"]))
-                                      }), 128))
-                                    ], 32))
+                                      type: "button",
+                                      onClick: _cache[9] || (_cache[9] = (...args) => ($options.switchToYearView && $options.switchToYearView(...args))),
+                                      onKeydown: _cache[10] || (_cache[10] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                                      class: "p-datepicker-year p-link",
+                                      disabled: $options.switchViewButtonDisabled
+                                    }, vue.toDisplayString($options.getYear(month)), 41, ["disabled"]))
                                   : vue.createCommentVNode("", true),
-                                (!$props.yearNavigator)
-                                  ? (vue.openBlock(), vue.createBlock("span", _hoisted_6, vue.toDisplayString($props.view === 'month' ? $data.currentYear : month.year), 1))
-                                  : vue.createCommentVNode("", true),
-                                ($props.yearNavigator && $props.numberOfMonths === 1)
-                                  ? (vue.openBlock(), vue.createBlock("select", {
-                                      key: 3,
-                                      class: "p-datepicker-year",
-                                      onChange: _cache[4] || (_cache[4] = $event => ($options.onYearDropdownChange($event.target.value)))
-                                    }, [
-                                      (vue.openBlock(true), vue.createBlock(vue.Fragment, null, vue.renderList($options.yearOptions, (year) => {
-                                        return (vue.openBlock(), vue.createBlock("option", {
-                                          value: year,
-                                          key: year,
-                                          selected: year === $data.currentYear
-                                        }, vue.toDisplayString(year), 9, ["value", "selected"]))
-                                      }), 128))
-                                    ], 32))
+                                ($data.currentView === 'year')
+                                  ? (vue.openBlock(), vue.createBlock("span", _hoisted_5, [
+                                      vue.renderSlot(_ctx.$slots, "decade", { years: $options.yearPickerValues }, () => [
+                                        vue.createTextVNode(vue.toDisplayString($options.yearPickerValues[0]) + " - " + vue.toDisplayString($options.yearPickerValues[$options.yearPickerValues.length - 1]), 1)
+                                      ])
+                                    ]))
                                   : vue.createCommentVNode("", true)
                               ]),
-                              ($props.numberOfMonths === 1 ? true : (groupIndex === $props.numberOfMonths - 1))
-                                ? vue.withDirectives((vue.openBlock(), vue.createBlock("button", {
-                                    key: 1,
-                                    class: "p-datepicker-next p-link",
-                                    onClick: _cache[5] || (_cache[5] = (...args) => ($options.onNextButtonClick && $options.onNextButtonClick(...args))),
-                                    type: "button",
-                                    onKeydown: _cache[6] || (_cache[6] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
-                                    disabled: _ctx.$attrs.disabled
-                                  }, [
-                                    _hoisted_7
-                                  ], 40, ["disabled"])), [
-                                    [_directive_ripple]
-                                  ])
-                                : vue.createCommentVNode("", true)
+                              vue.withDirectives(vue.createVNode("button", {
+                                class: "p-datepicker-next p-link",
+                                onClick: _cache[11] || (_cache[11] = (...args) => ($options.onNextButtonClick && $options.onNextButtonClick(...args))),
+                                type: "button",
+                                onKeydown: _cache[12] || (_cache[12] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                                disabled: _ctx.$attrs.disabled
+                              }, [
+                                _hoisted_6
+                              ], 40, ["disabled"]), [
+                                [vue.vShow, $props.numberOfMonths === 1 ? true : (groupIndex === $props.numberOfMonths - 1)],
+                                [_directive_ripple]
+                              ])
                             ]),
-                            ($props.view ==='date')
-                              ? (vue.openBlock(), vue.createBlock("div", _hoisted_8, [
-                                  vue.createVNode("table", _hoisted_9, [
+                            ($data.currentView ==='date')
+                              ? (vue.openBlock(), vue.createBlock("div", _hoisted_7, [
+                                  vue.createVNode("table", _hoisted_8, [
                                     vue.createVNode("thead", null, [
                                       vue.createVNode("tr", null, [
                                         ($props.showWeek)
-                                          ? (vue.openBlock(), vue.createBlock("th", _hoisted_10, [
+                                          ? (vue.openBlock(), vue.createBlock("th", _hoisted_9, [
                                               vue.createVNode("span", null, vue.toDisplayString($options.weekHeaderLabel), 1)
                                             ]))
                                           : vue.createCommentVNode("", true),
@@ -2286,10 +2563,10 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                                           key: week[0].day + '' + week[0].month
                                         }, [
                                           ($props.showWeek)
-                                            ? (vue.openBlock(), vue.createBlock("td", _hoisted_11, [
-                                                vue.createVNode("span", _hoisted_12, [
+                                            ? (vue.openBlock(), vue.createBlock("td", _hoisted_10, [
+                                                vue.createVNode("span", _hoisted_11, [
                                                   (month.weekNumbers[i] < 10)
-                                                    ? (vue.openBlock(), vue.createBlock("span", _hoisted_13, "0"))
+                                                    ? (vue.openBlock(), vue.createBlock("span", _hoisted_12, "0"))
                                                     : vue.createCommentVNode("", true),
                                                   vue.createTextVNode(" " + vue.toDisplayString(month.weekNumbers[i]), 1)
                                                 ])
@@ -2323,8 +2600,8 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                           ]))
                         }), 128))
                       ]),
-                      ($props.view === 'month')
-                        ? (vue.openBlock(), vue.createBlock("div", _hoisted_14, [
+                      ($data.currentView === 'month')
+                        ? (vue.openBlock(), vue.createBlock("div", _hoisted_13, [
                             (vue.openBlock(true), vue.createBlock(vue.Fragment, null, vue.renderList($options.monthPickerValues, (m, i) => {
                               return vue.withDirectives((vue.openBlock(), vue.createBlock("span", {
                                 key: m,
@@ -2338,6 +2615,22 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                               ])
                             }), 128))
                           ]))
+                        : vue.createCommentVNode("", true),
+                      ($data.currentView === 'year')
+                        ? (vue.openBlock(), vue.createBlock("div", _hoisted_14, [
+                            (vue.openBlock(true), vue.createBlock(vue.Fragment, null, vue.renderList($options.yearPickerValues, (y) => {
+                              return vue.withDirectives((vue.openBlock(), vue.createBlock("span", {
+                                key: y,
+                                onClick: $event => ($options.onYearSelect($event, y)),
+                                onKeydown: $event => ($options.onYearCellKeydown($event,y)),
+                                class: ["p-yearpicker-year", {'p-highlight': $options.isYearSelected(y)}]
+                              }, [
+                                vue.createTextVNode(vue.toDisplayString(y), 1)
+                              ], 42, ["onClick", "onKeydown"])), [
+                                [_directive_ripple]
+                              ])
+                            }), 128))
+                          ]))
                         : vue.createCommentVNode("", true)
                     ], 64))
                   : vue.createCommentVNode("", true),
@@ -2346,14 +2639,18 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                       vue.createVNode("div", _hoisted_16, [
                         vue.withDirectives(vue.createVNode("button", {
                           class: "p-link",
-                          onMousedown: _cache[7] || (_cache[7] = $event => ($options.onTimePickerElementMouseDown($event, 0, 1))),
-                          onMouseup: _cache[8] || (_cache[8] = $event => ($options.onTimePickerElementMouseUp($event))),
+                          onMousedown: _cache[13] || (_cache[13] = $event => ($options.onTimePickerElementMouseDown($event, 0, 1))),
+                          onMouseup: _cache[14] || (_cache[14] = $event => ($options.onTimePickerElementMouseUp($event))),
                           onKeydown: [
-                            _cache[9] || (_cache[9] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
-                            _cache[11] || (_cache[11] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 0, 1)), ["enter"]))
+                            _cache[15] || (_cache[15] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                            _cache[17] || (_cache[17] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 0, 1)), ["enter"])),
+                            _cache[18] || (_cache[18] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 0, 1)), ["space"]))
+                          ],
+                          onMouseleave: _cache[16] || (_cache[16] = $event => ($options.onTimePickerElementMouseLeave())),
+                          onKeyup: [
+                            _cache[19] || (_cache[19] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                            _cache[20] || (_cache[20] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["space"]))
                           ],
-                          onMouseleave: _cache[10] || (_cache[10] = $event => ($options.onTimePickerElementMouseLeave())),
-                          onKeyup: _cache[12] || (_cache[12] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
                           type: "button"
                         }, [
                           _hoisted_17
@@ -2363,14 +2660,18 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                         vue.createVNode("span", null, vue.toDisplayString($options.formattedCurrentHour), 1),
                         vue.withDirectives(vue.createVNode("button", {
                           class: "p-link",
-                          onMousedown: _cache[13] || (_cache[13] = $event => ($options.onTimePickerElementMouseDown($event, 0, -1))),
-                          onMouseup: _cache[14] || (_cache[14] = $event => ($options.onTimePickerElementMouseUp($event))),
+                          onMousedown: _cache[21] || (_cache[21] = $event => ($options.onTimePickerElementMouseDown($event, 0, -1))),
+                          onMouseup: _cache[22] || (_cache[22] = $event => ($options.onTimePickerElementMouseUp($event))),
                           onKeydown: [
-                            _cache[15] || (_cache[15] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
-                            _cache[17] || (_cache[17] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 0, -1)), ["enter"]))
+                            _cache[23] || (_cache[23] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                            _cache[25] || (_cache[25] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 0, -1)), ["enter"])),
+                            _cache[26] || (_cache[26] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 0, -1)), ["space"]))
+                          ],
+                          onMouseleave: _cache[24] || (_cache[24] = $event => ($options.onTimePickerElementMouseLeave())),
+                          onKeyup: [
+                            _cache[27] || (_cache[27] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                            _cache[28] || (_cache[28] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["space"]))
                           ],
-                          onMouseleave: _cache[16] || (_cache[16] = $event => ($options.onTimePickerElementMouseLeave())),
-                          onKeyup: _cache[18] || (_cache[18] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
                           type: "button"
                         }, [
                           _hoisted_18
@@ -2384,15 +2685,19 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                       vue.createVNode("div", _hoisted_20, [
                         vue.withDirectives(vue.createVNode("button", {
                           class: "p-link",
-                          onMousedown: _cache[19] || (_cache[19] = $event => ($options.onTimePickerElementMouseDown($event, 1, 1))),
-                          onMouseup: _cache[20] || (_cache[20] = $event => ($options.onTimePickerElementMouseUp($event))),
+                          onMousedown: _cache[29] || (_cache[29] = $event => ($options.onTimePickerElementMouseDown($event, 1, 1))),
+                          onMouseup: _cache[30] || (_cache[30] = $event => ($options.onTimePickerElementMouseUp($event))),
                           onKeydown: [
-                            _cache[21] || (_cache[21] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
-                            _cache[23] || (_cache[23] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 1, 1)), ["enter"]))
+                            _cache[31] || (_cache[31] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                            _cache[33] || (_cache[33] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 1, 1)), ["enter"])),
+                            _cache[34] || (_cache[34] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 1, 1)), ["space"]))
                           ],
                           disabled: _ctx.$attrs.disabled,
-                          onMouseleave: _cache[22] || (_cache[22] = $event => ($options.onTimePickerElementMouseLeave())),
-                          onKeyup: _cache[24] || (_cache[24] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                          onMouseleave: _cache[32] || (_cache[32] = $event => ($options.onTimePickerElementMouseLeave())),
+                          onKeyup: [
+                            _cache[35] || (_cache[35] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                            _cache[36] || (_cache[36] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["space"]))
+                          ],
                           type: "button"
                         }, [
                           _hoisted_21
@@ -2402,15 +2707,19 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                         vue.createVNode("span", null, vue.toDisplayString($options.formattedCurrentMinute), 1),
                         vue.withDirectives(vue.createVNode("button", {
                           class: "p-link",
-                          onMousedown: _cache[25] || (_cache[25] = $event => ($options.onTimePickerElementMouseDown($event, 1, -1))),
-                          onMouseup: _cache[26] || (_cache[26] = $event => ($options.onTimePickerElementMouseUp($event))),
+                          onMousedown: _cache[37] || (_cache[37] = $event => ($options.onTimePickerElementMouseDown($event, 1, -1))),
+                          onMouseup: _cache[38] || (_cache[38] = $event => ($options.onTimePickerElementMouseUp($event))),
                           onKeydown: [
-                            _cache[27] || (_cache[27] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
-                            _cache[29] || (_cache[29] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 1, -1)), ["enter"]))
+                            _cache[39] || (_cache[39] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                            _cache[41] || (_cache[41] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 1, -1)), ["enter"])),
+                            _cache[42] || (_cache[42] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 1, -1)), ["space"]))
                           ],
                           disabled: _ctx.$attrs.disabled,
-                          onMouseleave: _cache[28] || (_cache[28] = $event => ($options.onTimePickerElementMouseLeave())),
-                          onKeyup: _cache[30] || (_cache[30] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                          onMouseleave: _cache[40] || (_cache[40] = $event => ($options.onTimePickerElementMouseLeave())),
+                          onKeyup: [
+                            _cache[43] || (_cache[43] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                            _cache[44] || (_cache[44] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["space"]))
+                          ],
                           type: "button"
                         }, [
                           _hoisted_22
@@ -2427,15 +2736,19 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                         ? (vue.openBlock(), vue.createBlock("div", _hoisted_24, [
                             vue.withDirectives(vue.createVNode("button", {
                               class: "p-link",
-                              onMousedown: _cache[31] || (_cache[31] = $event => ($options.onTimePickerElementMouseDown($event, 2, 1))),
-                              onMouseup: _cache[32] || (_cache[32] = $event => ($options.onTimePickerElementMouseUp($event))),
+                              onMousedown: _cache[45] || (_cache[45] = $event => ($options.onTimePickerElementMouseDown($event, 2, 1))),
+                              onMouseup: _cache[46] || (_cache[46] = $event => ($options.onTimePickerElementMouseUp($event))),
                               onKeydown: [
-                                _cache[33] || (_cache[33] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
-                                _cache[35] || (_cache[35] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 2, 1)), ["enter"]))
+                                _cache[47] || (_cache[47] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                                _cache[49] || (_cache[49] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 2, 1)), ["enter"])),
+                                _cache[50] || (_cache[50] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 2, 1)), ["space"]))
                               ],
                               disabled: _ctx.$attrs.disabled,
-                              onMouseleave: _cache[34] || (_cache[34] = $event => ($options.onTimePickerElementMouseLeave())),
-                              onKeyup: _cache[36] || (_cache[36] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                              onMouseleave: _cache[48] || (_cache[48] = $event => ($options.onTimePickerElementMouseLeave())),
+                              onKeyup: [
+                                _cache[51] || (_cache[51] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                                _cache[52] || (_cache[52] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["space"]))
+                              ],
                               type: "button"
                             }, [
                               _hoisted_25
@@ -2445,15 +2758,19 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                             vue.createVNode("span", null, vue.toDisplayString($options.formattedCurrentSecond), 1),
                             vue.withDirectives(vue.createVNode("button", {
                               class: "p-link",
-                              onMousedown: _cache[37] || (_cache[37] = $event => ($options.onTimePickerElementMouseDown($event, 2, -1))),
-                              onMouseup: _cache[38] || (_cache[38] = $event => ($options.onTimePickerElementMouseUp($event))),
+                              onMousedown: _cache[53] || (_cache[53] = $event => ($options.onTimePickerElementMouseDown($event, 2, -1))),
+                              onMouseup: _cache[54] || (_cache[54] = $event => ($options.onTimePickerElementMouseUp($event))),
                               onKeydown: [
-                                _cache[39] || (_cache[39] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
-                                _cache[41] || (_cache[41] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 2, -1)), ["enter"]))
+                                _cache[55] || (_cache[55] = (...args) => ($options.onContainerButtonKeydown && $options.onContainerButtonKeydown(...args))),
+                                _cache[57] || (_cache[57] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 2, -1)), ["enter"])),
+                                _cache[58] || (_cache[58] = vue.withKeys($event => ($options.onTimePickerElementMouseDown($event, 2, -1)), ["space"]))
                               ],
                               disabled: _ctx.$attrs.disabled,
-                              onMouseleave: _cache[40] || (_cache[40] = $event => ($options.onTimePickerElementMouseLeave())),
-                              onKeyup: _cache[42] || (_cache[42] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                              onMouseleave: _cache[56] || (_cache[56] = $event => ($options.onTimePickerElementMouseLeave())),
+                              onKeyup: [
+                                _cache[59] || (_cache[59] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["enter"])),
+                                _cache[60] || (_cache[60] = vue.withKeys($event => ($options.onTimePickerElementMouseUp($event)), ["space"]))
+                              ],
                               type: "button"
                             }, [
                               _hoisted_26
@@ -2471,7 +2788,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                         ? (vue.openBlock(), vue.createBlock("div", _hoisted_28, [
                             vue.withDirectives(vue.createVNode("button", {
                               class: "p-link",
-                              onClick: _cache[43] || (_cache[43] = $event => ($options.toggleAMPM($event))),
+                              onClick: _cache[61] || (_cache[61] = $event => ($options.toggleAMPM($event))),
                               type: "button",
                               disabled: _ctx.$attrs.disabled
                             }, [
@@ -2482,7 +2799,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                             vue.createVNode("span", null, vue.toDisplayString($data.pm ? 'PM' : 'AM'), 1),
                             vue.withDirectives(vue.createVNode("button", {
                               class: "p-link",
-                              onClick: _cache[44] || (_cache[44] = $event => ($options.toggleAMPM($event))),
+                              onClick: _cache[62] || (_cache[62] = $event => ($options.toggleAMPM($event))),
                               type: "button",
                               disabled: _ctx.$attrs.disabled
                             }, [
@@ -2499,21 +2816,21 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
                       vue.createVNode(_component_CalendarButton, {
                         type: "button",
                         label: $options.todayLabel,
-                        onClick: _cache[45] || (_cache[45] = $event => ($options.onTodayButtonClick($event))),
+                        onClick: _cache[63] || (_cache[63] = $event => ($options.onTodayButtonClick($event))),
                         class: "p-button-text",
                         onKeydown: $options.onContainerButtonKeydown
                       }, null, 8, ["label", "onKeydown"]),
                       vue.createVNode(_component_CalendarButton, {
                         type: "button",
                         label: $options.clearLabel,
-                        onClick: _cache[46] || (_cache[46] = $event => ($options.onClearButtonClick($event))),
+                        onClick: _cache[64] || (_cache[64] = $event => ($options.onClearButtonClick($event))),
                         class: "p-button-text",
                         onKeydown: $options.onContainerButtonKeydown
                       }, null, 8, ["label", "onKeydown"])
                     ]))
                   : vue.createCommentVNode("", true),
                 vue.renderSlot(_ctx.$slots, "footer")
-              ], 10, ["role"]))
+              ], 42, ["role"]))
             : vue.createCommentVNode("", true)
         ]),
         _: 3
@@ -2549,7 +2866,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css_248z = "\n.p-calendar {\n    position: relative;\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n}\n.p-calendar .p-inputtext {\n    -webkit-box-flex: 1;\n        -ms-flex: 1 1 auto;\n            flex: 1 1 auto;\n    width: 1%;\n}\n.p-calendar-w-btn .p-inputtext {\n    border-top-right-radius: 0;\n    border-bottom-right-radius: 0;\n}\n.p-calendar-w-btn .p-datepicker-trigger {\n    border-top-left-radius: 0;\n    border-bottom-left-radius: 0;\n}\n\n/* Fluid */\n.p-fluid .p-calendar {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n}\n.p-fluid .p-calendar .p-inputtext {\n    width: 1%;\n}\n\n/* Datepicker */\n.p-calendar .p-datepicker {\n    min-width: 100%;\n}\n.p-datepicker {\n\twidth: auto;\n    position: absolute;\n    top: 0;\n    left: 0;\n}\n.p-datepicker-inline {\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    position: static;\n}\n\n/* Header */\n.p-datepicker-header {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: justify;\n        -ms-flex-pack: justify;\n            justify-content: space-between;\n}\n.p-datepicker-header .p-datepicker-title {\n    margin: 0 auto;\n}\n.p-datepicker-prev,\n.p-datepicker-next {\n    cursor: pointer;\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    overflow: hidden;\n    position: relative;\n}\n\n/* Multiple Month DatePicker */\n.p-datepicker-multiple-month .p-datepicker-group-container {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n}\n\n/* DatePicker Table */\n.p-datepicker table {\n\twidth: 100%;\n\tborder-collapse: collapse;\n}\n.p-datepicker td > span {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    cursor: pointer;\n    margin: 0 auto;\n    overflow: hidden;\n    position: relative;\n}\n\n/* Month Picker */\n.p-monthpicker-month {\n    width: 33.3%;\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    cursor: pointer;\n    overflow: hidden;\n    position: relative;\n}\n\n/*  Button Bar */\n.p-datepicker-buttonbar {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-pack: justify;\n        -ms-flex-pack: justify;\n            justify-content: space-between;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n\n/* Time Picker */\n.p-timepicker {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n.p-timepicker button {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    cursor: pointer;\n    overflow: hidden;\n    position: relative;\n}\n.p-timepicker > div {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-orient: vertical;\n    -webkit-box-direction: normal;\n        -ms-flex-direction: column;\n            flex-direction: column;\n}\n\n/* Touch UI */\n.p-datepicker-touch-ui,\n.p-calendar .p-datepicker-touch-ui {\n    position: fixed;\n    top: 50%;\n    left: 50%;\n    min-width: 80vw;\n    -webkit-transform: translate(-50%, -50%);\n            transform: translate(-50%, -50%);\n}\n";
+var css_248z = "\n.p-calendar {\n    position: relative;\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    max-width: 100%;\n}\n.p-calendar .p-inputtext {\n    -webkit-box-flex: 1;\n        -ms-flex: 1 1 auto;\n            flex: 1 1 auto;\n    width: 1%;\n}\n.p-calendar-w-btn .p-inputtext {\n    border-top-right-radius: 0;\n    border-bottom-right-radius: 0;\n}\n.p-calendar-w-btn .p-datepicker-trigger {\n    border-top-left-radius: 0;\n    border-bottom-left-radius: 0;\n}\n\n/* Fluid */\n.p-fluid .p-calendar {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n}\n.p-fluid .p-calendar .p-inputtext {\n    width: 1%;\n}\n\n/* Datepicker */\n.p-calendar .p-datepicker {\n    min-width: 100%;\n}\n.p-datepicker {\n\twidth: auto;\n    position: absolute;\n    top: 0;\n    left: 0;\n}\n.p-datepicker-inline {\n    display: inline-block;\n    position: static;\n    overflow-x: auto;\n}\n\n/* Header */\n.p-datepicker-header {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: justify;\n        -ms-flex-pack: justify;\n            justify-content: space-between;\n}\n.p-datepicker-header .p-datepicker-title {\n    margin: 0 auto;\n}\n.p-datepicker-prev,\n.p-datepicker-next {\n    cursor: pointer;\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    overflow: hidden;\n    position: relative;\n}\n\n/* Multiple Month DatePicker */\n.p-datepicker-multiple-month .p-datepicker-group-container {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n}\n.p-datepicker-multiple-month .p-datepicker-group-container .p-datepicker-group {\n    -webkit-box-flex: 1;\n        -ms-flex: 1 1 auto;\n            flex: 1 1 auto;\n}\n\n/* DatePicker Table */\n.p-datepicker table {\n\twidth: 100%;\n\tborder-collapse: collapse;\n}\n.p-datepicker td > span {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    cursor: pointer;\n    margin: 0 auto;\n    overflow: hidden;\n    position: relative;\n}\n\n/* Month Picker */\n.p-monthpicker-month {\n    width: 33.3%;\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    cursor: pointer;\n    overflow: hidden;\n    position: relative;\n}\n\n/* Year Picker */\n.p-yearpicker-year {\n    width: 50%;\n    display: -webkit-inline-box;\n    display: -ms-inline-flexbox;\n    display: inline-flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    cursor: pointer;\n    overflow: hidden;\n    position: relative;\n}\n\n/*  Button Bar */\n.p-datepicker-buttonbar {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-pack: justify;\n        -ms-flex-pack: justify;\n            justify-content: space-between;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n\n/* Time Picker */\n.p-timepicker {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n.p-timepicker button {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-pack: center;\n        -ms-flex-pack: center;\n            justify-content: center;\n    cursor: pointer;\n    overflow: hidden;\n    position: relative;\n}\n.p-timepicker > div {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n    -webkit-box-orient: vertical;\n    -webkit-box-direction: normal;\n        -ms-flex-direction: column;\n            flex-direction: column;\n}\n\n/* Touch UI */\n.p-datepicker-touch-ui,\n.p-calendar .p-datepicker-touch-ui {\n    position: fixed;\n    top: 50%;\n    left: 50%;\n    min-width: 80vw;\n    -webkit-transform: translate(-50%, -50%);\n            transform: translate(-50%, -50%);\n}\n";
 styleInject(css_248z);
 
 script.render = render;