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
6 changes: 5 additions & 1 deletion src/image.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,18 @@ export const image = style([
},
]);

export const noBorderRadius = style({
export const withoutBorderRadius = style({
borderRadius: 0,
});

export const circularBorderRadius = style({
borderRadius: '50%',
});

export const withBorderRadius = style({
borderRadius: skinVars.borderRadii.container,
});

export const defaultBorderRadius = style({
borderRadius: fallbackVar(mediaBorderRadius, skinVars.borderRadii.container),
});
6 changes: 4 additions & 2 deletions src/image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,10 @@ export const ImageContent = React.forwardRef<HTMLImageElement, ImageProps>(
const borderRadiusStyle = props.circular
? styles.circularBorderRadius
: noBorderRadius
? styles.noBorderRadius
: styles.defaultBorderRadius;
? styles.withoutBorderRadius
: noBorderRadius === false // explicitly set to false, so we set border radius
? styles.withBorderRadius
: styles.defaultBorderRadius; // === undefined, use the default border radius (or the setting set by parent component, like cards or slideshow)

const [isError, setIsError] = React.useState(!src);
const [hideLoadingFallback, setHideLoadingFallback] = React.useState(false);
Expand Down
Loading