primereact 6.6.0-rc.1 → 7.0.0

package/breadcrumb/breadcrumb.min.js

@@ -1 +1 @@
-this.primereact=this.primereact||{},this.primereact.breadcrumb=function(e,t,r){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var a=n(t);function l(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function i(e,t){return(i=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function u(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&i(e,t)}function s(e){return(s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function c(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function p(e,t){return!t||"object"!==s(t)&&"function"!=typeof t?c(e):t}function m(e){return(m=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function f(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}var d,h,b,y=function(e){u(h,e);var t,n,i,s,c,d=(t=h,n=f(),function(){var e,r=m(t);if(n){var a=m(this).constructor;e=Reflect.construct(r,arguments,a)}else e=r.apply(this,arguments);return p(this,e)});function h(){return l(this,h),d.apply(this,arguments)}return i=h,(s=[{key:"itemClick",value:function(e,t){t.disabled?e.preventDefault():(t.url||e.preventDefault(),t.command&&t.command({originalEvent:e,item:t}))}},{key:"renderHome",value:function(){var e=this;if(this.props.home){var t=r.classNames("p-breadcrumb-home",{"p-disabled":this.props.home.disabled},this.props.home.className),n=r.classNames("p-menuitem-icon",this.props.home.icon);return a.default.createElement("li",{className:t,style:this.props.home.style},a.default.createElement("a",{href:this.props.home.url||"#",className:"p-menuitem-link","aria-disabled":this.props.home.disabled,target:this.props.home.target,onClick:function(t){return e.itemClick(t,e.props.home)}},a.default.createElement("span",{className:n})))}return null}},{key:"renderSeparator",value:function(){return a.default.createElement("li",{className:"p-breadcrumb-chevron pi pi-chevron-right"})}},{key:"renderMenuitem",value:function(e){var t=this,n=r.classNames(e.className,{"p-disabled":e.disabled}),l=a.default.createElement("a",{href:e.url||"#",className:"p-menuitem-link",target:e.target,onClick:function(r){return t.itemClick(r,e)},"aria-disabled":e.disabled},e.label&&a.default.createElement("span",{className:"p-menuitem-text"},e.label));return e.template&&(l=r.ObjectUtils.getJSXElement(e.template,e,{onClick:function(r){return t.itemClick(r,e)},className:"p-menuitem-link",labelClassName:"p-menuitem-text",element:l,props:this.props})),a.default.createElement("li",{className:n,style:e.style},l)}},{key:"renderMenuitems",value:function(){var e=this;return this.props.model?this.props.model.map((function(t,r){var n=e.renderMenuitem(t),l=r===e.props.model.length-1?null:e.renderSeparator();return a.default.createElement(a.default.Fragment,{key:t.label+"_"+r},n,l)})):null}},{key:"render",value:function(){var e=r.classNames("p-breadcrumb p-component",this.props.className),t=this.renderHome(),n=this.renderMenuitems(),l=this.renderSeparator();return a.default.createElement("nav",{id:this.props.id,className:e,style:this.props.style,"aria-label":"Breadcrumb"},a.default.createElement("ul",null,t,l,n))}}])&&o(i.prototype,s),c&&o(i,c),h}(t.Component);return b={id:null,model:null,home:null,style:null,className:null},(h="defaultProps")in(d=y)?Object.defineProperty(d,h,{value:b,enumerable:!0,configurable:!0,writable:!0}):d[h]=b,e.BreadCrumb=y,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.core);
+this.primereact=this.primereact||{},this.primereact.breadcrumb=function(e,t,r){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=n(t);function a(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function l(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function i(e,t){return i=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e},i(e,t)}function u(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&i(e,t)}function s(e){return s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s(e)}function c(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function p(e,t){if(t&&("object"===s(t)||"function"==typeof t))return t;if(void 0!==t)throw new TypeError("Derived constructors may only return object or undefined");return c(e)}function m(e){return m=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)},m(e)}function f(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}var d,h,b,y=function(e){u(h,e);var t,n,i,s,c,d=(t=h,n=f(),function(){var e,r=m(t);if(n){var o=m(this).constructor;e=Reflect.construct(r,arguments,o)}else e=r.apply(this,arguments);return p(this,e)});function h(){return a(this,h),d.apply(this,arguments)}return i=h,(s=[{key:"itemClick",value:function(e,t){t.disabled?e.preventDefault():(t.url||e.preventDefault(),t.command&&t.command({originalEvent:e,item:t}))}},{key:"renderHome",value:function(){var e=this;if(this.props.home){var t=r.classNames("p-breadcrumb-home",{"p-disabled":this.props.home.disabled},this.props.home.className),n=r.classNames("p-menuitem-icon",this.props.home.icon);return o.default.createElement("li",{className:t,style:this.props.home.style},o.default.createElement("a",{href:this.props.home.url||"#",className:"p-menuitem-link","aria-disabled":this.props.home.disabled,target:this.props.home.target,onClick:function(t){return e.itemClick(t,e.props.home)}},o.default.createElement("span",{className:n})))}return null}},{key:"renderSeparator",value:function(){return o.default.createElement("li",{className:"p-breadcrumb-chevron pi pi-chevron-right"})}},{key:"renderMenuitem",value:function(e){var t=this,n=r.classNames(e.className,{"p-disabled":e.disabled}),a=o.default.createElement("a",{href:e.url||"#",className:"p-menuitem-link",target:e.target,onClick:function(r){return t.itemClick(r,e)},"aria-disabled":e.disabled},e.label&&o.default.createElement("span",{className:"p-menuitem-text"},e.label));return e.template&&(a=r.ObjectUtils.getJSXElement(e.template,e,{onClick:function(r){return t.itemClick(r,e)},className:"p-menuitem-link",labelClassName:"p-menuitem-text",element:a,props:this.props})),o.default.createElement("li",{className:n,style:e.style},a)}},{key:"renderMenuitems",value:function(){var e=this;return this.props.model?this.props.model.map((function(t,r){var n=e.renderMenuitem(t),a=r===e.props.model.length-1?null:e.renderSeparator();return o.default.createElement(o.default.Fragment,{key:t.label+"_"+r},n,a)})):null}},{key:"render",value:function(){var e=r.classNames("p-breadcrumb p-component",this.props.className),t=this.renderHome(),n=this.renderMenuitems(),a=this.renderSeparator();return o.default.createElement("nav",{id:this.props.id,className:e,style:this.props.style,"aria-label":"Breadcrumb"},o.default.createElement("ul",null,t,a,n))}}])&&l(i.prototype,s),c&&l(i,c),h}(t.Component);return b={id:null,model:null,home:null,style:null,className:null},(h="defaultProps")in(d=y)?Object.defineProperty(d,h,{value:b,enumerable:!0,configurable:!0,writable:!0}):d[h]=b,e.BreadCrumb=y,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.utils);

package/button/button.cjs.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var core = require('primereact/core');
+var utils = require('primereact/utils');
+var tooltip = require('primereact/tooltip');
+var ripple = require('primereact/ripple');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -100,6 +102,8 @@ function _assertThisInitialized(self) {
 function _possibleConstructorReturn(self, call) {
   if (call && (_typeof(call) === "object" || typeof call === "function")) {
     return call;
+  } else if (call !== void 0) {
+    throw new TypeError("Derived constructors may only return object or undefined");
   }
 
   return _assertThisInitialized(self);
@@ -196,7 +200,7 @@ var ButtonComponent = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderTooltip",
     value: function renderTooltip() {
-      this.tooltip = core.tip({
+      this.tooltip = tooltip.tip({
         target: this.elementRef.current,
         content: this.props.tooltip,
         options: this.props.tooltipOptions
@@ -205,43 +209,31 @@ var ButtonComponent = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderIcon",
     value: function renderIcon() {
+      var _classNames;
+
       var icon = this.props.loading ? this.props.loadingIcon : this.props.icon;
-      var content = null;
-
-      if (icon) {
-        var _classNames;
-
-        var iconType = _typeof(icon);
-
-        var className = core.classNames('p-button-icon p-c', (_classNames = {
-          'p-button-loading-icon': this.props.loading
-        }, _defineProperty(_classNames, "".concat(icon), iconType === 'string'), _defineProperty(_classNames, 'p-button-icon-left', this.props.iconPos === 'left' && this.props.label), _defineProperty(_classNames, 'p-button-icon-right', this.props.iconPos === 'right' && this.props.label), _defineProperty(_classNames, 'p-button-icon-top', this.props.iconPos === 'top' && this.props.label), _defineProperty(_classNames, 'p-button-icon-bottom', this.props.iconPos === 'bottom' && this.props.label), _classNames));
-        content = /*#__PURE__*/React__default['default'].createElement("span", {
-          className: className
-        });
-
-        if (iconType !== 'string') {
-          var defaultContentOptions = {
-            className: className,
-            element: content,
-            props: this.props
-          };
-          content = core.ObjectUtils.getJSXElement(icon, defaultContentOptions);
-        }
-      }
 
-      return content;
+      var iconType = _typeof(icon);
+
+      var className = utils.classNames('p-button-icon p-c', (_classNames = {
+        'p-button-loading-icon': this.props.loading
+      }, _defineProperty(_classNames, "".concat(icon), iconType === 'string'), _defineProperty(_classNames, 'p-button-icon-left', this.props.iconPos === 'left' && this.props.label), _defineProperty(_classNames, 'p-button-icon-right', this.props.iconPos === 'right' && this.props.label), _defineProperty(_classNames, 'p-button-icon-top', this.props.iconPos === 'top' && this.props.label), _defineProperty(_classNames, 'p-button-icon-bottom', this.props.iconPos === 'bottom' && this.props.label), _classNames));
+      return utils.IconUtils.getJSXIcon(icon, {
+        className: className
+      }, {
+        props: this.props
+      });
     }
   }, {
     key: "renderLabel",
     value: function renderLabel() {
       if (this.props.label) {
-        return /*#__PURE__*/React__default['default'].createElement("span", {
+        return /*#__PURE__*/React__default["default"].createElement("span", {
           className: "p-button-label p-c"
         }, this.props.label);
       }
 
-      return !this.props.children && !this.props.label && /*#__PURE__*/React__default['default'].createElement("span", {
+      return !this.props.children && !this.props.label && /*#__PURE__*/React__default["default"].createElement("span", {
         className: "p-button-label p-c",
         dangerouslySetInnerHTML: {
           __html: " "
@@ -252,8 +244,8 @@ var ButtonComponent = /*#__PURE__*/function (_Component) {
     key: "renderBadge",
     value: function renderBadge() {
       if (this.props.badge) {
-        var badgeClassName = core.classNames('p-badge', this.props.badgeClassName);
-        return /*#__PURE__*/React__default['default'].createElement("span", {
+        var badgeClassName = utils.classNames('p-badge', this.props.badgeClassName);
+        return /*#__PURE__*/React__default["default"].createElement("span", {
           className: badgeClassName
         }, this.props.badge);
       }
@@ -264,7 +256,7 @@ var ButtonComponent = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var disabled = this.isDisabled();
-      var className = core.classNames('p-button p-component', this.props.className, _defineProperty({
+      var className = utils.classNames('p-button p-component', this.props.className, _defineProperty({
         'p-button-icon-only': (this.props.icon || this.props.loading && this.props.loadingIcon) && !this.props.label,
         'p-button-vertical': (this.props.iconPos === 'top' || this.props.iconPos === 'bottom') && this.props.label,
         'p-disabled': disabled,
@@ -274,13 +266,13 @@ var ButtonComponent = /*#__PURE__*/function (_Component) {
       var icon = this.renderIcon();
       var label = this.renderLabel();
       var badge = this.renderBadge();
-      var buttonProps = core.ObjectUtils.findDiffKeys(this.props, ButtonComponent.defaultProps);
-      return /*#__PURE__*/React__default['default'].createElement("button", _extends({
+      var buttonProps = utils.ObjectUtils.findDiffKeys(this.props, ButtonComponent.defaultProps);
+      return /*#__PURE__*/React__default["default"].createElement("button", _extends({
         ref: this.elementRef
       }, buttonProps, {
         className: className,
         disabled: disabled
-      }), icon, label, this.props.children, badge, /*#__PURE__*/React__default['default'].createElement(core.Ripple, null));
+      }), icon, label, this.props.children, badge, /*#__PURE__*/React__default["default"].createElement(ripple.Ripple, null));
     }
   }]);
 
@@ -301,8 +293,8 @@ _defineProperty(ButtonComponent, "defaultProps", {
   loadingIcon: 'pi pi-spinner pi-spin'
 });
 
-var Button = /*#__PURE__*/React__default['default'].forwardRef(function (props, ref) {
-  return /*#__PURE__*/React__default['default'].createElement(ButtonComponent, _extends({
+var Button = /*#__PURE__*/React__default["default"].forwardRef(function (props, ref) {
+  return /*#__PURE__*/React__default["default"].createElement(ButtonComponent, _extends({
     forwardRef: ref
   }, props));
 });

package/button/button.cjs.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("react"),e=require("primereact/core");function o(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=o(t);function r(){return(r=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var o=arguments[e];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(t[n]=o[n])}return t}).apply(this,arguments)}function i(t){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function p(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function s(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function l(t,e){return(l=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&l(t,e)}function c(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function u(t,e){return!e||"object"!==i(e)&&"function"!=typeof e?c(t):e}function f(t){return(f=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function b(t,e,o){return e in t?Object.defineProperty(t,e,{value:o,enumerable:!0,configurable:!0,writable:!0}):t[e]=o,t}function h(t,e){var o=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),o.push.apply(o,n)}return o}function d(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?h(Object(o),!0).forEach((function(e){b(t,e,o[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):h(Object(o)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))}))}return t}function y(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}var m=function(o){a(v,t.Component);var l,c,h,m,g,O=(l=v,c=y(),function(){var t,e=f(l);if(c){var o=f(this).constructor;t=Reflect.construct(e,arguments,o)}else t=e.apply(this,arguments);return u(this,t)});function v(e){var o;return p(this,v),(o=O.call(this,e)).elementRef=t.createRef(o.props.forwardRef),o}return h=v,(m=[{key:"updateForwardRef",value:function(){var t=this.props.forwardRef;t&&("function"==typeof t?t(this.elementRef.current):t.current=this.elementRef.current)}},{key:"isDisabled",value:function(){return this.props.disabled||this.props.loading}},{key:"componentDidMount",value:function(){this.updateForwardRef(),this.props.tooltip&&this.renderTooltip()}},{key:"componentDidUpdate",value:function(t){t.tooltip===this.props.tooltip&&t.tooltipOptions===this.props.tooltipOptions||(this.tooltip?this.tooltip.update(d({content:this.props.tooltip},this.props.tooltipOptions||{})):this.renderTooltip())}},{key:"componentWillUnmount",value:function(){this.tooltip&&(this.tooltip.destroy(),this.tooltip=null)}},{key:"renderTooltip",value:function(){this.tooltip=e.tip({target:this.elementRef.current,content:this.props.tooltip,options:this.props.tooltipOptions})}},{key:"renderIcon",value:function(){var t=this.props.loading?this.props.loadingIcon:this.props.icon,o=null;if(t){var r,p=i(t),s=e.classNames("p-button-icon p-c",(b(r={"p-button-loading-icon":this.props.loading},"".concat(t),"string"===p),b(r,"p-button-icon-left","left"===this.props.iconPos&&this.props.label),b(r,"p-button-icon-right","right"===this.props.iconPos&&this.props.label),b(r,"p-button-icon-top","top"===this.props.iconPos&&this.props.label),b(r,"p-button-icon-bottom","bottom"===this.props.iconPos&&this.props.label),r));o=n.default.createElement("span",{className:s}),"string"!==p&&(o=e.ObjectUtils.getJSXElement(t,{className:s,element:o,props:this.props}))}return o}},{key:"renderLabel",value:function(){return this.props.label?n.default.createElement("span",{className:"p-button-label p-c"},this.props.label):!this.props.children&&!this.props.label&&n.default.createElement("span",{className:"p-button-label p-c",dangerouslySetInnerHTML:{__html:"&nbsp;"}})}},{key:"renderBadge",value:function(){if(this.props.badge){var t=e.classNames("p-badge",this.props.badgeClassName);return n.default.createElement("span",{className:t},this.props.badge)}return null}},{key:"render",value:function(){var t=this.isDisabled(),o=e.classNames("p-button p-component",this.props.className,b({"p-button-icon-only":(this.props.icon||this.props.loading&&this.props.loadingIcon)&&!this.props.label,"p-button-vertical":("top"===this.props.iconPos||"bottom"===this.props.iconPos)&&this.props.label,"p-disabled":t,"p-button-loading":this.props.loading,"p-button-loading-label-only":this.props.loading&&!this.props.icon&&this.props.label},"p-button-loading-".concat(this.props.iconPos),this.props.loading&&this.props.loadingIcon&&this.props.label)),i=this.renderIcon(),p=this.renderLabel(),s=this.renderBadge(),l=e.ObjectUtils.findDiffKeys(this.props,v.defaultProps);return n.default.createElement("button",r({ref:this.elementRef},l,{className:o,disabled:t}),i,p,this.props.children,s,n.default.createElement(e.Ripple,null))}}])&&s(h.prototype,m),g&&s(h,g),v}();b(m,"defaultProps",{label:null,icon:null,iconPos:"left",badge:null,badgeClassName:null,tooltip:null,tooltipOptions:null,forwardRef:null,disabled:!1,loading:!1,loadingIcon:"pi pi-spinner pi-spin"}),exports.Button=n.default.forwardRef((function(t,e){return n.default.createElement(m,r({forwardRef:e},t))})),exports.ButtonComponent=m;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("react"),e=require("primereact/utils"),o=require("primereact/tooltip"),n=require("primereact/ripple");function r(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var i=r(t);function p(){return p=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var o=arguments[e];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(t[n]=o[n])}return t},p.apply(this,arguments)}function s(t){return s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},s(t)}function l(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function a(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function c(t,e){return c=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},c(t,e)}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&c(t,e)}function f(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function b(t,e){if(e&&("object"===s(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return f(t)}function h(t){return h=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},h(t)}function d(t,e,o){return e in t?Object.defineProperty(t,e,{value:o,enumerable:!0,configurable:!0,writable:!0}):t[e]=o,t}function y(t,e){var o=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),o.push.apply(o,n)}return o}function m(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?y(Object(o),!0).forEach((function(e){d(t,e,o[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):y(Object(o)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))}))}return t}function g(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}var v=function(r){u(j,t.Component);var c,f,y,v,O,P=(c=j,f=g(),function(){var t,e=h(c);if(f){var o=h(this).constructor;t=Reflect.construct(e,arguments,o)}else t=e.apply(this,arguments);return b(this,t)});function j(e){var o;return l(this,j),(o=P.call(this,e)).elementRef=t.createRef(o.props.forwardRef),o}return y=j,(v=[{key:"updateForwardRef",value:function(){var t=this.props.forwardRef;t&&("function"==typeof t?t(this.elementRef.current):t.current=this.elementRef.current)}},{key:"isDisabled",value:function(){return this.props.disabled||this.props.loading}},{key:"componentDidMount",value:function(){this.updateForwardRef(),this.props.tooltip&&this.renderTooltip()}},{key:"componentDidUpdate",value:function(t){t.tooltip===this.props.tooltip&&t.tooltipOptions===this.props.tooltipOptions||(this.tooltip?this.tooltip.update(m({content:this.props.tooltip},this.props.tooltipOptions||{})):this.renderTooltip())}},{key:"componentWillUnmount",value:function(){this.tooltip&&(this.tooltip.destroy(),this.tooltip=null)}},{key:"renderTooltip",value:function(){this.tooltip=o.tip({target:this.elementRef.current,content:this.props.tooltip,options:this.props.tooltipOptions})}},{key:"renderIcon",value:function(){var t,o=this.props.loading?this.props.loadingIcon:this.props.icon,n=s(o),r=e.classNames("p-button-icon p-c",(d(t={"p-button-loading-icon":this.props.loading},"".concat(o),"string"===n),d(t,"p-button-icon-left","left"===this.props.iconPos&&this.props.label),d(t,"p-button-icon-right","right"===this.props.iconPos&&this.props.label),d(t,"p-button-icon-top","top"===this.props.iconPos&&this.props.label),d(t,"p-button-icon-bottom","bottom"===this.props.iconPos&&this.props.label),t));return e.IconUtils.getJSXIcon(o,{className:r},{props:this.props})}},{key:"renderLabel",value:function(){return this.props.label?i.default.createElement("span",{className:"p-button-label p-c"},this.props.label):!this.props.children&&!this.props.label&&i.default.createElement("span",{className:"p-button-label p-c",dangerouslySetInnerHTML:{__html:"&nbsp;"}})}},{key:"renderBadge",value:function(){if(this.props.badge){var t=e.classNames("p-badge",this.props.badgeClassName);return i.default.createElement("span",{className:t},this.props.badge)}return null}},{key:"render",value:function(){var t=this.isDisabled(),o=e.classNames("p-button p-component",this.props.className,d({"p-button-icon-only":(this.props.icon||this.props.loading&&this.props.loadingIcon)&&!this.props.label,"p-button-vertical":("top"===this.props.iconPos||"bottom"===this.props.iconPos)&&this.props.label,"p-disabled":t,"p-button-loading":this.props.loading,"p-button-loading-label-only":this.props.loading&&!this.props.icon&&this.props.label},"p-button-loading-".concat(this.props.iconPos),this.props.loading&&this.props.loadingIcon&&this.props.label)),r=this.renderIcon(),s=this.renderLabel(),l=this.renderBadge(),a=e.ObjectUtils.findDiffKeys(this.props,j.defaultProps);return i.default.createElement("button",p({ref:this.elementRef},a,{className:o,disabled:t}),r,s,this.props.children,l,i.default.createElement(n.Ripple,null))}}])&&a(y.prototype,v),O&&a(y,O),j}();d(v,"defaultProps",{label:null,icon:null,iconPos:"left",badge:null,badgeClassName:null,tooltip:null,tooltipOptions:null,forwardRef:null,disabled:!1,loading:!1,loadingIcon:"pi pi-spinner pi-spin"}),exports.Button=i.default.forwardRef((function(t,e){return i.default.createElement(v,p({forwardRef:e},t))})),exports.ButtonComponent=v;

package/button/button.d.ts

@@ -1,19 +1,12 @@
 import * as React from 'react';
 import TooltipOptions from '../tooltip/tooltipoptions';
+import {IconType} from "../utils/Utils";
 
 type ButtonPositionType = 'top' | 'bottom' | 'left' | 'right';
 
-type ButtonIconType = React.ReactNode | ((options: ButtonIconOptions) => React.ReactNode);
-
-export interface ButtonIconOptions {
-    className: string;
-    element: React.ReactNode;
-    props: ButtonProps;
-}
-
-export interface ButtonProps extends Omit<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, 'disabled'> {
+export interface ButtonProps extends Omit<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, 'disabled'|'ref'> {
     label?: string;
-    icon?: ButtonIconType;
+    icon?: IconType<ButtonProps>;
     iconPos?: ButtonPositionType;
     badge?: string;
     badgeClassName?: string;
@@ -21,7 +14,7 @@ export interface ButtonProps extends Omit<React.DetailedHTMLProps<React.ButtonHT
     tooltipOptions?: TooltipOptions;
     disabled?: boolean;
     loading?: boolean;
-    loadingIcon?: ButtonIconType;
+    loadingIcon?: IconType<ButtonProps>;
 }
 
 export declare class Button extends React.Component<ButtonProps, any> { }

package/button/button.esm.js

@@ -1,5 +1,7 @@
 import React, { createRef, Component } from 'react';
-import { tip, classNames, ObjectUtils, Ripple } from 'primereact/core';
+import { classNames, IconUtils, ObjectUtils } from 'primereact/utils';
+import { tip } from 'primereact/tooltip';
+import { Ripple } from 'primereact/ripple';
 
 function _extends() {
   _extends = Object.assign || function (target) {
@@ -92,6 +94,8 @@ function _assertThisInitialized(self) {
 function _possibleConstructorReturn(self, call) {
   if (call && (_typeof(call) === "object" || typeof call === "function")) {
     return call;
+  } else if (call !== void 0) {
+    throw new TypeError("Derived constructors may only return object or undefined");
   }
 
   return _assertThisInitialized(self);
@@ -197,32 +201,20 @@ var ButtonComponent = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderIcon",
     value: function renderIcon() {
+      var _classNames;
+
       var icon = this.props.loading ? this.props.loadingIcon : this.props.icon;
-      var content = null;
-
-      if (icon) {
-        var _classNames;
-
-        var iconType = _typeof(icon);
-
-        var className = classNames('p-button-icon p-c', (_classNames = {
-          'p-button-loading-icon': this.props.loading
-        }, _defineProperty(_classNames, "".concat(icon), iconType === 'string'), _defineProperty(_classNames, 'p-button-icon-left', this.props.iconPos === 'left' && this.props.label), _defineProperty(_classNames, 'p-button-icon-right', this.props.iconPos === 'right' && this.props.label), _defineProperty(_classNames, 'p-button-icon-top', this.props.iconPos === 'top' && this.props.label), _defineProperty(_classNames, 'p-button-icon-bottom', this.props.iconPos === 'bottom' && this.props.label), _classNames));
-        content = /*#__PURE__*/React.createElement("span", {
-          className: className
-        });
-
-        if (iconType !== 'string') {
-          var defaultContentOptions = {
-            className: className,
-            element: content,
-            props: this.props
-          };
-          content = ObjectUtils.getJSXElement(icon, defaultContentOptions);
-        }
-      }
 
-      return content;
+      var iconType = _typeof(icon);
+
+      var className = classNames('p-button-icon p-c', (_classNames = {
+        'p-button-loading-icon': this.props.loading
+      }, _defineProperty(_classNames, "".concat(icon), iconType === 'string'), _defineProperty(_classNames, 'p-button-icon-left', this.props.iconPos === 'left' && this.props.label), _defineProperty(_classNames, 'p-button-icon-right', this.props.iconPos === 'right' && this.props.label), _defineProperty(_classNames, 'p-button-icon-top', this.props.iconPos === 'top' && this.props.label), _defineProperty(_classNames, 'p-button-icon-bottom', this.props.iconPos === 'bottom' && this.props.label), _classNames));
+      return IconUtils.getJSXIcon(icon, {
+        className: className
+      }, {
+        props: this.props
+      });
     }
   }, {
     key: "renderLabel",

package/button/button.esm.min.js

@@ -1 +1 @@
-import t,{createRef as e,Component as o}from"react";import{tip as n,classNames as r,ObjectUtils as i,Ripple as p}from"primereact/core";function s(){return(s=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var o=arguments[e];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(t[n]=o[n])}return t}).apply(this,arguments)}function l(t){return(l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function a(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function c(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function u(t,e){return(u=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function f(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&u(t,e)}function h(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function b(t,e){return!e||"object"!==l(e)&&"function"!=typeof e?h(t):e}function d(t){return(d=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function y(t,e,o){return e in t?Object.defineProperty(t,e,{value:o,enumerable:!0,configurable:!0,writable:!0}):t[e]=o,t}function m(t,e){var o=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),o.push.apply(o,n)}return o}function g(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?m(Object(o),!0).forEach((function(e){y(t,e,o[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):m(Object(o)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))}))}return t}function O(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}var v=function(u){f(R,o);var h,m,v,P,w,j=(h=R,m=O(),function(){var t,e=d(h);if(m){var o=d(this).constructor;t=Reflect.construct(e,arguments,o)}else t=e.apply(this,arguments);return b(this,t)});function R(t){var o;return a(this,R),(o=j.call(this,t)).elementRef=e(o.props.forwardRef),o}return v=R,(P=[{key:"updateForwardRef",value:function(){var t=this.props.forwardRef;t&&("function"==typeof t?t(this.elementRef.current):t.current=this.elementRef.current)}},{key:"isDisabled",value:function(){return this.props.disabled||this.props.loading}},{key:"componentDidMount",value:function(){this.updateForwardRef(),this.props.tooltip&&this.renderTooltip()}},{key:"componentDidUpdate",value:function(t){t.tooltip===this.props.tooltip&&t.tooltipOptions===this.props.tooltipOptions||(this.tooltip?this.tooltip.update(g({content:this.props.tooltip},this.props.tooltipOptions||{})):this.renderTooltip())}},{key:"componentWillUnmount",value:function(){this.tooltip&&(this.tooltip.destroy(),this.tooltip=null)}},{key:"renderTooltip",value:function(){this.tooltip=n({target:this.elementRef.current,content:this.props.tooltip,options:this.props.tooltipOptions})}},{key:"renderIcon",value:function(){var e=this.props.loading?this.props.loadingIcon:this.props.icon,o=null;if(e){var n,p=l(e),s=r("p-button-icon p-c",(y(n={"p-button-loading-icon":this.props.loading},"".concat(e),"string"===p),y(n,"p-button-icon-left","left"===this.props.iconPos&&this.props.label),y(n,"p-button-icon-right","right"===this.props.iconPos&&this.props.label),y(n,"p-button-icon-top","top"===this.props.iconPos&&this.props.label),y(n,"p-button-icon-bottom","bottom"===this.props.iconPos&&this.props.label),n));o=t.createElement("span",{className:s}),"string"!==p&&(o=i.getJSXElement(e,{className:s,element:o,props:this.props}))}return o}},{key:"renderLabel",value:function(){return this.props.label?t.createElement("span",{className:"p-button-label p-c"},this.props.label):!this.props.children&&!this.props.label&&t.createElement("span",{className:"p-button-label p-c",dangerouslySetInnerHTML:{__html:"&nbsp;"}})}},{key:"renderBadge",value:function(){if(this.props.badge){var e=r("p-badge",this.props.badgeClassName);return t.createElement("span",{className:e},this.props.badge)}return null}},{key:"render",value:function(){var e=this.isDisabled(),o=r("p-button p-component",this.props.className,y({"p-button-icon-only":(this.props.icon||this.props.loading&&this.props.loadingIcon)&&!this.props.label,"p-button-vertical":("top"===this.props.iconPos||"bottom"===this.props.iconPos)&&this.props.label,"p-disabled":e,"p-button-loading":this.props.loading,"p-button-loading-label-only":this.props.loading&&!this.props.icon&&this.props.label},"p-button-loading-".concat(this.props.iconPos),this.props.loading&&this.props.loadingIcon&&this.props.label)),n=this.renderIcon(),l=this.renderLabel(),a=this.renderBadge(),c=i.findDiffKeys(this.props,R.defaultProps);return t.createElement("button",s({ref:this.elementRef},c,{className:o,disabled:e}),n,l,this.props.children,a,t.createElement(p,null))}}])&&c(v.prototype,P),w&&c(v,w),R}();y(v,"defaultProps",{label:null,icon:null,iconPos:"left",badge:null,badgeClassName:null,tooltip:null,tooltipOptions:null,forwardRef:null,disabled:!1,loading:!1,loadingIcon:"pi pi-spinner pi-spin"});var P=t.forwardRef((function(e,o){return t.createElement(v,s({forwardRef:o},e))}));export{P as Button,v as ButtonComponent};
+import t,{createRef as o,Component as e}from"react";import{classNames as r,IconUtils as n,ObjectUtils as i}from"primereact/utils";import{tip as p}from"primereact/tooltip";import{Ripple as s}from"primereact/ripple";function l(){return l=Object.assign||function(t){for(var o=1;o<arguments.length;o++){var e=arguments[o];for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])}return t},l.apply(this,arguments)}function c(t){return c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},c(t)}function a(t,o){if(!(t instanceof o))throw new TypeError("Cannot call a class as a function")}function u(t,o){for(var e=0;e<o.length;e++){var r=o[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function f(t,o){return f=Object.setPrototypeOf||function(t,o){return t.__proto__=o,t},f(t,o)}function h(t,o){if("function"!=typeof o&&null!==o)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(o&&o.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),o&&f(t,o)}function b(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function d(t,o){if(o&&("object"===c(o)||"function"==typeof o))return o;if(void 0!==o)throw new TypeError("Derived constructors may only return object or undefined");return b(t)}function y(t){return y=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},y(t)}function m(t,o,e){return o in t?Object.defineProperty(t,o,{value:e,enumerable:!0,configurable:!0,writable:!0}):t[o]=e,t}function g(t,o){var e=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);o&&(r=r.filter((function(o){return Object.getOwnPropertyDescriptor(t,o).enumerable}))),e.push.apply(e,r)}return e}function v(t){for(var o=1;o<arguments.length;o++){var e=null!=arguments[o]?arguments[o]:{};o%2?g(Object(e),!0).forEach((function(o){m(t,o,e[o])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(e)):g(Object(e)).forEach((function(o){Object.defineProperty(t,o,Object.getOwnPropertyDescriptor(e,o))}))}return t}function O(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}var P=function(f){h(k,e);var b,g,P,w,j,R=(b=k,g=O(),function(){var t,o=y(b);if(g){var e=y(this).constructor;t=Reflect.construct(o,arguments,e)}else t=o.apply(this,arguments);return d(this,t)});function k(t){var e;return a(this,k),(e=R.call(this,t)).elementRef=o(e.props.forwardRef),e}return P=k,(w=[{key:"updateForwardRef",value:function(){var t=this.props.forwardRef;t&&("function"==typeof t?t(this.elementRef.current):t.current=this.elementRef.current)}},{key:"isDisabled",value:function(){return this.props.disabled||this.props.loading}},{key:"componentDidMount",value:function(){this.updateForwardRef(),this.props.tooltip&&this.renderTooltip()}},{key:"componentDidUpdate",value:function(t){t.tooltip===this.props.tooltip&&t.tooltipOptions===this.props.tooltipOptions||(this.tooltip?this.tooltip.update(v({content:this.props.tooltip},this.props.tooltipOptions||{})):this.renderTooltip())}},{key:"componentWillUnmount",value:function(){this.tooltip&&(this.tooltip.destroy(),this.tooltip=null)}},{key:"renderTooltip",value:function(){this.tooltip=p({target:this.elementRef.current,content:this.props.tooltip,options:this.props.tooltipOptions})}},{key:"renderIcon",value:function(){var t,o=this.props.loading?this.props.loadingIcon:this.props.icon,e=c(o),i=r("p-button-icon p-c",(m(t={"p-button-loading-icon":this.props.loading},"".concat(o),"string"===e),m(t,"p-button-icon-left","left"===this.props.iconPos&&this.props.label),m(t,"p-button-icon-right","right"===this.props.iconPos&&this.props.label),m(t,"p-button-icon-top","top"===this.props.iconPos&&this.props.label),m(t,"p-button-icon-bottom","bottom"===this.props.iconPos&&this.props.label),t));return n.getJSXIcon(o,{className:i},{props:this.props})}},{key:"renderLabel",value:function(){return this.props.label?t.createElement("span",{className:"p-button-label p-c"},this.props.label):!this.props.children&&!this.props.label&&t.createElement("span",{className:"p-button-label p-c",dangerouslySetInnerHTML:{__html:"&nbsp;"}})}},{key:"renderBadge",value:function(){if(this.props.badge){var o=r("p-badge",this.props.badgeClassName);return t.createElement("span",{className:o},this.props.badge)}return null}},{key:"render",value:function(){var o=this.isDisabled(),e=r("p-button p-component",this.props.className,m({"p-button-icon-only":(this.props.icon||this.props.loading&&this.props.loadingIcon)&&!this.props.label,"p-button-vertical":("top"===this.props.iconPos||"bottom"===this.props.iconPos)&&this.props.label,"p-disabled":o,"p-button-loading":this.props.loading,"p-button-loading-label-only":this.props.loading&&!this.props.icon&&this.props.label},"p-button-loading-".concat(this.props.iconPos),this.props.loading&&this.props.loadingIcon&&this.props.label)),n=this.renderIcon(),p=this.renderLabel(),c=this.renderBadge(),a=i.findDiffKeys(this.props,k.defaultProps);return t.createElement("button",l({ref:this.elementRef},a,{className:e,disabled:o}),n,p,this.props.children,c,t.createElement(s,null))}}])&&u(P.prototype,w),j&&u(P,j),k}();m(P,"defaultProps",{label:null,icon:null,iconPos:"left",badge:null,badgeClassName:null,tooltip:null,tooltipOptions:null,forwardRef:null,disabled:!1,loading:!1,loadingIcon:"pi pi-spinner pi-spin"});var w=t.forwardRef((function(o,e){return t.createElement(P,l({forwardRef:e},o))}));export{w as Button,P as ButtonComponent};

package/button/button.js

@@ -1,5 +1,5 @@
 this.primereact = this.primereact || {};
-this.primereact.button = (function (exports, React, core) {
+this.primereact.button = (function (exports, React, utils, tooltip, ripple) {
   'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -97,6 +97,8 @@ this.primereact.button = (function (exports, React, core) {
   function _possibleConstructorReturn(self, call) {
     if (call && (_typeof(call) === "object" || typeof call === "function")) {
       return call;
+    } else if (call !== void 0) {
+      throw new TypeError("Derived constructors may only return object or undefined");
     }
 
     return _assertThisInitialized(self);
@@ -193,7 +195,7 @@ this.primereact.button = (function (exports, React, core) {
     }, {
       key: "renderTooltip",
       value: function renderTooltip() {
-        this.tooltip = core.tip({
+        this.tooltip = tooltip.tip({
           target: this.elementRef.current,
           content: this.props.tooltip,
           options: this.props.tooltipOptions
@@ -202,43 +204,31 @@ this.primereact.button = (function (exports, React, core) {
     }, {
       key: "renderIcon",
       value: function renderIcon() {
+        var _classNames;
+
         var icon = this.props.loading ? this.props.loadingIcon : this.props.icon;
-        var content = null;
-
-        if (icon) {
-          var _classNames;
-
-          var iconType = _typeof(icon);
-
-          var className = core.classNames('p-button-icon p-c', (_classNames = {
-            'p-button-loading-icon': this.props.loading
-          }, _defineProperty(_classNames, "".concat(icon), iconType === 'string'), _defineProperty(_classNames, 'p-button-icon-left', this.props.iconPos === 'left' && this.props.label), _defineProperty(_classNames, 'p-button-icon-right', this.props.iconPos === 'right' && this.props.label), _defineProperty(_classNames, 'p-button-icon-top', this.props.iconPos === 'top' && this.props.label), _defineProperty(_classNames, 'p-button-icon-bottom', this.props.iconPos === 'bottom' && this.props.label), _classNames));
-          content = /*#__PURE__*/React__default['default'].createElement("span", {
-            className: className
-          });
-
-          if (iconType !== 'string') {
-            var defaultContentOptions = {
-              className: className,
-              element: content,
-              props: this.props
-            };
-            content = core.ObjectUtils.getJSXElement(icon, defaultContentOptions);
-          }
-        }
 
-        return content;
+        var iconType = _typeof(icon);
+
+        var className = utils.classNames('p-button-icon p-c', (_classNames = {
+          'p-button-loading-icon': this.props.loading
+        }, _defineProperty(_classNames, "".concat(icon), iconType === 'string'), _defineProperty(_classNames, 'p-button-icon-left', this.props.iconPos === 'left' && this.props.label), _defineProperty(_classNames, 'p-button-icon-right', this.props.iconPos === 'right' && this.props.label), _defineProperty(_classNames, 'p-button-icon-top', this.props.iconPos === 'top' && this.props.label), _defineProperty(_classNames, 'p-button-icon-bottom', this.props.iconPos === 'bottom' && this.props.label), _classNames));
+        return utils.IconUtils.getJSXIcon(icon, {
+          className: className
+        }, {
+          props: this.props
+        });
       }
     }, {
       key: "renderLabel",
       value: function renderLabel() {
         if (this.props.label) {
-          return /*#__PURE__*/React__default['default'].createElement("span", {
+          return /*#__PURE__*/React__default["default"].createElement("span", {
             className: "p-button-label p-c"
           }, this.props.label);
         }
 
-        return !this.props.children && !this.props.label && /*#__PURE__*/React__default['default'].createElement("span", {
+        return !this.props.children && !this.props.label && /*#__PURE__*/React__default["default"].createElement("span", {
           className: "p-button-label p-c",
           dangerouslySetInnerHTML: {
             __html: " "
@@ -249,8 +239,8 @@ this.primereact.button = (function (exports, React, core) {
       key: "renderBadge",
       value: function renderBadge() {
         if (this.props.badge) {
-          var badgeClassName = core.classNames('p-badge', this.props.badgeClassName);
-          return /*#__PURE__*/React__default['default'].createElement("span", {
+          var badgeClassName = utils.classNames('p-badge', this.props.badgeClassName);
+          return /*#__PURE__*/React__default["default"].createElement("span", {
             className: badgeClassName
           }, this.props.badge);
         }
@@ -261,7 +251,7 @@ this.primereact.button = (function (exports, React, core) {
       key: "render",
       value: function render() {
         var disabled = this.isDisabled();
-        var className = core.classNames('p-button p-component', this.props.className, _defineProperty({
+        var className = utils.classNames('p-button p-component', this.props.className, _defineProperty({
           'p-button-icon-only': (this.props.icon || this.props.loading && this.props.loadingIcon) && !this.props.label,
           'p-button-vertical': (this.props.iconPos === 'top' || this.props.iconPos === 'bottom') && this.props.label,
           'p-disabled': disabled,
@@ -271,13 +261,13 @@ this.primereact.button = (function (exports, React, core) {
         var icon = this.renderIcon();
         var label = this.renderLabel();
         var badge = this.renderBadge();
-        var buttonProps = core.ObjectUtils.findDiffKeys(this.props, ButtonComponent.defaultProps);
-        return /*#__PURE__*/React__default['default'].createElement("button", _extends({
+        var buttonProps = utils.ObjectUtils.findDiffKeys(this.props, ButtonComponent.defaultProps);
+        return /*#__PURE__*/React__default["default"].createElement("button", _extends({
           ref: this.elementRef
         }, buttonProps, {
           className: className,
           disabled: disabled
-        }), icon, label, this.props.children, badge, /*#__PURE__*/React__default['default'].createElement(core.Ripple, null));
+        }), icon, label, this.props.children, badge, /*#__PURE__*/React__default["default"].createElement(ripple.Ripple, null));
       }
     }]);
 
@@ -298,8 +288,8 @@ this.primereact.button = (function (exports, React, core) {
     loadingIcon: 'pi pi-spinner pi-spin'
   });
 
-  var Button = /*#__PURE__*/React__default['default'].forwardRef(function (props, ref) {
-    return /*#__PURE__*/React__default['default'].createElement(ButtonComponent, _extends({
+  var Button = /*#__PURE__*/React__default["default"].forwardRef(function (props, ref) {
+    return /*#__PURE__*/React__default["default"].createElement(ButtonComponent, _extends({
       forwardRef: ref
     }, props));
   });
@@ -311,4 +301,4 @@ this.primereact.button = (function (exports, React, core) {
 
   return exports;
 
-}({}, React, primereact.core));
+})({}, React, primereact.utils, primereact.tooltip, primereact.ripple);

package/button/button.min.js

@@ -1 +1 @@
-this.primereact=this.primereact||{},this.primereact.button=function(t,e,o){"use strict";function n(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var r=n(e);function i(){return(i=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var o=arguments[e];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(t[n]=o[n])}return t}).apply(this,arguments)}function p(t){return(p="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function s(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function a(t,e){return(a=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function c(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&a(t,e)}function u(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function f(t,e){return!e||"object"!==p(e)&&"function"!=typeof e?u(t):e}function b(t){return(b=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function h(t,e,o){return e in t?Object.defineProperty(t,e,{value:o,enumerable:!0,configurable:!0,writable:!0}):t[e]=o,t}function d(t,e){var o=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),o.push.apply(o,n)}return o}function y(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?d(Object(o),!0).forEach((function(e){h(t,e,o[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):d(Object(o)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))}))}return t}function m(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}var g=function(t){c(v,t);var n,a,u,d,g,O=(n=v,a=m(),function(){var t,e=b(n);if(a){var o=b(this).constructor;t=Reflect.construct(e,arguments,o)}else t=e.apply(this,arguments);return f(this,t)});function v(t){var o;return s(this,v),(o=O.call(this,t)).elementRef=e.createRef(o.props.forwardRef),o}return u=v,(d=[{key:"updateForwardRef",value:function(){var t=this.props.forwardRef;t&&("function"==typeof t?t(this.elementRef.current):t.current=this.elementRef.current)}},{key:"isDisabled",value:function(){return this.props.disabled||this.props.loading}},{key:"componentDidMount",value:function(){this.updateForwardRef(),this.props.tooltip&&this.renderTooltip()}},{key:"componentDidUpdate",value:function(t){t.tooltip===this.props.tooltip&&t.tooltipOptions===this.props.tooltipOptions||(this.tooltip?this.tooltip.update(y({content:this.props.tooltip},this.props.tooltipOptions||{})):this.renderTooltip())}},{key:"componentWillUnmount",value:function(){this.tooltip&&(this.tooltip.destroy(),this.tooltip=null)}},{key:"renderTooltip",value:function(){this.tooltip=o.tip({target:this.elementRef.current,content:this.props.tooltip,options:this.props.tooltipOptions})}},{key:"renderIcon",value:function(){var t=this.props.loading?this.props.loadingIcon:this.props.icon,e=null;if(t){var n,i=p(t),s=o.classNames("p-button-icon p-c",(h(n={"p-button-loading-icon":this.props.loading},"".concat(t),"string"===i),h(n,"p-button-icon-left","left"===this.props.iconPos&&this.props.label),h(n,"p-button-icon-right","right"===this.props.iconPos&&this.props.label),h(n,"p-button-icon-top","top"===this.props.iconPos&&this.props.label),h(n,"p-button-icon-bottom","bottom"===this.props.iconPos&&this.props.label),n));e=r.default.createElement("span",{className:s}),"string"!==i&&(e=o.ObjectUtils.getJSXElement(t,{className:s,element:e,props:this.props}))}return e}},{key:"renderLabel",value:function(){return this.props.label?r.default.createElement("span",{className:"p-button-label p-c"},this.props.label):!this.props.children&&!this.props.label&&r.default.createElement("span",{className:"p-button-label p-c",dangerouslySetInnerHTML:{__html:"&nbsp;"}})}},{key:"renderBadge",value:function(){if(this.props.badge){var t=o.classNames("p-badge",this.props.badgeClassName);return r.default.createElement("span",{className:t},this.props.badge)}return null}},{key:"render",value:function(){var t=this.isDisabled(),e=o.classNames("p-button p-component",this.props.className,h({"p-button-icon-only":(this.props.icon||this.props.loading&&this.props.loadingIcon)&&!this.props.label,"p-button-vertical":("top"===this.props.iconPos||"bottom"===this.props.iconPos)&&this.props.label,"p-disabled":t,"p-button-loading":this.props.loading,"p-button-loading-label-only":this.props.loading&&!this.props.icon&&this.props.label},"p-button-loading-".concat(this.props.iconPos),this.props.loading&&this.props.loadingIcon&&this.props.label)),n=this.renderIcon(),p=this.renderLabel(),s=this.renderBadge(),l=o.ObjectUtils.findDiffKeys(this.props,v.defaultProps);return r.default.createElement("button",i({ref:this.elementRef},l,{className:e,disabled:t}),n,p,this.props.children,s,r.default.createElement(o.Ripple,null))}}])&&l(u.prototype,d),g&&l(u,g),v}(e.Component);return h(g,"defaultProps",{label:null,icon:null,iconPos:"left",badge:null,badgeClassName:null,tooltip:null,tooltipOptions:null,forwardRef:null,disabled:!1,loading:!1,loadingIcon:"pi pi-spinner pi-spin"}),t.Button=r.default.forwardRef((function(t,e){return r.default.createElement(g,i({forwardRef:e},t))})),t.ButtonComponent=g,Object.defineProperty(t,"__esModule",{value:!0}),t}({},React,primereact.core);
+this.primereact=this.primereact||{},this.primereact.button=function(t,e,o,n,r){"use strict";function i(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var p=i(e);function s(){return s=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var o=arguments[e];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(t[n]=o[n])}return t},s.apply(this,arguments)}function l(t){return l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},l(t)}function a(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function c(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function u(t,e){return u=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},u(t,e)}function f(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&u(t,e)}function b(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}function h(t,e){if(e&&("object"===l(e)||"function"==typeof e))return e;if(void 0!==e)throw new TypeError("Derived constructors may only return object or undefined");return b(t)}function d(t){return d=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},d(t)}function y(t,e,o){return e in t?Object.defineProperty(t,e,{value:o,enumerable:!0,configurable:!0,writable:!0}):t[e]=o,t}function m(t,e){var o=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),o.push.apply(o,n)}return o}function g(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?m(Object(o),!0).forEach((function(e){y(t,e,o[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):m(Object(o)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))}))}return t}function O(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}var v=function(t){f(j,t);var i,u,b,m,v,P=(i=j,u=O(),function(){var t,e=d(i);if(u){var o=d(this).constructor;t=Reflect.construct(e,arguments,o)}else t=e.apply(this,arguments);return h(this,t)});function j(t){var o;return a(this,j),(o=P.call(this,t)).elementRef=e.createRef(o.props.forwardRef),o}return b=j,(m=[{key:"updateForwardRef",value:function(){var t=this.props.forwardRef;t&&("function"==typeof t?t(this.elementRef.current):t.current=this.elementRef.current)}},{key:"isDisabled",value:function(){return this.props.disabled||this.props.loading}},{key:"componentDidMount",value:function(){this.updateForwardRef(),this.props.tooltip&&this.renderTooltip()}},{key:"componentDidUpdate",value:function(t){t.tooltip===this.props.tooltip&&t.tooltipOptions===this.props.tooltipOptions||(this.tooltip?this.tooltip.update(g({content:this.props.tooltip},this.props.tooltipOptions||{})):this.renderTooltip())}},{key:"componentWillUnmount",value:function(){this.tooltip&&(this.tooltip.destroy(),this.tooltip=null)}},{key:"renderTooltip",value:function(){this.tooltip=n.tip({target:this.elementRef.current,content:this.props.tooltip,options:this.props.tooltipOptions})}},{key:"renderIcon",value:function(){var t,e=this.props.loading?this.props.loadingIcon:this.props.icon,n=l(e),r=o.classNames("p-button-icon p-c",(y(t={"p-button-loading-icon":this.props.loading},"".concat(e),"string"===n),y(t,"p-button-icon-left","left"===this.props.iconPos&&this.props.label),y(t,"p-button-icon-right","right"===this.props.iconPos&&this.props.label),y(t,"p-button-icon-top","top"===this.props.iconPos&&this.props.label),y(t,"p-button-icon-bottom","bottom"===this.props.iconPos&&this.props.label),t));return o.IconUtils.getJSXIcon(e,{className:r},{props:this.props})}},{key:"renderLabel",value:function(){return this.props.label?p.default.createElement("span",{className:"p-button-label p-c"},this.props.label):!this.props.children&&!this.props.label&&p.default.createElement("span",{className:"p-button-label p-c",dangerouslySetInnerHTML:{__html:"&nbsp;"}})}},{key:"renderBadge",value:function(){if(this.props.badge){var t=o.classNames("p-badge",this.props.badgeClassName);return p.default.createElement("span",{className:t},this.props.badge)}return null}},{key:"render",value:function(){var t=this.isDisabled(),e=o.classNames("p-button p-component",this.props.className,y({"p-button-icon-only":(this.props.icon||this.props.loading&&this.props.loadingIcon)&&!this.props.label,"p-button-vertical":("top"===this.props.iconPos||"bottom"===this.props.iconPos)&&this.props.label,"p-disabled":t,"p-button-loading":this.props.loading,"p-button-loading-label-only":this.props.loading&&!this.props.icon&&this.props.label},"p-button-loading-".concat(this.props.iconPos),this.props.loading&&this.props.loadingIcon&&this.props.label)),n=this.renderIcon(),i=this.renderLabel(),l=this.renderBadge(),a=o.ObjectUtils.findDiffKeys(this.props,j.defaultProps);return p.default.createElement("button",s({ref:this.elementRef},a,{className:e,disabled:t}),n,i,this.props.children,l,p.default.createElement(r.Ripple,null))}}])&&c(b.prototype,m),v&&c(b,v),j}(e.Component);return y(v,"defaultProps",{label:null,icon:null,iconPos:"left",badge:null,badgeClassName:null,tooltip:null,tooltipOptions:null,forwardRef:null,disabled:!1,loading:!1,loadingIcon:"pi pi-spinner pi-spin"}),t.Button=p.default.forwardRef((function(t,e){return p.default.createElement(v,s({forwardRef:e},t))})),t.ButtonComponent=v,Object.defineProperty(t,"__esModule",{value:!0}),t}({},React,primereact.utils,primereact.tooltip,primereact.ripple);