Fix #6165: TabView refactor closeIcon like other icons (#6166)

primefaces · Mar 25, 2024 · 6a9159f · 6a9159f
1 parent d372c68
commit 6a9159f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/components/lib/tabview/TabView.js b/components/lib/tabview/TabView.js
@@ -338,9 +338,15 @@ export const TabView = React.forwardRef((inProps, ref) => {
         );
         const titleElement = <span {...headerTitleProps}>{header}</span>;
         const rightIconElement = rightIcon && IconUtils.getJSXIcon(rightIcon, undefined, { props });
-        const iconClassName = 'p-tabview-close';
-        const icon = closeIcon || <TimesIcon className={iconClassName} onClick={(e) => onTabHeaderClose(e, index)} />;
-        const closableIconElement = closable ? IconUtils.getJSXIcon(icon, { className: iconClassName, onClick: (e) => onTabHeaderClose(e, index) }, { props }) : null;
+        const closeIconProps = mergeProps(
+            {
+                className: cx('tab.closeIcon'),
+                onClick: (e) => onTabHeaderClose(e, index)
+            },
+            getTabPT(tab, 'closeIcon', index)
+        );
+        const icon = closeIcon || <TimesIcon {...closeIconProps} />;
+        const closableIconElement = closable ? IconUtils.getJSXIcon(icon, { ...closeIconProps }, { props }) : null;
 
         const headerActionProps = mergeProps(
             {

diff --git a/components/lib/tabview/TabViewBase.js b/components/lib/tabview/TabViewBase.js
@@ -21,6 +21,7 @@ const classes = {
         header: ({ selected, disabled, headerClassName, _className }) => classNames('p-unselectable-text', { 'p-tabview-selected p-highlight': selected, 'p-disabled': disabled }, headerClassName, _className),
         headertitle: 'p-tabview-title',
         headeraction: 'p-tabview-nav-link',
+        closeIcon: 'p-tabview-close',
         content: ({ props, selected, getTabProp, tab, isSelected, shouldUseTab, index }) =>
             shouldUseTab(tab, index) && (!props.renderActiveOnly || isSelected(index)) ? classNames(getTabProp(tab, 'contentClassName'), getTabProp(tab, 'className'), 'p-tabview-panel', { 'p-hidden': !selected }) : undefined
     }