Refactor #4293

primefaces · May 5, 2023 · 8c12ecc · 8c12ecc
1 parent b1dc8bb
commit 8c12ecc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/components/lib/accordion/Accordion.js b/components/lib/accordion/Accordion.js
@@ -17,7 +17,7 @@ export const Accordion = React.forwardRef((inProps, ref) => {
     const elementRef = React.useRef(null);
     const activeIndex = props.onTabChange ? props.activeIndex : activeIndexState;
 
-    const parentProps = {
+    const metaData = {
         props,
         state: {
             id: idState,
@@ -26,15 +26,13 @@ export const Accordion = React.forwardRef((inProps, ref) => {
     };
 
     const { ptm, ptmo } = AccordionBase.setMetaData({
-        ...parentProps
+        ...metaData
     });
 
     const getTabPT = (tab, key) => {
         return ptmo(getTabProp(tab, 'pt'), key, {
             props: tab.props,
-            parent: {
-                ...parentProps
-            }
+            parent: metaData
         });
     };
 
@@ -174,7 +172,7 @@ export const Accordion = React.forwardRef((inProps, ref) => {
             {
                 className: 'p-accordion-content'
             },
-            getTabPT(tab, 'toggleablecontent')
+            getTabPT(tab, 'content')
         );
 
         return (

diff --git a/components/lib/card/card.d.ts b/components/lib/card/card.d.ts
@@ -43,7 +43,7 @@ export interface CardPassThroughOptions {
     /**
      * Uses to pass attributes to the subtitle's DOM element.
      */
-    subtitle?: CardPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
+    subTitle?: CardPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
     /**
      * Uses to pass attributes to the content's DOM element.
      */

diff --git a/components/lib/tabview/TabView.js b/components/lib/tabview/TabView.js
@@ -27,7 +27,7 @@ export const TabView = React.forwardRef((inProps, ref) => {
     const tabsRef = React.useRef({});
     const activeIndex = props.onTabChange ? props.activeIndex : activeIndexState;
 
-    const parentProps = {
+    const metaData = {
         props,
         state: {
             id: idState,
@@ -39,15 +39,13 @@ export const TabView = React.forwardRef((inProps, ref) => {
     };
 
     const { ptm, ptmo } = TabViewBase.setMetaData({
-        ...parentProps
+        ...metaData
     });
 
     const getTabPT = (tab, key) => {
         return ptmo(getTabProp(tab, 'pt'), key, {
             props: tab.props,
-            parent: {
-                ...parentProps
-            }
+            parent: metaData
         });
     };
 
@@ -343,9 +341,9 @@ export const TabView = React.forwardRef((inProps, ref) => {
                         style,
                         role: 'tabpanel',
                         'aria-labelledby': ariaLabelledBy,
-                        'aria-hidden': !selected,
-                        ...TabPanelBase.getCOtherProps(tab)
+                        'aria-hidden': !selected
                     },
+                    TabPanelBase.getCOtherProps(tab),
                     getTabPT(tab, 'root'),
                     getTabPT(tab, 'content')
                 );

diff --git a/components/lib/tabview/tabview.d.ts b/components/lib/tabview/tabview.d.ts
@@ -273,11 +273,11 @@ export interface TabViewPassThroughOptions {
     /**
      * Uses to pass attributes to the nav container's DOM element.
      */
-    navcontainer?: TabViewPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
+    navContainer?: TabViewPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
     /**
      * Uses to pass attributes to the nav content's DOM element.
      */
-    navcontent?: TabViewPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
+    navContent?: TabViewPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
     /**
      * Uses to pass attributes to the list's DOM element.
      */
@@ -289,23 +289,23 @@ export interface TabViewPassThroughOptions {
     /**
      * Uses to pass attributes to the previous button's DOM element.
      */
-    prevbutton?: TabViewPassThroughType<React.HTMLAttributes<HTMLButtonElement>>;
+    previousButton?: TabViewPassThroughType<React.HTMLAttributes<HTMLButtonElement>>;
     /**
      * Uses to pass attributes to the previous button icon's DOM element.
      */
-    previcon?: TabViewPassThroughType<React.HTMLAttributes<HTMLSpanElement | SVGSVGElement>>;
+    previousIcon?: TabViewPassThroughType<React.HTMLAttributes<HTMLSpanElement | SVGSVGElement>>;
     /**
-     * Uses to pass attributes to the nex button's DOM element.
+     * Uses to pass attributes to the next button's DOM element.
      */
-    nextbutton?: TabViewPassThroughType<React.HTMLAttributes<HTMLButtonElement>>;
+    nextButton?: TabViewPassThroughType<React.HTMLAttributes<HTMLButtonElement>>;
     /**
      * Uses to pass attributes to the next button icon's DOM element.
      */
-    nexticon?: TabViewPassThroughType<React.HTMLAttributes<HTMLSpanElement | SVGSVGElement>>;
+    nextIcon?: TabViewPassThroughType<React.HTMLAttributes<HTMLSpanElement | SVGSVGElement>>;
     /**
      * Uses to pass attributes to the panel's DOM element.
      */
-    panelcontainer?: TabViewPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
+    panelContainer?: TabViewPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
 }
 
 /**