Skip to content

chore(new-ui): change line height of form item #542

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

Merged
RafaelVidaurre merged 5 commits into from
Apr 2, 2019
Merged

chore(new-ui): change line height of form item #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b17cf5a
chore(new-ui): change line height of form item
sajclarke Mar 22, 2019
62775d2
chore(new-ui): apply line-height changes to checkbox component
sajclarke Mar 27, 2019
ecc14f5
fix(new-ui): resolve vertical alignment
sajclarke Mar 28, 2019
ae27e18
chore(new-ui): resolve conflicts
sajclarke Apr 2, 2019
0d0da61
chore(new-ui): finalize changes to checkbox component
sajclarke Apr 2, 2019
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
56 changes: 27 additions & 29 deletions packages/new-polymath-ui/src/components/inputs/Checkbox/Checkbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React, { FC, useState, Fragment } from 'react';
import React, { FC, useState } from 'react';
import { uniqueId } from 'lodash';
import { InlineFlex } from '~/components/InlineFlex';
import { SvgCheckmark } from '~/images/icons/Checkmark';
import { FormikProxy, EnhancedComponentProps } from '../FormikProxy';
import * as sc from './styles';
import { Label } from './Label';

interface Props {
onChange: (e: boolean) => void;
onChange: (e: any) => void;
/**
* Specify whether the toggle should be on by default
*/
Expand Down Expand Up @@ -38,33 +37,32 @@ export const CheckboxPrimitive: FC<Props> = ({
}

return (
<Fragment>
<InlineFlex>
<sc.Input
{...other}
{...checkedProps}
type="checkbox"
id={name || id}
name={name || id}
onChange={e => {
onChange(e.currentTarget.checked);
}}
<sc.CheckboxInlineFlex>
<sc.Input
{...other}
{...checkedProps}
type="checkbox"
id={name || id}
name={name || id}
onChange={e => {
onChange(e.target.checked);
}}
/>
<sc.CheckboxInput htmlFor={name || id}>
<sc.CheckIcon
Asset={SvgCheckmark}
color="white"
width="0.85em"
cd
height="0.85em"
/>
<sc.CheckboxInput htmlFor={name || id}>
<sc.CheckIcon
Asset={SvgCheckmark}
color="white"
width="0.85em"
height="0.85em"
/>
</sc.CheckboxInput>
{label && (
<InlineFlex ml={2}>
<Label htmlFor={name || id}>{label}</Label>
</InlineFlex>
)}
</InlineFlex>
</Fragment>
</sc.CheckboxInput>
{label && (
<InlineFlex ml={2}>
<sc.CheckboxLabel htmlFor={name || id}>{label}</sc.CheckboxLabel>
</InlineFlex>
)}
</sc.CheckboxInlineFlex>
);
};

Expand Down
11 changes: 11 additions & 0 deletions packages/new-polymath-ui/src/components/inputs/Checkbox/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import styled from 'styled-components';
import { Icon } from '~/components/Icon';
import { InlineFlex } from '~/components/InlineFlex';
import { Label } from './Label';

export const Input = styled.input`
position: absolute;
Expand All @@ -14,6 +16,14 @@ export const Input = styled.input`
white-space: nowrap;
`;

export const CheckboxInlineFlex = styled(InlineFlex)`
line-height: 18px;
`;

export const CheckboxLabel = styled(Label)`
align-items: flex-start;
`;

export const CheckIcon = styled(Icon)`
display: block;
transition: ${({ theme }) => theme.transitions.hover.ms}ms;
Expand All @@ -34,6 +44,7 @@ export const CheckboxInput = styled.label`
height: 1.125rem;
background-color: #fff;
user-select: none;
align-items: flex-start;

${Input}:focus + & {
border-color: ${({ theme }) => theme.colors.secondary};
Expand Down