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

Export theme #272

Merged
merged 9 commits into from
Aug 19, 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
4 changes: 4 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ export { Icon } from './components/Icon'
// themes
export { createTheme } from './themes/createTheme'
export { ThemeProvider } from './themes/ThemeProvider'
export { defaultPalette } from './themes/createPalette'
export { defaultInteraction } from './themes/createInteraction'
export { defaultFrame } from './themes/createFrame'
export { defaultSize } from './themes/createSize'
22 changes: 15 additions & 7 deletions src/themes/createFrame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { defaultPalette, PaletteProperty } from './createPalette'

const lineWidth = '1px'
const lineStyle = 'solid'
const lineColor = defaultPalette.BORDER

export interface FrameProperty {
border?: {
Expand Down Expand Up @@ -30,19 +31,26 @@ export interface CreatedFrameTheme {
}
}

export const defaultFrame: CreatedFrameTheme = {
border: {
lineWidth,
lineStyle,
default: `${lineWidth} ${lineStyle} ${lineColor}`,
radius: {
s: '3px',
m: '6px',
l: '8px',
},
},
}

export const createFrame = (userFrame: FrameProperty = {}, userPalette: PaletteProperty = {}) => {
const color = userPalette.BORDER || defaultPalette.BORDER
const created: CreatedFrameTheme = merge(
{
border: {
lineWidth,
lineStyle,
...defaultFrame.border,
default: `${lineWidth} ${lineStyle} ${color}`,
radius: {
s: '3px',
m: '6px',
l: '8px',
},
},
},
userFrame,
Expand Down
16 changes: 10 additions & 6 deletions src/themes/createInteraction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,19 @@ export interface CreatedInteractionTheme {
}
}

export const defaultInteraction = {
hover: {
feedbackOpacity: '.7',
animationDuration: hoverAnimationDuration,
animationTiming: hoverAnimationTiming,
animation: `${hoverAnimationDuration} ${hoverAnimationTiming}`,
},
}

export const createInteraction = (userInteraction: InteractionProperty = {}) => {
const created: CreatedInteractionTheme = merge(
{
hover: {
feedbackOpacity: '.7',
animationDuration: hoverAnimationDuration,
animationTiming: hoverAnimationTiming,
animation: `${hoverAnimationDuration} ${hoverAnimationTiming}`,
},
...defaultInteraction,
},
userInteraction,
)
Expand Down
6 changes: 4 additions & 2 deletions src/themes/createPalette.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ export interface CreatedPaletteTheme {
OVERLAY: string
}

export const defaultPalette = {
const hoverColor = (value: string): string => darken(0.05, value)

export const defaultPalette: CreatedPaletteTheme = {
hoverColor,
TEXT_BLACK: '#333',
TEXT_GREY: '#767676',
BORDER: '#d6d6d6',
Expand All @@ -45,7 +48,6 @@ export const defaultPalette = {
export const createPalette = (userPalette: PaletteProperty = {}) => {
const created: CreatedPaletteTheme = merge(
{
hoverColor: (value: string): string => darken(0.05, value),
...defaultPalette,
},
userPalette,
Expand Down
58 changes: 33 additions & 25 deletions src/themes/createSize.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { merge } from '../libs/lodash'

const defaultHtmlFontSize = 16
const defaultSpace = 8
const defaultSpaceSize = 8

export interface SizeProperty {
htmlFontSize?: number
Expand Down Expand Up @@ -51,36 +51,44 @@ export interface CreatedSizeTheme {
}
}

const defaultSize = {
font: {
SHORT: 11,
TALL: 14,
GRANDE: 18,
VENTI: 24,
},
mediaQuery: {
SP: 599,
TABLET: 959,
},
const pxToRem = (value: number) => (font: number) => {
return `${value / font}rem`
}

const getSpace = (size: number) => {
return {
XXS: size,
XS: size * 2,
S: size * 3,
M: size * 4,
L: size * 5,
XL: size * 6,
XXL: size * 7,
}
}

const defaultFontSize = { SHORT: 11, TALL: 14, GRANDE: 18, VENTI: 24 }

const defaultMediaQuery = { SP: 599, TABLET: 959 }

const defaultSpace = getSpace(defaultSpaceSize)

export const defaultSize: CreatedSizeTheme = {
pxToRem: (value: number) => pxToRem(value)(defaultHtmlFontSize),
font: defaultFontSize,
space: defaultSpace,
mediaQuery: defaultMediaQuery,
}

export const createSize = (userSize: SizeProperty = {}) => {
const space = userSize.space || {}
const XXS = space.defaultRem || defaultSpace
const XXS = space.defaultRem || defaultSpaceSize
const created: CreatedSizeTheme = merge(
{
pxToRem: (value: number): string =>
`${value / (userSize.htmlFontSize || defaultHtmlFontSize)}rem`,
space: {
XXS,
XS: XXS * 2,
S: XXS * 3,
M: XXS * 4,
L: XXS * 5,
XL: XXS * 6,
XXL: XXS * 7,
},
...defaultSize,
pxToRem: (value: number) => pxToRem(value)(userSize.htmlFontSize || defaultHtmlFontSize),
space: getSpace(XXS),
font: defaultFontSize,
mediaQuery: defaultMediaQuery,
},
userSize,
)
Expand Down