-
Notifications
You must be signed in to change notification settings - Fork 97
feat(typography): add List component
#388
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6b16f19
Initial `List` and `Item` components
jzempel 42830fa
Handle size variations and add interactive demo
jzempel 39dee54
Add long text to interactive demo
jzempel e8b3f8e
Add list/item tests
jzempel d049838
Update default levels
jzempel 79112fb
Add start value to interactive demo
jzempel 45cd0da
Address @austin94 review comments
jzempel 5c24cfe
Divide out ordered/unordered list components
jzempel 9c1a4f3
Update lists demo
jzempel 691b32b
Add "sizes" to lists demo
jzempel dcbd020
Test using static notation
jzempel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /** | ||
| * Copyright Zendesk, Inc. | ||
| * | ||
| * Use of this source code is governed under the Apache License, Version 2.0 | ||
| * found at http://www.apache.org/licenses/LICENSE-2.0. | ||
| */ | ||
|
|
||
| import React, { useContext } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import styled from 'styled-components'; | ||
| import { isRtl, retrieveTheme } from '@zendeskgarden/react-theming'; | ||
| import { ListContext, StyledOrderedList } from './List'; | ||
| import { StyledMD } from '../MD'; | ||
jzempel marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| const COMPONENT_ID = 'typography.list_item'; | ||
|
|
||
| const StyledListItem = styled.li.attrs({ | ||
| 'data-garden-id': COMPONENT_ID, | ||
| 'data-garden-version': PACKAGE_VERSION | ||
| })` | ||
| /* stylelint-disable */ | ||
| ${StyledOrderedList} > & { | ||
austingreendev marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| margin-${props => (isRtl(props) ? 'right' : 'left')}: -4px; | ||
| padding-${props => (isRtl(props) ? 'right' : 'left')}: 4px; | ||
| } | ||
| /* stylelint-enable */ | ||
| ${props => retrieveTheme(COMPONENT_ID, props)}; | ||
| `; | ||
|
|
||
| const StyledListItemContent = styled(StyledMD)` | ||
| /* stylelint-disable-next-line declaration-colon-newline-after */ | ||
| padding: ${props => { | ||
| switch (props.size) { | ||
| case 'small': | ||
| return '0'; | ||
| case 'large': | ||
| return '4px 0'; | ||
| case 'medium': | ||
| default: | ||
| return '2px 0'; | ||
| } | ||
| }}; | ||
| `; | ||
|
|
||
| const Item = ({ children, ...props }) => { | ||
| const size = useContext(ListContext); | ||
jzempel marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| return ( | ||
| <StyledListItem> | ||
| <StyledListItemContent size={size}>{children}</StyledListItemContent> | ||
| </StyledListItem> | ||
| ); | ||
| }; | ||
|
|
||
| Item.propTypes = { | ||
| children: PropTypes.any | ||
| }; | ||
|
|
||
| /** @component */ | ||
| export default Item; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| /** | ||
| * Copyright Zendesk, Inc. | ||
| * | ||
| * Use of this source code is governed under the Apache License, Version 2.0 | ||
| * found at http://www.apache.org/licenses/LICENSE-2.0. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { render, renderRtl } from 'garden-test-utils'; | ||
| import Item from './Item'; | ||
|
|
||
| describe('Item', () => { | ||
| it('applies default padding', () => { | ||
| const { container } = render(<Item />); | ||
|
|
||
| expect(container.querySelector('li').firstChild).toHaveStyleRule('padding', '2px 0'); | ||
austingreendev marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| The following example shows unordered lists. Unordered lists may receive | ||
| style types of `circle`, `disc`, or `square`. | ||
|
|
||
| ```jsx | ||
| <p style={{marginTop: 0}}>Type <Code>disc</Code> (default)</p> | ||
|
|
||
| <List> | ||
| <Item>Item</Item> | ||
| <Item>Item</Item> | ||
| <Item>Item</Item> | ||
| </List> | ||
|
|
||
| <p>Type <Code>circle</Code></p> | ||
|
|
||
| <List type="circle"> | ||
| <Item>Item</Item> | ||
| <Item>Item</Item> | ||
| <Item>Item</Item> | ||
| </List> | ||
|
|
||
| <p>Type <Code>square</Code></p> | ||
|
|
||
| <List type="square"> | ||
| <Item>Item</Item> | ||
| <Item>Item</Item> | ||
| <Item>Item</Item> | ||
| </List> | ||
| ``` | ||
|
|
||
| The following example shows ordered lists. Ordered lists may receive style | ||
| types of `decimal`, `decimal-leading-zero`, `lower-alpha`, `upper-alpha`, | ||
| `lower-roman`, or `upper-roman`. | ||
|
|
||
| ```jsx | ||
| <p style={{marginTop: 0}}>Type <Code>decimal</Code> (default)</p> | ||
|
|
||
| <List ordered> | ||
| <Item>One</Item> | ||
| <Item>Two</Item> | ||
| <Item>Three</Item> | ||
| </List> | ||
|
|
||
| <p>Type <Code>decimal-leading-zero</Code></p> | ||
|
|
||
| <List ordered type="decimal-leading-zero"> | ||
| <Item>One</Item> | ||
| <Item>Two</Item> | ||
| <Item>Three</Item> | ||
| </List> | ||
|
|
||
| <p>Type <Code>lower-alpha</Code></p> | ||
|
|
||
| <List ordered type="lower-alpha"> | ||
| <Item>One</Item> | ||
| <Item>Two</Item> | ||
| <Item>Three</Item> | ||
| </List> | ||
|
|
||
| <p>Type <Code>upper-alpha</Code></p> | ||
|
|
||
| <List ordered type="upper-alpha"> | ||
| <Item>One</Item> | ||
| <Item>Two</Item> | ||
| <Item>Three</Item> | ||
| </List> | ||
|
|
||
| <p>Type <Code>lower-roman</Code></p> | ||
|
|
||
| <List ordered type="lower-roman"> | ||
| <Item>One</Item> | ||
| <Item>Two</Item> | ||
| <Item>Three</Item> | ||
| </List> | ||
|
|
||
| <p>Type <Code>upper-roman</Code></p> | ||
|
|
||
| <List ordered type="upper-roman"> | ||
| <Item>One</Item> | ||
| <Item>Two</Item> | ||
| <Item>Three</Item> | ||
| </List> | ||
| ``` | ||
|
|
||
| ### Interactive Demo | ||
|
|
||
| ```jsx | ||
| const { Well } = require('@zendeskgarden/react-notifications/src'); | ||
| const { Checkbox, Field, Input, Label } = require('@zendeskgarden/react-forms/src'); | ||
| const { | ||
| Dropdown, | ||
| Select, | ||
| Field: SelectField, | ||
| Label: SelectLabel, | ||
| Menu, | ||
| Item: MenuItem | ||
| } = require('@zendeskgarden/react-dropdowns/src'); | ||
| const { Range, RangeField, Label: RangeLabel } = require('@zendeskgarden/react-ranges/src'); | ||
|
|
||
| initialState = { | ||
| length: 1, | ||
| levels: 1, | ||
| ordered: false, | ||
| size: List.defaultProps.size, | ||
| start: 1 | ||
| }; | ||
|
|
||
| const text = 'garden es bonus vobis proinde vos postulo essum magis kohlrabi welsh onion daikon amaranth tatsoi tomatillo melon azuki bean garlic beet greens corn soko endive gumbo gourd shallot courgette tatsoi pea sprouts fava bean collard greens dandelion okra wakame tomato cucumber earthnut pea peanut soko zucchini.'.split( | ||
|
||
| ' ' | ||
| ); | ||
|
|
||
| const getType = (ordered, level) => { | ||
| const types = ordered ? ['decimal', 'lower-alpha', 'lower-roman'] : ['disc', 'circle', 'square']; | ||
| const index = level % types.length; | ||
|
|
||
| return types[index]; | ||
| }; | ||
|
|
||
| const NestedList = ({ level = 0, ...props }) => { | ||
| const content = text.slice(0, state.length).join(' '); | ||
|
|
||
| if (level < state.levels) { | ||
| return ( | ||
| <List start={state.start} type={getType(props.ordered, level)} {...props}> | ||
| <Item>{content}</Item> | ||
| <Item> | ||
| {content} | ||
| <NestedList level={level + 1} {...props} /> | ||
| </Item> | ||
| <Item>{content}</Item> | ||
| <Item>{content}</Item> | ||
| </List> | ||
| ); | ||
| } else { | ||
| return <></>; | ||
| } | ||
| }; | ||
|
|
||
| <> | ||
| <Well recessed style={{ width: 300 }}> | ||
| <Field> | ||
| <Checkbox | ||
| checked={state.ordered} | ||
| onChange={event => setState({ ordered: event.target.checked })} | ||
| > | ||
| <Label style={{ marginBottom: 8 }}>Ordered</Label> | ||
| </Checkbox> | ||
| </Field> | ||
| <RangeField> | ||
| <RangeLabel>Levels</RangeLabel> | ||
| <Range | ||
| max={9} | ||
| min={1} | ||
| value={state.levels} | ||
| onChange={event => setState({ levels: event.target.value })} | ||
| /> | ||
| </RangeField> | ||
| <RangeField> | ||
| <RangeLabel>Length</RangeLabel> | ||
| <Range | ||
| max={text.length} | ||
| min={1} | ||
| value={state.length} | ||
| onChange={event => setState({ length: event.target.value })} | ||
| /> | ||
| </RangeField> | ||
| <Dropdown selectedItem={state.size} onSelect={size => setState({ size })}> | ||
| <SelectField> | ||
| <SelectLabel>Size</SelectLabel> | ||
| <Select small>{state.size}</Select> | ||
| </SelectField> | ||
| <Menu small> | ||
| <MenuItem value="small">small</MenuItem> | ||
| <MenuItem value="medium">medium (default)</MenuItem> | ||
| <MenuItem value="large">large</MenuItem> | ||
| </Menu> | ||
| </Dropdown> | ||
| <Field> | ||
| <Label>Start</Label> | ||
| <Input | ||
| disabled={!state.ordered} | ||
| small | ||
| type="number" | ||
| value={state.start} | ||
| onChange={event => setState({ start: event.target.value })} | ||
| /> | ||
| </Field> | ||
| </Well> | ||
| <MD tag="p"> | ||
| Nori grape silver beet broccoli kombu beet greens fava bean potato quandong celery. Bunya nuts | ||
| black-eyed pea prairie turnip leek lentil turnip greens parsnip. Sea lettuce lettuce water | ||
| chestnut eggplant winter purslane fennel azuki bean earthnut pea sierra leone bologi leek soko | ||
| chicory celtuce parsley jícama salsify. | ||
| </MD> | ||
| <NestedList {...state} /> | ||
| <MD tag="p" style={{ marginBottom: 0 }}> | ||
| Soko radicchio bunya nuts gram dulse silver beet parsnip napa cabbage lotus root sea lettuce | ||
| brussels sprout cabbage. Catsear cauliflower garbanzo yarrow salsify chicory garlic bell pepper | ||
| napa cabbage lettuce tomato kale arugula melon sierra leone bologi rutabaga tigernut. Sea | ||
| lettuce gumbo grape kale kombu cauliflower salsify kohlrabi okra. | ||
| </MD> | ||
| </>; | ||
| ``` | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.