Fixed #1705 - optionDisabled prop on Dropdown wrongly typed

primefaces · Nov 17, 2021 · 5a91e00 · 5a91e00
1 parent 91635f7
commit 5a91e00
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/src/components/dropdown/Dropdown.d.ts b/src/components/dropdown/Dropdown.d.ts
@@ -1,12 +1,14 @@
 import { VNode } from 'vue';
 import VirtualScrollerProps from '../virtualscroller';
 
+type DropdownOptionDisabledType = string | ((data: any) => boolean) | undefined;
+
 interface DropdownProps {
     modelValue?: any;
     options?: any[];
     optionLabel?: string;
     optionValue?: any;
-    optionDisabled?: boolean;
+    optionDisabled?: DropdownOptionDisabledType;
     optionGroupLabel?: string;
     optionGroupChildren?: string;
     scrollHeight?: string;

diff --git a/src/components/listbox/Listbox.d.ts b/src/components/listbox/Listbox.d.ts
@@ -1,12 +1,14 @@
 import { VNode } from 'vue';
 import VirtualScrollerProps from '../virtualscroller';
 
+type ListboxOptionDisabledType = string | ((data: any) => boolean) | undefined;
+
 interface ListboxProps {
     modelValue?: any;
     options?: any[];
     optionLabel?: string;
     optionValue?: any;
-    optionDisabled?: boolean;
+    optionDisabled?: ListboxOptionDisabledType;
     optionGroupLabel?: string;
     optionGroupChildren?: string;
     listStyle?: string;

diff --git a/src/components/multiselect/MultiSelect.d.ts b/src/components/multiselect/MultiSelect.d.ts
@@ -1,12 +1,14 @@
 import { VNode } from 'vue';
 import VirtualScrollerProps from '../virtualscroller';
 
+type MultiSelectOptionDisabledType = string | ((data: any) => boolean) | undefined;
+
 interface MultiSelectProps {
     modelValue?: any;
     options?: any[];
     optionLabel?: string;
     optionValue?: any;
-    optionDisabled?: boolean;
+    optionDisabled?: MultiSelectOptionDisabledType;
     optionGroupLabel?: string;
     optionGroupChildren?: string;
     scrollHeight?: string;

diff --git a/src/components/selectbutton/SelectButton.d.ts b/src/components/selectbutton/SelectButton.d.ts
@@ -1,9 +1,11 @@
+type SelectButtonOptionDisabledType = string | ((data: any) => boolean) | undefined;
+
 interface SelectButtonProps {
     modelValue?: any;
     options?: any[];
     optionLabel?: string;
     optionValue?: any;
-    optionDisabled?: boolean;
+    optionDisabled?: SelectButtonOptionDisabledType;
     multiple?: boolean;
     disabled?: boolean;
     dataKey?: string;

diff --git a/src/views/dropdown/DropdownDoc.vue b/src/views/dropdown/DropdownDoc.vue
@@ -157,7 +157,7 @@ export default {
                     </tr>
                     <tr>
                         <td>optionDisabled</td>
-                        <td>boolean</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the disabled flag of an option, defaults to false when not defined.</td>
                     </tr>

diff --git a/src/views/listbox/ListboxDoc.vue b/src/views/listbox/ListboxDoc.vue
@@ -154,7 +154,7 @@ export default {
                     </tr>
                     <tr>
                         <td>optionDisabled</td>
-                        <td>boolean</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the disabled flag of an option, defaults to false when not defined.</td>
                     </tr>

diff --git a/src/views/multiselect/MultiSelectDoc.vue b/src/views/multiselect/MultiSelectDoc.vue
@@ -166,7 +166,7 @@ export default {
                     </tr>
                     <tr>
                         <td>optionDisabled</td>
-                        <td>boolean</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the disabled flag of an option, defaults to false when not defined.</td>
                     </tr>

diff --git a/src/views/selectbutton/SelectButtonDoc.vue b/src/views/selectbutton/SelectButtonDoc.vue
@@ -96,7 +96,7 @@ export default {
                     </tr>
                     <tr>
                         <td>optionDisabled</td>
-                        <td>boolean</td>
+                        <td>string | function</td>
                         <td>null</td>
                         <td>Property name or getter function to use as the disabled flag of an option, defaults to false when not defined.</td>
                     </tr>