diff --git a/api-generator/components/cascadeselect.js b/api-generator/components/cascadeselect.js
index 36c65374e..6b8efbb40 100644
--- a/api-generator/components/cascadeselect.js
+++ b/api-generator/components/cascadeselect.js
@@ -13,25 +13,25 @@ const CascadeSelectProps = [
     },
     {
         name: "optionLabel",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the label of an option."
     },
     {
         name: "optionValue",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the value of an option, defaults to the option itself when not defined."
     },
     {
         name: "optionGroupLabel",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the label of an option group."
     },
     {
         name: "optionGroupChildren",
-        type: "array",
+        type: "array | function",
         default: "null",
         description: "Property name or getter function to retrieve the items of a group."
     },
diff --git a/api-generator/components/dropdown.js b/api-generator/components/dropdown.js
index 36d4936f8..8bad4e2db 100644
--- a/api-generator/components/dropdown.js
+++ b/api-generator/components/dropdown.js
@@ -13,13 +13,13 @@ const DropdownProps = [
     },
     {
         name: "optionLabel",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the label of an option."
     },
     {
         name: "optionValue",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the value of an option, defaults to the option itself when not defined."
     },
@@ -31,13 +31,13 @@ const DropdownProps = [
     },
     {
         name: "optionGroupLabel",
-        type: "string",
+        type: "string | function",
         default: "null",
         description:  "Property name or getter function to use as the label of an option group."
     },
     {
         name: "optionGroupChildren",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function that refers to the children options of option group."
     },
diff --git a/api-generator/components/listbox.js b/api-generator/components/listbox.js
index 37413fe1f..f13c660d6 100644
--- a/api-generator/components/listbox.js
+++ b/api-generator/components/listbox.js
@@ -13,31 +13,31 @@ const ListboxProps = [
     },
     {
         name: "optionLabel",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the label of an option."
     },
     {
         name: "optionValue",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the value of an option, defaults to the option itself when not defined."
     },
     {
         name: "optionDisabled",
-        type: "boolean",
+        type: "boolean | function",
         default: "null",
         description: "Property name or getter function to use as the disabled flag of an option, defaults to false when not defined."
     },
     {
         name: "optionGroupLabel",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the label of an option group."
     },
     {
         name: "optionGroupChildren",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function that refers to the children options of option group."
     },
diff --git a/api-generator/components/multiselect.js b/api-generator/components/multiselect.js
index efc1919cd..a21205705 100644
--- a/api-generator/components/multiselect.js
+++ b/api-generator/components/multiselect.js
@@ -19,25 +19,25 @@ const MultiSelectProps = [
     },
     {
         name: "optionValue",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the value of an option, defaults to the option itself when not defined."
     },
     {
         name: "optionDisabled",
-        type: "boolean",
+        type: "boolean | function",
         default: "null",
         description: "Property name or getter function to use as the disabled flag of an option, defaults to false when not defined."
     },
     {
         name: "optionGroupLabel",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function to use as the label of an option group."
     },
     {
         name: "optionGroupChildren",
-        type: "string",
+        type: "string | function",
         default: "null",
         description: "Property name or getter function that refers to the children options of option group."
     },
diff --git a/src/views/cascadeselect/CascadeSelectDoc.vue b/src/views/cascadeselect/CascadeSelectDoc.vue
index 2c0e405a5..87f554508 100644
--- a/src/views/cascadeselect/CascadeSelectDoc.vue
+++ b/src/views/cascadeselect/CascadeSelectDoc.vue
@@ -156,25 +156,25 @@ data() {
                     </tr>
                     <tr>
                         <td>optionLabel</td>
-                        <td>string</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the label of an option.</td>
                     </tr>
                     <tr>
                         <td>optionValue</td>
-                        <td>string</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the value of an option, defaults to the option itself when not defined.</td>
                     </tr>
                     <tr>
                         <td>optionGroupLabel</td>
-                        <td>string</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the label of an option group.</td>
                     </tr>
                     <tr>
                         <td>optionGroupChildren</td>
-                        <td>array</td>
+                        <td>array | function</td>
                         <td>null</td>
                         <td>Property name or getter function to retrieve the items of a group.</td>
                     </tr>
diff --git a/src/views/dropdown/DropdownDoc.vue b/src/views/dropdown/DropdownDoc.vue
index 40c42f301..83c3cbc95 100755
--- a/src/views/dropdown/DropdownDoc.vue
+++ b/src/views/dropdown/DropdownDoc.vue
@@ -411,7 +411,7 @@ export default {
                         <td>option: OptionGroup instance <br />
                             index: Index of the option group</td>
                     </tr>
-                     <tr>
+                    <tr>
                         <td>value</td>
                         <td>value: Value of the component <br />
                             placeholder: Placeholder prop value</td>
diff --git a/src/views/listbox/ListboxDoc.vue b/src/views/listbox/ListboxDoc.vue
index d303f6579..b46bb3f19 100755
--- a/src/views/listbox/ListboxDoc.vue
+++ b/src/views/listbox/ListboxDoc.vue
@@ -142,13 +142,13 @@ export default {
                     </tr>
                     <tr>
                         <td>optionLabel</td>
-                        <td>string</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the label of an option.</td>
                     </tr>
                     <tr>
                         <td>optionValue</td>
-                        <td>string</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the value of an option, defaults to the option itself when not defined.</td>
                     </tr>
@@ -160,13 +160,13 @@ export default {
                     </tr>
                     <tr>
                         <td>optionGroupLabel</td>
-                        <td>string</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the label of an option group.</td>
                     </tr>
                     <tr>
                         <td>optionGroupChildren</td>
-                        <td>string</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function that refers to the children options of option group.</td>
                     </tr>