Skip to content

refactor: remove automatic column calculation #949

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

Merged
thorbrink merged 1 commit into from
Oct 15, 2025
Merged

refactor: remove automatic column calculation #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 2 additions & 62 deletions source/php/Module/Menu/Decorator/Listing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,69 +10,9 @@ public function __construct(private $fields)
public function decorate(array $data): array
{
$amountOfItems = !empty($data['menu']['items']) ? count($data['menu']['items']) : 0;
$columns = (int) ($this->fields['mod_menu_columns'] ?? 3);
$data['columns'] = $this->tryGetColumns($data['wrapped'], $columns, $amountOfItems);
$data['gridClasses'] = $this->getGridColumnsCompabilityClasses(
$data['wrapped'],
$columns,
$amountOfItems
) ?? [];
$data['columns'] = (int) ($this->fields['mod_menu_columns'] ?? 3);
$data['fakeItems'] = $data['wrapped'] ? ($data['columns'] - ($amountOfItems % $data['columns'])) % $data['columns'] : 0;

return $data;
}

/**
* Tries to calculate the number of columns for a menu listing.
*
* This method takes into consideration whether the menu items should be wrapped or not,
* the desired number of columns, and the total amount of menu items.
*
* @param bool $wrapped Whether the menu items should be wrapped or not.
* @param int $columns The desired number of columns.
* @param int $amountOfItems The total amount of menu items.
* @return int The calculated number of columns.
*/
private function tryGetColumns(bool $wrapped, int $columns, int $amountOfItems): int
{
if (!$wrapped || $amountOfItems % $columns === 0) {
return $columns;
}

if ($amountOfItems < $columns) {
return $amountOfItems;
}

foreach (range($columns - 1, 1) as $column) {
if ($amountOfItems % $column === 0) {
return $column;
}
}

return $columns;
}

/**
* Adds grid classes based on the number of columns and the amount of items.
*
* @param int $columns The number of columns.
* @param int $amountOfItems The amount of items.
* @return array The array of grid classes.
*/
private function getGridColumnsCompabilityClasses (bool $wrapped, int $columns, int $amountOfItems): array
{
if (!$wrapped) {
return [];
}
// to work with 3 columns since its an odd number.
$modifiedColumns = $columns === 3 ? 6 : $columns;

$classList = [];

if ($amountOfItems % $modifiedColumns !== 0) {
$classList[] = 'c-group--single-column-sm';
$classList[] = 'c-group--single-column-md';
}

return $classList;
}
}
55 changes: 29 additions & 26 deletions source/php/Module/Menu/views/menus/listing/components/content.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,33 @@
'classList' => array_merge([
'mod-menu__container',
], $gridClasses ?? [])
])
@foreach ($menu['items'] as $index => $menuItem)
<div
class="mod-menu__item {{implode(' ', $menuItem['classList'] ?? [])}}@if (!$mobileCollapse) is-expanded @endif"
@if ($mobileCollapse)
data-js-toggle-item="mod-menu-item-{{$ID}}-{{$index}}" data-js-toggle-class="is-expanded"
@endif
>
@group([
'display' => 'grid',
'classList' => [
'mod-menu__grid'
],
'attributeList' => [
'style' => 'grid-template-columns: auto 1fr;'
],
'gap' => 1
])
@includeWhen(!empty($menuItem['icon']['icon']), 'menus.listing.partials.icon')
@includeWhen(!empty($menuItem['label']), 'menus.listing.partials.parent')
@includeWhen(!empty($menuItem['description']), 'menus.listing.partials.description')
@includeWhen(!empty($menuItem['children']), 'menus.listing.partials.children')
@endgroup
@includeWhen(!empty($menuItem['children'] && $mobileCollapse), 'menus.listing.partials.expand')
</div>
@endforeach
])
@foreach ($menu['items'] as $index => $menuItem)
<div
class="mod-menu__item {{implode(' ', $menuItem['classList'] ?? [])}}@if (!$mobileCollapse) is-expanded @endif"
@if ($mobileCollapse)
data-js-toggle-item="mod-menu-item-{{$ID}}-{{$index}}" data-js-toggle-class="is-expanded"
@endif
>
@group([
'display' => 'grid',
'classList' => [
'mod-menu__grid'
],
'attributeList' => [
'style' => 'grid-template-columns: auto 1fr;'
],
'gap' => 1
])
@includeWhen(!empty($menuItem['icon']['icon']), 'menus.listing.partials.icon')
@includeWhen(!empty($menuItem['label']), 'menus.listing.partials.parent')
@includeWhen(!empty($menuItem['description']), 'menus.listing.partials.description')
@includeWhen(!empty($menuItem['children']), 'menus.listing.partials.children')
@endgroup
@includeWhen(!empty($menuItem['children'] && $mobileCollapse), 'menus.listing.partials.expand')
</div>
@endforeach
@for ($i = 0; $i < ($fakeItems ?? 0); $i++)
<div class="mod-menu__item mod-menu__item--fake"></div>
@endfor
@endgroup