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

fix(Grid): Update grid layout to support new 2xl breakpoint #2305

Merged
merged 6 commits into from Jun 27, 2019

Conversation

@jessiehuff
Copy link
Contributor

jessiehuff commented Jun 19, 2019

Fixes #2199

Update the grid layout to support the 2xl breakpoint added here - patternfly/patternfly-next#1880

… meet JSX attribute name requirements
@patternfly-build

This comment has been minimized.

Copy link
Contributor

patternfly-build commented Jun 19, 2019

PatternFly-React preview: https://patternfly-react-pr-2305.surge.sh

@@ -25,6 +25,8 @@ const propTypes = {
lg: gridItemSpanValueShape,
/** the number of columns all grid items should span on a xLarge device */
xl: gridItemSpanValueShape,
/** the number of columns all grid items should span on a 2xLarge device */
xl2: gridItemSpanValueShape,

This comment has been minimized.

Copy link
@mcoker

mcoker Jun 19, 2019

Contributor

should we call it 2xl or is there a reason it's xl2 here?

This comment has been minimized.

Copy link
@jessiehuff

jessiehuff Jun 19, 2019

Author Contributor

I had to name it xl2 to meet JSX attribute name requirements. It won't allow a prop to start with a number. :(

This comment has been minimized.

Copy link
@boaz0

boaz0 Jun 21, 2019

Member

Maybe '2xl': gridItemSpanValueShape will make JSX happy?

This comment has been minimized.

Copy link
@jessiehuff

jessiehuff Jun 21, 2019

Author Contributor

That works for defining the prop, but it doesn't work when actually creating a <GridItem 2xl={2}>

@mcoker
mcoker approved these changes Jun 21, 2019
Copy link
Contributor

mcoker left a comment

lgtm! thanks!

@tlabaj
tlabaj approved these changes Jun 27, 2019
Copy link
Contributor

tlabaj left a comment

LGTM

@dlabaj
dlabaj approved these changes Jun 27, 2019
@dlabaj dlabaj merged commit 2025c1c into patternfly:master Jun 27, 2019
8 checks passed
8 checks passed
ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: build_integration Your tests passed on CircleCI!
Details
ci/circleci: build_pf3_docs Your tests passed on CircleCI!
Details
ci/circleci: build_pf4_docs Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: test_jest_other Your tests passed on CircleCI!
Details
ci/circleci: test_jest_pf4 Your tests passed on CircleCI!
Details
ci/circleci: upload_docs Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.