diff --git a/src/Presenters/Admin/Tailwind.php b/src/Presenters/Admin/Tailwind.php index 24ccfad..bde6843 100644 --- a/src/Presenters/Admin/Tailwind.php +++ b/src/Presenters/Admin/Tailwind.php @@ -34,13 +34,11 @@ public function getCloseTagWrapper() */ public function getMenuWithoutDropdownWrapper($item) { - return '
  • - getAttributes() . '> -
    + return '
  • + getAttributes() . '> ' . $this->getIcon($item) . ' - ' . $item->title . ' - +
    • ' . PHP_EOL; @@ -49,9 +47,9 @@ public function getMenuWithoutDropdownWrapper($item) /** * {@inheritdoc }. */ - public function getActiveState($item, $state = '' ) + public function getActiveState($item, $state = 'active-menu' ) { - return $item->isActive() ? $state : '-outline'; + return $item->isActive() ? $state : ''; } /** @@ -105,12 +103,12 @@ public function getMenuWithDropDownWrapper($item) return '
    getActiveStateOnChild($item) .'> - + ' . $this->getIcon($item) . ' ' . $item->title . ' ' . $this->getChevron($item) . ' -
    +
      ' . $this->getChildMenuItems($item) . '
    @@ -130,27 +128,40 @@ public function getMultiLevelDropdownWrapper($item) { $id = Str::slug($item->title); - return '
  • - - -
    • ' + return '
  • + + ' . $this->getIcon($item) . ' + ' . $item->title . ' + + +
    +
      + ' . $this->getChildMenuItems($item) . ' +
    +
    +
    • ' . PHP_EOL; } + public function iconState($item, $state = '') + { + return $item->isActive() ? $state : '-outline'; + } + + public function iconChildState($item, $state = '') + { + return $item->hasActiveOnChild() ? $state : '-outline'; + } + public function getIcon($item) { - $state = $this->iconState($item); + $state = empty($item->getChilds()) ? $this->iconState($item) : $this->iconChildState($item); - return '
    - -
    '. PHP_EOL; + if ($item->icon !== null && $item->icon !== '') { + return '
    + +
    '. PHP_EOL; + } } public function getChevron($item) @@ -160,11 +171,6 @@ public function getChevron($item) return ''. PHP_EOL; } - public function iconState($item, $state = '') - { - return $item->hasActiveOnChild() ? $state : '-outline'; - } - public function chevronState($item, $state = '-up') { return $item->hasActiveOnChild() ? $state : '-down';