@sb1/ffe-buttons-react 14.0.2 → 14.0.6

package/es/ActionButton.js

@@ -56,12 +56,8 @@ ActionButton.propTypes = {
   leftIcon: node,
 
   /** Icon shown to the right of the label */
-  rightIcon: node,
-
-  /** Dark variant */
-  dark: bool
+  rightIcon: node
 };
 ActionButton.defaultProps = {
-  ghost: false,
-  dark: false
+  ghost: false
 };

package/es/BackButton.js

@@ -1,7 +1,7 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from 'react';
-import { oneOfType, func, node, string, bool, object, shape, elementType } from 'prop-types';
+import { oneOfType, func, node, string, object, shape, elementType } from 'prop-types';
 import InlineButton from './InlineBaseButton';
 
 var BackButton = function BackButton(props) {
@@ -23,12 +23,6 @@ BackButton.propTypes = {
   /** Ref-setting function, or ref created by useRef, passed to the button element */
   innerRef: oneOfType([func, shape({
     current: object
-  })]),
-
-  /** Dark variant */
-  dark: bool
-};
-BackButton.defaultProps = {
-  dark: false
+  })])
 };
 export default BackButton;

package/es/BaseButton.js

@@ -1,4 +1,4 @@
-var _excluded = ["ariaLoadingMessage", "buttonType", "children", "className", "condensed", "disabled", "element", "innerRef", "isLoading", "leftIcon", "rightIcon"];
+var _excluded = ["ariaLoadingMessage", "buttonType", "children", "className", "condensed", "element", "innerRef", "isLoading", "leftIcon", "rightIcon", "onClick"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -19,25 +19,32 @@ var BaseButton = function BaseButton(props) {
       children = props.children,
       className = props.className,
       condensed = props.condensed,
-      disabled = props.disabled,
       Element = props.element,
       innerRef = props.innerRef,
       isLoading = props.isLoading,
       leftIcon = props.leftIcon,
       rightIcon = props.rightIcon,
+      _onClick = props.onClick,
       rest = _objectWithoutProperties(props, _excluded);
 
   var supportsSpinner = ['action', 'primary', 'secondary'].includes(buttonType);
   return /*#__PURE__*/React.createElement(Element, _extends({
     "aria-busy": isLoading && supportsSpinner,
-    "aria-disabled": disabled || isLoading && supportsSpinner,
+    "aria-disabled": rest.disabled || isLoading && supportsSpinner,
     className: classNames('ffe-button', "ffe-button--".concat(buttonType), {
       'ffe-button--condensed': condensed
     }, {
       'ffe-button--loading': isLoading && supportsSpinner
     }, className),
-    disabled: disabled || isLoading && supportsSpinner,
-    ref: innerRef
+    ref: innerRef,
+    onClick: function onClick(event) {
+      if (isLoading && supportsSpinner) {
+        event.preventDefault();
+        event.stopPropagation();
+      } else if (_onClick) {
+        _onClick(event);
+      }
+    }
   }, rest), /*#__PURE__*/React.createElement("span", {
     className: "ffe-button__label"
   }, leftIcon && /*#__PURE__*/React.cloneElement(leftIcon, {
@@ -88,7 +95,10 @@ BaseButton.propTypes = {
   leftIcon: node,
 
   /** Icon shown to the right of the label */
-  rightIcon: node
+  rightIcon: node,
+
+  /** Called when button is clicked if not loading or disabled */
+  onClick: func
 };
 BaseButton.defaultProps = {
   ariaLoadingMessage: 'Vennligst vent',

package/es/BaseButton.spec.js

@@ -77,7 +77,6 @@ describe('<BaseButton />', function () {
         isLoading: true
       });
       expect(wrapper.prop('aria-disabled')).toBe(true);
-      expect(wrapper.prop('disabled')).toBe(true);
     });
     it('does nothing for unsupported button type', function () {
       var wrapper = getWrapper({
@@ -87,7 +86,6 @@ describe('<BaseButton />', function () {
       expect(wrapper.hasClass('ffe-button--loading')).toBe(false);
       expect(wrapper.prop('aria-busy')).toBe(false);
       expect(wrapper.prop('aria-disabled')).toBe(false);
-      expect(wrapper.prop('disabled')).toBe(false);
     });
   });
 });

package/es/PrimaryButton.js

@@ -41,12 +41,6 @@ PrimaryButton.propTypes = {
   leftIcon: node,
 
   /** Icon shown to the right of the label */
-  rightIcon: node,
-
-  /** Dark variant */
-  dark: bool
-};
-PrimaryButton.defaultProps = {
-  dark: false
+  rightIcon: node
 };
 export default PrimaryButton;

package/es/SecondaryButton.js

@@ -41,12 +41,6 @@ SecondaryButton.propTypes = {
   leftIcon: node,
 
   /** Icon shown to the right of the label */
-  rightIcon: node,
-
-  /** Dark variant */
-  dark: bool
-};
-SecondaryButton.defaultProps = {
-  dark: false
+  rightIcon: node
 };
 export default SecondaryButton;

package/es/TertiaryButton.js

@@ -1,7 +1,7 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from 'react';
-import { func, node, oneOfType, string, bool, object, shape, elementType } from 'prop-types';
+import { func, node, oneOfType, string, object, shape, elementType } from 'prop-types';
 import InlineButton from './InlineBaseButton';
 
 var TertiaryButton = function TertiaryButton(props) {
@@ -29,12 +29,6 @@ TertiaryButton.propTypes = {
   leftIcon: node,
 
   /** Icon shown to the right of the label */
-  rightIcon: node,
-
-  /** Dark variant */
-  dark: bool
-};
-TertiaryButton.defaultProps = {
-  dark: false
+  rightIcon: node
 };
 export default TertiaryButton;

package/lib/ActionButton.js

@@ -70,12 +70,8 @@ ActionButton.propTypes = {
   leftIcon: _propTypes.node,
 
   /** Icon shown to the right of the label */
-  rightIcon: _propTypes.node,
-
-  /** Dark variant */
-  dark: _propTypes.bool
+  rightIcon: _propTypes.node
 };
 ActionButton.defaultProps = {
-  ghost: false,
-  dark: false
+  ghost: false
 };

package/lib/BackButton.js

@@ -34,13 +34,7 @@ BackButton.propTypes = {
   /** Ref-setting function, or ref created by useRef, passed to the button element */
   innerRef: (0, _propTypes.oneOfType)([_propTypes.func, (0, _propTypes.shape)({
     current: _propTypes.object
-  })]),
-
-  /** Dark variant */
-  dark: _propTypes.bool
-};
-BackButton.defaultProps = {
-  dark: false
+  })])
 };
 var _default = BackButton;
 exports.default = _default;

package/lib/BaseButton.js

@@ -11,7 +11,7 @@ var _propTypes = require("prop-types");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _excluded = ["ariaLoadingMessage", "buttonType", "children", "className", "condensed", "disabled", "element", "innerRef", "isLoading", "leftIcon", "rightIcon"];
+var _excluded = ["ariaLoadingMessage", "buttonType", "children", "className", "condensed", "element", "innerRef", "isLoading", "leftIcon", "rightIcon", "onClick"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -30,25 +30,32 @@ var BaseButton = function BaseButton(props) {
       children = props.children,
       className = props.className,
       condensed = props.condensed,
-      disabled = props.disabled,
       Element = props.element,
       innerRef = props.innerRef,
       isLoading = props.isLoading,
       leftIcon = props.leftIcon,
       rightIcon = props.rightIcon,
+      _onClick = props.onClick,
       rest = _objectWithoutProperties(props, _excluded);
 
   var supportsSpinner = ['action', 'primary', 'secondary'].includes(buttonType);
   return /*#__PURE__*/_react.default.createElement(Element, _extends({
     "aria-busy": isLoading && supportsSpinner,
-    "aria-disabled": disabled || isLoading && supportsSpinner,
+    "aria-disabled": rest.disabled || isLoading && supportsSpinner,
     className: (0, _classnames.default)('ffe-button', "ffe-button--".concat(buttonType), {
       'ffe-button--condensed': condensed
     }, {
       'ffe-button--loading': isLoading && supportsSpinner
     }, className),
-    disabled: disabled || isLoading && supportsSpinner,
-    ref: innerRef
+    ref: innerRef,
+    onClick: function onClick(event) {
+      if (isLoading && supportsSpinner) {
+        event.preventDefault();
+        event.stopPropagation();
+      } else if (_onClick) {
+        _onClick(event);
+      }
+    }
   }, rest), /*#__PURE__*/_react.default.createElement("span", {
     className: "ffe-button__label"
   }, leftIcon && /*#__PURE__*/_react.default.cloneElement(leftIcon, {
@@ -99,7 +106,10 @@ BaseButton.propTypes = {
   leftIcon: _propTypes.node,
 
   /** Icon shown to the right of the label */
-  rightIcon: _propTypes.node
+  rightIcon: _propTypes.node,
+
+  /** Called when button is clicked if not loading or disabled */
+  onClick: _propTypes.func
 };
 BaseButton.defaultProps = {
   ariaLoadingMessage: 'Vennligst vent',

package/lib/BaseButton.spec.js

@@ -84,7 +84,6 @@ describe('<BaseButton />', function () {
         isLoading: true
       });
       expect(wrapper.prop('aria-disabled')).toBe(true);
-      expect(wrapper.prop('disabled')).toBe(true);
     });
     it('does nothing for unsupported button type', function () {
       var wrapper = getWrapper({
@@ -94,7 +93,6 @@ describe('<BaseButton />', function () {
       expect(wrapper.hasClass('ffe-button--loading')).toBe(false);
       expect(wrapper.prop('aria-busy')).toBe(false);
       expect(wrapper.prop('aria-disabled')).toBe(false);
-      expect(wrapper.prop('disabled')).toBe(false);
     });
   });
 });

package/lib/PrimaryButton.js

@@ -52,13 +52,7 @@ PrimaryButton.propTypes = {
   leftIcon: _propTypes.node,
 
   /** Icon shown to the right of the label */
-  rightIcon: _propTypes.node,
-
-  /** Dark variant */
-  dark: _propTypes.bool
-};
-PrimaryButton.defaultProps = {
-  dark: false
+  rightIcon: _propTypes.node
 };
 var _default = PrimaryButton;
 exports.default = _default;

package/lib/SecondaryButton.js

@@ -52,13 +52,7 @@ SecondaryButton.propTypes = {
   leftIcon: _propTypes.node,
 
   /** Icon shown to the right of the label */
-  rightIcon: _propTypes.node,
-
-  /** Dark variant */
-  dark: _propTypes.bool
-};
-SecondaryButton.defaultProps = {
-  dark: false
+  rightIcon: _propTypes.node
 };
 var _default = SecondaryButton;
 exports.default = _default;

package/lib/TertiaryButton.js

@@ -40,13 +40,7 @@ TertiaryButton.propTypes = {
   leftIcon: _propTypes.node,
 
   /** Icon shown to the right of the label */
-  rightIcon: _propTypes.node,
-
-  /** Dark variant */
-  dark: _propTypes.bool
-};
-TertiaryButton.defaultProps = {
-  dark: false
+  rightIcon: _propTypes.node
 };
 var _default = TertiaryButton;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sb1/ffe-buttons-react",
-  "version": "14.0.2",
+  "version": "14.0.6",
   "description": "React implementation of ffe-buttons",
   "keywords": [
     "ffe"
@@ -33,7 +33,7 @@
     "setupTestFrameworkScriptFile": "../../test-setup.js"
   },
   "dependencies": {
-    "@sb1/ffe-icons-react": "^7.2.18",
+    "@sb1/ffe-icons-react": "^7.2.19",
     "classnames": "^2.2.5",
     "prop-types": "^15.7.0"
   },
@@ -53,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "53a5f3124f5da484d5c004a2381a480285d4d70b"
+  "gitHead": "0fb5a2f3fc9b083939ed70ee4685aa1890d42af7"
 }

package/types/index.d.ts

@@ -24,7 +24,6 @@ export interface BaseButtonProps extends MinimalBaseButtonProps {
     isLoading?: boolean;
     leftIcon?: React.ReactNode;
     rightIcon?: React.ReactNode;
-    dark?: boolean;
 }
 
 export interface ActionButtonProps extends BaseButtonProps {
@@ -33,7 +32,6 @@ export interface ActionButtonProps extends BaseButtonProps {
 
 export interface BackButtonProps extends MinimalBaseButtonProps {
     children?: React.ReactNode;
-    dark?: boolean;
 }
 
 export interface ButtonGroupProps {
@@ -80,7 +78,6 @@ export interface TertiaryButtonProps extends MinimalBaseButtonProps {
     children?: React.ReactNode;
     leftIcon?: React.ReactNode;
     rightIcon?: React.ReactNode;
-    dark?: boolean;
 }
 
 declare class ActionButton extends React.Component<ActionButtonProps, any> {}