Skip to content

Add tag props to grid and cell components #42

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
wab wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add tag props to grid and cell components #42

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3f9679
add tag props
wab Jun 15, 2018
186953e
move to regular dependecy
wab Jun 16, 2018
f181f30
add documentation
wab Jun 16, 2018
6d3d790
change default tag grid to "div"
wab Jun 16, 2018
0728c79
add tag blacklist attrs
wab Jun 20, 2018
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
6 changes: 4 additions & 2 deletions lib/Cell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import styled from "styled-components";
import PropTypes from "prop-types";
import tag from "clean-tag";

const Cell = styled.section`
const Cell = styled(tag.section)`
height: 100%;
min-width: 0;
align-content: space-around;
Expand Down Expand Up @@ -32,7 +33,8 @@ Cell.propTypes = {
left: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
middle: PropTypes.bool,
center: PropTypes.bool,
area: PropTypes.string
area: PropTypes.string,
is: PropTypes.string
};

export default Cell;
6 changes: 4 additions & 2 deletions lib/Grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import styled from "styled-components";
import PropTypes from "prop-types";
import tag from "clean-tag";

const autoRows = ({ minRowHeight = "20px" }) => `minmax(${minRowHeight}, auto)`;

Expand All @@ -12,7 +13,7 @@ const flow = ({ flow = "row" }) => flow;

const formatAreas = areas => areas.map(area => `"${area}"`).join(" ");

const Grid = styled.div`
const Grid = styled(tag.section)`
display: grid;
height: ${({ height = "auto" }) => height};
grid-auto-flow: ${flow};
Expand All @@ -36,7 +37,8 @@ Grid.propTypes = {
rows: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
areas: PropTypes.arrayOf(PropTypes.string),
justifyContent: PropTypes.string,
alignContent: PropTypes.string
alignContent: PropTypes.string,
is: PropTypes.string
};

export default Grid;
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
},
"peerDependencies": {
"clean-tag": "^1.0.4",
Copy link
Copy Markdown
Owner

@azz azz Jun 16, 2018

Choose a reason for hiding this comment

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

Should be a regular dependency

"react": "*",
"react-dom": "*",
"styled-components": "^2"
Expand Down
27 changes: 27 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,14 @@ circular-json@^0.3.1:
version "0.3.3"
resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"

clean-tag@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/clean-tag/-/clean-tag-1.0.4.tgz#9b407b306fadce114e6dffa774e7b61bdfc0c190"
dependencies:
html-tags "^2.0.0"
react ">=16.0.0"
styled-system ">=1.1 || >=2.0"

cli-cursor@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
Expand Down Expand Up @@ -1886,6 +1894,10 @@ html-encoding-sniffer@^1.0.1:
dependencies:
whatwg-encoding "^1.0.1"

html-tags@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"

http-proxy@^1.8.1:
version "1.16.2"
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
Expand Down Expand Up @@ -3309,6 +3321,15 @@ react-test-renderer@next:
fbjs "^0.8.9"
object-assign "^4.1.0"

react@>=16.0.0:
version "16.4.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.1.tgz#de51ba5764b5dbcd1f9079037b862bd26b82fe32"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

react@next:
version "16.0.0-beta.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0-beta.2.tgz#340bbaa28c8678499353586cf46d096438dee561"
Expand Down Expand Up @@ -3975,6 +3996,12 @@ styled-components@^2.1.1:
stylis "^3.2.1"
supports-color "^3.2.3"

"styled-system@>=1.1 || >=2.0":
version "2.2.9"
resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-2.2.9.tgz#1a9a2187b1856b4a385ed65a1daff771a253f3d9"
dependencies:
prop-types "^15.6.0"

stylis@^3.2.1:
version "3.2.8"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.2.8.tgz#9b23a3e06597f7944a3d9ae880d5796248b8784f"
Expand Down