Fix primefaces#5379: Accordion tab header passthrough errors

Fix primefaces#5546: AccordionTab Tailwind issues
melloware · Jan 9, 2024 · f6e4ab0 · f6e4ab0
1 parent ea64b8d
commit f6e4ab0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/components/doc/accordion/theming/tailwinddoc.js b/components/doc/accordion/theming/tailwinddoc.js
@@ -19,7 +19,7 @@ const TRANSITIONS = {
 const Tailwind = {  
     accordion: {
         root: 'mb-1',
-        accordiontab: {
+        tab: {
             root: 'mb-1',
             header: ({ props }) => ({
                 className: classNames(

diff --git a/components/lib/accordion/Accordion.js b/components/lib/accordion/Accordion.js
@@ -47,7 +47,7 @@ export const Accordion = React.forwardRef((inProps, ref) => {
             }
         };
 
-        return mergeProps(ptm(`accordion.${key}`, { tab: tabMetaData }), ptm(`accordiontab.${key}`, { accordiontab: tabMetaData }), ptm(`accordiontab.${key}`, tabMetaData), ptmo(getTabProp(tab, 'pt'), key, tabMetaData));
+        return mergeProps(ptm(`accordion.${key}`, { tab: tabMetaData }), ptm(`tab.${key}`, { accordiontab: tabMetaData }), ptm(`tab.${key}`, tabMetaData), ptmo(getTabProp(tab, 'pt'), key, tabMetaData));
     };
 
     const getTabProp = (tab, name) => AccordionTabBase.getCProp(tab, name);
@@ -201,7 +201,7 @@ export const Accordion = React.forwardRef((inProps, ref) => {
         const tabIndex = getTabProp(tab, 'disabled') ? -1 : getTabProp(tab, 'tabIndex');
         const headerTitleProps = mergeProps(
             {
-                className: cx('accordiontab.headertitle')
+                className: cx('tab.headertitle')
             },
             getTabPT(tab, 'headertitle', index)
         );
@@ -210,7 +210,7 @@ export const Accordion = React.forwardRef((inProps, ref) => {
         const headerIconProps = mergeProps(
             {
                 'aria-hidden': 'true',
-                className: cx('accordiontab.headericon')
+                className: cx('tab.headericon')
             },
             getTabPT(tab, 'headericon', index)
         );
@@ -230,7 +230,7 @@ export const Accordion = React.forwardRef((inProps, ref) => {
             {
                 id: headerId,
                 href: '#' + ariaControls,
-                className: cx('accordiontab.headeraction'),
+                className: cx('tab.headeraction'),
                 role: 'button',
                 tabIndex,
                 onClick: (e) => onTabHeaderClick(e, tab, index),
@@ -261,7 +261,7 @@ export const Accordion = React.forwardRef((inProps, ref) => {
             {
                 id: contentId,
                 ref: contentRef,
-                className: classNames(getTabProp(tab, 'contentClassName'), getTabProp(tab, 'className'), cx('accordiontab.toggleablecontent')),
+                className: classNames(getTabProp(tab, 'contentClassName'), getTabProp(tab, 'className'), cx('tab.toggleablecontent')),
                 style,
                 role: 'region',
                 'aria-labelledby': ariaLabelledby
@@ -271,14 +271,14 @@ export const Accordion = React.forwardRef((inProps, ref) => {
 
         const contentProps = mergeProps(
             {
-                className: cx('accordiontab.content')
+                className: cx('tab.content')
             },
             getTabPT(tab, 'content', index)
         );
 
         const transitionProps = mergeProps(
             {
-                classNames: cx('accordiontab.transition'),
+                classNames: cx('tab.transition'),
                 timeout: { enter: 1000, exit: 450 },
                 in: selected,
                 unmountOnExit: true,
@@ -306,7 +306,7 @@ export const Accordion = React.forwardRef((inProps, ref) => {
             const rootProps = mergeProps(
                 {
                     key,
-                    className: cx('accordiontab.root', { selected })
+                    className: cx('tab.root', { selected })
                 },
                 AccordionTabBase.getCOtherProps(tab),
                 getTabPT(tab, 'root', index)

diff --git a/components/lib/accordion/AccordionBase.js b/components/lib/accordion/AccordionBase.js
@@ -3,7 +3,7 @@ import { ObjectUtils, classNames } from '../utils/Utils';
 
 const classes = {
     root: 'p-accordion p-component',
-    accordiontab: {
+    tab: {
         root: ({ selected }) =>
             classNames('p-accordion-tab', {
                 'p-accordion-tab-active': selected

diff --git a/components/lib/passthrough/tailwind/index.js b/components/lib/passthrough/tailwind/index.js
@@ -129,7 +129,7 @@ const Tailwind = {
     },
     accordion: {
         root: 'mb-1',
-        accordiontab: {
+        tab: {
             root: 'mb-1',
             header: ({ context }) => {
                 return {