diff --git a/src/common/Base.tsx b/src/common/Base.tsx index f5fd00fe..f31ac413 100644 --- a/src/common/Base.tsx +++ b/src/common/Base.tsx @@ -13,13 +13,14 @@ export interface BaseProps extends DetailedHTMLProps> = props => { - const { ref = null, innerRef = null, fit = false, grow = false, shrink = false, fullWidth = false, fullHeight = false, overflow = null, position = null, float = null, pointer = false, textColor = null, classNames = [], className = '', style = {}, ...rest } = props; + const { ref = null, innerRef = null, fit = false, grow = false, shrink = false, fullWidth = false, fullHeight = false, overflow = null, position = null, float = null, pointer = false, visible = null, textColor = null, classNames = [], className = '', style = {}, ...rest } = props; const getClassNames = useMemo(() => { @@ -41,12 +42,14 @@ export const Base: FC> = props => if(pointer) newClassNames.push('cursor-pointer'); + if(visible !== null) newClassNames.push(visible ? 'visible' : 'invisible'); + if(textColor) newClassNames.push('text-' + textColor); if(classNames.length) newClassNames.push(...classNames); return newClassNames; - }, [ fit, grow, shrink, fullWidth, fullHeight, overflow, position, float, pointer, textColor, classNames ]); + }, [ fit, grow, shrink, fullWidth, fullHeight, overflow, position, float, pointer, visible, textColor, classNames ]); const getClassName = useMemo(() => { diff --git a/src/common/Grid.tsx b/src/common/Grid.tsx index ed59d47a..860a89ca 100644 --- a/src/common/Grid.tsx +++ b/src/common/Grid.tsx @@ -1,5 +1,4 @@ -import { FC, useMemo } from 'react'; -import { CSSProperties } from 'styled-components'; +import { CSSProperties, FC, useMemo } from 'react'; import { Base, BaseProps } from './Base'; import { GridContextProvider } from './GridContext'; import { AlignItemType, AlignSelfType, JustifyContentType, SpacingType } from './types'; diff --git a/src/common/types/OverflowType.ts b/src/common/types/OverflowType.ts index a8a793db..7c9e3b15 100644 --- a/src/common/types/OverflowType.ts +++ b/src/common/types/OverflowType.ts @@ -1 +1 @@ -export type OverflowType = 'hidden' | 'auto' | 'unset'; +export type OverflowType = 'auto' | 'hidden' | 'visible' | 'scroll' | 'unset';