Skip to content

Commit

Permalink
Merge pull request #58 from palmetto/develop
Browse files Browse the repository at this point in the history
release v0.1.4
  • Loading branch information
juanfabrega authored Jul 8, 2020
2 parents 099bdce + ce564a0 commit 7e9d6f8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@palmetto/palmetto-components",
"author": "@palmetto",
"version": "0.1.3",
"version": "0.1.4",
"private": false,
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand Down
5 changes: 4 additions & 1 deletion src/components/FormLabel/FormLabel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ FormLabel.propTypes = {
/**
* The label text
*/
labelText: PropTypes.string.isRequired,
labelText: PropTypes.oneOfType([
PropTypes.string,
PropTypes.node,
]).isRequired,
/**
* Render an asterisk after the label to mark it as required
*/
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2051,10 +2051,10 @@
"@nodelib/fs.scandir" "2.1.3"
fastq "^1.6.0"

"@palmetto/palmetto-design-tokens@^0.1.9":
version "0.1.9"
resolved "https://registry.yarnpkg.com/@palmetto/palmetto-design-tokens/-/palmetto-design-tokens-0.1.9.tgz#b08111a4c2e5ab447f68c90c466fa7e266de80f5"
integrity sha512-TKWO/CO8NzmbK/GpB1RPSwoib8WAL7kHNMvChNrCeO/q4HalZs6tkdHRxXtxWQNEjgO+pJBoM9f9sf2dgF18dg==
"@palmetto/palmetto-design-tokens@^0.1.10":
version "0.1.10"
resolved "https://registry.yarnpkg.com/@palmetto/palmetto-design-tokens/-/palmetto-design-tokens-0.1.10.tgz#0511ff9b7190b776d70b3ebb0a6cb404f277f359"
integrity sha512-G0KZCTiY6zHARuPbB+nI+DUWb5bPtyZSylco89HML6+6dhtONNIv+RDgN3Bz4NjiuVEDw6rbae0wUtyFB8qUeg==

"@reach/router@^1.2.1":
version "1.3.3"
Expand Down

0 comments on commit 7e9d6f8

Please sign in to comment.