Merge pull request #447 from newfold-labs/fix/preview-button-text

Fix button text missing in preview and old flow
newfold-labs · Feb 1, 2024 · 3ca0dc8 · 3ca0dc8
2 parents a37d1de + 9e31a14
commit 3ca0dc8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/OnboardingSPA/components/Button/NavCardButton/index.js b/src/OnboardingSPA/components/Button/NavCardButton/index.js
@@ -53,20 +53,16 @@ const NavCardButton = ( { text, disabled, className, icon } ) => {
 	return (
 		<Button
 			className={ classNames( 'nfd-nav-card-button', className ) }
-			text={
-				<>
-					<span className={ `${ className }__text` }>{ text }</span>
-					{ icon && (
-						<Icon
-							className={ `${ className }__icon` }
-							icon={ icon }
-						/>
-					) }
-				</>
-			}
 			handleClick={ handleBtnClick }
 			disabled={ disabled }
-		/>
+		>
+			<>
+				<span className={ `${ className }__text` }>{ text }</span>
+				{ icon && (
+					<Icon className={ `${ className }__icon` } icon={ icon } />
+				) }
+			</>
+		</Button>
 	);
 };
 

diff --git a/src/OnboardingSPA/components/Button/index.js b/src/OnboardingSPA/components/Button/index.js
@@ -5,9 +5,9 @@
  * @return Button
  */
 
-const Button = ( { text, handleClick, disabled, className } ) => {
+const Button = ( { children, handleClick, disabled, className } ) => {
 	const handleBtnClick = () => {
-		if ( handleClick ) {
+		if ( typeof handleClick === 'function' ) {
 			handleClick();
 		}
 	};
@@ -19,7 +19,7 @@ const Button = ( { text, handleClick, disabled, className } ) => {
 			onClick={ handleBtnClick }
 			disabled={ disabled }
 		>
-			{ text }
+			{ children }
 		</button>
 	);
 };