From 411d0028341f8737ab57bd2cdef93dc09572cf36 Mon Sep 17 00:00:00 2001
From: tugcekucukoglu <tugcekucukoglu.860@gmail.com>
Date: Wed, 12 Jun 2024 17:55:24 +0300
Subject: [PATCH] Ports from v3

---
 packages/primevue/src/autocomplete/AutoComplete.vue | 2 +-
 packages/primevue/src/datatable/DataTable.d.ts      | 2 +-
 packages/primevue/src/datepicker/BaseDatePicker.vue | 4 ++++
 packages/primevue/src/datepicker/DatePicker.d.ts    | 4 ++++
 packages/primevue/src/datepicker/DatePicker.vue     | 1 +
 packages/primevue/src/inputotp/InputOtp.vue         | 4 ++++
 packages/primevue/src/listbox/Listbox.d.ts          | 2 +-
 packages/primevue/src/multiselect/MultiSelect.d.ts  | 2 +-
 packages/primevue/src/password/BasePassword.vue     | 4 ++--
 packages/primevue/src/password/Password.d.ts        | 6 +++---
 packages/primevue/src/select/Select.d.ts            | 2 +-
 packages/primevue/src/splitbutton/SplitButton.vue   | 1 +
 packages/primevue/src/tieredmenu/TieredMenu.vue     | 5 +++--
 packages/primevue/src/treeselect/TreeSelect.d.ts    | 2 +-
 14 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/packages/primevue/src/autocomplete/AutoComplete.vue b/packages/primevue/src/autocomplete/AutoComplete.vue
index 4b5ac5ebd..2117ea4c0 100755
--- a/packages/primevue/src/autocomplete/AutoComplete.vue
+++ b/packages/primevue/src/autocomplete/AutoComplete.vue
@@ -55,7 +55,7 @@
                 :aria-posinset="i + 1"
                 v-bind="ptm('chipItem')"
             >
-                <slot name="chip" :class="cx('pcChip')" :value="option" :index="i" :removeCallback="(event) => removeOption(event, i)">
+                <slot name="chip" :class="cx('pcChip')" :value="option" :index="i" :removeCallback="(event) => removeOption(event, i)" v-bind="ptm('pcChip')">
                     <!-- TODO: removetokenicon and removeTokenIcon  deprecated since v4.0. Use chipicon slot and chipIcon prop-->
                     <Chip :class="cx('pcChip')" :label="getOptionLabel(option)" :removeIcon="chipIcon || removeTokenIcon" removable :unstyled="unstyled" @remove="removeOption($event, i)" :pt="ptm('pcChip')">
                         <template #removeicon>
diff --git a/packages/primevue/src/datatable/DataTable.d.ts b/packages/primevue/src/datatable/DataTable.d.ts
index 3c5426504..a75c818bc 100755
--- a/packages/primevue/src/datatable/DataTable.d.ts
+++ b/packages/primevue/src/datatable/DataTable.d.ts
@@ -129,7 +129,7 @@ export interface DataTableSortMeta {
     /**
      * Column field
      */
-    field: string;
+    field: string | ((item: any) => string) | undefined;
     /**
      * Column sort order
      */
diff --git a/packages/primevue/src/datepicker/BaseDatePicker.vue b/packages/primevue/src/datepicker/BaseDatePicker.vue
index 06260589a..1a1939e99 100644
--- a/packages/primevue/src/datepicker/BaseDatePicker.vue
+++ b/packages/primevue/src/datepicker/BaseDatePicker.vue
@@ -180,6 +180,10 @@ export default {
             type: String,
             default: null
         },
+        name: {
+            type: String,
+            default: null
+        },
         id: {
             type: String,
             default: null
diff --git a/packages/primevue/src/datepicker/DatePicker.d.ts b/packages/primevue/src/datepicker/DatePicker.d.ts
index 1f8b0df89..9ddfda7b9 100755
--- a/packages/primevue/src/datepicker/DatePicker.d.ts
+++ b/packages/primevue/src/datepicker/DatePicker.d.ts
@@ -731,6 +731,10 @@ export interface DatePickerProps {
      * Placeholder text for the input.
      */
     placeholder?: string | undefined;
+    /**
+     * Name of the element.
+     */
+    name?: string | undefined;
     /**
      * A valid query selector or an HTMLElement to specify where the overlay gets attached.
      * @defaultValue body
diff --git a/packages/primevue/src/datepicker/DatePicker.vue b/packages/primevue/src/datepicker/DatePicker.vue
index 7294f977d..c2770cf6e 100755
--- a/packages/primevue/src/datepicker/DatePicker.vue
+++ b/packages/primevue/src/datepicker/DatePicker.vue
@@ -9,6 +9,7 @@
             :style="inputStyle"
             :value="inputFieldValue"
             :placeholder="placeholder"
+            :name="name"
             :invalid="invalid"
             :variant="variant"
             :unstyled="unstyled"
diff --git a/packages/primevue/src/inputotp/InputOtp.vue b/packages/primevue/src/inputotp/InputOtp.vue
index e40668dd5..f9828b55d 100755
--- a/packages/primevue/src/inputotp/InputOtp.vue
+++ b/packages/primevue/src/inputotp/InputOtp.vue
@@ -129,6 +129,10 @@ export default {
             this.$emit('blur', event);
         },
         onKeyDown(event) {
+            if (event.ctrlKey || event.metaKey) {
+                return;
+            }
+
             switch (event.code) {
                 case 'ArrowLeft':
                     this.moveToPrev(event);
diff --git a/packages/primevue/src/listbox/Listbox.d.ts b/packages/primevue/src/listbox/Listbox.d.ts
index 4e802965c..27bf7e030 100755
--- a/packages/primevue/src/listbox/Listbox.d.ts
+++ b/packages/primevue/src/listbox/Listbox.d.ts
@@ -391,7 +391,7 @@ export interface ListboxProps {
     emptyFilterMessage?: string | undefined;
     /**
      * Text to display when there are no options available. Defaults to value from PrimeVue locale configuration.
-     * @defaultValue No results found
+     * @defaultValue No available options
      */
     emptyMessage?: string | undefined;
     /**
diff --git a/packages/primevue/src/multiselect/MultiSelect.d.ts b/packages/primevue/src/multiselect/MultiSelect.d.ts
index 627decbc5..51cbaf21d 100755
--- a/packages/primevue/src/multiselect/MultiSelect.d.ts
+++ b/packages/primevue/src/multiselect/MultiSelect.d.ts
@@ -526,7 +526,7 @@ export interface MultiSelectProps {
     emptyFilterMessage?: string | undefined;
     /**
      * Text to display when there are no options available. Defaults to value from PrimeVue locale configuration.
-     * @defaultValue No results found'
+     * @defaultValue No available options'
      */
     emptyMessage?: string | undefined;
     /**
diff --git a/packages/primevue/src/password/BasePassword.vue b/packages/primevue/src/password/BasePassword.vue
index 95a2ca94d..0f2d2d67d 100644
--- a/packages/primevue/src/password/BasePassword.vue
+++ b/packages/primevue/src/password/BasePassword.vue
@@ -12,11 +12,11 @@ export default {
             default: null
         },
         mediumRegex: {
-            type: String,
+            type: [String, RegExp],
             default: '^(((?=.*[a-z])(?=.*[A-Z]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[A-Z])(?=.*[0-9])))(?=.{6,})' // eslint-disable-line
         },
         strongRegex: {
-            type: String,
+            type: [String, RegExp],
             default: '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.{8,})' // eslint-disable-line
         },
         weakLabel: {
diff --git a/packages/primevue/src/password/Password.d.ts b/packages/primevue/src/password/Password.d.ts
index e330d2fe0..04cf9b6c8 100755
--- a/packages/primevue/src/password/Password.d.ts
+++ b/packages/primevue/src/password/Password.d.ts
@@ -11,7 +11,7 @@ import type { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor,
 import type { ComponentHooks } from '@primevue/core/basecomponent';
 import type { InputTextPassThroughOptions } from 'primevue/inputtext';
 import type { PassThroughOptions } from 'primevue/passthrough';
-import { HTMLAttributes, InputHTMLAttributes, TransitionProps, VNode } from 'vue';
+import { InputHTMLAttributes, TransitionProps, VNode } from 'vue';
 
 export declare type PasswordPassThroughOptionType = PasswordPassThroughAttributes | ((options: PasswordPassThroughMethodOptions) => PasswordPassThroughAttributes | string) | string | null | undefined;
 
@@ -182,12 +182,12 @@ export interface PasswordProps extends InputHTMLAttributes {
      * Regex for a medium level password.
      * @defaultValue ^(((?=.*[a-z])(?=.*[A-Z]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[A-Z])(?=.*[0-9])))(?=.{6,})
      */
-    mediumRegex?: string | undefined;
+    mediumRegex?: string | RegExp | undefined;
     /**
      * Regex for a strong level password.
      * @defaultValue ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.{8,})
      */
-    strongRegex?: string | undefined;
+    strongRegex?: string | RegExp | undefined;
     /**
      * Text for a weak password. Defaults to PrimeVue Locale configuration.
      */
diff --git a/packages/primevue/src/select/Select.d.ts b/packages/primevue/src/select/Select.d.ts
index ffe98f613..ba505aa18 100755
--- a/packages/primevue/src/select/Select.d.ts
+++ b/packages/primevue/src/select/Select.d.ts
@@ -512,7 +512,7 @@ export interface SelectProps {
     emptyFilterMessage?: string | undefined;
     /**
      * Text to display when there are no options available. Defaults to value from PrimeVue locale configuration.
-     * @defaultValue No results found
+     * @defaultValue No available options
      */
     emptyMessage?: string | undefined;
     /**
diff --git a/packages/primevue/src/splitbutton/SplitButton.vue b/packages/primevue/src/splitbutton/SplitButton.vue
index f780c554e..57ffc62ff 100755
--- a/packages/primevue/src/splitbutton/SplitButton.vue
+++ b/packages/primevue/src/splitbutton/SplitButton.vue
@@ -7,6 +7,7 @@
             :disabled="disabled"
             :severity="severity"
             :text="text"
+            :icon="icon"
             :outlined="outlined"
             :size="size"
             :aria-label="label"
diff --git a/packages/primevue/src/tieredmenu/TieredMenu.vue b/packages/primevue/src/tieredmenu/TieredMenu.vue
index 234f0ed30..4dc7a8c2f 100755
--- a/packages/primevue/src/tieredmenu/TieredMenu.vue
+++ b/packages/primevue/src/tieredmenu/TieredMenu.vue
@@ -383,11 +383,12 @@ export default {
             this.onEnterKey(event);
         },
         onEscapeKey(event) {
-            if (this.focusedItemInfo.level !== 0) {
+            if (this.popup || this.focusedItemInfo.level !== 0) {
                 const _focusedItemInfo = this.focusedItemInfo;
 
                 this.hide(event, false);
-                !this.popup && (this.focusedItemInfo = { index: Number(_focusedItemInfo.parentKey.split('_')[0]), level: 0, parentKey: '' });
+                this.focusedItemInfo = { index: Number(_focusedItemInfo.parentKey.split('_')[0]), level: 0, parentKey: '' };
+                this.popup && DomHandler.focus(this.target);
             }
 
             event.preventDefault();
diff --git a/packages/primevue/src/treeselect/TreeSelect.d.ts b/packages/primevue/src/treeselect/TreeSelect.d.ts
index dfecd8429..b5a1bb87d 100644
--- a/packages/primevue/src/treeselect/TreeSelect.d.ts
+++ b/packages/primevue/src/treeselect/TreeSelect.d.ts
@@ -215,7 +215,7 @@ export interface TreeSelectProps {
     appendTo?: HintedString<'body' | 'self'> | undefined | HTMLElement;
     /**
      * Text to display when there are no options available. Defaults to value from PrimeVue locale configuration.
-     * @defaultValue No results found
+     * @defaultValue No available options
      */
     emptyMessage?: string | undefined;
     /**