Skip to content

Fix/global header icons #4174

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

Draft
rohitratannagar wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix/global header icons #4174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions workspaces/global-header/.changeset/real-windows-remain.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@red-hat-developer-hub/backstage-plugin-global-header': patch
---

Fixes the icon of global-header
21 changes: 20 additions & 1 deletion workspaces/global-header/plugins/global-header/src/components/HeaderIcon/HeaderIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import type { CSSProperties } from 'react';
import type { CSSProperties, ComponentType } from 'react';
import { useApp } from '@backstage/core-plugin-api';
import type { SvgIconProps } from '@mui/material/SvgIcon';
import MuiIcon from '@mui/material/Icon';
import Box from '@mui/material/Box';
import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';

/**
* @public
Expand All @@ -35,6 +37,14 @@ function toMaterialIconLigature(name: string): string {
return name.replace(/[A-Z]/g, m => `_${m.toLowerCase()}`);
}

/**
* Bundled MUI icon fallbacks for names used in default toolbar extensions.
* Avoids reliance on the Material Icons web font being loaded at runtime.
*/
const BUILTIN_ICONS: Record<string, ComponentType<SvgIconProps>> = {
addCircleOutline: AddCircleOutlineIcon,
};

/**
* @public
*/
Expand All @@ -57,6 +67,15 @@ export const HeaderIcon = ({
);
}

const BuiltinIcon = BUILTIN_ICONS[icon];
if (BuiltinIcon) {
return (
<Box sx={{ display: 'flex', alignItems: 'center', ...layout }}>
<BuiltinIcon fontSize={size} />
</Box>
);
}

if (icon.startsWith('<svg')) {
const svgDataUri = `data:image/svg+xml;base64,${btoa(icon)}`;
return (
Expand Down
2 changes: 1 addition & 1 deletion .../global-header/plugins/global-header/src/components/HeaderIconButton/HeaderIconButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const HeaderIconButton = ({
icon,
tooltip,
color = 'inherit',
size = 'small',
size = 'medium',
ariaLabel,
to,
}: HeaderIconButtonProps) => {
Expand Down
Loading