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.

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

Forward refs passed to Pill to the container element #751

Merged
merged 3 commits into from
Mar 4, 2019
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: 6 additions & 0 deletions .changeset/4d37f5be/changes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"releases": [{ "name": "@arch-ui/pill", "type": "minor" }],
"dependents": [
{ "name": "@voussoir/admin-ui", "type": "patch", "dependencies": ["@arch-ui/pill"] }
]
}
1 change: 1 addition & 0 deletions .changeset/4d37f5be/changes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Forward refs passed to Pill to the container element
143 changes: 75 additions & 68 deletions packages/arch/packages/pill/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/** @jsx jsx */
import { jsx } from '@emotion/core';
import styled from '@emotion/styled';
import { forwardRef, type Node } from 'react';

import { XIcon } from '@arch-ui/icons';
import { colors } from '@arch-ui/theme';
Expand Down Expand Up @@ -45,11 +46,14 @@ const subtleTextColor = {
warning: colors.warning,
};

type Variant = 'bold' | 'subtle';
type Appearance = 'default' | 'primary' | 'danger' | 'create' | 'warning';

type ButtonProps = {
/* Affects the visual style of the lozenge */
appearance: 'default' | 'primary' | 'danger' | 'create' | 'warning',
appearance?: Appearance,
/* The value displayed within the lozenge. */
variant: 'bold' | 'subtle',
variant?: Variant,
};
type Props = ButtonProps & {
children: Node,
Expand All @@ -58,75 +62,78 @@ type Props = ButtonProps & {
};

const PillWrapper = styled.div({ display: 'inline-flex' });
const PillButton = styled.button(({ appearance, variant }: Props) => {
const fontSizeNumeric = 0.75;
const fontSize = `${fontSizeNumeric}em`;
const borderRadius = `${fontSizeNumeric * 2}em`;

return {
backgroundColor:
variant === 'bold'
? boldBackgroundColor[appearance].default
: subtleBackgroundColor[appearance].default,
color: variant === 'bold' ? boldTextColor[appearance] : subtleTextColor[appearance],
alignItems: 'center',
border: 0,
cursor: 'pointer',
display: 'flex',
fontSize: fontSize,
fontWeight: 500,
lineHeight: '1.8em',
justifyContent: 'center',
maxWidth: '100%',
minWidth: 1,
outline: 0,
whiteSpace: 'nowrap',
const PillButton = styled.button(
({ appearance, variant }: { appearance: Appearance, variant: Variant }) => {
const fontSizeNumeric = 0.75;
const fontSize = `${fontSizeNumeric}em`;
const borderRadius = `${fontSizeNumeric * 2}em`;

':hover,:focus': {
backgroundColor:
variant === 'bold'
? boldBackgroundColor[appearance].hover
: subtleBackgroundColor[appearance].hover,
},
':active': {
return {
backgroundColor:
variant === 'bold'
? boldBackgroundColor[appearance].active
: subtleBackgroundColor[appearance].active,
},
? boldBackgroundColor[appearance].default
: subtleBackgroundColor[appearance].default,
color: variant === 'bold' ? boldTextColor[appearance] : subtleTextColor[appearance],
alignItems: 'center',
border: 0,
cursor: 'pointer',
display: 'flex',
fontSize: fontSize,
fontWeight: 500,
lineHeight: '1.8em',
justifyContent: 'center',
maxWidth: '100%',
minWidth: 1,
outline: 0,
whiteSpace: 'nowrap',

':first-of-type': {
paddingLeft: '0.9em',
paddingRight: '0.75em',
borderTopLeftRadius: borderRadius,
borderBottomLeftRadius: borderRadius,
marginRight: 1,
},
':last-of-type': {
paddingLeft: '0.75em',
paddingRight: '0.9em',
borderTopRightRadius: borderRadius,
borderBottomRightRadius: borderRadius,
marginLeft: 1,
},
};
});
':hover,:focus': {
backgroundColor:
variant === 'bold'
? boldBackgroundColor[appearance].hover
: subtleBackgroundColor[appearance].hover,
},
':active': {
backgroundColor:
variant === 'bold'
? boldBackgroundColor[appearance].active
: subtleBackgroundColor[appearance].active,
},

export const Pill = ({ appearance, children, onClick, onRemove, variant, ...props }: Props) => {
return (
<PillWrapper {...props}>
<PillButton appearance={appearance} variant={variant} onClick={onClick}>
{children}
</PillButton>
{onRemove ? (
<PillButton appearance={appearance} variant={variant} onClick={onRemove}>
<XIcon css={{ height: 12 }} />
':first-of-type': {
paddingLeft: '0.9em',
paddingRight: '0.75em',
borderTopLeftRadius: borderRadius,
borderBottomLeftRadius: borderRadius,
marginRight: 1,
},
':last-of-type': {
paddingLeft: '0.75em',
paddingRight: '0.9em',
borderTopRightRadius: borderRadius,
borderBottomRightRadius: borderRadius,
marginLeft: 1,
},
};
}
);

export const Pill = forwardRef<Props, HTMLDivElement>(
(
{ appearance = 'default', children, onClick, onRemove, variant = 'subtle', ...props }: Props,
ref
) => {
return (
<PillWrapper {...props} ref={ref}>
<PillButton appearance={appearance} variant={variant} onClick={onClick}>
{children}
</PillButton>
) : null}
</PillWrapper>
);
};
Pill.defaultProps = {
appearance: 'default',
variant: 'subtle',
};
{onRemove ? (
<PillButton appearance={appearance} variant={variant} onClick={onRemove}>
<XIcon css={{ height: 12 }} />
</PillButton>
) : null}
</PillWrapper>
);
}
);