Skip to content

Fix/2000 loader hardcoded color #2009

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

Open
akash-dabhi-qed wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix/2000 loader hardcoded color #2009

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
0e99150
fix: now using theme primary color for Loader instead of hardcoded hex
akash-dabhi-qed Apr 13, 2026
e35fc2d
added custom theme color story to verify Loader fix
akash-dabhi-qed Apr 13, 2026
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
36 changes: 35 additions & 1 deletion docs/stories/04-components/Loader.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta, StoryObj } from '@storybook/react-vite';
import { Loader } from '@strapi/design-system';
import { DesignSystemProvider, Loader, extendTheme, lightTheme } from '@strapi/design-system';
import { outdent } from 'outdent';

const meta: Meta<typeof Loader> = {
Expand Down Expand Up @@ -38,3 +38,37 @@ export const Small = {
},
},
} satisfies Story;

const customTheme = extendTheme(lightTheme, {
colors: {
primary600: '#ff0000',
},
});

export const CustomThemeColor = {
render: () => (
<DesignSystemProvider theme={customTheme}>
<Loader>Loading content...</Loader>
</DesignSystemProvider>
),
name: 'custom theme color',
parameters: {
docs: {
description: {
story:
'The spinner respects the `primary600` theme color. Here `primary600` is overridden to red (`#ff0000`) to verify the fix — without it the spinner would always appear purple.',
},
source: {
code: outdent`
const customTheme = extendTheme(lightTheme, {
colors: { primary600: '#ff0000' },
});

<DesignSystemProvider theme={customTheme}>
<Loader>Loading content...</Loader>
</DesignSystemProvider>
`,
},
},
},
} satisfies Story;
13 changes: 11 additions & 2 deletions packages/design-system/src/components/Loader/Loader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const Loader = React.forwardRef<HTMLDivElement, LoaderProps>(({ children,
return (
<div role="alert" aria-live="assertive" ref={ref} {...props}>
<VisuallyHidden>{children}</VisuallyHidden>
<LoaderImg src={loaderSvg} aria-hidden $small={small} />
<LoaderImg aria-hidden $small={small} />
</div>
);
});
Expand All @@ -29,7 +29,16 @@ const rotation = keyframes`
}
`;

const LoaderImg = styled.img<PropsToTransientProps<Required<Pick<LoaderProps, 'small'>>>>`
const LoaderImg = styled.div<PropsToTransientProps<Required<Pick<LoaderProps, 'small'>>>>`
width: 63px;
height: 63px;
background-color: ${({ theme }) => theme.colors.primary600};
mask-image: url(${loaderSvg});
mask-size: contain;
mask-repeat: no-repeat;
-webkit-mask-image: url(${loaderSvg});
-webkit-mask-size: contain;
-webkit-mask-repeat: no-repeat;
animation: ${rotation} 1s infinite linear;
will-change: transform;
${({ $small, theme }) => $small && `width: ${theme.spaces[6]}; height: ${theme.spaces[6]};`}
Expand Down