From b69cabb76e3905a5daf86c602af77c885a677437 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Sun, 20 Oct 2024 12:37:06 +0900
Subject: [PATCH] Quality: remove custom fallback css for 40px size (#224)

---
 src/editor.scss                         | 7 -------
 src/elements/table-placeholder.tsx      | 4 ++--
 src/settings/table-caption-settings.tsx | 2 +-
 src/settings/table-cell-settings.tsx    | 8 ++++----
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/editor.scss b/src/editor.scss
index a2c93a9..beaef0c 100644
--- a/src/editor.scss
+++ b/src/editor.scss
@@ -402,13 +402,6 @@
 	cursor: initial;
 }
 
-// TODO: Remove this style and replace it with `__next40pxDefaultSize` prop
-// when supported WordPress versions are greater than or equal to 6.5.
-// See: https://github.com/WordPress/gutenberg/pull/55471
-.ftb-is-next-40px-default-size .components-text-control__input {
-	height: 40px;
-}
-
 // Setting Component Styles
 .ftb-button-group {
 	display: block;
diff --git a/src/elements/table-placeholder.tsx b/src/elements/table-placeholder.tsx
index 0eddc5e..a220526 100644
--- a/src/elements/table-placeholder.tsx
+++ b/src/elements/table-placeholder.tsx
@@ -166,7 +166,6 @@ export default function TablePlaceholder( { setAttributes }: Props ) {
 				</div>
 				<div className="ftb-placeholder__row">
 					<TextControl
-						className="ftb-is-next-40px-default-size"
 						label={ __( 'Column count', 'flexible-table-block' ) }
 						type="number"
 						min="1"
@@ -174,9 +173,9 @@ export default function TablePlaceholder( { setAttributes }: Props ) {
 						value={ colCount || '' }
 						onChange={ onChangeColumnCount }
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 					/>
 					<TextControl
-						className="ftb-is-next-40px-default-size"
 						label={ __( 'Row count', 'flexible-table-block' ) }
 						type="number"
 						min="1"
@@ -184,6 +183,7 @@ export default function TablePlaceholder( { setAttributes }: Props ) {
 						value={ rowCount || '' }
 						onChange={ onChangeRowCount }
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 					/>
 					<Button
 						variant="primary"
diff --git a/src/settings/table-caption-settings.tsx b/src/settings/table-caption-settings.tsx
index 9a01b48..2884cfb 100644
--- a/src/settings/table-caption-settings.tsx
+++ b/src/settings/table-caption-settings.tsx
@@ -127,7 +127,6 @@ export default function TableCaptionSettings( {
 					__nextHasNoMarginBottom
 				>
 					<TextControl
-						className="ftb-is-next-40px-default-size"
 						label={ __( 'Caption line height', 'flexible-table-block' ) }
 						autoComplete="off"
 						onChange={ onChangeLineHeight }
@@ -136,6 +135,7 @@ export default function TableCaptionSettings( {
 						value={ captionStylesObj?.lineHeight || '' }
 						min={ 0 }
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 					/>
 				</BaseControl>
 			</div>
diff --git a/src/settings/table-cell-settings.tsx b/src/settings/table-cell-settings.tsx
index 0a5b959..87e45b6 100644
--- a/src/settings/table-cell-settings.tsx
+++ b/src/settings/table-cell-settings.tsx
@@ -244,7 +244,6 @@ export default function TableCellSettings( { setAttributes, vTable, selectedCell
 					__nextHasNoMarginBottom
 				>
 					<TextControl
-						className="ftb-is-next-40px-default-size"
 						label={ __( 'Cell line height', 'flexible-table-block' ) }
 						value={ cellStylesObj?.lineHeight || '' }
 						autoComplete="off"
@@ -253,6 +252,7 @@ export default function TableCellSettings( { setAttributes, vTable, selectedCell
 						min={ 0 }
 						onChange={ onChangeLineHeight }
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 					/>
 				</BaseControl>
 			</div>
@@ -395,20 +395,19 @@ export default function TableCellSettings( { setAttributes, vTable, selectedCell
 				) ) }
 			</ToggleGroupControl>
 			<TextControl
-				className="ftb-is-next-40px-default-size"
 				label={ __( 'Cell CSS class(es)', 'flexible-table-block' ) }
 				autoComplete="off"
 				value={ targetCell.className || '' }
 				onChange={ onChangeClass }
 				help={ __( 'Separate multiple classes with spaces.', 'flexible-table-block' ) }
 				__nextHasNoMarginBottom
+				__next40pxDefaultSize
 			/>
 			{ selectedCellTags.length === 1 && (
 				<>
 					<hr />
 					{ selectedCellTags.includes( 'th' ) && (
 						<TextControl
-							className="ftb-is-next-40px-default-size"
 							label={ createInterpolateElement(
 								__( '<code>id</code> attribute', 'flexible-table-block' ),
 								{ code: <code /> }
@@ -417,10 +416,10 @@ export default function TableCellSettings( { setAttributes, vTable, selectedCell
 							value={ targetCell.id || '' }
 							onChange={ onChangeId }
 							__nextHasNoMarginBottom
+							__next40pxDefaultSize
 						/>
 					) }
 					<TextControl
-						className="ftb-is-next-40px-default-size"
 						label={ createInterpolateElement(
 							__( '<code>headers</code> attribute', 'flexible-table-block' ),
 							{ code: <code /> }
@@ -429,6 +428,7 @@ export default function TableCellSettings( { setAttributes, vTable, selectedCell
 						value={ targetCell.headers || '' }
 						onChange={ onChangeHeaders }
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 					/>
 					{ selectedCellTags.includes( 'th' ) && (
 						<BaseControl id="flexible-table-block-cell-scope" __nextHasNoMarginBottom>