@sb1/ffe-buttons-react 15.0.0 → 16.0.2

package/es/ActionButton.js

@@ -29,9 +29,6 @@ ActionButton.propTypes = {
   /** Extra class names */
   className: string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: bool,
-
   /** Disable a button in certain situations */
   disabled: bool,
 

package/es/BaseButton.js

@@ -1,4 +1,4 @@
-var _excluded = ["ariaLoadingMessage", "buttonType", "children", "className", "condensed", "element", "innerRef", "isLoading", "leftIcon", "rightIcon", "onClick"];
+var _excluded = ["ariaLoadingMessage", "buttonType", "children", "className", "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); }
 
@@ -18,7 +18,6 @@ var BaseButton = function BaseButton(props) {
       buttonType = props.buttonType,
       children = props.children,
       className = props.className,
-      condensed = props.condensed,
       Element = props.element,
       innerRef = props.innerRef,
       isLoading = props.isLoading,
@@ -32,8 +31,6 @@ var BaseButton = function BaseButton(props) {
     "aria-busy": 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),
     ref: innerRef,
@@ -48,11 +45,12 @@ var BaseButton = function BaseButton(props) {
   }, rest), /*#__PURE__*/React.createElement("span", {
     className: "ffe-button__label"
   }, leftIcon && /*#__PURE__*/React.cloneElement(leftIcon, {
-    className: 'ffe-button__icon ffe-button__icon--left'
+    className: 'ffe-button__icon ffe-button__icon--left',
+    'aria-hidden': 'true'
   }), children, rightIcon && /*#__PURE__*/React.cloneElement(rightIcon, {
-    className: 'ffe-button__icon ffe-button__icon--right'
-  })), supportsSpinner && /*#__PURE__*/React.createElement("span", {
-    "aria-hidden": !isLoading,
+    className: 'ffe-button__icon ffe-button__icon--right',
+    'aria-hidden': 'true'
+  })), supportsSpinner && isLoading && /*#__PURE__*/React.createElement("span", {
     "aria-label": ariaLoadingMessage,
     className: "ffe-button__spinner"
   }));
@@ -74,9 +72,6 @@ BaseButton.propTypes = {
   /** Extra class names */
   className: string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: bool,
-
   /** Disable a button in certain situations */
   disabled: bool,
 

package/es/PrimaryButton.js

@@ -20,9 +20,6 @@ PrimaryButton.propTypes = {
   /** Extra class names */
   className: string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: bool,
-
   /** Disable a button in certain situations */
   disabled: bool,
 

package/es/SecondaryButton.js

@@ -20,9 +20,6 @@ SecondaryButton.propTypes = {
   /** Extra class names */
   className: string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: bool,
-
   /** Disable a button in certain situations */
   disabled: bool,
 

package/es/ShortcutButton.js

@@ -19,9 +19,6 @@ ShortcutButton.propTypes = {
   /** Extra class names */
   className: string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: bool,
-
   /** Disable a button in certain situations */
   disabled: bool,
 

package/es/TaskButton.js

@@ -27,9 +27,6 @@ TaskButton.propTypes = {
   /** Extra class names */
   className: string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: bool,
-
   /** Disable a button in certain situations */
   disabled: bool,
 

package/lib/ActionButton.js

@@ -43,9 +43,6 @@ ActionButton.propTypes = {
   /** Extra class names */
   className: _propTypes.string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: _propTypes.bool,
-
   /** Disable a button in certain situations */
   disabled: _propTypes.bool,
 

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", "element", "innerRef", "isLoading", "leftIcon", "rightIcon", "onClick"];
+var _excluded = ["ariaLoadingMessage", "buttonType", "children", "className", "element", "innerRef", "isLoading", "leftIcon", "rightIcon", "onClick"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -29,7 +29,6 @@ var BaseButton = function BaseButton(props) {
       buttonType = props.buttonType,
       children = props.children,
       className = props.className,
-      condensed = props.condensed,
       Element = props.element,
       innerRef = props.innerRef,
       isLoading = props.isLoading,
@@ -43,8 +42,6 @@ var BaseButton = function BaseButton(props) {
     "aria-busy": 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),
     ref: innerRef,
@@ -59,11 +56,12 @@ var BaseButton = function BaseButton(props) {
   }, rest), /*#__PURE__*/_react.default.createElement("span", {
     className: "ffe-button__label"
   }, leftIcon && /*#__PURE__*/_react.default.cloneElement(leftIcon, {
-    className: 'ffe-button__icon ffe-button__icon--left'
+    className: 'ffe-button__icon ffe-button__icon--left',
+    'aria-hidden': 'true'
   }), children, rightIcon && /*#__PURE__*/_react.default.cloneElement(rightIcon, {
-    className: 'ffe-button__icon ffe-button__icon--right'
-  })), supportsSpinner && /*#__PURE__*/_react.default.createElement("span", {
-    "aria-hidden": !isLoading,
+    className: 'ffe-button__icon ffe-button__icon--right',
+    'aria-hidden': 'true'
+  })), supportsSpinner && isLoading && /*#__PURE__*/_react.default.createElement("span", {
     "aria-label": ariaLoadingMessage,
     className: "ffe-button__spinner"
   }));
@@ -85,9 +83,6 @@ BaseButton.propTypes = {
   /** Extra class names */
   className: _propTypes.string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: _propTypes.bool,
-
   /** Disable a button in certain situations */
   disabled: _propTypes.bool,
 

package/lib/PrimaryButton.js

@@ -31,9 +31,6 @@ PrimaryButton.propTypes = {
   /** Extra class names */
   className: _propTypes.string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: _propTypes.bool,
-
   /** Disable a button in certain situations */
   disabled: _propTypes.bool,
 

package/lib/SecondaryButton.js

@@ -31,9 +31,6 @@ SecondaryButton.propTypes = {
   /** Extra class names */
   className: _propTypes.string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: _propTypes.bool,
-
   /** Disable a button in certain situations */
   disabled: _propTypes.bool,
 

package/lib/ShortcutButton.js

@@ -31,9 +31,6 @@ ShortcutButton.propTypes = {
   /** Extra class names */
   className: _propTypes.string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: _propTypes.bool,
-
   /** Disable a button in certain situations */
   disabled: _propTypes.bool,
 

package/lib/TaskButton.js

@@ -38,9 +38,6 @@ TaskButton.propTypes = {
   /** Extra class names */
   className: _propTypes.string,
 
-  /** Condensed modifier. Use in condensed designs */
-  condensed: _propTypes.bool,
-
   /** Disable a button in certain situations */
   disabled: _propTypes.bool,
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sb1/ffe-buttons-react",
-  "version": "15.0.0",
+  "version": "16.0.2",
   "description": "React implementation of ffe-buttons",
   "keywords": [
     "ffe"
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0ff2b9371adf4b9fda3acbe2ec821d43f2105877"
+  "gitHead": "aedebe00873310156565d8bd15a210558f2dd57f"
 }

package/types/index.d.ts

@@ -19,7 +19,6 @@ export interface MinimalBaseButtonProps extends React.HTMLProps<HTMLElement> {
 export interface BaseButtonProps extends MinimalBaseButtonProps {
     children?: React.ReactNode;
     ariaLoadingMessage?: string;
-    condensed?: boolean;
     disabled?: boolean;
     isLoading?: boolean;
     leftIcon?: React.ReactNode;
@@ -36,6 +35,7 @@ export interface ButtonGroupProps {
     className?: string;
     thin?: boolean;
     inline?: boolean;
+    children: React.ReactNode;
 }
 
 export interface ExpandButtonProps extends MinimalBaseButtonProps {
@@ -60,14 +60,12 @@ export interface SecondaryButtonProps extends BaseButtonProps {}
 
 export interface ShortcutButtonProps extends MinimalBaseButtonProps {
     children?: React.ReactNode;
-    condensed?: boolean;
     disabled?: boolean;
     leftIcon?: React.ReactNode;
 }
 
 export interface TaskButtonProps extends MinimalBaseButtonProps {
     children?: React.ReactNode;
-    condensed?: boolean;
     disabled?: boolean;
     icon: React.ReactNode;
 }