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
26 changes: 18 additions & 8 deletions src/Icon/Service/IconService.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,14 @@ public function getIconForTag(): string
return 'tag';
}

public function getIconForClassDefinition(?string $iconPath): ElementIcon
public function getIconForClassDefinition(?string $value): ElementIcon
{
$type = ElementIconTypes::PATH->value;
// $iconPath can be null and empty string
if (empty($iconPath)) {
$type = ElementIconTypes::NAME->value;
$iconPath = 'class';
if (empty($value)) {
return new ElementIcon(ElementIconTypes::NAME->value, 'class');
}

return new ElementIcon($type, $iconPath);
return new ElementIcon($this->guessIconType($value), $value);
}

public function getIconForLayout(?string $iconPath): ?ElementIcon
Expand All @@ -157,14 +155,26 @@ private function getClassIcon(DataObjectSearchResultItem|DataObject $dataObject)
if ($dataObject instanceof Concrete) {
$class = $this->getValidClass($this->classDefinitionResolver, $dataObject->getClassId());
if ($class->getIcon() !== null) {
return new ElementIcon(ElementIconTypes::PATH->value, $class->getIcon());
return new ElementIcon($this->guessIconType($class->getIcon()), $class->getIcon());
}
}

if ($dataObject->getClassDefinitionIcon() !== null) {
return new ElementIcon(ElementIconTypes::PATH->value, $dataObject->getClassDefinitionIcon());
return new ElementIcon(
$this->guessIconType($dataObject->getClassDefinitionIcon()),
$dataObject->getClassDefinitionIcon()
);
}

return null;
}

private function guessIconType(string $value): string
{
if (str_contains($value, '/') && str_contains($value, '.')) {
return ElementIconTypes::PATH->value;
}

return ElementIconTypes::NAME->value;
}
}
2 changes: 1 addition & 1 deletion src/Icon/Service/IconServiceInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function getIconForDocument(string $documentType): ElementIcon;

public function getIconForTag(): string;

public function getIconForClassDefinition(?string $iconPath): ElementIcon;
public function getIconForClassDefinition(?string $value): ElementIcon;

public function getIconForLayout(?string $iconPath): ?ElementIcon;

Expand Down
Loading