Merge pull request #3 in FFE/ffe-button-react from export-bugfix to m…

…aster * commit '0d71db98d61c18c71f78f633353f807fb301134e': FIX point package.json to index.js, remove isRequired from children prop
SpareBank1 · May 6, 2016 · b4a0c0c · b4a0c0c
2 parents df95be0 + 2e91a07
commit b4a0c0c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "ffe-button-react",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "React implementation of ffe-button",
-  "main": "lib/FFEButton.js",
+  "main": "lib/index.js",
   "scripts": {
     "build": "babel -d lib/. --ignore=*.test.js src/.",
     "lint": "eslint src/.",

diff --git a/src/FFEActionButton.js b/src/FFEActionButton.js
@@ -30,7 +30,7 @@ export default function FFEActionButton(props) {
 FFEActionButton.propTypes = {
     action: PropTypes.string,
     ariaLoadingMessage: PropTypes.string,
-    children: PropTypes.node.isRequired,
+    children: PropTypes.node,
     id: PropTypes.string,
     isLoading: PropTypes.bool,
     label: PropTypes.string,

diff --git a/src/FFEPrimaryButton.js b/src/FFEPrimaryButton.js
@@ -30,7 +30,7 @@ export default function FFEPrimaryButton(props) {
 FFEPrimaryButton.propTypes = {
     action: PropTypes.string,
     ariaLoadingMessage: PropTypes.string,
-    children: PropTypes.node.isRequired,
+    children: PropTypes.node,
     id: PropTypes.string,
     isLoading: PropTypes.bool,
     label: PropTypes.string,

diff --git a/src/FFESecondaryButton.js b/src/FFESecondaryButton.js
@@ -30,7 +30,7 @@ export default function FFESecondaryButton(props) {
 FFESecondaryButton.propTypes = {
     action: PropTypes.string,
     ariaLoadingMessage: PropTypes.string,
-    children: PropTypes.node.isRequired,
+    children: PropTypes.node,
     id: PropTypes.string,
     isLoading: PropTypes.bool,
     label: PropTypes.string,

diff --git a/src/FFEShortcutButton.js b/src/FFEShortcutButton.js
@@ -30,7 +30,7 @@ export default function FFEShortcutButton(props) {
 FFEShortcutButton.propTypes = {
     action: PropTypes.string,
     ariaLoadingMessage: PropTypes.string,
-    children: PropTypes.node.isRequired,
+    children: PropTypes.node,
     id: PropTypes.string,
     isLoading: PropTypes.bool,
     label: PropTypes.string,