From a42abd68a07b124c5152f83148befffa586cd942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tu=C4=9F=C3=A7e=20K=C3=BC=C3=A7=C3=BCko=C4=9Flu?= Date: Tue, 18 Apr 2023 10:37:05 +0300 Subject: [PATCH] Refactor #3832 Refactor #3833 - Chips update & .d.ts fixes --- components/lib/autocomplete/AutoComplete.d.ts | 3 +++ components/lib/avatar/Avatar.d.ts | 5 +++++ components/lib/calendar/Calendar.d.ts | 7 ++++++- components/lib/carousel/Carousel.d.ts | 2 +- components/lib/cascadeselect/CascadeSelect.d.ts | 11 +++++++++++ components/lib/chip/Chip.d.ts | 10 ++++++++-- components/lib/chips/Chips.d.ts | 10 +++++++++- components/lib/chips/Chips.vue | 2 +- components/lib/column/Column.d.ts | 5 +++++ components/lib/column/Column.vue | 2 +- components/lib/datatable/DataTable.d.ts | 3 +++ 11 files changed, 53 insertions(+), 7 deletions(-) diff --git a/components/lib/autocomplete/AutoComplete.d.ts b/components/lib/autocomplete/AutoComplete.d.ts index def676430..ff0dcaca5 100755 --- a/components/lib/autocomplete/AutoComplete.d.ts +++ b/components/lib/autocomplete/AutoComplete.d.ts @@ -206,6 +206,7 @@ export interface AutoCompleteProps { panelProps?: HTMLAttributes | undefined; /** * Icon to display in the dropdown. + * @deprecated since v3.27.0. Use 'dropdownicon' slot. */ dropdownIcon?: string | undefined; /** @@ -214,10 +215,12 @@ export interface AutoCompleteProps { dropdownClass?: string | object | undefined; /** * Icon to display in loading state. + * @deprecated since v3.27.0. Use 'loadingicon' slot. */ loadingIcon?: string | undefined; /** * Icon to display in chip remove action. + * @deprecated since v3.27.0. Use 'removetokenicon' slot. */ removeTokenIcon?: string | undefined; /** diff --git a/components/lib/avatar/Avatar.d.ts b/components/lib/avatar/Avatar.d.ts index 3eaef7fdc..0a8ec13b9 100644 --- a/components/lib/avatar/Avatar.d.ts +++ b/components/lib/avatar/Avatar.d.ts @@ -19,6 +19,7 @@ export interface AvatarProps { label?: string | undefined; /** * Defines the icon to display. + * @deprecated since v3.27.0. Use 'icon' slot. */ icon?: string | undefined; /** @@ -53,6 +54,10 @@ export interface AvatarSlots { * Content can easily be customized with the default slot instead of using the built-in modes. */ default(): VNode[]; + /** + * Content can easily be customized with the default slot instead of using the built-in modes. + */ + icon(): VNode[]; } /** diff --git a/components/lib/calendar/Calendar.d.ts b/components/lib/calendar/Calendar.d.ts index 78c91e8c9..b90945efe 100755 --- a/components/lib/calendar/Calendar.d.ts +++ b/components/lib/calendar/Calendar.d.ts @@ -109,22 +109,27 @@ export interface CalendarProps { showIcon?: boolean | undefined; /** * Icon of the calendar button. + * @deprecated since v3.27.0. Use 'triggericon' slot. */ icon?: string | undefined; /** * Icon to show in the previous button. + * @deprecated since v3.27.0. Use 'previousicon' slot. */ previousIcon?: string | undefined; /** * Icon to show in the next button. + * @deprecated since v3.27.0. Use 'nexticon' slot. */ nextIcon?: string | undefined; /** * Icon to show in each of the increment buttons. + * @deprecated since v3.27.0. Use 'incrementicon' slot. */ incrementIcon?: string | undefined; /** * Icon to show in each of the decrement buttons. + * @deprecated since v3.27.0. Use 'decrementicon' slot. */ decrementIcon?: string | undefined; /** @@ -370,7 +375,7 @@ export interface CalendarSlots { /** * Custom previous icon template. */ - previcon(): VNode[]; + previousicon(): VNode[]; /** * Custom next icon template. */ diff --git a/components/lib/carousel/Carousel.d.ts b/components/lib/carousel/Carousel.d.ts index 9210bb379..5ba3e4dd8 100755 --- a/components/lib/carousel/Carousel.d.ts +++ b/components/lib/carousel/Carousel.d.ts @@ -133,7 +133,7 @@ export interface CarouselSlots { /** * Custom previous icon template. */ - previcon(): VNode[]; + previousicon(): VNode[]; /** * Custom next icon template. */ diff --git a/components/lib/cascadeselect/CascadeSelect.d.ts b/components/lib/cascadeselect/CascadeSelect.d.ts index deb096a30..e3ef5b5dc 100644 --- a/components/lib/cascadeselect/CascadeSelect.d.ts +++ b/components/lib/cascadeselect/CascadeSelect.d.ts @@ -116,14 +116,17 @@ export interface CascadeSelectProps { loading?: boolean | undefined; /** * Icon to display in the dropdown. + * @deprecated since v3.27.0. Use 'dropdownicon' slot. */ dropdownIcon?: string | undefined; /** * Icon to display in loading state. + * @deprecated since v3.27.0. Use 'loadingicon' slot. */ loadingIcon?: string | undefined; /** * Icon to display in the option group. + * @deprecated since v3.27.0. Use 'optiongroupicon' slot. */ optionGroupIcon?: string | undefined; /** @@ -211,6 +214,14 @@ export interface CascadeSelectSlots { * Custom indicator template. */ indicator(): VNode[]; + /** + * Custom dropdown icon template. + */ + dropdownicon(): VNode[]; + /** + * Custom loading icon template. + */ + loadingicon(): VNode[]; /** * Custom option group icon template. */ diff --git a/components/lib/chip/Chip.d.ts b/components/lib/chip/Chip.d.ts index 2b8204b13..ddf0b676f 100644 --- a/components/lib/chip/Chip.d.ts +++ b/components/lib/chip/Chip.d.ts @@ -20,6 +20,7 @@ export interface ChipProps { label?: string; /** * Defines the icon to display. + * @deprecated since v3.27.0. Use 'icon' slot. */ icon?: string; /** @@ -33,6 +34,7 @@ export interface ChipProps { removable?: boolean; /** * Icon of the remove element. + * @deprecated since v3.27.0. Use 'removeicon' slot. */ removeIcon?: string; } @@ -45,6 +47,10 @@ export interface ChipSlots { * Content can easily be customized with the default slot instead of using the built-in modes. */ default(): VNode[]; + /** + * Custom icon template. + */ + icon(): VNode[]; /** * Custom remove icon template of chip component. * @param {Object} scope - remove icon slot's params. @@ -53,11 +59,11 @@ export interface ChipSlots { /** * Remove icon click event */ - click(): void; + onClick(): void; /** * Remove icon keydown event */ - keydown(): void; + onKeydown(): void; }): VNode[]; } diff --git a/components/lib/chips/Chips.d.ts b/components/lib/chips/Chips.d.ts index c535357ed..21509f45c 100755 --- a/components/lib/chips/Chips.d.ts +++ b/components/lib/chips/Chips.d.ts @@ -72,10 +72,12 @@ export interface ChipsProps { inputStyle?: object | undefined; /** * Uses to pass all properties of the HTMLInputElement to the focusable input element inside the component. + * @deprecated since v3.26.0. Use 'pt' property instead. */ inputProps?: InputHTMLAttributes | undefined; /** * Icon to display in chip remove action. + * @deprecated since v3.27.0. Use 'removetokenicon' slot. */ removeTokenIcon?: string | undefined; /** @@ -111,8 +113,14 @@ export interface ChipsSlots { }): VNode[]; /** * Custom remove token icon template. + * @param {Object} scope - remove token icon slot's params. */ - removetokenicon(): VNode[]; + removetokenicon(scope: { + /** + * Remove icon click event + */ + onClick(): void; + }): VNode[]; } /** * Defines valid emits in Chips component. diff --git a/components/lib/chips/Chips.vue b/components/lib/chips/Chips.vue index 1d9f18a91..9eae6daa7 100755 --- a/components/lib/chips/Chips.vue +++ b/components/lib/chips/Chips.vue @@ -28,7 +28,7 @@ {{ val }} - + diff --git a/components/lib/column/Column.d.ts b/components/lib/column/Column.d.ts index 6b80da152..9fe1efede 100755 --- a/components/lib/column/Column.d.ts +++ b/components/lib/column/Column.d.ts @@ -221,6 +221,7 @@ export interface ColumnProps { rowReorder?: boolean | undefined; /** * Icon of the drag handle to reorder rows. + * @deprecated since v3.27.0. Use 'rowreordericon' slot. */ rowReorderIcon?: string | undefined; /** @@ -557,6 +558,10 @@ export interface ColumnSlots { */ checked: boolean; }): VNode[]; + /** + * Custom row reorder icon template. + */ + rowreordericon(): VNode[]; } export interface ColumnEmits {} diff --git a/components/lib/column/Column.vue b/components/lib/column/Column.vue index f0c23e217..e608dc0f2 100755 --- a/components/lib/column/Column.vue +++ b/components/lib/column/Column.vue @@ -140,7 +140,7 @@ export default { }, rowReorderIcon: { type: String, - default: 'pi pi-bars' + default: undefined }, reorderableColumn: { type: Boolean, diff --git a/components/lib/datatable/DataTable.d.ts b/components/lib/datatable/DataTable.d.ts index aef1f7320..1ae810743 100755 --- a/components/lib/datatable/DataTable.d.ts +++ b/components/lib/datatable/DataTable.d.ts @@ -611,6 +611,7 @@ export interface DataTableProps { loading?: boolean | undefined; /** * The icon to show while indicating data load is in progress. + * @deprecated since v3.27.0. Use 'loadingicon' slot. */ loadingIcon?: string | undefined; /** @@ -729,10 +730,12 @@ export interface DataTableProps { expandedRows?: any[] | DataTableExpandedRows | null; /** * Icon of the row toggler to display the row as expanded. + * @deprecated since v3.27.0. Use 'rowtogglericon' slot. */ expandedRowIcon?: string | undefined; /** * Icon of the row toggler to display the row as collapsed. + * @deprecated since v3.27.0. Use 'rowtogglericon' slot. */ collapsedRowIcon?: string | undefined; /**