@entur/button
Advanced tools
Comparing version 3.0.5 to 3.0.6
@@ -290,2 +290,11 @@ 'use strict'; | ||
var Element = as || defaultElement; | ||
var IconWithAriaHidden = React__default["default"].Children.map(children, function (child) { | ||
if (React__default["default"].isValidElement(child)) { | ||
// @ts-expect-error aria-hidden does, in fact, exist | ||
return React__default["default"].cloneElement(child, { | ||
'aria-hidden': true | ||
}); | ||
} | ||
return child; | ||
}); | ||
var iconButtonElement = React__default["default"].createElement(Element, _extends({ | ||
@@ -299,3 +308,3 @@ className: classNames__default["default"]('eds-icon-button', className, { | ||
ref: ref | ||
}, rest), loading ? React__default["default"].createElement(loader.LoadingDots, null) : children); | ||
}, rest), loading ? React__default["default"].createElement(loader.LoadingDots, null) : React__default["default"].createElement(React__default["default"].Fragment, null, IconWithAriaHidden)); | ||
if (disabled) { | ||
@@ -302,0 +311,0 @@ return React__default["default"].createElement("div", { |
@@ -1,2 +0,2 @@ | ||
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@entur/utils"),t=require("react"),a=require("classnames"),r=require("@entur/loader");function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function s(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(a){if("default"!==a){var r=Object.getOwnPropertyDescriptor(e,a);Object.defineProperty(t,a,r.get?r:{enumerable:!0,get:function(){return e[a]}})}})),t.default=e,t}var u=s(t),o=n(t),i=n(a);function d(){return d=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var a=arguments[t];for(var r in a)Object.prototype.hasOwnProperty.call(a,r)&&(e[r]=a[r])}return e},d.apply(this,arguments)}function l(e,t){if(null==e)return{};var a,r,n={},s=Object.keys(e);for(r=0;r<s.length;r++)t.indexOf(a=s[r])>=0||(n[a]=e[a]);return n}var c=["as","children","variant","size","loading","className","disabled","width","aria-label"],f=u.forwardRef((function(e,t){var a,n=e.as,s=e.children,o=e.variant,f=e.size,b=void 0===f?"medium":f,m=e.loading,v=e.className,g=e.disabled,p=void 0!==g&&g,y=e.width,h=void 0===y?"auto":y,E=e["aria-label"],N=l(e,c),w=n||"button",q=u.Children.toArray(s),x=q.length>1&&"string"!=typeof q[0],_=q.length>1&&"string"!=typeof q[q.length-1],B=q.filter((function(e){return"string"==typeof e})).join(" ");return u.createElement(w,d({className:i.default("eds-button",(a={},a["eds-button--variant-"+o]=o,a["eds-button--size-"+b]=b,a["eds-button--width-fluid"]="fluid"===h,a["eds-button--loading"]=m,a["eds-button--leading-icon"]=x,a["eds-button--trailing-icon"]=_,a),v),ref:t,"aria-busy":m,disabled:p,"aria-disabled":p,"aria-label":E||(m?B:void 0)},N),m?u.createElement(r.LoadingDots,{className:"eds-button__loading-dots"}):s)})),b=o.default.forwardRef((function(e,t){return o.default.createElement(f,d({as:e.as||"button"},e,{ref:t,variant:"primary"}))})),m=o.default.forwardRef((function(e,t){return o.default.createElement(f,d({as:e.as||"button"},e,{ref:t,variant:"secondary"}))})),v=o.default.forwardRef((function(e,t){return o.default.createElement(f,d({as:e.as||"button"},e,{ref:t,variant:"success"}))})),g=o.default.forwardRef((function(e,t){return o.default.createElement(f,d({as:e.as||"button"},e,{ref:t,variant:"negative"}))})),p=o.default.forwardRef((function(e,t){return o.default.createElement(f,d({as:e.as||"button"},e,{ref:t,variant:"tertiary"}))})),y=["as","className"],h=["className","children","size"],E=["children","className","variant","disabled","loading","as"],N=u.forwardRef((function(e,t){var a=e.children,n=e.className,s=e.variant,o=e.disabled,c=void 0!==o&&o,f=e.loading,b=void 0!==f&&f,m=e.as,v=l(e,E);return u.createElement(m||"button",d({className:i.default("eds-square-button",{"eds-square-button--success":"success"===s},{"eds-square-button--secondary":"secondary"===s},{"eds-square-button--tertiary":"tertiary"===s},{"eds-square-button--loading":b},n),"aria-busy":b,disabled:c,"aria-disabled":c,ref:t},v),u.Children.map(a,(function(e){return"string"==typeof e?u.createElement("span",{className:"eds-square-button__label"},e):u.createElement("span",{className:"eds-square-button__icon"},b?u.createElement(r.LoadingDots,{className:"eds-square-button__loading-dots"}):e)})))})),w=o.default.forwardRef((function(e,t){return o.default.createElement(N,d({as:e.as||"button",ref:t},e,{variant:"secondary"}))})),q=o.default.forwardRef((function(e,t){return o.default.createElement(N,d({as:e.as||"button",ref:t},e,{variant:"success"}))})),x=o.default.forwardRef((function(e,t){return o.default.createElement(N,d({as:e.as||"button",ref:t},e,{variant:"tertiary"}))})),_=["children","className","disabled","size","as","loading"],B=o.default.forwardRef((function(e,t){var a=e.children,n=e.className,s=e.disabled,u=void 0!==s&&s,c=e.size,f=e.as,b=e.loading,m=l(e,_),v=o.default.createElement(f||"button",d({className:i.default("eds-icon-button",n,{"eds-icon-button--disabled":u},"eds-icon-button--size-"+c),disabled:u,"aria-disabled":u,"aria-busy":b,ref:t},m),b?o.default.createElement(r.LoadingDots,null):a);return u?o.default.createElement("div",{className:"eds-icon-button--disabled__wrapper"},v):o.default.createElement(o.default.Fragment,null,v)}));e.warnAboutMissingStyles("button"),exports.Button=f,exports.ButtonGroup=function(e){var t=e.as,a=void 0===t?"div":t,r=e.className,n=l(e,y);return o.default.createElement(a,d({className:i.default("eds-button-group",r)},n))},exports.FloatingButton=function(e){var t=e.className,a=e.children,r=e.size,n=void 0===r?"medium":r,s=l(e,h);return o.default.createElement("button",d({className:i.default("eds-floating-button",{"eds-floating-button--extended":o.default.Children.count(a)>1},{"eds-floating-button--small":"small"===n},t),type:"button"},s),function(e){return o.default.Children.map(e,(function(e){return"string"==typeof e?o.default.createElement("span",null,e):e}))}(a))},exports.IconButton=B,exports.NegativeButton=g,exports.PrimaryButton=b,exports.SecondaryButton=m,exports.SecondarySquareButton=w,exports.SuccessButton=v,exports.SuccessSquareButton=q,exports.TertiaryButton=p,exports.TertiarySquareButton=x; | ||
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@entur/utils"),t=require("react"),a=require("classnames"),n=require("@entur/loader");function r(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function s(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(a){if("default"!==a){var n=Object.getOwnPropertyDescriptor(e,a);Object.defineProperty(t,a,n.get?n:{enumerable:!0,get:function(){return e[a]}})}})),t.default=e,t}var u=s(t),l=r(t),o=r(a);function d(){return d=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var a=arguments[t];for(var n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n])}return e},d.apply(this,arguments)}function i(e,t){if(null==e)return{};var a,n,r={},s=Object.keys(e);for(n=0;n<s.length;n++)t.indexOf(a=s[n])>=0||(r[a]=e[a]);return r}var f=["as","children","variant","size","loading","className","disabled","width","aria-label"],c=u.forwardRef((function(e,t){var a,r=e.as,s=e.children,l=e.variant,c=e.size,b=void 0===c?"medium":c,m=e.loading,v=e.className,g=e.disabled,p=void 0!==g&&g,y=e.width,h=void 0===y?"auto":y,E=e["aria-label"],N=i(e,f),w=r||"button",q=u.Children.toArray(s),x=q.length>1&&"string"!=typeof q[0],_=q.length>1&&"string"!=typeof q[q.length-1],B=q.filter((function(e){return"string"==typeof e})).join(" ");return u.createElement(w,d({className:o.default("eds-button",(a={},a["eds-button--variant-"+l]=l,a["eds-button--size-"+b]=b,a["eds-button--width-fluid"]="fluid"===h,a["eds-button--loading"]=m,a["eds-button--leading-icon"]=x,a["eds-button--trailing-icon"]=_,a),v),ref:t,"aria-busy":m,disabled:p,"aria-disabled":p,"aria-label":E||(m?B:void 0)},N),m?u.createElement(n.LoadingDots,{className:"eds-button__loading-dots"}):s)})),b=l.default.forwardRef((function(e,t){return l.default.createElement(c,d({as:e.as||"button"},e,{ref:t,variant:"primary"}))})),m=l.default.forwardRef((function(e,t){return l.default.createElement(c,d({as:e.as||"button"},e,{ref:t,variant:"secondary"}))})),v=l.default.forwardRef((function(e,t){return l.default.createElement(c,d({as:e.as||"button"},e,{ref:t,variant:"success"}))})),g=l.default.forwardRef((function(e,t){return l.default.createElement(c,d({as:e.as||"button"},e,{ref:t,variant:"negative"}))})),p=l.default.forwardRef((function(e,t){return l.default.createElement(c,d({as:e.as||"button"},e,{ref:t,variant:"tertiary"}))})),y=["as","className"],h=["className","children","size"],E=["children","className","variant","disabled","loading","as"],N=u.forwardRef((function(e,t){var a=e.children,r=e.className,s=e.variant,l=e.disabled,f=void 0!==l&&l,c=e.loading,b=void 0!==c&&c,m=e.as,v=i(e,E);return u.createElement(m||"button",d({className:o.default("eds-square-button",{"eds-square-button--success":"success"===s},{"eds-square-button--secondary":"secondary"===s},{"eds-square-button--tertiary":"tertiary"===s},{"eds-square-button--loading":b},r),"aria-busy":b,disabled:f,"aria-disabled":f,ref:t},v),u.Children.map(a,(function(e){return"string"==typeof e?u.createElement("span",{className:"eds-square-button__label"},e):u.createElement("span",{className:"eds-square-button__icon"},b?u.createElement(n.LoadingDots,{className:"eds-square-button__loading-dots"}):e)})))})),w=l.default.forwardRef((function(e,t){return l.default.createElement(N,d({as:e.as||"button",ref:t},e,{variant:"secondary"}))})),q=l.default.forwardRef((function(e,t){return l.default.createElement(N,d({as:e.as||"button",ref:t},e,{variant:"success"}))})),x=l.default.forwardRef((function(e,t){return l.default.createElement(N,d({as:e.as||"button",ref:t},e,{variant:"tertiary"}))})),_=["children","className","disabled","size","as","loading"],B=l.default.forwardRef((function(e,t){var a=e.children,r=e.className,s=e.disabled,u=void 0!==s&&s,f=e.size,c=e.as,b=e.loading,m=i(e,_),v=c||"button",g=l.default.Children.map(a,(function(e){return l.default.isValidElement(e)?l.default.cloneElement(e,{"aria-hidden":!0}):e})),p=l.default.createElement(v,d({className:o.default("eds-icon-button",r,{"eds-icon-button--disabled":u},"eds-icon-button--size-"+f),disabled:u,"aria-disabled":u,"aria-busy":b,ref:t},m),b?l.default.createElement(n.LoadingDots,null):l.default.createElement(l.default.Fragment,null,g));return u?l.default.createElement("div",{className:"eds-icon-button--disabled__wrapper"},p):l.default.createElement(l.default.Fragment,null,p)}));e.warnAboutMissingStyles("button"),exports.Button=c,exports.ButtonGroup=function(e){var t=e.as,a=void 0===t?"div":t,n=e.className,r=i(e,y);return l.default.createElement(a,d({className:o.default("eds-button-group",n)},r))},exports.FloatingButton=function(e){var t=e.className,a=e.children,n=e.size,r=void 0===n?"medium":n,s=i(e,h);return l.default.createElement("button",d({className:o.default("eds-floating-button",{"eds-floating-button--extended":l.default.Children.count(a)>1},{"eds-floating-button--small":"small"===r},t),type:"button"},s),function(e){return l.default.Children.map(e,(function(e){return"string"==typeof e?l.default.createElement("span",null,e):e}))}(a))},exports.IconButton=B,exports.NegativeButton=g,exports.PrimaryButton=b,exports.SecondaryButton=m,exports.SecondarySquareButton=w,exports.SuccessButton=v,exports.SuccessSquareButton=q,exports.TertiaryButton=p,exports.TertiarySquareButton=x; | ||
//# sourceMappingURL=button.cjs.production.min.js.map |
@@ -263,2 +263,11 @@ import { warnAboutMissingStyles } from '@entur/utils'; | ||
var Element = as || defaultElement; | ||
var IconWithAriaHidden = React__default.Children.map(children, function (child) { | ||
if (React__default.isValidElement(child)) { | ||
// @ts-expect-error aria-hidden does, in fact, exist | ||
return React__default.cloneElement(child, { | ||
'aria-hidden': true | ||
}); | ||
} | ||
return child; | ||
}); | ||
var iconButtonElement = React__default.createElement(Element, _extends({ | ||
@@ -272,3 +281,3 @@ className: classNames('eds-icon-button', className, { | ||
ref: ref | ||
}, rest), loading ? React__default.createElement(LoadingDots, null) : children); | ||
}, rest), loading ? React__default.createElement(LoadingDots, null) : React__default.createElement(React__default.Fragment, null, IconWithAriaHidden)); | ||
if (disabled) { | ||
@@ -275,0 +284,0 @@ return React__default.createElement("div", { |
{ | ||
"name": "@entur/button", | ||
"version": "3.0.5", | ||
"version": "3.0.6", | ||
"license": "EUPL-1.2", | ||
@@ -30,3 +30,3 @@ "main": "dist/index.js", | ||
"dependencies": { | ||
"@entur/loader": "^0.4.28", | ||
"@entur/loader": "^0.4.29", | ||
"@entur/tokens": "^3.8.1", | ||
@@ -36,3 +36,3 @@ "@entur/utils": "^0.9.0", | ||
}, | ||
"gitHead": "cd5c398453c486f6f160905247b94c6da2622d7c" | ||
"gitHead": "02c9d76ac36b3357b91ee60ac3e0f66eb111c9c2" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
161666
1457
Updated@entur/loader@^0.4.29