Skip to content

Commit 46b1138

Browse files
authored
feat(Slideshow): allow images with border radius inside (#1363)
WEB-2152
1 parent 1452f71 commit 46b1138

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

src/image.css.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,18 @@ export const image = style([
3131
},
3232
]);
3333

34-
export const noBorderRadius = style({
34+
export const withoutBorderRadius = style({
3535
borderRadius: 0,
3636
});
3737

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

42+
export const withBorderRadius = style({
43+
borderRadius: skinVars.borderRadii.container,
44+
});
45+
4246
export const defaultBorderRadius = style({
4347
borderRadius: fallbackVar(mediaBorderRadius, skinVars.borderRadii.container),
4448
});

src/image.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,10 @@ export const ImageContent = React.forwardRef<HTMLImageElement, ImageProps>(
170170
const borderRadiusStyle = props.circular
171171
? styles.circularBorderRadius
172172
: noBorderRadius
173-
? styles.noBorderRadius
174-
: styles.defaultBorderRadius;
173+
? styles.withoutBorderRadius
174+
: noBorderRadius === false // explicitly set to false, so we set border radius
175+
? styles.withBorderRadius
176+
: styles.defaultBorderRadius; // === undefined, use the default border radius (or the setting set by parent component, like cards or slideshow)
175177

176178
const [isError, setIsError] = React.useState(!src);
177179
const [hideLoadingFallback, setHideLoadingFallback] = React.useState(false);

0 commit comments

Comments
 (0)