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

Append focused prop for TableRow component #304

Merged
merged 1 commit into from
Aug 1, 2023
Merged

Append focused prop for TableRow component #304

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
85 changes: 59 additions & 26 deletions src/components/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { gray4, gray6 } from '@taskany/colors';
import styled, { css } from 'styled-components';

const maxCols = 12;
Expand All @@ -17,36 +18,53 @@ interface JustifyProps {
justify: 'start' | 'center' | 'end' | 'between' | 'around' | 'baseline';
}

export type TableCellProps =
| {
/** Size of column width in range from `1` to `12` */
col: number;
/** Minimum size column, use instead of `col` prop */
min?: never;
/** Absolute or relative width, ex. `10ch` or `100` */
width?: never;
}
| {
col?: never;
min: boolean;
width?: never;
}
| {
col?: never;
min?: never;
width: number | string;
}
| {
col?: never;
min?: never;
width?: never;
};
export type TableCellProps = Partial<JustifyProps & AlignProps> &
(
| {
/** Size of column width in range from `1` to `12` */
col: number;
min?: never;
width?: never;
}
| {
col?: never;
/** Minimum size column, use instead of `col` prop */
min: true;
width?: never;
}
| {
col?: never;
min?: never;
/** Absolute or relative width, ex. `10ch` or `100` */
width: number | string;
}
| {
col?: never;
min?: never;
width?: never;
}
);

export interface TableProps extends GapProps {
/** Container width */
width?: number;
}

export type TableRowProps = GapProps &
Partial<AlignProps & JustifyProps> &
(
| {
interactive?: false | never;
focused?: never;
}
| {
/** Apply interactive styles: hover */
interactive: true;
/** Prop that mark current row as focused, ex. for keyboard navigation */
focused: boolean;
}
);

const mapRuleSet: { [key in AlignProps['align'] | JustifyProps['justify']]: string } = {
baseline: 'baseline',
start: 'flex-start',
Expand All @@ -73,7 +91,7 @@ export const Table = styled.div<TableProps>`
`}
`;

export const TableRow = styled.div<Partial<AlignProps & JustifyProps> & GapProps>`
export const TableRow = styled.div<TableRowProps>`
display: flex;
flex-basis: 100%;
align-items: flex-start;
Expand All @@ -96,9 +114,24 @@ export const TableRow = styled.div<Partial<AlignProps & JustifyProps> & GapProps
css`
gap: ${gap}px;
`}

${({ interactive }) =>
interactive &&
css`
&:hover {
background-color: ${gray6};
}
`}

${({ focused, interactive }) =>
interactive &&
focused &&
css`
background-color: ${gray4};
`}
`;

export const TableCell = styled.div<TableCellProps & Partial<JustifyProps & AlignProps>>`
export const TableCell = styled.div<TableCellProps>`
display: inline-flex;
align-items: baseline;
flex-wrap: wrap;
Expand Down
88 changes: 82 additions & 6 deletions src/stories/Table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import React, { useEffect, useState } from 'react';
import type { Meta, StoryFn } from '@storybook/react';
import { gray5, gray3 } from '@taskany/colors';
import styled from 'styled-components';
import { gray5, gray3, gapS, radiusM } from '@taskany/colors';
import styled, { css } from 'styled-components';

import { Table, TableRow, TableCell } from '../components/Table';
import { GoalIcon } from '../components/Icon/GoalIcon';
Expand All @@ -11,6 +11,7 @@ import { Dot } from '../components/Dot';
import { Tag } from '../components/Tag';
import { CircleProgressBar } from '../components/CircleProgressBar';
import { Button } from '../components/Button';
import { useKeyPress } from '../hooks/useKeyPress';

const meta: Meta<typeof Table> = {
title: 'Table',
Expand Down Expand Up @@ -41,9 +42,23 @@ const data = Array.from({ length: 10 }, (_, i) => ({
}));

const StyledTableRow = styled(TableRow)<{ depth?: number }>`
padding: 5px 0;
border-bottom: 1px solid ${gray5};
border-top: 1px solid ${gray3};
padding: ${gapS};

${({ interactive }) =>
// for interactive rows append border-radius style
interactive &&
css`
border-radius: ${radiusM};
`}

${({ interactive }) =>
// for non-interactive rows append border styles
// for explicit separation of rows
!interactive &&
css`
border-bottom: 1px solid ${gray5};
border-top: 1px solid ${gray3};
`}

&:first-child {
border-top: 0;
Expand Down Expand Up @@ -137,3 +152,64 @@ export const RecursiveTable = () => {
</Table>
);
};

export const FocusAndHover: Story = () => {
const [activeIndex, setActiveIndex] = useState(0);

const downPress = useKeyPress('ArrowDown');
const upPress = useKeyPress('ArrowUp');

useEffect(() => {
setActiveIndex((prev) => {
if (upPress) {
return prev > 0 ? prev - 1 : prev;
}

return prev;
});
}, [upPress]);

useEffect(() => {
setActiveIndex((prev) => {
if (downPress) {
return prev < data.length - 1 ? prev + 1 : prev;
}

return prev;
});
}, [downPress]);

return (
<Table width={600}>
{data.map(({ title, projectId, tags, progress }, index) => (
<StyledTableRow key={title} align="center" gap={10} interactive focused={activeIndex === index}>
<TableCell min>
<GoalIcon size="xxs" noWrap />
</TableCell>
<TableCell col={5}>
<Text size="s" weight="bold">
<Dot size="m" view="primary" />
{title}
</Text>
</TableCell>
<TableCell min>
<CircleProgressBar value={progress} size="s" />
</TableCell>
<TableCell width="6ch">
<Text size="s" weight="thin">
{projectId}
</Text>
</TableCell>
<TableCell justify="end">
{tags.map((t) => (
<Tag size="s" title={t} />
))}
</TableCell>
<TableCell min justify="center">
<UserPic size={14} email="admin@taskany.org" />
</TableCell>
</StyledTableRow>
))}
</Table>
);
};
Loading