Change number of columns based on number of kits [TMZ-178] (#92)

elementor · Nov 26, 2024 · ce9aaf5 · ce9aaf5
1 parent 06c5582
commit ce9aaf5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/modules/admin/assets/js/components/onboarding/screens/install-kit.js b/modules/admin/assets/js/components/onboarding/screens/install-kit.js
@@ -7,8 +7,15 @@ import Grid from '@elementor/ui/Grid';
 import { PreviewWithImage } from '../../preview/preview-with-image';
 
 export const InstallKit = ( { message, kits = [], setPreviewKit, severity } ) => {
+	let md = 3;
+
+	if ( 0 !== kits.length % 4 && 0 === kits.length % 3 ) {
+		// if a number is divisble by 3 update to 3
+		md = 4;
+	}
+
 	return (
-		<Stack direction="column" alignItems="center" justifyContent="center">
+		<Stack direction="column" alignItems="center" justifyContent="center" sx={ { overflowY: 'auto' } }>
 			<Stack sx={ { maxWidth: 900 } } alignItems="center" justifyContent="center" gap={ 4 }>
 				<Navigation />
 				<Stack alignItems="center" justifyContent="center" gap={ 4 }>
@@ -27,7 +34,7 @@ export const InstallKit = ( { message, kits = [], setPreviewKit, severity } ) =>
 
 					<Grid container rowSpacing={ 3 } columnSpacing={ 5 } >
 						{ kits.map( ( kit ) => (
-							<Grid key={ kit._id } item xs={ 12 } sm={ 6 } md={ 3 }>
+							<Grid key={ kit._id } item xs={ 12 } sm={ 6 } md={ md }>
 								<PreviewWithImage { ...kit } onClick={ () => {
 									setPreviewKit( kit );
 								} } />

diff --git a/modules/admin/assets/js/components/top-bar/top-bar-content.js b/modules/admin/assets/js/components/top-bar/top-bar-content.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
 
 export const TopBarContent = ( { sx = {}, iconSize = 'medium', onClose } ) => {
 	return (
-		<Stack direction="row" sx={ { alignItems: 'center', height: 50, px: 2, backgroundColor: 'background.default', justifyContent: 'space-between', ...sx } }>
+		<Stack direction="row" sx={ { alignItems: 'center', minHeight: 50, px: 2, backgroundColor: 'background.default', justifyContent: 'space-between', ...sx } }>
 			<Stack direction="row" spacing={ 1 } alignItems="center">
 				<SvgIcon fontSize={ iconSize } color="secondary">
 					<ElementorNoticeIcon />

diff --git a/modules/admin/assets/js/pages/onboarding-page.js b/modules/admin/assets/js/pages/onboarding-page.js
@@ -94,7 +94,7 @@ export const OnboardingPage = () => {
 	return (
 		<ThemeProvider colorScheme="auto">
 			<Modal open sx={ { zIndex: 100000 } } >
-				<Box style={ { ...style, display: 'flex', flexDirection: 'column' } }>
+				<Box style={ { ...style, display: 'flex', flexDirection: 'column', py: 4 } }>
 					{ ! previewKit && ( <TopBarContent onClose={ onClose } sx={ { borderBottom: '1px solid var(--divider-divider, rgba(0, 0, 0, 0.12))', mb: 4 } } iconSize="small" /> ) }
 					{ 0 === step && ! isLoading && ! previewKit && (
 						<GetStarted allowTracking={ allowTracking } setAllowTracking={ setAllowTracking } severity={ severity } message={ message } buttonText={ buttonText } onClick={ onClick } />