Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
20 changes: 18 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
# MForm - REDAXO Addon für Modul-Input-Formulare
#
# Version 9.0.1

## Version 9.1.0

### Neu

- **Tabs als ID-freie Implementierung** – `addTabElement()` funktioniert jetzt stabil in verschachtelten und dynamischen Kontexten (z. B. FlexRepeater, Fieldset, Collapse, Modal), ohne Bootstrap-ID-Verkabelung und ohne Kollisionen zwischen geklonten Instanzen.
- **Optionale Tab-Modernisierung** – Tab-Navigation kann optional als modernisierte Variante gerendert werden über `tab-style => 'modern'` bzw. `data-group-tab-style => 'modern'`.
- **Optionale vertikale Tab-Navigation** – Tabs können optional links neben dem Inhalt dargestellt werden über `tab-layout => 'vertical'` bzw. `data-group-tab-layout => 'vertical'` (inkl. Mobile-Fallback auf gestapelte Ansicht).
- **Font-Awesome-Icons je Tab** – Icon-Unterstützung über `tab-icon` bleibt erhalten und funktioniert weiterhin in den neuen Tab-Varianten.

### Kompatibilität

- Standardverhalten bleibt unverändert: Ohne neue Attribute bleiben Tabs visuell und funktional wie bisher.
- Bestehende Module mit `addTabElement()` bleiben kompatibel.

---

## Version 9.0.1

### Behoben

Expand Down
132 changes: 132 additions & 0 deletions assets/css/mform.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,116 @@
background: #fff;
}

.mform .mform-tabs {
--mform-tab-nav-bg: #f7f9fc;
--mform-tab-nav-border: #dfe5ee;
--mform-tab-content-bg: #ffffff;
--mform-tab-content-border: #dfe5ee;
--mform-tab-link-color: #48586b;
--mform-tab-link-active-bg: #ffffff;
--mform-tab-link-active-color: #1d2e40;
--mform-tab-link-hover-bg: #eef3f8;
}

.mform .mform-tabs.mform-tabs--modern > .nav-tabs {
border-bottom: 1px solid var(--mform-tab-nav-border);
background: var(--mform-tab-nav-bg);
padding: 6px 6px 0;
}

.mform .mform-tabs.mform-tabs--modern > .nav-tabs > li > a {
border-radius: 8px 8px 0 0;
border: 1px solid transparent;
color: var(--mform-tab-link-color);
transition: background-color .2s ease, color .2s ease, border-color .2s ease;
}

.mform .mform-tabs.mform-tabs--modern > .nav-tabs > li > a:hover,
.mform .mform-tabs.mform-tabs--modern > .nav-tabs > li > a:focus {
background: var(--mform-tab-link-hover-bg);
color: var(--mform-tab-link-active-color);
}

.mform .mform-tabs.mform-tabs--modern > .nav-tabs > li.active > a,
.mform .mform-tabs.mform-tabs--modern > .nav-tabs > li.active > a:hover,
.mform .mform-tabs.mform-tabs--modern > .nav-tabs > li.active > a:focus {
background: var(--mform-tab-link-active-bg);
border-color: var(--mform-tab-content-border) var(--mform-tab-content-border) var(--mform-tab-link-active-bg);
color: var(--mform-tab-link-active-color);
}

.mform .mform-tabs.mform-tabs--modern > .tab-content {
border: 1px solid var(--mform-tab-content-border);
border-top: 0;
background: var(--mform-tab-content-bg);
}

.mform .mform-tabs.mform-tabs--vertical {
display: flex;
align-items: stretch;
}

.mform .mform-tabs.mform-tabs--vertical > .nav-tabs {
width: 240px;
min-width: 240px;
border-bottom: 0;
border-right: 1px solid var(--mform-tab-nav-border);
background: var(--mform-tab-nav-bg);
padding: 8px;
}

.mform .mform-tabs.mform-tabs--vertical > .nav-tabs > li {
float: none;
width: 100%;
margin-bottom: 4px;
}

.mform .mform-tabs.mform-tabs--vertical > .nav-tabs > li > a {
margin-right: 0;
border-radius: 6px;
border: 1px solid transparent;
color: var(--mform-tab-link-color);
}

.mform .mform-tabs.mform-tabs--vertical > .nav-tabs > li > a:hover,
.mform .mform-tabs.mform-tabs--vertical > .nav-tabs > li > a:focus {
background: var(--mform-tab-link-hover-bg);
color: var(--mform-tab-link-active-color);
}

.mform .mform-tabs.mform-tabs--vertical > .nav-tabs > li.active > a,
.mform .mform-tabs.mform-tabs--vertical > .nav-tabs > li.active > a:hover,
.mform .mform-tabs.mform-tabs--vertical > .nav-tabs > li.active > a:focus {
background: var(--mform-tab-link-active-bg);
border-color: var(--mform-tab-content-border);
color: var(--mform-tab-link-active-color);
}

.mform .mform-tabs.mform-tabs--vertical > .tab-content {
flex: 1;
border: 1px solid var(--mform-tab-content-border);
border-left: 0;
background: var(--mform-tab-content-bg);
}

@media (max-width: 767px) {
.mform .mform-tabs.mform-tabs--vertical {
display: block;
}

.mform .mform-tabs.mform-tabs--vertical > .nav-tabs {
width: auto;
min-width: 0;
border-right: 0;
border-bottom: 1px solid var(--mform-tab-nav-border);
}

.mform .mform-tabs.mform-tabs--vertical > .tab-content {
border-left: 1px solid var(--mform-tab-content-border);
border-top: 0;
}
}

.mform .mform-tabs.rex-page-nav:last-child {
margin-bottom: 0;
}
Expand Down Expand Up @@ -169,6 +279,17 @@ body.rex-theme-dark .mform .mform-tabs .nav-tabs {
/*background-color: rgba(0, 0, 0, 0.15);*/
}

body.rex-theme-dark .mform .mform-tabs {
--mform-tab-nav-bg: #19222d;
--mform-tab-nav-border: #304050;
--mform-tab-content-bg: #202b35;
--mform-tab-content-border: #304050;
--mform-tab-link-color: #b9c7d6;
--mform-tab-link-active-bg: #202b35;
--mform-tab-link-active-color: #eef4fb;
--mform-tab-link-hover-bg: #243342;
}

body.rex-theme-dark .mform .mform-tabs .tab-content {
background-color: #202b35;
}
Expand Down Expand Up @@ -309,6 +430,17 @@ body.rex-theme-dark .mform .custom-link.input-group.is-empty input.form-control[
}

@media (prefers-color-scheme: dark) {
body.rex-has-theme:not(.rex-theme-light) .mform .mform-tabs {
--mform-tab-nav-bg: #19222d;
--mform-tab-nav-border: #304050;
--mform-tab-content-bg: #202b35;
--mform-tab-content-border: #304050;
--mform-tab-link-color: #b9c7d6;
--mform-tab-link-active-bg: #202b35;
--mform-tab-link-active-color: #eef4fb;
--mform-tab-link-hover-bg: #243342;
}

body.rex-has-theme:not(.rex-theme-light) .mform .mform-tabs .nav-tabs {
/*background-color: rgba(0, 0, 0, 0.15);*/
}
Expand Down
71 changes: 46 additions & 25 deletions assets/js/formbuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
'repeaterOpen', 'repeaterCopyPaste', 'repeaterConfirmDelete',
'repeaterConfirmDeleteMsg', 'repeaterBtnText', 'repeaterBtnClass'] },
tab: { label: 'Tab', method: 'addTabElement',
props: ['label', 'tabPullRight'] },
props: ['label', 'tabPullRight', 'tabIcon', 'tabStyle', 'tabLayout'] },
fieldset: { label: 'Fieldset', method: 'addFieldsetArea',
props: ['label'] }
};
Expand Down Expand Up @@ -184,6 +184,9 @@
repeaterBtnClass: '',
// Tab
tabPullRight: false,
tabIcon: '',
tabStyle: '',
tabLayout: '',
children: (type === 'repeater' || type === 'tab' || type === 'fieldset') ? [] : null
};
}
Expand Down Expand Up @@ -379,10 +382,6 @@
var nestedEl = sample ? sample.closest('[data-fb-nested]') : null;
if (nestedEl) targetDepth = parseInt(nestedEl.dataset.fbDepth, 10) || 0;
}
if (clipboard.type === 'tab' && targetDepth > 0) {
alert('Tabs koennen nur auf der obersten Ebene eingefuegt werden.');
return;
}
if (wouldExceedRepeaterDepth(clipboard, targetDepth)) {
alert('Mehr als ' + (MAX_REPEATER_DEPTH + 1) + ' Repeater-Ebenen werden nicht unterstuetzt.');
return;
Expand Down Expand Up @@ -515,11 +514,6 @@
}
// New item from palette has no children, so subtree depth is 0; depthOf check above
// is sufficient for palette inserts.
if (type === 'tab' && depthOf(evt.to) > 0) {
alert('Tabs koennen nur auf der obersten Ebene platziert werden.');
setTimeout(doRender, 0);
return;
}
var newItem = makeItem(type);
toList.splice(evt.newIndex, 0, newItem);
setTimeout(function () { doRender(); selectItem(newItem); }, 0);
Expand All @@ -538,12 +532,6 @@
setTimeout(doRender, 0);
return;
}
if (item.type === 'tab' && depthOf(evt.to) > 0) {
alert('Tabs koennen nur auf der obersten Ebene platziert werden.');
setTimeout(doRender, 0);
return;
}

removeItem(uid);
toList.splice(evt.newIndex, 0, item);
setTimeout(doRender, 0);
Expand Down Expand Up @@ -588,15 +576,6 @@
if (!type) return;
var newItem = makeItem(type);

// Tabs are top-level only (Fieldsets duerfen ueberall liegen).
if (type === 'tab') {
state.push(newItem);
renderCanvas();
emitCode();
selectItem(newItem);
return;
}

// If an active repeater/tab/fieldset is selected, attempt to insert as child.
// Otherwise append at top level.
var canNestInto = activeItem && (activeItem.type === 'repeater' || activeItem.type === 'tab' || activeItem.type === 'fieldset');
Expand Down Expand Up @@ -930,6 +909,13 @@
var label = item.label || '';
var openTab = isFirst ? 'true' : 'false';
var args = phpStr(label) + ', MForm::factory()\n' + inner;
var tabAttrs = tabAttrsPhp(item);
if (tabAttrs) {
if (item.tabPullRight) {
return indent + '$mform->addTabElement(' + args + ', ' + openTab + ', true, ' + tabAttrs + ');';
}
return indent + '$mform->addTabElement(' + args + ', ' + openTab + ', false, ' + tabAttrs + ');';
}
// Drop trailing args we can default; only emit pullRight if true
if (item.tabPullRight) {
return indent + '$mform->addTabElement(' + args + ', ' + openTab + ', true);';
Expand All @@ -940,6 +926,32 @@
return indent + '$mform->addTabElement(' + args + ');';
}

function renderInnerTabChainLink(item, indent, isFirst) {
var inner = renderRepeaterInner(item, indent);
var label = item.label || '';
var openTab = isFirst ? 'true' : 'false';
var args = phpStr(label) + ', MForm::factory()\n' + inner;
var tabAttrs = tabAttrsPhp(item);
if (tabAttrs) {
return indent + '->addTabElement(' + args + ', ' + openTab + ', ' + (item.tabPullRight ? 'true' : 'false') + ', ' + tabAttrs + ')';
}
if (item.tabPullRight) {
return indent + '->addTabElement(' + args + ', ' + openTab + ', true)';
}
if (isFirst) {
return indent + '->addTabElement(' + args + ', true)';
}
return indent + '->addTabElement(' + args + ')';
}

function tabAttrsPhp(item) {
var attrs = {};
if (item.tabIcon) attrs['tab-icon'] = item.tabIcon;
if (item.tabStyle) attrs['tab-style'] = item.tabStyle;
if (item.tabLayout) attrs['tab-layout'] = item.tabLayout;
return attrsToPhp(attrs);
}

function renderFieldsetStmt(item, indent) {
var inner = renderRepeaterInner(item, indent);
var legend = item.label || '';
Expand Down Expand Up @@ -976,17 +988,26 @@
return indent + ' // Felder hier ablegen\n';
}
var keyPool = {};
var prevWasTab = false;
var lines = children.map(function (c) {
if (c.type === 'fieldset') {
prevWasTab = false;
return renderInnerFieldsetChainLink(c, indent + ' ');
}
if (c.type === 'tab') {
var isFirstTab = !prevWasTab;
prevWasTab = true;
return renderInnerTabChainLink(c, indent + ' ', isFirstTab);
}
var key = slugify(c.label, 'field_' + c.id);
var base = key, n = 2;
while (keyPool[key]) { key = base + '_' + n++; }
keyPool[key] = true;
if (c.type === 'repeater') {
prevWasTab = false;
return renderInnerRepeaterChainLink(c, key, indent + ' ');
}
prevWasTab = false;
return renderInnerChainLink(c, key, indent + ' ');
});
return lines.join('\n') + '\n';
Expand Down
51 changes: 44 additions & 7 deletions assets/mform.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,51 @@ function initMFormSelectPicker(mform) {

function initMFormTabs(mform) {
mform.find('.mform-tabs').each(function () {
let wrapper = $(this);
$(this).find('ul[role=tablist] a').unbind().bind('click', function () {
let tab = wrapper.find('div[data-tab-group-nav-tab-id=' + $(this).data('tab-item') + ']'),
uid = Math.floor((1 + Math.random()) * 0x10000).toString(16).substring(1);
tab.attr('id', uid);
$(this).attr('href', '#' + uid);
$('#' + uid).tab("show");
let wrapper = $(this),
nav = wrapper.children('ul[role=tablist]').first(),
panes = wrapper.children('.tab-content').first().children('.tab-pane');

if (!nav.length || !panes.length) {
return;
}

function activateTab(tabId) {
let links = nav.find('[data-mform-tab-toggle]'),
targetLink = links.filter(function () {
return String($(this).data('tab-item')) === String(tabId);
}).first();

if (!targetLink.length) {
targetLink = links.first();
tabId = String(targetLink.data('tab-item'));
}

nav.find('li[role=presentation]').removeClass('active');
links.attr('aria-selected', 'false');
targetLink.closest('li[role=presentation]').addClass('active');
targetLink.attr('aria-selected', 'true');

panes.removeClass('active');
panes.filter(function () {
return String($(this).attr('data-tab-group-nav-tab-id')) === String(tabId);
}).first().addClass('active');
}

wrapper.off('click.mformTabs').on('click.mformTabs', '[data-mform-tab-toggle]', function (e) {
if ($(this).closest('ul[role=tablist]')[0] !== nav[0]) {
return;
}
e.preventDefault();
e.stopPropagation();
activateTab($(this).data('tab-item'));
});

let activeLink = nav.find('li.active [data-mform-tab-toggle]').first();
if (activeLink.length) {
activateTab(activeLink.data('tab-item'));
} else {
activateTab(nav.find('[data-mform-tab-toggle]').first().data('tab-item'));
}
});
}

Expand Down
Loading
Loading