@@ -105,18 +126,41 @@ export default function Edit({
{attributes.showLegend && (
setAttributes({ legend })}
+ style={{
+ textAlign: legendAlign as CSSProperties['textAlign'],
+ fontFamily: 'inherit',
+ }}
/>
)}
) : (
- `Type: ${types?.[0]?.value ?? DEFAULT_DONATION_TYPE.value} (hidden)`
+ <>
+ {attributes.showLegend && (
+ setAttributes({ legend })}
+ style={{
+ textAlign: legendAlign as CSSProperties['textAlign'],
+ fontFamily: 'inherit',
+ }}
+ />
+ )}
+ {`Type: ${types?.[0]?.value ?? DEFAULT_DONATION_TYPE.value} (hidden)`}
+
)}
diff --git a/src/Blocks/donation-type/render.php b/src/Blocks/donation-type/render.php
new file mode 100644
index 0000000..fdb07fa
--- /dev/null
+++ b/src/Blocks/donation-type/render.php
@@ -0,0 +1,136 @@
+|null $attributes Block attributes.
+ * @var string|null $content Inner content (unused here).
+ * @var WP_Block $block Block instance.
+ */
+
+$attributes = $attributes ?? [];
+
+$show_legend = array_key_exists('showLegend', $attributes) ? (bool) $attributes['showLegend'] : true;
+
+$legend = (isset($attributes['legend']) && trim((string) $attributes['legend']) !== '')
+ ? (string) $attributes['legend']
+ : __('Donation type', 'fame_lahjoitukset');
+
+$legend_align_raw = isset($attributes['legendAlign']) ? (string) $attributes['legendAlign'] : 'left';
+$legend_align = in_array($legend_align_raw, ['left', 'center', 'right', 'justify'], true)
+ ? $legend_align_raw
+ : 'left';
+
+$legend_classes = ['fame-form__legend'];
+
+if (!$show_legend) {
+ $legend_classes[] = 'screen-reader-text';
+}
+
+$legend_classes[] = 'has-text-align-' . $legend_align;
+
+// Ensures alignment works even when legend is rendered as a in the hidden branch.
+$legend_style = 'text-align:' . $legend_align . ';';
+
+$saved_types = (isset($attributes['types']) && is_array($attributes['types'])) ? $attributes['types'] : [];
+$saved_value = isset($attributes['value']) ? (string) $attributes['value'] : '';
+
+// Context: enabled donation types from parent (providesContext).
+$enabled_types = [];
+if (array_key_exists('famehelsinki/donation-types', $block->context)) {
+ $raw = $block->context['famehelsinki/donation-types'];
+ if (is_array($raw)) {
+ $enabled_types = array_values(array_map('strval', $raw));
+ }
+}
+
+// Types comes from attributes (saved) or context (enabled) or fallback (default).
+$types = !empty($saved_types)
+ ? $saved_types
+ : [
+ ['value' => 'single', 'label' => __('Single', 'fame_lahjoitukset')],
+ ['value' => 'recurring', 'label' => __('Recurring', 'fame_lahjoitukset')],
+ ];
+
+$types = array_values(array_filter(
+ $types,
+ static fn($t) =>
+ is_array($t) && isset($t['value']) && (string) $t['value'] !== ''
+));
+
+if (!empty($enabled_types)) {
+ $types = array_values(array_filter(
+ $types,
+ static fn($t) => in_array((string) $t['value'], $enabled_types, true)
+ ));
+}
+
+// Fallback
+if (empty($types)) {
+ $types = [
+ ['value' => 'single', 'label' => __('Single', 'fame_lahjoitukset')],
+ ];
+}
+
+$values = array_map(static fn($t) => (string) ($t['value'] ?? ''), $types);
+
+$default_value =
+ ($saved_value !== '' && in_array($saved_value, $values, true))
+ ? $saved_value
+ : (string) ($types[0]['value'] ?? '');
+
+$is_hidden = count($types) <= 1;
+
+$classes = $is_hidden
+ ? 'fame-form__hidden'
+ : 'fame-form__fieldset fame-form__fieldset--donation-type';
+
+$wrapper_attrs = get_block_wrapper_attributes(['class' => $classes]);
+
+?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Blocks/donation-type/save.tsx b/src/Blocks/donation-type/save.tsx
index 4d2aa1f..9e8345e 100644
--- a/src/Blocks/donation-type/save.tsx
+++ b/src/Blocks/donation-type/save.tsx
@@ -1,59 +1,8 @@
-import { RichText, useBlockProps } from '@wordpress/block-editor'
-import React from 'react'
-import { DEFAULT_DONATION_TYPE } from '../common/donation-type.ts'
-import { SaveProps } from '../common/types.ts'
-import { Attributes } from './edit.tsx'
-
/**
- * The save function defines the way in which the different attributes should
- * be combined into the final markup, which is then serialized by the block
- * editor into `post_content`.
- *
- * @see https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#save
+ * Dynamic block – rendering happens in PHP (render.php).
+ * Nothing is saved to post_content.
*/
-export default function save({ attributes }: SaveProps
): React.JSX.Element {
- const { legend, showLegend, types, value: defaultValue } = attributes
- const isHidden = !Array.isArray(types) || types.length <= 1
- const blockProps = useBlockProps.save({
- className: isHidden
- ? 'fame-form__hidden'
- : 'fame-form__fieldset fame-form__fieldset--donation-type',
- })
-
- if (isHidden) {
- return (
-
-
-
- )
- }
- return (
-
- )
+export default function save() {
+ return null
}
diff --git a/src/Blocks/form-controls/block.json b/src/Blocks/form-controls/block.json
index 37a73d2..0a71bb2 100644
--- a/src/Blocks/form-controls/block.json
+++ b/src/Blocks/form-controls/block.json
@@ -10,12 +10,16 @@
"attributes": {
"submitLabel": {
"type": "string",
- "source": "text",
- "selector": ".fame-form__controls [type=\"submit\"]",
"default": "Donate"
},
- "submitLabelSingle": { "type": "string", "default": "Donate" },
- "submitLabelRecurring": { "type": "string", "default": "Donate" }
+ "submitLabelSingle": {
+ "type": "string",
+ "default": "Donate"
+ },
+ "submitLabelRecurring": {
+ "type": "string",
+ "default": "Donate"
+ }
},
"supports": {
"multiple": false,
@@ -30,5 +34,6 @@
},
"icon": "button",
"textdomain": "fame_lahjoitukset",
- "editorScript": "file:./index.js"
+ "editorScript": "file:./index.js",
+ "render": "file:./render.php"
}
diff --git a/src/Blocks/form-controls/deprecated/save-v1.tsx b/src/Blocks/form-controls/deprecated/save-v1.tsx
deleted file mode 100644
index 8253436..0000000
--- a/src/Blocks/form-controls/deprecated/save-v1.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { __ } from '@wordpress/i18n'
-import { RichText, useBlockProps } from '@wordpress/block-editor'
-import React from 'react'
-import { SaveProps } from '../../common/types.ts'
-
-type AttributesV1 = {
- submitLabel?: string
-}
-
-export default function SaveV1({
- attributes: { submitLabel = __('Donate', 'fame_lahjoitukset') },
-}: SaveProps): React.JSX.Element {
- return (
-
-
-
-
- )
-}
diff --git a/src/Blocks/form-controls/edit.tsx b/src/Blocks/form-controls/edit.tsx
index 871504e..09e8e97 100644
--- a/src/Blocks/form-controls/edit.tsx
+++ b/src/Blocks/form-controls/edit.tsx
@@ -75,7 +75,7 @@ export default function Edit({
setLabelForType(currentType, value)}
diff --git a/src/Blocks/form-controls/index.ts b/src/Blocks/form-controls/index.ts
index c084afc..6cc909e 100644
--- a/src/Blocks/form-controls/index.ts
+++ b/src/Blocks/form-controls/index.ts
@@ -11,7 +11,6 @@ import { registerBlockType } from '@wordpress/blocks'
import Edit from './edit'
import save from './save'
import metadata from './block.json'
-import SaveV1 from './deprecated/save-v1'
/**
* Every block starts by registering a new block type definition.
@@ -28,27 +27,4 @@ registerBlockType(metadata.name, {
* @see ./save.js
*/
save,
-
- /**
- * Support old saved content (before submitLabelSingle/Recurring
- * and before switching from RichText.Content to