Skip to content

[6.x] Updates Matrix field and Matrix blocks to use group roles #18295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gcamacho079 wants to merge 2 commits into
base: 6.x
Choose a base branch
from
+125 −112
Open

[6.x] Updates Matrix field and Matrix blocks to use group roles #18295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebb5d01
Make matrix block use a group role
gcamacho079 Jan 23, 2026
f55c302
Update Matrix to use fieldset
gcamacho079 Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/fields/Matrix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,6 +1655,14 @@ public function getGqlFragmentEntityByName(string $fragmentName): GqlInlineFragm
return $entryType;
}

/**
* @inheritdoc
*/
public function useFieldset(): bool
{
return true;
}

// Events
// -------------------------------------------------------------------------

Expand Down
229 changes: 117 additions & 112 deletions src/templates/_components/fieldtypes/Matrix/block.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{% set staticEntries = staticEntries ?? false %}

{% set actionBtnLabel = "#{entryTypeName} #{'Actions'|t('app')}" %}
{% set titleId = "matrixblock-title--#{entry.uid}" %}
{% set actionMenuId = "matrixblock-action-menu--#{entry.uid}" %}

{% set actionMenuItems = [
Expand Down Expand Up @@ -151,123 +152,127 @@
}) %}
{% set tabs = form.getTabMenu() %}
{% endnamespace %}

{% tag 'div' with {
class: [
'matrixblock',
'js-deletable',
not entry.enabled ? 'disabled-entry',
static ? 'static',
]|filter,
style: {
'--custom-bg-color': entryType.color.cssVar(50) ?? null,
'--custom-text-color': entryType.color.cssVar(900) ?? null,
'--custom-titlebar-bg-color': entryType.color.cssVar(100) ?? null,
'--custom-border-color': entryType.color.cssVar(200) ?? null,
}|filter,
data: {
id: entry.id,
'draft-id': entry.isProvisionalDraft ? null : entry.draftId,
'revision-id': entry.revisionId,
'owner-id': entry.getOwnerId(),
'site-id': entry.siteId,
uid: entry.uid,
type: entryType.handle,
'type-name': entryTypeName,
collapsed: entry.collapsed,
'type-id': entry.typeId,
'field-layout-id': entry.getFieldLayout().id,
'visible-layout-elements': form.getVisibleElements(),
'base-input-name': baseInputName|namespaceInputName,
},
role: 'listitem',
} %}
{% if not static %}
{{ hiddenInput("#{name}[sortOrder][]", entry.uid) }}
{# only register a delta name for this entry if it’s not new #}
{% if entry.id and not entry.getIsUnpublishedDraft() %}
{% do view.registerDeltaName(baseInputName) %}
{% endif %}
{{ hiddenInput("#{baseInputName}[type]", entryType.handle) }}
{{ hiddenInput("#{baseInputName}[enabled]", entry.enabled ? '1' : '') }}
{% if isFresh ?? false %}
{{ hiddenInput("#{baseInputName}[fresh]", '1') }}
{% endif %}
{% endif %}

<div role="listitem">
{% tag 'div' with {
class: 'titlebar',
class: [
'matrixblock',
'js-deletable',
not entry.enabled ? 'disabled-entry',
static ? 'static',
]|filter,
style: {
'--custom-bg-color': entryType.color.cssVar(50) ?? null,
'--custom-text-color': entryType.color.cssVar(900) ?? null,
'--custom-titlebar-bg-color': entryType.color.cssVar(100) ?? null,
'--custom-border-color': entryType.color.cssVar(200) ?? null,
}|filter,
data: {
id: entry.id,
'draft-id': entry.isProvisionalDraft ? null : entry.draftId,
'revision-id': entry.revisionId,
'owner-id': entry.getOwnerId(),
'site-id': entry.siteId,
uid: entry.uid,
type: entryType.handle,
'type-name': entryTypeName,
collapsed: entry.collapsed,
'type-id': entry.typeId,
'field-layout-id': entry.getFieldLayout().id,
'visible-layout-elements': form.getVisibleElements(),
'base-input-name': baseInputName|namespaceInputName,
},
role: 'group',
aria: {
labelledby: titleId,
}
} %}
{% tag 'div' with {
class: {
blocktype: true,
flex: true,
'flex-nowrap': true,
'flex-gap-xs': true,
error: not static and entry.hasErrors(),
}|filter|keys,
} %}
{% if entryType.icon %}
{{ tag('div', {
class: ['cp-icon', 'small', entryType.color.value ?? null]|filter,
html: iconSvg(entryType.icon),
}) }}
{% if not static %}
{{ hiddenInput("#{name}[sortOrder][]", entry.uid) }}
{# only register a delta name for this entry if it’s not new #}
{% if entry.id and not entry.getIsUnpublishedDraft() %}
{% do view.registerDeltaName(baseInputName) %}
{% endif %}
{{ hiddenInput("#{baseInputName}[type]", entryType.handle) }}
{{ hiddenInput("#{baseInputName}[enabled]", entry.enabled ? '1' : '') }}
{% if isFresh ?? false %}
{{ hiddenInput("#{baseInputName}[fresh]", '1') }}
{% endif %}
<div>{{ entryTypeName }}</div>
{% if not static and entry.hasErrors() %}<span data-icon="alert" aria-label="{{ 'Error'|t('app') }}"></span>{% endif %}
{% endtag %}
<div class="preview"></div>
{% endif %}

{% tag 'div' with {
class: ['matrixblock-tabs'],
style: {
'--custom-sel-tab-shadow-color': entryType.color.cssVar(200) ?? null,
}|filter,
class: 'titlebar',
} %}
{% if tabs|length > 1 %}
{% namespace baseInputName %}
{% include '_includes/tabs.twig' %}
{% endnamespace %}
{% endif %}
{% endtag %}
{% endtag %}{# /.titlebar #}
{% tag 'div' with {
class: {
blocktype: true,
flex: true,
'flex-nowrap': true,
'flex-gap-xs': true,
error: not static and entry.hasErrors(),
}|filter|keys,
} %}
{% if entryType.icon %}
{{ tag('div', {
class: ['cp-icon', 'small', entryType.color.value ?? null]|filter,
html: iconSvg(entryType.icon),
}) }}
{% endif %}
<div id="{{ titleId }}">{{ entryTypeName }}</div>
{% if not static and entry.hasErrors() %}<span data-icon="alert" aria-label="{{ 'Error'|t('app') }}"></span>{% endif %}
{% endtag %}
<div class="preview"></div>
{% tag 'div' with {
class: ['matrixblock-tabs'],
style: {
'--custom-sel-tab-shadow-color': entryType.color.cssVar(200) ?? null,
}|filter,
} %}
{% if tabs|length > 1 %}
{% namespace baseInputName %}
{% include '_includes/tabs.twig' %}
{% endnamespace %}
{% endif %}
{% endtag %}
{% endtag %}{# /.titlebar #}

<div class="actions">
<div class="status off" title="{{ 'Disabled'|t('app') }}">
{{ tag('span', {
class: 'visually-hidden',
html: 'Disabled'|t('app'),
}) }}
</div>
<div class="actions">
<div class="status off" title="{{ 'Disabled'|t('app') }}">
{{ tag('span', {
class: 'visually-hidden',
html: 'Disabled'|t('app'),
}) }}
</div>

{% if actionMenuItems is not empty %}
<div class="checkbox" title="{{ 'Select'|t('app') }}" aria-label="{{ 'Select'|t('app') }}" tabindex="0" role="checkbox" aria-checked="false"></div>
{{ disclosureMenu(actionMenuItems, {
hiddenLabel: 'Actions'|t('app'),
buttonAttributes: {
class: ['action-btn', 'small'],
title: 'Actions'|t('app'),
data: {
'disclosure-trigger': true,
{% if actionMenuItems is not empty %}
<div class="checkbox" title="{{ 'Select'|t('app') }}" aria-label="{{ 'Select'|t('app') }}" tabindex="0" role="checkbox" aria-checked="false"></div>
{{ disclosureMenu(actionMenuItems, {
hiddenLabel: 'Actions'|t('app'),
buttonAttributes: {
class: ['action-btn', 'small'],
title: 'Actions'|t('app'),
data: {
'disclosure-trigger': true,
},
},
},
}) }}
{% endif %}
{% if not static %}
{{ button({
class: ['chromeless', 'small', 'move-btn'],
icon: 'move',
attributes: {
title: 'Reorder'|t('app'),
aria: {label: 'Reorder'|t('app')},
role: 'none',
tabindex: '-1',
},
}) }}
{% endif %}
</div>
<div class="fields">
{% namespace baseInputName %}
{{ form.render()|raw }}
{% endnamespace %}
</div>
{% endtag %}{# /.matrixblock #}
}) }}
{% endif %}
{% if not static %}
{{ button({
class: ['chromeless', 'small', 'move-btn'],
icon: 'move',
attributes: {
title: 'Reorder'|t('app'),
aria: {label: 'Reorder'|t('app')},
role: 'none',
tabindex: '-1',
},
}) }}
{% endif %}
</div>
<div class="fields">
{% namespace baseInputName %}
{{ form.render()|raw }}
{% endnamespace %}
</div>
{% endtag %}{# /.matrixblock #}
</div>
Loading