Get proper unit if first column isn't auto

stellarwp · Dec 6, 2024 · 42de5a2 · 42de5a2
1 parent c85aed2
commit 42de5a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/blocks/table/components/backend-styles/index.js b/src/blocks/table/components/backend-styles/index.js
@@ -68,9 +68,9 @@ export default function BackendStyles(props) {
 	const previewRowMinHeight = getPreviewSize(previewDevice, rowMinHeight, tabletRowMinHeight, mobileRowMinHeight);
 	const previewColumnSettingUnit = getPreviewSize(
 		previewDevice,
-		columnSettings?.[0]?.unit,
-		columnSettings?.[0]?.unitTablet,
-		columnSettings?.[0]?.unitMobile
+		columnSettings?.find((setting) => setting?.unit)?.unit,
+		columnSettings?.find((setting) => setting?.unitTablet)?.unitTablet,
+		columnSettings?.find((setting) => setting?.unitMobile)?.unitMobile
 	);
 
 	css.set_selector(`.kb-table${uniqueID}`);
@@ -113,9 +113,9 @@ export default function BackendStyles(props) {
 			if (!settings?.useAuto) {
 				const previewWidth = getPreviewSize(
 					previewDevice,
-					settings.width,
-					settings.widthTablet,
-					settings.widthMobile,
+					settings?.width,
+					settings?.widthTablet,
+					settings?.widthMobile,
 					true
 				);
 				css.set_selector(`.kb-table${uniqueID} tr > *:nth-child(${index + 1})`);

diff --git a/src/blocks/table/edit.js b/src/blocks/table/edit.js
@@ -330,9 +330,9 @@ export function Edit(props) {
 	};
 	const previewColumnSettingUnit = getPreviewSize(
 		previewDevice,
-		columnSettings?.[0]?.unit,
-		columnSettings?.[0]?.unitTablet,
-		columnSettings?.[0]?.unitMobile
+		columnSettings?.find((setting) => setting?.unit)?.unit,
+		columnSettings?.find((setting) => setting?.unitTablet)?.unitTablet,
+		columnSettings?.find((setting) => setting?.unitMobile)?.unitMobile
 	);
 
 	const StickyUpsell = (