From c7b80b6cd58fdd114a84946c70ba6e09bca2d1b1 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Tue, 21 Jan 2025 18:35:17 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20SImplify=20InputSettingsBl?=
 =?UTF-8?q?ock=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reusable-components/_settings-block.scss  |  9 ---
 .../SettingsBlocks/InputSettingsBlock.js      | 74 ++++++++-----------
 .../Blocks/PaypalSettings.js                  |  4 +-
 3 files changed, 32 insertions(+), 55 deletions(-)

diff --git a/modules/ppcp-settings/resources/css/components/reusable-components/_settings-block.scss b/modules/ppcp-settings/resources/css/components/reusable-components/_settings-block.scss
index 551770bb1..493eebe33 100644
--- a/modules/ppcp-settings/resources/css/components/reusable-components/_settings-block.scss
+++ b/modules/ppcp-settings/resources/css/components/reusable-components/_settings-block.scss
@@ -97,15 +97,6 @@
 		margin-left: 5px;
 	}
 
-	.ppcp-r-settings-block__action {
-		display: flex;
-		align-items: center;
-
-		.components-flex {
-			row-gap: 0;
-		}
-	}
-
 	+ .ppcp-r-settings-block:not(.no-gap) {
 		margin-top: var(--block-separator-gap, 32px);
 		padding-top: var(--block-separator-gap, 32px);
diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/InputSettingsBlock.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/InputSettingsBlock.js
index 3470e8b60..f43069973 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/InputSettingsBlock.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/InputSettingsBlock.js
@@ -1,4 +1,5 @@
 import { TextControl } from '@wordpress/components';
+
 import SettingsBlock from './SettingsBlock';
 import {
 	Title,
@@ -7,55 +8,40 @@ import {
 	SupplementaryLabel,
 } from './SettingsBlockElements';
 
-const DEFAULT_ELEMENT_ORDER = [ 'title', 'action', 'description' ];
-
-const ELEMENT_RENDERERS = {
-	title: ( { title, supplementaryLabel } ) => (
-		<Title>
-			{ title }
-			{ supplementaryLabel && (
-				<SupplementaryLabel>{ supplementaryLabel }</SupplementaryLabel>
-			) }
-		</Title>
-	),
-	action: ( { actionProps } ) => (
-		<Action>
-			<TextControl
-				className="ppcp-r-vertical-text-control"
-				placeholder={ actionProps?.placeholder }
-				value={ actionProps?.value }
-				onChange={ ( newValue ) =>
-					actionProps?.callback( actionProps?.key, newValue )
-				}
-			/>
-		</Action>
-	),
-	description: ( { description } ) => (
-		<Description>{ description }</Description>
-	),
-};
-
 const InputSettingsBlock = ( {
 	title,
 	description,
 	supplementaryLabel,
-	order = DEFAULT_ELEMENT_ORDER,
+	showDescriptionFirst = false,
+	actionProps = {},
 	...props
-} ) => (
-	<SettingsBlock { ...props } className="ppcp-r-settings-block__input">
-		{ order.map( ( elementKey ) => {
-			const RenderElement = ELEMENT_RENDERERS[ elementKey ];
-			return RenderElement ? (
-				<RenderElement
-					key={ elementKey }
-					title={ title }
-					description={ description }
-					supplementaryLabel={ supplementaryLabel }
-					actionProps={ props.actionProps }
+} ) => {
+	const TheDescription = <Description>{ description }</Description>;
+
+	return (
+		<SettingsBlock { ...props } className="ppcp-r-settings-block__input">
+			<Title>
+				{ title }
+				{ supplementaryLabel && (
+					<SupplementaryLabel>
+						{ supplementaryLabel }
+					</SupplementaryLabel>
+				) }
+			</Title>
+			{ showDescriptionFirst && TheDescription }
+			<Action>
+				<TextControl
+					className="ppcp-r-vertical-text-control"
+					placeholder={ actionProps.placeholder }
+					value={ actionProps.value }
+					onChange={ ( newValue ) =>
+						actionProps.callback( actionProps.key, newValue )
+					}
 				/>
-			) : null;
-		} ) }
-	</SettingsBlock>
-);
+			</Action>
+			{ ! showDescriptionFirst && TheDescription }
+		</SettingsBlock>
+	);
+};
 
 export default InputSettingsBlock;
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/PaypalSettings.js b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/PaypalSettings.js
index f8d68881e..bc6ffc8c8 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/PaypalSettings.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/PaypalSettings.js
@@ -87,6 +87,7 @@ const PaypalSettings = ( { updateFormValue, settings } ) => {
 					'What business name to show to your buyers during checkout and on receipts.',
 					'woocommerce-paypal-payments'
 				) }
+				showDescriptionFirst={ true }
 				actionProps={ {
 					value: settings.brandName,
 					callback: updateFormValue,
@@ -96,7 +97,6 @@ const PaypalSettings = ( { updateFormValue, settings } ) => {
 						'woocommerce-paypal-payments'
 					),
 				} }
-				order={ [ 'title', 'description', 'action' ] }
 			/>
 
 			<InputSettingsBlock
@@ -105,6 +105,7 @@ const PaypalSettings = ( { updateFormValue, settings } ) => {
 					"The dynamic text used to construct the statement descriptor that appears on a payer's card statement. Applies to PayPal and Credit Card transactions. Max value of 22 characters.",
 					'woocommerce-paypal-payments'
 				) }
+				showDescriptionFirst={ true }
 				actionProps={ {
 					value: settings.softDescriptor,
 					callback: updateFormValue,
@@ -114,7 +115,6 @@ const PaypalSettings = ( { updateFormValue, settings } ) => {
 						'woocommerce-paypal-payments'
 					),
 				} }
-				order={ [ 'title', 'description', 'action' ] }
 			/>
 
 			<RadioSettingsBlock