merge branch v2 (release 2.0.0-alpha.41)

Author: marcantondahmen

CHANGELOG.md

@@ -1,8 +1,27 @@
 # Changelog
 
-## [v2.0.0-alpha.40](https://github.com/marcantondahmen/automad/commit/322d2e033ec1e2147874017ebd9d065157dbf619)
+## [v2.0.0-alpha.41](https://github.com/marcantondahmen/automad/commit/26fffa59ae5cdc8e555e1977732fe9247ce5a05f)
 
-Sun, 3 Aug 2025 14:21:13 +0200
+Sat, 16 Aug 2025 20:16:42 +0200
+
+### Breaking Changes
+
+- remove option to make a section block match the row height in a flex layout and fix stretch flex layout in a parent section ([873686df6](https://github.com/marcantondahmen/automad/commit/873686df66418aeb442eecd2fcf9cc78603443d5))
+
+### New Features
+
+- add option to fill out the entire rectangle when using the row layout of the gallery block ([f44920e6e](https://github.com/marcantondahmen/automad/commit/f44920e6ebf4680e272c4360af8ec60f35686eb2))
+
+### Bugfixes
+
+- remove option to make a section block match the row height in a flex layout and fix stretch flex layout in a parent section ([873686df6](https://github.com/marcantondahmen/automad/commit/873686df66418aeb442eecd2fcf9cc78603443d5))
+- fix field filters in customization tab ([ecec9f56e](https://github.com/marcantondahmen/automad/commit/ecec9f56e06a9b9c84b234aeaa1230a650827156))
+- fix issue with filtering empty tune data ([4cada3d24](https://github.com/marcantondahmen/automad/commit/4cada3d240d59e3788af533781a40f6035c7ac3d))
+- fix rendering of gallery blocks ([c0685a7d7](https://github.com/marcantondahmen/automad/commit/c0685a7d773f09807a3d3a1f5678f74d0bc4da10))
+
+## [v2.0.0-alpha.40](https://github.com/marcantondahmen/automad/commit/c82e048885f52e5e7638a05ea455ec4b8280956a)
+
+Sun, 3 Aug 2025 15:25:26 +0200
 
 ### New Features
 
@@ -660,18 +679,3 @@ Wed, 24 Nov 2021 09:35:46 +0100
 - **ui**: add feed configuration ui ([686d563d1](https://github.com/marcantondahmen/automad/commit/686d563d11a8cdec881c6053cc01ad6049e76400))
 - **ui**: redesign system settings ui ([aa84f8021](https://github.com/marcantondahmen/automad/commit/aa84f8021a0da6ff8d587e5f384cf6b6a46d1b4d))
 - remove gulp-util and update dependencies ([02ae09d59](https://github.com/marcantondahmen/automad/commit/02ae09d59931fc09f92fb8fd0161147d199031c4))
-
-## [v1.9.4](https://github.com/marcantondahmen/automad/commit/e52d003777a26e28746ab50140a0ebb65f0a28e5)
-
-Thu, 11 Nov 2021 12:06:24 +0100
-
-### New Features
-
-- **themes**: improve color scheme of dark theme ([11c27250f](https://github.com/marcantondahmen/automad/commit/11c27250f46b2ff9b8438289096e48a6b48f4aec))
-- **ui**: allow uppercase letters in custom field names ([0d11fc032](https://github.com/marcantondahmen/automad/commit/0d11fc032d0082a01190c8ed1cf020fdb31445fd))
-
-### Bugfixes
-
-- **core**: fix :current and :currentPath properties of pages that are redirected ([f79a2cfa9](https://github.com/marcantondahmen/automad/commit/f79a2cfa9907334f4615a5dadda09ab7c4fa0635))
-- **ui**: fix overflowing select buttons ([78c3f9a7d](https://github.com/marcantondahmen/automad/commit/78c3f9a7d746422ec9a3e3ae1597b3e96bc5054f))
-- **ui**: fix overflowing toolbox ([bad19924b](https://github.com/marcantondahmen/automad/commit/bad19924b32a58aa65248844fa52b7b0d2df6b23))

automad/lang/english.json

@@ -179,7 +179,7 @@
 	"fontSize": "Font Size",
 	"forgotPassword": "Forgot Password",
 	"galleryBlockLayout": "Layout",
-	"galleryBlockLayoutCleanBottom": "Clean bottom edge",
+	"galleryBlockLayoutFillRectangle": "Fill rectangle",
 	"galleryBlockLayoutColumnWidth": "Column Width",
 	"galleryBlockLayoutColumns": "Column Layout",
 	"galleryBlockLayoutGap": "Gap",
@@ -269,7 +269,6 @@
 	"mailBlockTitle": "Mail Form",
 	"mailBlockTo": "Receiving mail address",
 	"maintenanceModeText": "The server is under maintenance. All content stays accessible to visitors as usual but is currently read-only. Grap a quick coffee and as soon as maintenance is finished you can resume editing.",
-	"matchRowHeight": "Match Content to Row Height",
 	"metaDescription": "Meta Description (optional)",
 	"metaTitle": "Meta Title (optional)",
 	"missingEmailAlertBody": "There is currently no email address associated with your user account. In order to be able to receive password reset emails or other system notifications you can add an email address inside the user settings.",

automad/src/client/admin/components/Fields/EditorField.ts

@@ -103,11 +103,14 @@ export class EditorFieldComponent extends BaseFieldComponent {
 					const { blocks: raw } =
 						(await api.saver.save()) as EditorOutputData;
 
-					const blocks = raw.map((block) => {
-						block.tunes = filterEmptyData<KeyValueMap>(block.tunes);
-
-						return block;
-					});
+					const blocks =
+						raw?.map((block) => {
+							block.tunes = filterEmptyData<KeyValueMap>(
+								block.tunes ?? {}
+							);
+
+							return block;
+						}) || [];
 
 					if (
 						JSON.stringify(this.value.blocks) ===

automad/src/client/admin/components/Filter.ts

@@ -79,7 +79,7 @@ class FilterComponent extends BaseComponent {
 	protected get targetSelector(): string {
 		return (
 			this.getAttribute(Attr.target) ||
-			`section [${Attr.api}] .${CSS.field}:not(am-title-field):not(.${CSS.card} .${CSS.field}), .${CSS.card}`
+			`section [${Attr.api}] .${CSS.field}:not(am-title-field):not(.${CSS.card} .${CSS.field}), .${CSS.card}, .${CSS.alert}, .${CSS.grid}, hr, p`
 		);
 	}
 

automad/src/client/admin/components/PackageManager/PackageCard.ts

@@ -50,8 +50,6 @@ import {
 import { Package } from '@/admin/types';
 import { BaseComponent } from '@/admin/components/Base';
 
-const packageBrowser = 'https://packages.automad.org';
-
 /**
  * Perform a package manager action.
  *
@@ -295,7 +293,12 @@ const createFooter = (pkg: Package, container: HTMLElement): void => {
  *
  * @extends BaseComponent
  */
-class PackageCardComponent extends BaseComponent {
+export class PackageCardComponent extends BaseComponent {
+	/**
+	 * The tag name.
+	 */
+	static TAG_NAME = 'am-package-card';
+
 	/**
 	 * Render the package card as soon as the package data is provided.
 	 */
@@ -320,4 +323,4 @@ class PackageCardComponent extends BaseComponent {
 	}
 }
 
-customElements.define('am-package-card', PackageCardComponent);
+customElements.define(PackageCardComponent.TAG_NAME, PackageCardComponent);

automad/src/client/admin/components/PackageManager/PackageList.ts

@@ -33,6 +33,7 @@
  */
 
 import {
+	Attr,
 	create,
 	CSS,
 	EventName,
@@ -44,6 +45,7 @@ import {
 } from '@/admin/core';
 import { KeyValueMap, Package } from '@/admin/types';
 import { BaseComponent } from '@/admin/components/Base';
+import { PackageCardComponent } from './PackageCard';
 
 /**
  * Get and sort all required package data in order to generate the package card grid.
@@ -88,7 +90,10 @@ class PackageListComponent extends BaseComponent {
 		this.innerHTML = html`
 			<div class="${CSS.flex} ${CSS.flexGap}">
 				<am-update-all-packages></am-update-all-packages>
-				<am-filter placeholder="packagesFilter"></am-filter>
+				<am-filter
+					placeholder="packagesFilter"
+					${Attr.target}="${PackageCardComponent.TAG_NAME}"
+				></am-filter>
 			</div>
 		`;
 

automad/src/client/admin/editor/blocks/Gallery.ts

@@ -85,7 +85,7 @@ export class GalleryBlock extends BaseBlock<GalleryBlockData> {
 	 * @param data.columnWidthPx
 	 * @param data.rowHeightPx
 	 * @param data.gapPx
-	 * @param data.cleanBottom
+	 * @param data.fillRectangle
 	 * @return the gallery block data
 	 */
 	protected prepareData(data: GalleryBlockData): GalleryBlockData {
@@ -95,7 +95,7 @@ export class GalleryBlock extends BaseBlock<GalleryBlockData> {
 			columnWidthPx: data.columnWidthPx || 250,
 			rowHeightPx: data.rowHeightPx || 250,
 			gapPx: data.gapPx || 5,
-			cleanBottom: data.cleanBottom ?? false,
+			fillRectangle: data.fillRectangle ?? false,
 		};
 	}
 
@@ -178,7 +178,7 @@ export class GalleryBlock extends BaseBlock<GalleryBlockData> {
 		listen(modal, 'change', () => {
 			this.data = {
 				...this.data,
-				cleanBottom: false, // Always set false, since false toggles are ignored by collectFieldData()
+				fillRectangle: false, // Always set false, since false toggles are ignored by collectFieldData()
 				...collectFieldData(modal),
 			};
 		});
@@ -231,12 +231,12 @@ export class GalleryBlock extends BaseBlock<GalleryBlockData> {
 			{ required: '' }
 		);
 
-		if (this.data.layout == 'columns') {
+		if (['columns', 'rows'].includes(this.data.layout)) {
 			createField(FieldTag.toggle, settings, {
-				name: 'cleanBottom',
-				value: this.data.cleanBottom,
+				name: 'fillRectangle',
+				value: this.data.fillRectangle,
 				key: uniqueId(),
-				label: App.text('galleryBlockLayoutCleanBottom'),
+				label: App.text('galleryBlockLayoutFillRectangle'),
 			});
 		}
 

automad/src/client/admin/editor/blocks/Section.ts

@@ -155,7 +155,6 @@ export const sectionBorderStyles = [
 export const styleDefaults: SectionStyle = {
 	card: false,
 	shadow: false,
-	matchRowHeight: false,
 	color: '',
 	backgroundColor: '',
 	backgroundBlendMode: 'normal',
@@ -609,7 +608,6 @@ export class SectionBlock extends BaseBlock<SectionBlockData> {
 		};
 
 		field(FieldTag.toggle, 'card', 'optimizeContentForCards', body);
-		field(FieldTag.toggle, 'matchRowHeight', 'matchRowHeight', body);
 
 		const group1 = create('div', [CSS.grid, CSS.gridAuto], {}, body);
 
@@ -730,10 +728,6 @@ export class SectionBlock extends BaseBlock<SectionBlockData> {
 			classes.push(`${baseClass}--overflow-hidden`);
 		}
 
-		if (style.matchRowHeight) {
-			classes.push(`${baseClass}--match-height`);
-		}
-
 		this.holder.className = classes.join(' ');
 
 		const inline: string[] = [];

automad/src/client/admin/styles/components/editor/block.less

@@ -36,6 +36,9 @@
 	position: relative;
 	flex-basis: 100%;
 	flex-grow: 0;
+
+	display: flex;
+	align-items: stretch;
 	min-width: 16rem;
 	margin: 0 !important;
 	padding: 0 !important;
@@ -51,6 +54,8 @@
 
 	&__content {
 		position: relative;
+		display: flex;
+		align-items: stretch;
 		width: 100%;
 		padding: 0.2rem 0;
 		max-width: @am-bl-editor-block-max-width !important;

automad/src/client/admin/styles/components/editor/blocks/section.less

@@ -131,6 +131,7 @@
 
 	&__editor {
 		display: block;
+		flex-grow: 1;
 
 		& > .codex-editor > .codex-editor__redactor {
 			--space: var(--gap, 1px);
@@ -242,6 +243,7 @@
 		}
 
 		.ce-block & > .codex-editor {
+			height: 100%;
 			color: var(--color, inherit);
 			padding-top: var(--paddingTop);
 			padding-bottom: var(--paddingBottom);