Skip to content

Fix propagate styles #202

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

Closed
wants to merge 2 commits into from
Closed

Fix propagate styles #202

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
1aa76df
Fix propagate styles. Solves #201
AydinHassan Dec 18, 2019
b031f5f
CS
AydinHassan Dec 18, 2019
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
37 changes: 25 additions & 12 deletions src/Builder/CliMenuBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,6 @@ public function addSubMenu(string $text, \Closure $callback) : self

$menu = $builder->build();
$menu->setParent($this->menu);

//we apply the parent theme if nothing was changed
//if no styles were changed in this sub-menu
if (!$menu->getStyle()->hasChangedFromDefaults()) {
$menu->setStyle($this->menu->getStyle());
}

$this->menu->addItem($item = new MenuMenuItem(
$text,
Expand All @@ -210,12 +204,6 @@ public function addSubMenuFromBuilder(string $text, CliMenuBuilder $builder) : s
$menu = $builder->build();
$menu->setParent($this->menu);

//we apply the parent theme if nothing was changed
//if no styles were changed in this sub-menu
if (!$menu->getStyle()->hasChangedFromDefaults()) {
$menu->setStyle($this->menu->getStyle());
}

$this->menu->addItem($item = new MenuMenuItem(
$text,
$menu,
Expand Down Expand Up @@ -556,6 +544,31 @@ public function build() : CliMenu
$this->style->setDisplaysExtra($this->itemsHaveExtra($this->menu->getItems()));
}

if (!$this->subMenu) {
$this->propagateStyles($this->menu->getItems());
}

return $this->menu;
}

private function propagateStyles(array $items) : void
{
$menuItems = array_filter($items, function (MenuItemInterface $menuItem) {
return $menuItem instanceof MenuMenuItem;
});

$changedMenus = array_filter($menuItems, function (MenuMenuItem $menuItem) {
return !$menuItem->getSubMenu()
->getStyle()
->hasChangedFromDefaults();
});

array_walk($changedMenus, function (MenuMenuItem $menuItem) {
$menuItem->getSubMenu()->setStyle(
$this->menu->getStyle()
);

$this->propagateStyles($menuItem->getSubMenu()->getItems());
});
}
}
27 changes: 27 additions & 0 deletions test/Builder/CliMenuBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,33 @@ public function testSubMenuInheritsParentsStyle() : void
self::assertSame($menu->getStyle(), $menu->getItems()[0]->getSubMenu()->getStyle());
}

public function testNestedSubMenuInheritsParentsStyle() : void
{
$terminal = self::createMock(Terminal::class);
$terminal
->expects($this->any())
->method('getWidth')
->will($this->returnValue(200));

$menu = (new CliMenuBuilder($terminal))
->setBackgroundColour('green')
->addSubMenu('My SubMenu', function (CliMenuBuilder $b) {
$b->addSubMenu('Nested submenu', function (CliMenuBuilder $b) {
$b->addItem('Nested item', function () {
});
})->addItem('Some Item', function () {
});
})
->build();

self::assertSame('green', $menu->getItems()[0]->getSubMenu()->getStyle()->getBg());
self::assertSame($menu->getStyle(), $menu->getItems()[0]->getSubMenu()->getStyle());
self::assertSame(
$menu->getStyle(),
$menu->getItems()[0]->getSubMenu()->getItems()[0]->getSubMenu()->getStyle()
);
}

public function testSubMenuDoesNotInheritsParentsStyleWhenSubMenuStyleHasAlterations() : void
{
$menu = (new CliMenuBuilder)
Expand Down