Merge branch 'master' of https://github.com/primefaces/primevue

primefaces · Dec 30, 2024 · ec0a5f4 · ec0a5f4
2 parents 3161e53 + 2950c76
commit ec0a5f4
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 63 deletions.
diff --git a/packages/primevue/src/cascadeselect/style/CascadeSelectStyle.js b/packages/primevue/src/cascadeselect/style/CascadeSelectStyle.js
@@ -271,7 +271,7 @@ const classes = {
         'p-cascadeselect-label',
         {
             'p-placeholder': instance.label === props.placeholder,
-            'p-cascadeselect-label-empty': !instance.$slots['value'] && (instance.label === 'p-emptylabel' || instance.label.length === 0)
+            'p-cascadeselect-label-empty': !instance.$slots['value'] && (instance.label === 'p-emptylabel' || instance.label?.length === 0)
         }
     ],
     clearIcon: 'p-cascadeselect-clear-icon',

diff --git a/packages/primevue/src/datepicker/DatePicker.vue b/packages/primevue/src/datepicker/DatePicker.vue
@@ -1329,6 +1329,8 @@ export default {
                     if (lookAhead(match)) {
                         while (num.length < len) {
                             num = '0' + num;
+                            this.selectionStart = this.selectionStart + 1;
+                            this.selectionEnd = this.selectionEnd + 1;
                         }
                     }
 

diff --git a/packages/primevue/src/select/Select.vue b/packages/primevue/src/select/Select.vue
@@ -798,7 +798,10 @@ export default {
         hasFocusableElements() {
             return getFocusableElements(this.overlay, ':not([data-p-hidden-focusable="true"])').length > 0;
         },
-        isOptionMatched(option) {
+        isOptionExactMatched(option) {
+            return this.isValidOption(option) && typeof this.getOptionLabel(option) === 'string' && this.getOptionLabel(option)?.toLocaleLowerCase(this.filterLocale) == this.searchValue.toLocaleLowerCase(this.filterLocale);
+        },
+        isOptionStartsWith(option) {
             return this.isValidOption(option) && typeof this.getOptionLabel(option) === 'string' && this.getOptionLabel(option)?.toLocaleLowerCase(this.filterLocale).startsWith(this.searchValue.toLocaleLowerCase(this.filterLocale));
         },
         isValidOption(option) {
@@ -846,11 +849,10 @@ export default {
             let matched = false;
 
             if (isNotEmpty(this.searchValue)) {
-                if (this.focusedOptionIndex !== -1) {
-                    optionIndex = this.visibleOptions.slice(this.focusedOptionIndex).findIndex((option) => this.isOptionMatched(option));
-                    optionIndex = optionIndex === -1 ? this.visibleOptions.slice(0, this.focusedOptionIndex).findIndex((option) => this.isOptionMatched(option)) : optionIndex + this.focusedOptionIndex;
-                } else {
-                    optionIndex = this.visibleOptions.findIndex((option) => this.isOptionMatched(option));
+                optionIndex = this.visibleOptions.findIndex((option) => this.isOptionExactMatched(option));
+
+                if (optionIndex === -1) {
+                    optionIndex = this.visibleOptions.findIndex((option) => this.isOptionStartsWith(option));
                 }
 
                 if (optionIndex !== -1) {

diff --git a/packages/primevue/src/tree/Tree.spec.js b/packages/primevue/src/tree/Tree.spec.js
@@ -50,6 +50,7 @@ describe('Tree.vue', () => {
 
         let searchField = wrapper.find('input.p-inputtext');
         const key = 't';
+
         searchField.element.value = key;
 
         await searchField.trigger('keyup', {

diff --git a/packages/primevue/src/virtualscroller/VirtualScroller.vue b/packages/primevue/src/virtualscroller/VirtualScroller.vue
@@ -91,11 +91,12 @@ export default {
                 this.d_loading = newValue;
             }
         },
-        items(newValue, oldValue) {
-            if (!oldValue || oldValue.length !== (newValue || []).length) {
+        items: {
+            handler(newValue) {
                 this.init();
                 this.calculateAutoSize();
-            }
+            },
+            deep: true
         },
         itemSize() {
             this.init();