Tweak: improve changelog appearance [TMZ-928] (#543) (#544)

Author: github-actions[bot]

.gitignore

@@ -2,7 +2,8 @@
 node_modules/
 .sass-cache/
 build/**
-assets/
+# Only ignore root-level assets directory (build output), not module assets (source files)
+/assets/
 hello-elementor/
 elementor-hello-theme/
 log/
@@ -13,7 +14,6 @@ Thumbs.db
 *.log
 *.map
 yarn.lock
-assets/js/
 *.zip
 .npmrc
 .env

modules/admin-home/assets/images/plus.svg

@@ -0,0 +1,44 @@
+import Dialog from '@elementor/ui/Dialog';
+import DialogContent from '@elementor/ui/DialogContent';
+import DialogHeader from '@elementor/ui/DialogHeader';
+import Typography from '@elementor/ui/Typography';
+import { __ } from '@wordpress/i18n';
+import Stack from '@elementor/ui/Stack';
+import Update from './update';
+import Divider from '@elementor/ui/Divider';
+import { PlusIcon } from './plus-icon';
+import { Fragment } from 'react';
+
+export const ChangelogDialog = ( { open, onClose, whatsNew } ) => {
+	return (
+		<Dialog
+			open={ open }
+			onClose={ onClose }
+			maxWidth="sm"
+			fullWidth
+		>
+			<DialogHeader
+				onClose={ onClose }
+				variant="outlined"
+				logo={ <PlusIcon /> }
+			>
+				<Typography variant="overline" sx={ { textTransform: 'uppercase', fontWeight: 400, color: 'text.primary' } }>
+					{ __( 'Changelog', 'hello-elementor' ) }
+				</Typography>
+			</DialogHeader>
+
+			<DialogContent sx={ { p: 0 } }>
+				<Stack direction={ 'column' } >
+					{ whatsNew.map( ( item, index ) => {
+							return (
+								<Fragment key={ item.id } >
+									<Update { ...item } />
+									{ index !== whatsNew.length - 1 && <Divider /> }
+								</Fragment>
+							);
+						} ) }
+				</Stack>
+			</DialogContent>
+		</Dialog>
+	);
+};

modules/admin-home/assets/js/components/settings/changelog.js

@@ -0,0 +1,10 @@
+import SvgIcon from '@elementor/ui/SvgIcon';
+import { ReactComponent as Icon } from '../../../images/plus.svg';
+
+export const PlusIcon = ( props ) => {
+	return (
+		<SvgIcon viewBox="0 0 24 24" { ...props }>
+			<Icon />
+		</SvgIcon>
+	);
+};

modules/admin-home/assets/js/components/settings/plus-icon.js

@@ -18,8 +18,7 @@ import Paper from '@elementor/ui/Paper';
 import { styled } from '@elementor/ui/styles';
 import Link from '@elementor/ui/Link';
 import Stack from '@elementor/ui/Stack';
-import Modal from '@elementor/ui/Modal';
-import Update from './update';
+import { ChangelogDialog } from './changelog';
 
 const Notices = () => {
 	const notices = useSelect(
@@ -75,19 +74,6 @@ const StyledTabs = styled( Tabs )( () => ( {
 	},
 } ) );
 
-const style = {
-	position: 'absolute',
-	top: '50%',
-	left: '50%',
-	transform: 'translate(-50%, -50%)',
-	bgcolor: 'background.paper',
-	border: '1px solid #000',
-	boxShadow: 24,
-	p: 2,
-	maxHeight: '80vh',
-	overflowY: 'auto',
-};
-
 export const SettingsPage = () => {
 	const { whatsNew } = useSettingsContext();
 	const { getTabsProps, getTabProps, getTabPanelProps } = useTabs( 'one' );
@@ -131,19 +117,7 @@ export const SettingsPage = () => {
 					<TabPanel { ...getTabPanelProps( 'three' ) }><Theme /></TabPanel>
 				</Box>
 			</Paper>
-			<Modal
-				open={ open }
-				onClose={ handleClose }
-				aria-labelledby="modal-modal-title"
-				aria-describedby="modal-modal-description"
-	>
-				<Box sx={ style }>
-					<Typography variant={ 'h4' }>{ __( 'Changelog', 'hello-plus' ) }</Typography>
-					<Stack direction={ 'column' } gap={ 1 } sx={ { mt: 2 } }>
-						{ whatsNew.map( ( item ) => <Update key={ item.id } { ...item } /> ) }
-					</Stack>
-				</Box>
-			</Modal>
+			<ChangelogDialog open={ open } onClose={ handleClose } whatsNew={ whatsNew } />
 		</>
 	);
 };

modules/admin-home/assets/js/components/settings/settings-page.js

@@ -1,11 +1,19 @@
-import Stack from '@elementor/ui/Stack';
+import Box from '@elementor/ui/Box';
 import Typography from '@elementor/ui/Typography';
+import { useMemo } from 'react';
 
 export default function Update( { title, description } ) {
+	const descriptionToShow = useMemo( () => {
+		const parser = new DOMParser();
+		const doc = parser.parseFromString( description, 'text/html' );
+		const listItems = doc.querySelectorAll( 'li' );
+		const extractedContent = Array.from( listItems ).map( ( item ) => item.textContent.trim() );
+		return extractedContent.join( '\n' );
+	}, [ description ] );
     return (
-	<Stack direction={ 'column' } gap={ 2 }>
-		<Typography variant={ 'h6' }>{ title }</Typography>
-		<div dangerouslySetInnerHTML={ { __html: description } } />
-	</Stack>
+	<Box sx={ { py: 2, px: 3 } }>
+		<Typography variant={ 'subtitle1' } sx={ { pb: 0.75 } }>{ title }</Typography>
+		<Typography variant={ 'body2' } sx={ { whiteSpace: 'pre-line' } }>{ descriptionToShow }</Typography>
+	</Box>
     );
 }