Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 11 additions & 5 deletions _api_app/app/Sites/Sections/MessyTemplateRenderService.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,13 @@ public function getBodyClassList(
$isAutoResponsive,
$isEditMode
) {
$classes = [
'xContent-' . $currentSection['name'],
'xSectionType-' . $currentSectionType,
];
$classes = [];

if ($currentSection) {
$classes[] = 'xContent-' . $currentSection['name'];
}

$classes[] = 'xSectionType-' . $currentSectionType;

if (! empty($tagSlug)) {
$classes[] = 'xSubmenu-' . $tagSlug;
Expand Down Expand Up @@ -279,9 +282,12 @@ public function getPageEntriesClasses($currentSection, $tagSlug, $isResponsive)
$classes = [
'xEntriesList',
'clearfix',
'xSection-' . $currentSection['name'],
];

if ($currentSection) {
$classes[] = 'xSection-' . $currentSection['name'];
}

if (! empty($tagSlug)) {
$classes[] = 'xTag-' . $tagSlug;
}
Expand Down
20 changes: 12 additions & 8 deletions _api_app/app/Sites/Sections/SectionTemplateRenderService.php
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,13 @@ public function getBodyClasses($siteTemplateSettings, $sections, $sectionSlug, $
$currentSection = $this->getCurrentSection($sections, $sectionSlug);
$currentSectionType = $this->getCurrentSectionType($currentSection);

$classes = [
'xContent-' . $currentSection['name'],
'xSectionType-' . $currentSectionType,
];
$classes = [];

if ($currentSection) {
$classes[] = 'xContent-' . $currentSection['name'];
}

$classes[] = 'xSectionType-' . $currentSectionType;

if (! empty($tagSlug)) {
$classes[] = 'xSubmenu-' . $tagSlug;
Expand Down Expand Up @@ -257,10 +260,11 @@ public function getPageEntriesAttributes($sections, $sectionSlug, $tagSlug)
{
$currentSection = $this->getCurrentSection($sections, $sectionSlug);
$attributes = [];
$classes = [
'xEntriesList',
'xSection-' . $currentSection['name'],
];
$classes = ['xEntriesList'];

if ($currentSection) {
$classes[] = 'xSection-' . $currentSection['name'];
}

if (! empty($tagSlug)) {
$classes[] = 'xTag-' . $tagSlug;
Expand Down
44 changes: 44 additions & 0 deletions _api_app/tests/Feature/SectionTemplateRenderServiceTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

use App\Sites\Sections\DefaultTemplateRenderService;
use App\Sites\Sections\MessyTemplateRenderService;

function sectionTemplateRenderSettings(): array
{
return ['pageLayout' => ['responsive' => 'no', 'centeredContents' => 'no']];
}

it('renders default template classes for a site without sections', function () {
$service = new DefaultTemplateRenderService;

$bodyClasses = $service->getBodyClasses(sectionTemplateRenderSettings(), [], null, null, false);
$pageEntriesAttributes = $service->getPageEntriesAttributes([], null, null);

expect($bodyClasses)->toBe('xSectionType-default')
->and($pageEntriesAttributes)->toContain('xEntriesList')
->and($pageEntriesAttributes)->not->toContain('xSection-');
});

it('renders messy template classes for a site without sections', function () {
$service = new MessyTemplateRenderService;

$bodyClasses = $service->getBodyClassList(sectionTemplateRenderSettings(), null, 'default', null, false, false, false);
$pageEntriesClasses = $service->getPageEntriesClasses(null, null, false);

expect($bodyClasses)->toBe('xSectionType-default')
->and($pageEntriesClasses)->toContain('xEntriesList')
->and($pageEntriesClasses)->not->toContain('xSection-');
});

it('renders the current section name in template classes', function () {
$sections = [['name' => 'about', '@attributes' => ['type' => 'default']]];
$defaultService = new DefaultTemplateRenderService;
$messyService = new MessyTemplateRenderService;

expect($defaultService->getBodyClasses(sectionTemplateRenderSettings(), $sections, 'about', null, false))
->toBe('xContent-about xSectionType-default')
->and($defaultService->getPageEntriesAttributes($sections, 'about', null))->toContain('xSection-about')
->and($messyService->getBodyClassList(sectionTemplateRenderSettings(), $sections[0], 'default', null, false, false, false))
->toBe('xContent-about xSectionType-default')
->and($messyService->getPageEntriesClasses($sections[0], null, false))->toContain('xSection-about');
});
Loading