Skip to content
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

Jump to bottom

feat: add border-{bottom,top}-{left,right}-radius support #54

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −21
Open

feat: add border-{bottom,top}-{left,right}-radius support #54

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
4 changes: 2 additions & 2 deletions src/InnerShadow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export default class InnerShadow extends React.PureComponent {
insideViewStyle,
allShadowProps,
} = transformStyleProps(style);
const { backgroundColor, width, height, borderRadius } = allShadowProps;
const viewStyle = { borderRadius, width, height };
const { backgroundColor, width, height, borderRadius, borderBottomLeftRadius, borderBottomRightRadius, borderTopRightRadius, borderTopLeftRadius } = allShadowProps;
const viewStyle = { borderRadius, width, height, borderBottomLeftRadius, borderBottomRightRadius, borderTopRightRadius, borderTopLeftRadius };

return (
<View style={{ ...viewStyle, ...outsideViewStyle }} {...containerProps}>
Expand Down
8 changes: 7 additions & 1 deletion src/InnerShadowART.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,16 @@ export default class InnerShadowART extends React.PureComponent {
} else {
stroke += absOffsetY;
}

const adaptedBorderRadius = borderRadius + stroke / 2;

const path = getPathWithRadius(
width + stroke + 2,
height + stroke + 2,
borderRadius + stroke / 2,
adaptedBorderRadius,
adaptedBorderRadius,
adaptedBorderRadius,
adaptedBorderRadius,
);

return (
Expand Down
4 changes: 2 additions & 2 deletions src/OuterShadow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export default class OuterShadow extends React.PureComponent {
insideViewStyle,
allShadowProps,
} = transformStyleProps(style);
const { width, height, borderRadius } = allShadowProps;
const viewStyle = { borderRadius, width, height };
const { width, height, borderRadius, borderBottomLeftRadius, borderBottomRightRadius, borderTopRightRadius, borderTopLeftRadius } = allShadowProps;
const viewStyle = { borderRadius, width, height, borderBottomLeftRadius, borderBottomRightRadius, borderTopLeftRadius, borderTopRightRadius };

return (
<View style={{ ...viewStyle, ...outsideViewStyle }} {...containerProps}>
Expand Down
6 changes: 5 additions & 1 deletion src/OuterShadowART.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ export default class OuterShadowART extends React.PureComponent {
width = 0,
height = 0,
borderRadius,
borderBottomLeftRadius,
borderBottomRightRadius,
borderTopRightRadius,
borderTopLeftRadius,
shadowRadius,
shadowOffset,
shadowOpacity,
Expand All @@ -24,7 +28,7 @@ export default class OuterShadowART extends React.PureComponent {
shadowColor,
});

const path = getPathWithRadius(width, height, borderRadius);
const path = getPathWithRadius(width, height, borderBottomLeftRadius || borderRadius, borderBottomRightRadius || borderRadius, borderTopRightRadius || borderRadius, borderTopLeftRadius || borderRadius);
const absOffsetX = Math.abs(shadowOffset.x);
const absOffsetY = Math.abs(shadowOffset.y);

Expand Down
30 changes: 15 additions & 15 deletions src/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
/* eslint-disable no-bitwise */
import { Platform, StyleSheet } from 'react-native';

export function getPathWithRadius(width, height, borderRadius) {
if (borderRadius) {
const APrefix = `A ${borderRadius}, ${borderRadius}, 0 0 1`;
const ATopLeft = `${APrefix} ${borderRadius},0`;
const ATopRight = `${APrefix} ${width},${borderRadius}`;
const ABottomRight = `${APrefix} ${width - borderRadius},${height}`;
const ABottomLeft = `${APrefix} 0,${height - borderRadius}`;
return `M 0,${borderRadius} ${ATopLeft} H ${
width - borderRadius
} ${ATopRight} V ${
height - borderRadius
} ${ABottomRight} H ${borderRadius} ${ABottomLeft} Z`;
} else {
return `M 0,0 H ${width} V ${height} H 0 Z`;
}
export function getPathWithRadius(width, height, borderBottomLeftRadius = 0, borderBottomRightRadius = 0, borderTopRightRadius = 0, borderTopLeftRadius = 0) {
const APrefix = `A ${borderBottomLeftRadius}, ${borderBottomRightRadius}, 0 0 1`;
const ATopLeft = `${APrefix} ${borderTopLeftRadius},0`;
const ATopRight = `${APrefix} ${width},${borderTopRightRadius}`;
const ABottomRight = `${APrefix} ${width - borderBottomRightRadius},${height}`;
const ABottomLeft = `${APrefix} 0,${height - borderBottomLeftRadius}`;
return `M 0,${borderTopLeftRadius} ${ATopLeft} H ${
width - borderTopRightRadius
} ${ATopRight} V ${
height - borderBottomRightRadius
} ${ABottomRight} H ${borderBottomLeftRadius} ${ABottomLeft} Z`;
}

export function transformShadowPropsForAndroid(props) {
Expand Down Expand Up @@ -122,6 +118,10 @@ export function transformStyleProps(styleProps, neomorph) {
width,
height,
borderRadius: borderRadius < 0 ? 0 : borderRadius,
borderBottomLeftRadius: borderBottomLeftRadius < 0 ? 0 : borderBottomLeftRadius,
borderBottomRightRadius: borderBottomRightRadius < 0 ? 0 : borderBottomRightRadius,
borderTopLeftRadius: borderTopLeftRadius < 0 ? 0 : borderTopLeftRadius,
borderTopRightRadius: borderTopRightRadius < 0 ? 0 : borderTopRightRadius,
backgroundColor:
backgroundColor === 'transparent' ? '#00000000' : backgroundColor,
shadowOpacity,
Expand Down