Merge pull request #169 from fedspendingtransparency/mod/9962-classna…

…mes-in-cardbutton Mod/9962 classnames in cardbutton
fedspendingtransparency · Jun 14, 2023 · 305cbe4 · 305cbe4
2 parents 2df58bb + 3313ef3
commit 305cbe4
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 13 deletions.
diff --git a/components/Button.jsx b/components/Button.jsx
@@ -149,7 +149,7 @@ const Button = (props) => {
     }
 
     // ANY ADDITIONAL CLASS NAMES
-    if (!props.additionalClassnames === '' && props.additionalClassnames !== null && props.additionalClassnames !== undefined) {
+    if (props.additionalClassnames) {
         classNameList += ' ';
         classNameList += props.additionalClassnames;
     }

diff --git a/components/cards/CardButton.jsx b/components/cards/CardButton.jsx
@@ -26,7 +26,18 @@ const propTypes = {
 };
 
 const CardButton = ({
-    link, govLink, onlyPerformAction = "false", action, text, variant = "secondary", customClassName = '', children, disabled, backgroundColor, buttonSize, textAlignment
+    link,
+    govLink,
+    onlyPerformAction = "false",
+    action,
+    text,
+    variant = "secondary",
+    customClassName = '',
+    children,
+    disabled,
+    backgroundColor,
+    buttonSize,
+    textAlignment
 }) => {
     const variantMapper = {
         primary: "primary",
@@ -50,9 +61,19 @@ const CardButton = ({
     }
 
     if (onlyPerformAction === true) {
+        console.log('customClassName', customClassName);
         return (
             <div className="card__button">
-                <Button onKeyUp={(e) => handleKeyUp(e)} onClick={action} copy={text || children} buttonTitle={text || children} buttonSize="md" buttonType={variantMapper[variant] === undefined ? "secondary" : variantMapper[variant]} backgroundColor="light" textAlignment="center" /> 
+                <Button
+                    additionalClassnames={customClassName}
+                    onKeyUp={(e) => handleKeyUp(e)}
+                    onClick={action}
+                    copy={text || children}
+                    buttonTitle={text || children}
+                    buttonSize="md"
+                    buttonType={variantMapper[variant] === undefined ? "secondary" : variantMapper[variant]}
+                    backgroundColor="light"
+                    textAlignment="center" />
             </div>);
     }
 
@@ -65,6 +86,7 @@ const CardButton = ({
                     tabIndex="0"
                     aria-label={`${text}`}>
                     <Button
+                        additionalClassnames={customClassName}
                         onClick={handleOnClick}
                         onKeyUp={(e) => handleKeyUp(e)}
                         copy={text || children}
@@ -77,23 +99,24 @@ const CardButton = ({
             )
                 :
                 (
-                    <>                    
+                    <>
                     <div
                     className={`${variantMapperStyle[variant]}`}
                     role="button"
                     tabIndex="0"
                     aria-label={`${text}`}>
                         <Button
+                            additionalClassnames={customClassName}
                             onClick={handleOnClick}
                             onKeyUp={(e) => handleKeyUp(e)}
                             copy={text || children}
                             buttonTitle={text || children}
                             buttonSize={buttonSize}
                             textAlignment={textAlignment}
                             buttonType={variantMapper[variant] === undefined ? "secondary" : variantMapper[variant]}
-                            backgroundColor={backgroundColor} />  
+                            backgroundColor={backgroundColor} />
                     </div>
-                </>                    
+                </>
                 )}
         </div>
     );

diff --git a/dist/index.js b/dist/index.js
diff --git a/docs/iframe.html b/docs/iframe.html
@@ -361,4 +361,4 @@
 
 
 
-            window['STORIES'] = [{"titlePrefix":"","directory":"./.storybook","files":"**/stories/*.stories.@(mdx|js)","importPathMatcher":"^\\.[\\\\/](?:\\.storybook(?:[\\\\/](?!\\.)(?:(?:(?!(?:^|[\\\\/])\\.).)*?)[\\\\/]|[\\\\/]|$)stories[\\\\/](?!\\.)(?=.)[^\\\\/]*?\\.stories\\.(mdx|js))$"}];</script><script src="runtime~main.0cb46b86.iframe.bundle.js"></script><script src="211.2bd6d30e.iframe.bundle.js"></script><script src="main.f017a75c.iframe.bundle.js"></script></body></html>
+            window['STORIES'] = [{"titlePrefix":"","directory":"./.storybook","files":"**/stories/*.stories.@(mdx|js)","importPathMatcher":"^\\.[\\\\/](?:\\.storybook(?:[\\\\/](?!\\.)(?:(?:(?!(?:^|[\\\\/])\\.).)*?)[\\\\/]|[\\\\/]|$)stories[\\\\/](?!\\.)(?=.)[^\\\\/]*?\\.stories\\.(mdx|js))$"}];</script><script src="runtime~main.0cb46b86.iframe.bundle.js"></script><script src="211.2bd6d30e.iframe.bundle.js"></script><script src="main.5d5486e2.iframe.bundle.js"></script></body></html>
diff --git a/docs/main.5d5486e2.iframe.bundle.js b/docs/main.5d5486e2.iframe.bundle.js
diff --git a/docs/main.f017a75c.iframe.bundle.js b/docs/main.f017a75c.iframe.bundle.js
diff --git a/docs/project.json b/docs/project.json
@@ -1 +1 @@
-{"generatedAt":1686757723568,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":false,"hasStorybookEslint":false,"refCount":0,"packageManager":{"type":"npm","version":"8.16.0"},"storybookVersion":"6.5.16","language":"typescript","storybookPackages":{"@storybook/builder-webpack5":{"version":"6.5.16"},"@storybook/manager-webpack5":{"version":"6.5.16"},"@storybook/addon-console":{"version":"1.2.3"},"@storybook/react":{"version":"6.5.16"},"@storybook/source-loader":{"version":"6.5.16"},"@storybook/theming":{"version":"6.5.16"},"storybook":{"version":"5.3.22"}},"framework":{"name":"react"},"addons":{"@storybook/addon-knobs":{"version":"6.4.0"},"@storybook/addon-docs":{"version":"6.5.16"},"@storybook/addon-a11y":{"version":"6.5.16"},"@storybook/addon-viewport":{"version":"6.5.16"},"@storybook/addon-actions":{"version":"6.5.16"},"@storybook/addon-essentials":{"version":"6.5.16"},"@storybook/addon-controls":{"version":"6.5.16"}}}
+{"generatedAt":1686768368380,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":false,"hasStorybookEslint":false,"refCount":0,"packageManager":{"type":"npm","version":"8.16.0"},"storybookVersion":"6.5.16","language":"typescript","storybookPackages":{"@storybook/builder-webpack5":{"version":"6.5.16"},"@storybook/manager-webpack5":{"version":"6.5.16"},"@storybook/addon-console":{"version":"1.2.3"},"@storybook/react":{"version":"6.5.16"},"@storybook/source-loader":{"version":"6.5.16"},"@storybook/theming":{"version":"6.5.16"},"storybook":{"version":"5.3.22"}},"framework":{"name":"react"},"addons":{"@storybook/addon-knobs":{"version":"6.4.0"},"@storybook/addon-docs":{"version":"6.5.16"},"@storybook/addon-a11y":{"version":"6.5.16"},"@storybook/addon-viewport":{"version":"6.5.16"},"@storybook/addon-actions":{"version":"6.5.16"},"@storybook/addon-essentials":{"version":"6.5.16"},"@storybook/addon-controls":{"version":"6.5.16"}}}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "data-transparency-ui",
-  "version": "5.6.3",
+  "version": "5.6.4",
   "description": "Library of UI components powering Data Transparency websites",
   "main": "dist/index.js",
   "style": "dist/data-transparency-ui.css",