Skip to content

DRY up constants.js #412

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
merged 3 commits into from
Feb 19, 2019
Merged

DRY up constants.js #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef6fa91
ci: "publish" + "deploy" need "npm install"
shawnbot Feb 19, 2019
62eea0a
Merge pull request #410 from primer/fix-actions
Feb 19, 2019
9f2ed11
dry up constants.js
colebemis Feb 19, 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
2 changes: 2 additions & 0 deletions .github/main.workflow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ action "npm test" {

action "deploy" {
uses = "primer/deploy@v2.0.0"
needs = ["npm install"]
secrets = ["GITHUB_TOKEN", "NOW_TOKEN"]
}

action "publish" {
uses = "primer/publish@master"
needs = ["npm install"]
secrets = [
"GITHUB_TOKEN",
"NPM_AUTH_TOKEN",
Expand Down
74 changes: 12 additions & 62 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,68 +4,6 @@ import theme from './theme'

export const get = key => themeGet(key, getKey(theme, key))

export const COMMON = compose(
styles.color,
styles.space
)

export const BORDER = compose(
styles.borders,
styles.borderColor,
styles.boxShadow,
styles.borderRadius
)

export const TYPOGRAPHY = compose(
styles.fontFamily,
styles.fontSize,
styles.fontStyle,
styles.fontWeight,
styles.lineHeight,
styles.textAlign
)

export const LAYOUT = compose(
styles.display,
styles.size,
styles.width,
styles.height,
styles.minWidth,
styles.minHeight,
styles.maxWidth,
styles.maxHeight,
styles.overflow,
styles.verticalAlign
)

export const POSITION = compose(
styles.position,
styles.zIndex,
styles.top,
styles.right,
styles.bottom,
styles.left
)

export const FLEX_CONTAINER = compose(
styles.flexBasis,
styles.flexDirection,
styles.flexWrap,
styles.alignContent,
styles.alignItems,
styles.justifyContent,
styles.justifyItems,
styles.order
)

export const FLEX_ITEM = compose(
styles.flex,
styles.justifySelf,
styles.alignSelf
)

// These lists are just used to generate docs

export const COMMON_LIST = ['color', 'space']

export const BORDER_LIST = ['borders', 'borderColor', 'boxShadow', 'borderRadius']
Expand Down Expand Up @@ -123,4 +61,16 @@ export const FLEX_ITEM_LIST = [
'alignSelf'
]

export const COMMON = composeList(COMMON_LIST)
export const BORDER = composeList(BORDER_LIST)
export const TYPOGRAPHY = composeList(TYPOGRAPHY_LIST)
export const LAYOUT = composeList(LAYOUT_LIST)
export const POSITION = composeList(POSITION_LIST)
export const FLEX_CONTAINER = composeList(FLEX_CONTAINER_LIST)
export const FLEX_ITEM = composeList(FLEX_ITEM_LIST)

function composeList(list) {
return compose(...list.map(name => styles[name]))
Copy link
Contributor Author

@colebemis colebemis Feb 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure what the best name for this function and its argument is 🤷‍♂️

Copy link

@emplums emplums Feb 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is pretty good naming as is!

}

export const Base = ({is: Tag = 'div', theme, ...rest}) => <Tag {...rest} />