Skip to content

Commit

Permalink
fix: handle empty mobile ordered items in header controller (#1268)
Browse files Browse the repository at this point in the history
  • Loading branch information
thorbrink authored Jan 21, 2025
1 parent afa4fb0 commit 4bef600
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions library/Controller/Header/Flexible.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private function getItems(string $section): array
[$desktopOrderedItems, $mobileOrderedItems] = $this->getOrderedMenuItems($settingCamelCased);

$this->hasSearch = $this->hasSearch($desktopOrderedItems, $mobileOrderedItems);
$this->hasSeparateBrandText = $this->hasSeparateBrandText($desktopOrderedItems, $mobileOrderedItems);
$this->hasSeparateBrandText = $this->hasSeparateBrandText($desktopOrderedItems, $mobileOrderedItems ?: []);

// Building the items
$items = $this->flipKeyValueTransformer->transform($desktopOrderedItems, $mobileOrderedItems);
Expand Down Expand Up @@ -164,12 +164,14 @@ private function hasSeparateBrandText(array $desktopOrderedItems, array $mobileO
// Gets the ordered menu items from the customizer.
private function getOrderedMenuItems(string $settingCamelCased): array
{
return [
$this->customizer->{$settingCamelCased} ?: [],
($this->isResponsive && isset($this->customizer->{$settingCamelCased . $this->headerSettingKeyResponsive}))
? $this->customizer->{$settingCamelCased . $this->headerSettingKeyResponsive}
: [],
];
$shouldGetMobileOrderedItems = fn() => $this->isResponsive && isset($this->customizer->{$settingCamelCased . $this->headerSettingKeyResponsive});

$desktopOrderedItems = $this->customizer->{$settingCamelCased};
$mobileOrderedItems = $shouldGetMobileOrderedItems()
? $this->customizer->{$settingCamelCased . $this->headerSettingKeyResponsive}
: [];

return [ $desktopOrderedItems ?: [], $mobileOrderedItems ?: [] ];
}

// Gets the camelCased setting name.
Expand Down

0 comments on commit 4bef600

Please sign in to comment.