Skip to content

Allow FlexBox to have its element type specified #405

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

Open
alexpaxton wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow FlexBox to have its element type specified #405

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
3 changes: 2 additions & 1 deletion src/Components/FlexBox/Documentation/FlexBox.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {withKnobs, select, boolean, number} from '@storybook/addon-knobs'
import {withKnobs, select, boolean, number, text} from '@storybook/addon-knobs'
import {mapEnumKeys} from '../../../Utils/storybook'

// Components
Expand Down Expand Up @@ -41,6 +41,7 @@ componentSpacerStories.add(
<div className="story--example">
<FlexBox.FlexBox
ref={flexBoxRef}
element={text('element', 'div')}
direction={
FlexDirection[
select('direction', mapEnumKeys(FlexDirection), 'Row')
Expand Down
19 changes: 8 additions & 11 deletions src/Components/FlexBox/FlexBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ export interface FlexBoxProps extends StandardFunctionProps {
stretchToFitWidth?: boolean
/** stretches component spacer to fit parent height */
stretchToFitHeight?: boolean
/** HTML element type, must pass in a valid type */
element?: string
}

export type FlexBoxRef = HTMLDivElement
export type FlexBoxRef = HTMLElement

export const FlexBoxRoot = forwardRef<FlexBoxRef, FlexBoxProps>(
(
Expand All @@ -38,6 +40,7 @@ export const FlexBoxRoot = forwardRef<FlexBoxRef, FlexBoxProps>(
style,
testID = 'flex-box',
margin,
element = 'div',
children,
direction = FlexDirection.Row,
className,
Expand All @@ -58,16 +61,10 @@ export const FlexBoxRoot = forwardRef<FlexBoxRef, FlexBoxProps>(
[`${className}`]: className,
})

return (
<div
id={id}
ref={ref}
style={style}
data-testid={testID}
className={flexBoxClass}
>
{children}
</div>
return React.createElement(
element,
{id: id, ref, style, className: flexBoxClass, 'data-testid': testID},
children
)
}
)
Expand Down