Merge branch 'primefaces:master' into fix--6153

primefaces · Aug 1, 2024 · a8bc83d · a8bc83d
2 parents eff82df + 706e623
commit a8bc83d
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 41 deletions.
diff --git a/packages/core/src/config/PrimeVue.js b/packages/core/src/config/PrimeVue.js
@@ -3,6 +3,7 @@ import { FilterMatchMode } from '@primevue/core/api';
 import BaseStyle from '@primevue/core/base/style';
 import PrimeVueService from '@primevue/core/service';
 import { inject, reactive, ref, watch } from 'vue';
+import { mergeKeys } from '@primeuix/utils';
 
 export const defaultOptions = {
     ripple: false,
@@ -266,7 +267,7 @@ export function setupConfig(app, PrimeVue) {
 
 export default {
     install: (app, options) => {
-        const configOptions = { ...defaultOptions, ...options };
+        const configOptions = mergeKeys(defaultOptions, options);
 
         setup(app, configOptions);
     }

diff --git a/packages/primevue/src/contextmenu/ContextMenu.vue b/packages/primevue/src/contextmenu/ContextMenu.vue
@@ -324,7 +324,7 @@ export default {
         onEnterKey(event) {
             if (this.focusedItemInfo.index !== -1) {
                 const element = findSingle(this.list, `li[id="${`${this.focusedItemIdx}`}"]`);
-                const anchorElement = element && findSingle(element, 'a[data-pc-section="itemlink"]');
+                const anchorElement = element && findSingle(element, '[data-pc-section="itemlink"]');
 
                 anchorElement ? anchorElement.click() : element && element.click();
                 const processedItem = this.visibleItems[this.focusedItemInfo.index];

diff --git a/packages/primevue/src/datepicker/DatePicker.vue b/packages/primevue/src/datepicker/DatePicker.vue
@@ -1735,7 +1735,7 @@ export default {
                 }
             } else if (value.every((v) => this.isSelectable(v.getDate(), v.getMonth(), v.getFullYear(), false))) {
                 if (this.isRangeSelection()) {
-                    isValid = value.length > 1 && value[1] > value[0] ? true : false;
+                    isValid = value.length > 1 && value[1] >= value[0];
                 }
             }
 
@@ -2516,7 +2516,7 @@ export default {
                 cell = findSingle(this.overlay, 'span[data-p-selected="true"]');
 
                 if (!cell) {
-                    let todayCell = findSingle(this.overlay, 'td.p-datepicker-today span:not([data-p-disabled="true"]):not([data-p-ink="true"])');
+                    let todayCell = findSingle(this.overlay, 'td[data-p-today="true"] span:not([data-p-disabled="true"]):not([data-p-ink="true"])');
 
                     if (todayCell) cell = todayCell;
                     else cell = findSingle(this.overlay, '.p-datepicker-calendar td span:not([data-p-disabled="true"]):not([data-p-ink="true"])');
@@ -2645,6 +2645,8 @@ export default {
                         /* NoOp */
                     }
                 }
+
+                this.$emit('keydown', event);
             }
         },
         overlayRef(el) {

diff --git a/packages/primevue/src/datepicker/style/DatePickerStyle.js b/packages/primevue/src/datepicker/style/DatePickerStyle.js
@@ -418,7 +418,7 @@ const classes = {
         let selectedDayClass = '';
 
         if (instance.isRangeSelection() && instance.isSelected(date) && date.selectable) {
-            selectedDayClass = date.day === props.modelValue[0].getDate() || date.day === props.modelValue[1].getDate() ? 'p-datepicker-day-selected' : 'p-datepicker-day-selected-range';
+            selectedDayClass = instance.isDateEquals(props.modelValue[0], date) || instance.isDateEquals(props.modelValue[1], date) ? 'p-datepicker-day-selected' : 'p-datepicker-day-selected-range';
         }
 
         return [

diff --git a/packages/primevue/src/drawer/Drawer.vue b/packages/primevue/src/drawer/Drawer.vue
@@ -31,7 +31,7 @@
                         <div :ref="contentRef" :class="cx('content')" v-bind="ptm('content')">
                             <slot></slot>
                         </div>
-                        <div :ref="footerContainerRef" :class="cx('footer')" v-bind="ptm('footer')">
+                        <div v-if="$slots.footer" :ref="footerContainerRef" :class="cx('footer')" v-bind="ptm('footer')">
                             <slot name="footer"> </slot>
                         </div>
                     </template>
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { addClass, focus, blockBodyScroll, unblockBodyScroll } from '@primeuix/utils/dom';
+import { addClass, blockBodyScroll, focus, unblockBodyScroll } from '@primeuix/utils/dom';
 import { ZIndex } from '@primeuix/utils/zindex';
 import TimesIcon from '@primevue/icons/times';
 import Button from 'primevue/button';

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml