primereact 8.4.0 → 8.5.0

package/toast/toast.cjs.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("react-transition-group"),r=require("primereact/api"),n=require("primereact/csstransition"),a=require("primereact/hooks"),o=require("primereact/portal"),i=require("primereact/utils"),s=require("primereact/ripple");function l(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function c(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var u=c(e),f=l(r);function p(){return p=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},p.apply(this,arguments)}function m(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function d(e){if(Array.isArray(e))return m(e)}function y(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function b(e,t){if(e){if("string"==typeof e)return m(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?m(e,t):void 0}}function v(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function g(e){return d(e)||y(e)||b(e)||v()}function O(e){if(Array.isArray(e))return e}function h(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,a,o=[],i=!0,s=!1;try{for(r=r.call(e);!(i=(n=r.next()).done)&&(o.push(n.value),!t||o.length!==t);i=!0);}catch(e){s=!0,a=e}finally{try{i||null==r.return||r.return()}finally{if(s)throw a}}return o}}function j(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function E(e,t){return O(e)||h(e,t)||b(e,t)||j()}function w(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function N(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function S(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?N(Object(r),!0).forEach((function(t){w(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):N(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}var P=u.memo(u.forwardRef((function(e,t){var r=e.message,n=r.severity,o=r.content,l=r.summary,c=r.detail,f=r.closable,p=r.className,m=r.style,d=r.contentClassName,y=r.contentStyle,b=E(a.useTimeout((function(){v()}),r.life||3e3,!r.sticky),1)[0],v=function(){b(),e.onClose&&e.onClose(e.message)},g=i.classNames("p-toast-message",w({},"p-toast-message-".concat(n),n),p),O=i.classNames("p-toast-message-content",d),h=function(){if(e.message){var t=i.ObjectUtils.getJSXElement(o,S(S({},e),{},{onClose:v})),r=i.classNames("p-toast-message-icon pi",{"pi-info-circle":"info"===n,"pi-exclamation-triangle":"warn"===n,"pi-times":"error"===n,"pi-check":"success"===n});return t||u.createElement(u.Fragment,null,u.createElement("span",{className:r}),u.createElement("div",{className:"p-toast-message-text"},u.createElement("span",{className:"p-toast-summary"},l),c&&u.createElement("div",{className:"p-toast-detail"},c)))}return null}();return u.createElement("div",{ref:t,className:g,style:m,role:"alert","aria-live":"assertive","aria-atomic":"true",onClick:function(t){!e.onClick||i.DomHandler.hasClass(t.target,"p-toast-icon-close")||i.DomHandler.hasClass(t.target,"p-toast-icon-close-icon")||e.onClick(e.message)}},u.createElement("div",{className:O,style:y},h,!1!==f?u.createElement("button",{type:"button",className:"p-toast-icon-close p-link",onClick:v},u.createElement("span",{className:"p-toast-icon-close-icon pi pi-times"}),u.createElement(s.Ripple,null)):null))})));P.displayName="ToastMessage";var x=0,C=u.memo(u.forwardRef((function(e,r){var s=E(u.useState([]),2),l=s[0],c=s[1],m=u.useRef(null),d=function(t){if(t){var r;if(Array.isArray(t))for(var n=0;n<t.length;n++)t[n].id=x++,r=[].concat(g(l),g(t));else t.id=x++,r=l?[].concat(g(l),[t]):[t];0===l.length&&i.ZIndexUtils.set("toast",m.current,f.default.autoZIndex,e.baseZIndex||f.default.zIndex.toast),c(r)}},y=function(){i.ZIndexUtils.clear(m.current),c([])},b=function(e){var t=Array.isArray(e)?e:[e];c(t)},v=function(t){var r=l.filter((function(e){return e.id!==t.id}));c(r),e.onRemove&&e.onRemove(t)},O=function(){e.onShow&&e.onShow()},h=function(){1===l.length&&i.ZIndexUtils.clear(m.current),e.onHide&&e.onHide()};a.useUnmountEffect((function(){i.ZIndexUtils.clear(m.current)})),u.useImperativeHandle(r,(function(){return{props:e,show:d,replace:b,clear:y,getElement:function(){return m.current}}}));var j,w,N=(j=i.ObjectUtils.findDiffKeys(e,C.defaultProps),w=i.classNames("p-toast p-component p-toast-"+e.position,e.className),u.createElement("div",p({ref:m,id:e.id,className:w,style:e.style},j),u.createElement(t.TransitionGroup,null,l.map((function(t){var r=u.createRef();return u.createElement(n.CSSTransition,{nodeRef:r,key:t.id,classNames:"p-toast-message",unmountOnExit:!0,timeout:{enter:300,exit:300},onEntered:O,onExited:h,options:e.transitionOptions},u.createElement(P,{ref:r,message:t,onClick:e.onClick,onClose:v}))})))));return u.createElement(o.Portal,{element:N,appendTo:e.appendTo})})));C.displayName="Toast",C.defaultProps={__TYPE:"Toast",id:null,className:null,style:null,baseZIndex:0,position:"top-right",transitionOptions:null,appendTo:"self",onClick:null,onRemove:null,onShow:null,onHide:null},exports.Toast=C;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("react-transition-group"),n=require("primereact/api"),r=require("primereact/csstransition"),a=require("primereact/hooks"),o=require("primereact/portal"),s=require("primereact/utils"),i=require("primereact/ripple");function l(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function c(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(n){if("default"!==n){var r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:function(){return e[n]}})}})),t.default=e,Object.freeze(t)}var u=c(e),m=l(n);function f(){return f=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},f.apply(this,arguments)}function p(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function d(e){if(Array.isArray(e))return p(e)}function y(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function v(e,t){if(e){if("string"==typeof e)return p(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?p(e,t):void 0}}function g(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function b(e){return d(e)||y(e)||v(e)||g()}function h(e){if(Array.isArray(e))return e}function E(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var r,a,o=[],s=!0,i=!1;try{for(n=n.call(e);!(s=(r=n.next()).done)&&(o.push(r.value),!t||o.length!==t);s=!0);}catch(e){i=!0,a=e}finally{try{s||null==n.return||n.return()}finally{if(i)throw a}}return o}}function I(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function N(e,t){return h(e)||E(e,t)||v(e,t)||I()}var O=u.memo(u.forwardRef((function(e,t){var n,r,o,l=e.messageInfo,c=l.message,m=c.severity,f=c.content,p=c.summary,d=c.detail,y=c.closable,v=c.className,g=c.style,b=c.contentClassName,h=c.contentStyle,E=N(a.useTimeout((function(){I()}),c.life||3e3,!c.sticky),1)[0],I=function(){E(),e.onClose&&e.onClose(l)},O=function(t){!e.onClick||s.DomHandler.hasClass(t.target,"p-toast-icon-close")||s.DomHandler.hasClass(t.target,"p-toast-icon-close-icon")||e.onClick(l.message)},C=s.classNames("p-toast-message",(n={},r="p-toast-message-".concat(m),o=m,r in n?Object.defineProperty(n,r,{value:o,enumerable:!0,configurable:!0,writable:!0}):n[r]=o,n),v),j=s.classNames("p-toast-message-content",b),w=function(){if(l){var e=s.ObjectUtils.getJSXElement(f,{message:l.message,onClick:O,onClose:I}),t=s.classNames("p-toast-message-icon pi",{"pi-info-circle":"info"===m,"pi-exclamation-triangle":"warn"===m,"pi-times":"error"===m,"pi-check":"success"===m});return e||u.createElement(u.Fragment,null,u.createElement("span",{className:t}),u.createElement("div",{className:"p-toast-message-text"},u.createElement("span",{className:"p-toast-summary"},p),d&&u.createElement("div",{className:"p-toast-detail"},d)))}return null}();return u.createElement("div",{ref:t,className:C,style:g,role:"alert","aria-live":"assertive","aria-atomic":"true",onClick:O},u.createElement("div",{className:j,style:h},w,!1!==y?u.createElement("button",{type:"button",className:"p-toast-icon-close p-link",onClick:I},u.createElement("span",{className:"p-toast-icon-close-icon pi pi-times"}),u.createElement(i.Ripple,null)):null))})));O.displayName="ToastMessage";var C=0,j=u.memo(u.forwardRef((function(e,n){var i=N(u.useState([]),2),l=i[0],c=i[1],p=u.useRef(null),d=function(t){if(t){var n;if(Array.isArray(t)){var r=t.reduce((function(e,t){return e.push({_pId:C++,message:t}),e}),[]);n=l?[].concat(b(l),b(r)):r}else{var a={_pId:C++,message:t};n=l?[].concat(b(l),[a]):[a]}0===l.length&&s.ZIndexUtils.set("toast",p.current,m.default.autoZIndex,e.baseZIndex||m.default.zIndex.toast),c(n)}},y=function(){s.ZIndexUtils.clear(p.current),c([])},v=function(e){var t=Array.isArray(e)?e:[e];c(t)},g=function(t){var n=l.filter((function(e){return e._pId!==t._pId}));c(n),e.onRemove&&e.onRemove(t.message)},h=function(){e.onShow&&e.onShow()},E=function(){1===l.length&&s.ZIndexUtils.clear(p.current),e.onHide&&e.onHide()};a.useUnmountEffect((function(){s.ZIndexUtils.clear(p.current)})),u.useImperativeHandle(n,(function(){return{props:e,show:d,replace:v,clear:y,getElement:function(){return p.current}}}));var I,w,x=(I=s.ObjectUtils.findDiffKeys(e,j.defaultProps),w=s.classNames("p-toast p-component p-toast-"+e.position,e.className),u.createElement("div",f({ref:p,id:e.id,className:w,style:e.style},I),u.createElement(t.TransitionGroup,null,l.map((function(t){var n=u.createRef();return u.createElement(r.CSSTransition,{nodeRef:n,key:t._pId,classNames:"p-toast-message",unmountOnExit:!0,timeout:{enter:300,exit:300},onEntered:h,onExited:E,options:e.transitionOptions},u.createElement(O,{ref:n,messageInfo:t,onClick:e.onClick,onClose:g}))})))));return u.createElement(o.Portal,{element:x,appendTo:e.appendTo})})));j.displayName="Toast",j.defaultProps={__TYPE:"Toast",id:null,className:null,style:null,baseZIndex:0,position:"top-right",transitionOptions:null,appendTo:"self",onClick:null,onRemove:null,onShow:null,onHide:null},exports.Toast=j;

package/toast/toast.esm.js

@@ -117,22 +117,20 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var ToastMessage = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _props$message = props.message,
-      severity = _props$message.severity,
-      content = _props$message.content,
-      summary = _props$message.summary,
-      detail = _props$message.detail,
-      closable = _props$message.closable,
-      life = _props$message.life,
-      sticky = _props$message.sticky,
-      _className = _props$message.className,
-      style = _props$message.style,
-      _contentClassName = _props$message.contentClassName,
-      contentStyle = _props$message.contentStyle;
+  var messageInfo = props.messageInfo;
+  var _messageInfo$message = messageInfo.message,
+      severity = _messageInfo$message.severity,
+      content = _messageInfo$message.content,
+      summary = _messageInfo$message.summary,
+      detail = _messageInfo$message.detail,
+      closable = _messageInfo$message.closable,
+      life = _messageInfo$message.life,
+      sticky = _messageInfo$message.sticky,
+      _className = _messageInfo$message.className,
+      style = _messageInfo$message.style,
+      _contentClassName = _messageInfo$message.contentClassName,
+      contentStyle = _messageInfo$message.contentStyle;
 
   var _useTimeout = useTimeout(function () {
     onClose();
@@ -142,12 +140,12 @@ var ToastMessage = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
 
   var onClose = function onClose() {
     clearTimer();
-    props.onClose && props.onClose(props.message);
+    props.onClose && props.onClose(messageInfo);
   };
 
   var onClick = function onClick(event) {
     if (props.onClick && !(DomHandler.hasClass(event.target, 'p-toast-icon-close') || DomHandler.hasClass(event.target, 'p-toast-icon-close-icon'))) {
-      props.onClick(props.message);
+      props.onClick(messageInfo.message);
     }
   };
 
@@ -166,10 +164,12 @@ var ToastMessage = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
   };
 
   var createMessage = function createMessage() {
-    if (props.message) {
-      var contentEl = ObjectUtils.getJSXElement(content, _objectSpread(_objectSpread({}, props), {}, {
+    if (messageInfo) {
+      var contentEl = ObjectUtils.getJSXElement(content, {
+        message: messageInfo.message,
+        onClick: onClick,
         onClose: onClose
-      }));
+      });
       var iconClassName = classNames('p-toast-message-icon pi', {
         'pi-info-circle': severity === 'info',
         'pi-exclamation-triangle': severity === 'warn',
@@ -223,13 +223,20 @@ var Toast = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (pro
       var messages;
 
       if (Array.isArray(value)) {
-        for (var i = 0; i < value.length; i++) {
-          value[i].id = messageIdx++;
-          messages = [].concat(_toConsumableArray(messagesState), _toConsumableArray(value));
-        }
+        var multipleMessages = value.reduce(function (acc, message) {
+          acc.push({
+            _pId: messageIdx++,
+            message: message
+          });
+          return acc;
+        }, []);
+        messages = messagesState ? [].concat(_toConsumableArray(messagesState), _toConsumableArray(multipleMessages)) : multipleMessages;
       } else {
-        value.id = messageIdx++;
-        messages = messagesState ? [].concat(_toConsumableArray(messagesState), [value]) : [value];
+        var message = {
+          _pId: messageIdx++,
+          message: value
+        };
+        messages = messagesState ? [].concat(_toConsumableArray(messagesState), [message]) : [message];
       }
 
       messagesState.length === 0 && ZIndexUtils.set('toast', containerRef.current, PrimeReact.autoZIndex, props.baseZIndex || PrimeReact.zIndex['toast']);
@@ -247,12 +254,12 @@ var Toast = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (pro
     setMessagesState(replaced);
   };
 
-  var onClose = function onClose(message) {
+  var onClose = function onClose(messageInfo) {
     var messages = messagesState.filter(function (msg) {
-      return msg.id !== message.id;
+      return msg._pId !== messageInfo._pId;
     });
     setMessagesState(messages);
-    props.onRemove && props.onRemove(message);
+    props.onRemove && props.onRemove(messageInfo.message);
   };
 
   var onEntered = function onEntered() {
@@ -287,11 +294,11 @@ var Toast = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (pro
       id: props.id,
       className: className,
       style: props.style
-    }, otherProps), /*#__PURE__*/React.createElement(TransitionGroup, null, messagesState.map(function (message) {
+    }, otherProps), /*#__PURE__*/React.createElement(TransitionGroup, null, messagesState.map(function (messageInfo) {
       var messageRef = /*#__PURE__*/React.createRef();
       return /*#__PURE__*/React.createElement(CSSTransition, {
         nodeRef: messageRef,
-        key: message.id,
+        key: messageInfo._pId,
         classNames: "p-toast-message",
         unmountOnExit: true,
         timeout: {
@@ -303,7 +310,7 @@ var Toast = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (pro
         options: props.transitionOptions
       }, /*#__PURE__*/React.createElement(ToastMessage, {
         ref: messageRef,
-        message: message,
+        messageInfo: messageInfo,
         onClick: props.onClick,
         onClose: onClose
       }));

package/toast/toast.esm.min.js

@@ -1 +1 @@
-import*as e from"react";import{TransitionGroup as t}from"react-transition-group";import r from"primereact/api";import{CSSTransition as n}from"primereact/csstransition";import{useTimeout as o,useUnmountEffect as a}from"primereact/hooks";import{Portal as i}from"primereact/portal";import{classNames as l,DomHandler as s,ObjectUtils as c,ZIndexUtils as u}from"primereact/utils";import{Ripple as m}from"primereact/ripple";function p(){return p=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},p.apply(this,arguments)}function f(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function y(e){if(Array.isArray(e))return f(e)}function d(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function b(e,t){if(e){if("string"==typeof e)return f(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?f(e,t):void 0}}function v(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function g(e){return y(e)||d(e)||b(e)||v()}function h(e){if(Array.isArray(e))return e}function O(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,o,a=[],i=!0,l=!1;try{for(r=r.call(e);!(i=(n=r.next()).done)&&(a.push(n.value),!t||a.length!==t);i=!0);}catch(e){l=!0,o=e}finally{try{i||null==r.return||r.return()}finally{if(l)throw o}}return a}}function E(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function w(e,t){return h(e)||O(e,t)||b(e,t)||E()}function j(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function N(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function S(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?N(Object(r),!0).forEach((function(t){j(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):N(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}var C=e.memo(e.forwardRef((function(t,r){var n=t.message,a=n.severity,i=n.content,u=n.summary,p=n.detail,f=n.closable,y=n.className,d=n.style,b=n.contentClassName,v=n.contentStyle,g=w(o((function(){h()}),n.life||3e3,!n.sticky),1)[0],h=function(){g(),t.onClose&&t.onClose(t.message)},O=l("p-toast-message",j({},"p-toast-message-".concat(a),a),y),E=l("p-toast-message-content",b),N=function(){if(t.message){var r=c.getJSXElement(i,S(S({},t),{},{onClose:h})),n=l("p-toast-message-icon pi",{"pi-info-circle":"info"===a,"pi-exclamation-triangle":"warn"===a,"pi-times":"error"===a,"pi-check":"success"===a});return r||e.createElement(e.Fragment,null,e.createElement("span",{className:n}),e.createElement("div",{className:"p-toast-message-text"},e.createElement("span",{className:"p-toast-summary"},u),p&&e.createElement("div",{className:"p-toast-detail"},p)))}return null}();return e.createElement("div",{ref:r,className:O,style:d,role:"alert","aria-live":"assertive","aria-atomic":"true",onClick:function(e){!t.onClick||s.hasClass(e.target,"p-toast-icon-close")||s.hasClass(e.target,"p-toast-icon-close-icon")||t.onClick(t.message)}},e.createElement("div",{className:E,style:v},N,!1!==f?e.createElement("button",{type:"button",className:"p-toast-icon-close p-link",onClick:h},e.createElement("span",{className:"p-toast-icon-close-icon pi pi-times"}),e.createElement(m,null)):null))})));C.displayName="ToastMessage";var k=0,A=e.memo(e.forwardRef((function(o,s){var m=w(e.useState([]),2),f=m[0],y=m[1],d=e.useRef(null),b=function(e){if(e){var t;if(Array.isArray(e))for(var n=0;n<e.length;n++)e[n].id=k++,t=[].concat(g(f),g(e));else e.id=k++,t=f?[].concat(g(f),[e]):[e];0===f.length&&u.set("toast",d.current,r.autoZIndex,o.baseZIndex||r.zIndex.toast),y(t)}},v=function(){u.clear(d.current),y([])},h=function(e){var t=Array.isArray(e)?e:[e];y(t)},O=function(e){var t=f.filter((function(t){return t.id!==e.id}));y(t),o.onRemove&&o.onRemove(e)},E=function(){o.onShow&&o.onShow()},j=function(){1===f.length&&u.clear(d.current),o.onHide&&o.onHide()};a((function(){u.clear(d.current)})),e.useImperativeHandle(s,(function(){return{props:o,show:b,replace:h,clear:v,getElement:function(){return d.current}}}));var N,S,P=(N=c.findDiffKeys(o,A.defaultProps),S=l("p-toast p-component p-toast-"+o.position,o.className),e.createElement("div",p({ref:d,id:o.id,className:S,style:o.style},N),e.createElement(t,null,f.map((function(t){var r=e.createRef();return e.createElement(n,{nodeRef:r,key:t.id,classNames:"p-toast-message",unmountOnExit:!0,timeout:{enter:300,exit:300},onEntered:E,onExited:j,options:o.transitionOptions},e.createElement(C,{ref:r,message:t,onClick:o.onClick,onClose:O}))})))));return e.createElement(i,{element:P,appendTo:o.appendTo})})));A.displayName="Toast",A.defaultProps={__TYPE:"Toast",id:null,className:null,style:null,baseZIndex:0,position:"top-right",transitionOptions:null,appendTo:"self",onClick:null,onRemove:null,onShow:null,onHide:null};export{A as Toast};
+import*as e from"react";import{TransitionGroup as t}from"react-transition-group";import n from"primereact/api";import{CSSTransition as r}from"primereact/csstransition";import{useTimeout as a,useUnmountEffect as o}from"primereact/hooks";import{Portal as i}from"primereact/portal";import{classNames as s,DomHandler as l,ObjectUtils as c,ZIndexUtils as u}from"primereact/utils";import{Ripple as m}from"primereact/ripple";function p(){return p=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},p.apply(this,arguments)}function f(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function d(e){if(Array.isArray(e))return f(e)}function y(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function v(e,t){if(e){if("string"==typeof e)return f(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?f(e,t):void 0}}function g(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function b(e){return d(e)||y(e)||v(e)||g()}function h(e){if(Array.isArray(e))return e}function E(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var r,a,o=[],i=!0,s=!1;try{for(n=n.call(e);!(i=(r=n.next()).done)&&(o.push(r.value),!t||o.length!==t);i=!0);}catch(e){s=!0,a=e}finally{try{i||null==n.return||n.return()}finally{if(s)throw a}}return o}}function I(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function C(e,t){return h(e)||E(e,t)||v(e,t)||I()}var N=e.memo(e.forwardRef((function(t,n){var r,o,i,u=t.messageInfo,p=u.message,f=p.severity,d=p.content,y=p.summary,v=p.detail,g=p.closable,b=p.className,h=p.style,E=p.contentClassName,I=p.contentStyle,N=C(a((function(){w()}),p.life||3e3,!p.sticky),1)[0],w=function(){N(),t.onClose&&t.onClose(u)},S=function(e){!t.onClick||l.hasClass(e.target,"p-toast-icon-close")||l.hasClass(e.target,"p-toast-icon-close-icon")||t.onClick(u.message)},k=s("p-toast-message",(r={},o="p-toast-message-".concat(f),i=f,o in r?Object.defineProperty(r,o,{value:i,enumerable:!0,configurable:!0,writable:!0}):r[o]=i,r),b),A=s("p-toast-message-content",E),x=function(){if(u){var t=c.getJSXElement(d,{message:u.message,onClick:S,onClose:w}),n=s("p-toast-message-icon pi",{"pi-info-circle":"info"===f,"pi-exclamation-triangle":"warn"===f,"pi-times":"error"===f,"pi-check":"success"===f});return t||e.createElement(e.Fragment,null,e.createElement("span",{className:n}),e.createElement("div",{className:"p-toast-message-text"},e.createElement("span",{className:"p-toast-summary"},y),v&&e.createElement("div",{className:"p-toast-detail"},v)))}return null}();return e.createElement("div",{ref:n,className:k,style:h,role:"alert","aria-live":"assertive","aria-atomic":"true",onClick:S},e.createElement("div",{className:A,style:I},x,!1!==g?e.createElement("button",{type:"button",className:"p-toast-icon-close p-link",onClick:w},e.createElement("span",{className:"p-toast-icon-close-icon pi pi-times"}),e.createElement(m,null)):null))})));N.displayName="ToastMessage";var w=0,S=e.memo(e.forwardRef((function(a,l){var m=C(e.useState([]),2),f=m[0],d=m[1],y=e.useRef(null),v=function(e){if(e){var t;if(Array.isArray(e)){var r=e.reduce((function(e,t){return e.push({_pId:w++,message:t}),e}),[]);t=f?[].concat(b(f),b(r)):r}else{var o={_pId:w++,message:e};t=f?[].concat(b(f),[o]):[o]}0===f.length&&u.set("toast",y.current,n.autoZIndex,a.baseZIndex||n.zIndex.toast),d(t)}},g=function(){u.clear(y.current),d([])},h=function(e){var t=Array.isArray(e)?e:[e];d(t)},E=function(e){var t=f.filter((function(t){return t._pId!==e._pId}));d(t),a.onRemove&&a.onRemove(e.message)},I=function(){a.onShow&&a.onShow()},k=function(){1===f.length&&u.clear(y.current),a.onHide&&a.onHide()};o((function(){u.clear(y.current)})),e.useImperativeHandle(l,(function(){return{props:a,show:v,replace:h,clear:g,getElement:function(){return y.current}}}));var A,x,O=(A=c.findDiffKeys(a,S.defaultProps),x=s("p-toast p-component p-toast-"+a.position,a.className),e.createElement("div",p({ref:y,id:a.id,className:x,style:a.style},A),e.createElement(t,null,f.map((function(t){var n=e.createRef();return e.createElement(r,{nodeRef:n,key:t._pId,classNames:"p-toast-message",unmountOnExit:!0,timeout:{enter:300,exit:300},onEntered:I,onExited:k,options:a.transitionOptions},e.createElement(N,{ref:n,messageInfo:t,onClick:a.onClick,onClose:E}))})))));return e.createElement(i,{element:O,appendTo:a.appendTo})})));S.displayName="Toast",S.defaultProps={__TYPE:"Toast",id:null,className:null,style:null,baseZIndex:0,position:"top-right",transitionOptions:null,appendTo:"self",onClick:null,onRemove:null,onShow:null,onHide:null};export{S as Toast};

package/toast/toast.js

@@ -135,22 +135,20 @@ this.primereact.toast = (function (exports, React, reactTransitionGroup, PrimeRe
     return obj;
   }
 
-  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
   var ToastMessage = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
-    var _props$message = props.message,
-        severity = _props$message.severity,
-        content = _props$message.content,
-        summary = _props$message.summary,
-        detail = _props$message.detail,
-        closable = _props$message.closable,
-        life = _props$message.life,
-        sticky = _props$message.sticky,
-        _className = _props$message.className,
-        style = _props$message.style,
-        _contentClassName = _props$message.contentClassName,
-        contentStyle = _props$message.contentStyle;
+    var messageInfo = props.messageInfo;
+    var _messageInfo$message = messageInfo.message,
+        severity = _messageInfo$message.severity,
+        content = _messageInfo$message.content,
+        summary = _messageInfo$message.summary,
+        detail = _messageInfo$message.detail,
+        closable = _messageInfo$message.closable,
+        life = _messageInfo$message.life,
+        sticky = _messageInfo$message.sticky,
+        _className = _messageInfo$message.className,
+        style = _messageInfo$message.style,
+        _contentClassName = _messageInfo$message.contentClassName,
+        contentStyle = _messageInfo$message.contentStyle;
 
     var _useTimeout = hooks.useTimeout(function () {
       onClose();
@@ -160,12 +158,12 @@ this.primereact.toast = (function (exports, React, reactTransitionGroup, PrimeRe
 
     var onClose = function onClose() {
       clearTimer();
-      props.onClose && props.onClose(props.message);
+      props.onClose && props.onClose(messageInfo);
     };
 
     var onClick = function onClick(event) {
       if (props.onClick && !(utils.DomHandler.hasClass(event.target, 'p-toast-icon-close') || utils.DomHandler.hasClass(event.target, 'p-toast-icon-close-icon'))) {
-        props.onClick(props.message);
+        props.onClick(messageInfo.message);
       }
     };
 
@@ -184,10 +182,12 @@ this.primereact.toast = (function (exports, React, reactTransitionGroup, PrimeRe
     };
 
     var createMessage = function createMessage() {
-      if (props.message) {
-        var contentEl = utils.ObjectUtils.getJSXElement(content, _objectSpread(_objectSpread({}, props), {}, {
+      if (messageInfo) {
+        var contentEl = utils.ObjectUtils.getJSXElement(content, {
+          message: messageInfo.message,
+          onClick: onClick,
           onClose: onClose
-        }));
+        });
         var iconClassName = utils.classNames('p-toast-message-icon pi', {
           'pi-info-circle': severity === 'info',
           'pi-exclamation-triangle': severity === 'warn',
@@ -241,13 +241,20 @@ this.primereact.toast = (function (exports, React, reactTransitionGroup, PrimeRe
         var messages;
 
         if (Array.isArray(value)) {
-          for (var i = 0; i < value.length; i++) {
-            value[i].id = messageIdx++;
-            messages = [].concat(_toConsumableArray(messagesState), _toConsumableArray(value));
-          }
+          var multipleMessages = value.reduce(function (acc, message) {
+            acc.push({
+              _pId: messageIdx++,
+              message: message
+            });
+            return acc;
+          }, []);
+          messages = messagesState ? [].concat(_toConsumableArray(messagesState), _toConsumableArray(multipleMessages)) : multipleMessages;
         } else {
-          value.id = messageIdx++;
-          messages = messagesState ? [].concat(_toConsumableArray(messagesState), [value]) : [value];
+          var message = {
+            _pId: messageIdx++,
+            message: value
+          };
+          messages = messagesState ? [].concat(_toConsumableArray(messagesState), [message]) : [message];
         }
 
         messagesState.length === 0 && utils.ZIndexUtils.set('toast', containerRef.current, PrimeReact__default["default"].autoZIndex, props.baseZIndex || PrimeReact__default["default"].zIndex['toast']);
@@ -265,12 +272,12 @@ this.primereact.toast = (function (exports, React, reactTransitionGroup, PrimeRe
       setMessagesState(replaced);
     };
 
-    var onClose = function onClose(message) {
+    var onClose = function onClose(messageInfo) {
       var messages = messagesState.filter(function (msg) {
-        return msg.id !== message.id;
+        return msg._pId !== messageInfo._pId;
       });
       setMessagesState(messages);
-      props.onRemove && props.onRemove(message);
+      props.onRemove && props.onRemove(messageInfo.message);
     };
 
     var onEntered = function onEntered() {
@@ -305,11 +312,11 @@ this.primereact.toast = (function (exports, React, reactTransitionGroup, PrimeRe
         id: props.id,
         className: className,
         style: props.style
-      }, otherProps), /*#__PURE__*/React__namespace.createElement(reactTransitionGroup.TransitionGroup, null, messagesState.map(function (message) {
+      }, otherProps), /*#__PURE__*/React__namespace.createElement(reactTransitionGroup.TransitionGroup, null, messagesState.map(function (messageInfo) {
         var messageRef = /*#__PURE__*/React__namespace.createRef();
         return /*#__PURE__*/React__namespace.createElement(csstransition.CSSTransition, {
           nodeRef: messageRef,
-          key: message.id,
+          key: messageInfo._pId,
           classNames: "p-toast-message",
           unmountOnExit: true,
           timeout: {
@@ -321,7 +328,7 @@ this.primereact.toast = (function (exports, React, reactTransitionGroup, PrimeRe
           options: props.transitionOptions
         }, /*#__PURE__*/React__namespace.createElement(ToastMessage, {
           ref: messageRef,
-          message: message,
+          messageInfo: messageInfo,
           onClick: props.onClick,
           onClose: onClose
         }));

package/toast/toast.min.js

@@ -1 +1 @@
-this.primereact=this.primereact||{},this.primereact.toast=function(e,t,n,r,a,o,i,s,l){"use strict";function c(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function u(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(n){if("default"!==n){var r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:function(){return e[n]}})}})),t.default=e,Object.freeze(t)}var f=u(t),m=c(r);function p(){return p=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},p.apply(this,arguments)}function d(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function y(e){if(Array.isArray(e))return d(e)}function b(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function v(e,t){if(e){if("string"==typeof e)return d(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?d(e,t):void 0}}function g(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function h(e){return y(e)||b(e)||v(e)||g()}function O(e){if(Array.isArray(e))return e}function j(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var r,a,o=[],i=!0,s=!1;try{for(n=n.call(e);!(i=(r=n.next()).done)&&(o.push(r.value),!t||o.length!==t);i=!0);}catch(e){s=!0,a=e}finally{try{i||null==n.return||n.return()}finally{if(s)throw a}}return o}}function E(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function w(e,t){return O(e)||j(e,t)||v(e,t)||E()}function N(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function S(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function P(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?S(Object(n),!0).forEach((function(t){N(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):S(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}var C=f.memo(f.forwardRef((function(e,t){var n=e.message,r=n.severity,a=n.content,i=n.summary,c=n.detail,u=n.closable,m=n.className,p=n.style,d=n.contentClassName,y=n.contentStyle,b=w(o.useTimeout((function(){v()}),n.life||3e3,!n.sticky),1)[0],v=function(){b(),e.onClose&&e.onClose(e.message)},g=s.classNames("p-toast-message",N({},"p-toast-message-".concat(r),r),m),h=s.classNames("p-toast-message-content",d),O=function(){if(e.message){var t=s.ObjectUtils.getJSXElement(a,P(P({},e),{},{onClose:v})),n=s.classNames("p-toast-message-icon pi",{"pi-info-circle":"info"===r,"pi-exclamation-triangle":"warn"===r,"pi-times":"error"===r,"pi-check":"success"===r});return t||f.createElement(f.Fragment,null,f.createElement("span",{className:n}),f.createElement("div",{className:"p-toast-message-text"},f.createElement("span",{className:"p-toast-summary"},i),c&&f.createElement("div",{className:"p-toast-detail"},c)))}return null}();return f.createElement("div",{ref:t,className:g,style:p,role:"alert","aria-live":"assertive","aria-atomic":"true",onClick:function(t){!e.onClick||s.DomHandler.hasClass(t.target,"p-toast-icon-close")||s.DomHandler.hasClass(t.target,"p-toast-icon-close-icon")||e.onClick(e.message)}},f.createElement("div",{className:h,style:y},O,!1!==u?f.createElement("button",{type:"button",className:"p-toast-icon-close p-link",onClick:v},f.createElement("span",{className:"p-toast-icon-close-icon pi pi-times"}),f.createElement(l.Ripple,null)):null))})));C.displayName="ToastMessage";var k=0,x=f.memo(f.forwardRef((function(e,t){var r=w(f.useState([]),2),l=r[0],c=r[1],u=f.useRef(null),d=function(t){if(t){var n;if(Array.isArray(t))for(var r=0;r<t.length;r++)t[r].id=k++,n=[].concat(h(l),h(t));else t.id=k++,n=l?[].concat(h(l),[t]):[t];0===l.length&&s.ZIndexUtils.set("toast",u.current,m.default.autoZIndex,e.baseZIndex||m.default.zIndex.toast),c(n)}},y=function(){s.ZIndexUtils.clear(u.current),c([])},b=function(e){var t=Array.isArray(e)?e:[e];c(t)},v=function(t){var n=l.filter((function(e){return e.id!==t.id}));c(n),e.onRemove&&e.onRemove(t)},g=function(){e.onShow&&e.onShow()},O=function(){1===l.length&&s.ZIndexUtils.clear(u.current),e.onHide&&e.onHide()};o.useUnmountEffect((function(){s.ZIndexUtils.clear(u.current)})),f.useImperativeHandle(t,(function(){return{props:e,show:d,replace:b,clear:y,getElement:function(){return u.current}}}));var j,E,N=(j=s.ObjectUtils.findDiffKeys(e,x.defaultProps),E=s.classNames("p-toast p-component p-toast-"+e.position,e.className),f.createElement("div",p({ref:u,id:e.id,className:E,style:e.style},j),f.createElement(n.TransitionGroup,null,l.map((function(t){var n=f.createRef();return f.createElement(a.CSSTransition,{nodeRef:n,key:t.id,classNames:"p-toast-message",unmountOnExit:!0,timeout:{enter:300,exit:300},onEntered:g,onExited:O,options:e.transitionOptions},f.createElement(C,{ref:n,message:t,onClick:e.onClick,onClose:v}))})))));return f.createElement(i.Portal,{element:N,appendTo:e.appendTo})})));return x.displayName="Toast",x.defaultProps={__TYPE:"Toast",id:null,className:null,style:null,baseZIndex:0,position:"top-right",transitionOptions:null,appendTo:"self",onClick:null,onRemove:null,onShow:null,onHide:null},e.Toast=x,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,ReactTransitionGroup,primereact.api,primereact.csstransition,primereact.hooks,primereact.portal,primereact.utils,primereact.ripple);
+this.primereact=this.primereact||{},this.primereact.toast=function(e,t,n,r,a,o,s,i,l){"use strict";function c(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function u(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(n){if("default"!==n){var r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:function(){return e[n]}})}})),t.default=e,Object.freeze(t)}var m=u(t),f=c(r);function p(){return p=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},p.apply(this,arguments)}function d(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function y(e){if(Array.isArray(e))return d(e)}function v(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function b(e,t){if(e){if("string"==typeof e)return d(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?d(e,t):void 0}}function g(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function h(e){return y(e)||v(e)||b(e)||g()}function E(e){if(Array.isArray(e))return e}function I(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var r,a,o=[],s=!0,i=!1;try{for(n=n.call(e);!(s=(r=n.next()).done)&&(o.push(r.value),!t||o.length!==t);s=!0);}catch(e){i=!0,a=e}finally{try{s||null==n.return||n.return()}finally{if(i)throw a}}return o}}function N(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function O(e,t){return E(e)||I(e,t)||b(e,t)||N()}var C=m.memo(m.forwardRef((function(e,t){var n,r,a,s=e.messageInfo,c=s.message,u=c.severity,f=c.content,p=c.summary,d=c.detail,y=c.closable,v=c.className,b=c.style,g=c.contentClassName,h=c.contentStyle,E=O(o.useTimeout((function(){I()}),c.life||3e3,!c.sticky),1)[0],I=function(){E(),e.onClose&&e.onClose(s)},N=function(t){!e.onClick||i.DomHandler.hasClass(t.target,"p-toast-icon-close")||i.DomHandler.hasClass(t.target,"p-toast-icon-close-icon")||e.onClick(s.message)},C=i.classNames("p-toast-message",(n={},r="p-toast-message-".concat(u),a=u,r in n?Object.defineProperty(n,r,{value:a,enumerable:!0,configurable:!0,writable:!0}):n[r]=a,n),v),j=i.classNames("p-toast-message-content",g),w=function(){if(s){var e=i.ObjectUtils.getJSXElement(f,{message:s.message,onClick:N,onClose:I}),t=i.classNames("p-toast-message-icon pi",{"pi-info-circle":"info"===u,"pi-exclamation-triangle":"warn"===u,"pi-times":"error"===u,"pi-check":"success"===u});return e||m.createElement(m.Fragment,null,m.createElement("span",{className:t}),m.createElement("div",{className:"p-toast-message-text"},m.createElement("span",{className:"p-toast-summary"},p),d&&m.createElement("div",{className:"p-toast-detail"},d)))}return null}();return m.createElement("div",{ref:t,className:C,style:b,role:"alert","aria-live":"assertive","aria-atomic":"true",onClick:N},m.createElement("div",{className:j,style:h},w,!1!==y?m.createElement("button",{type:"button",className:"p-toast-icon-close p-link",onClick:I},m.createElement("span",{className:"p-toast-icon-close-icon pi pi-times"}),m.createElement(l.Ripple,null)):null))})));C.displayName="ToastMessage";var j=0,w=m.memo(m.forwardRef((function(e,t){var r=O(m.useState([]),2),l=r[0],c=r[1],u=m.useRef(null),d=function(t){if(t){var n;if(Array.isArray(t)){var r=t.reduce((function(e,t){return e.push({_pId:j++,message:t}),e}),[]);n=l?[].concat(h(l),h(r)):r}else{var a={_pId:j++,message:t};n=l?[].concat(h(l),[a]):[a]}0===l.length&&i.ZIndexUtils.set("toast",u.current,f.default.autoZIndex,e.baseZIndex||f.default.zIndex.toast),c(n)}},y=function(){i.ZIndexUtils.clear(u.current),c([])},v=function(e){var t=Array.isArray(e)?e:[e];c(t)},b=function(t){var n=l.filter((function(e){return e._pId!==t._pId}));c(n),e.onRemove&&e.onRemove(t.message)},g=function(){e.onShow&&e.onShow()},E=function(){1===l.length&&i.ZIndexUtils.clear(u.current),e.onHide&&e.onHide()};o.useUnmountEffect((function(){i.ZIndexUtils.clear(u.current)})),m.useImperativeHandle(t,(function(){return{props:e,show:d,replace:v,clear:y,getElement:function(){return u.current}}}));var I,N,S=(I=i.ObjectUtils.findDiffKeys(e,w.defaultProps),N=i.classNames("p-toast p-component p-toast-"+e.position,e.className),m.createElement("div",p({ref:u,id:e.id,className:N,style:e.style},I),m.createElement(n.TransitionGroup,null,l.map((function(t){var n=m.createRef();return m.createElement(a.CSSTransition,{nodeRef:n,key:t._pId,classNames:"p-toast-message",unmountOnExit:!0,timeout:{enter:300,exit:300},onEntered:g,onExited:E,options:e.transitionOptions},m.createElement(C,{ref:n,messageInfo:t,onClick:e.onClick,onClose:b}))})))));return m.createElement(s.Portal,{element:S,appendTo:e.appendTo})})));return w.displayName="Toast",w.defaultProps={__TYPE:"Toast",id:null,className:null,style:null,baseZIndex:0,position:"top-right",transitionOptions:null,appendTo:"self",onClick:null,onRemove:null,onShow:null,onHide:null},e.Toast=w,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,ReactTransitionGroup,primereact.api,primereact.csstransition,primereact.hooks,primereact.portal,primereact.utils,primereact.ripple);

package/togglebutton/togglebutton.d.ts

@@ -33,6 +33,6 @@ export interface ToggleButtonProps extends Omit<React.DetailedHTMLProps<React.In
     children?: React.ReactNode;
 }
 
-export declare class ToggleButton extends React.Component<ToggleButtonProps, any> { 
+export declare class ToggleButton extends React.Component<ToggleButtonProps, any> {
     public getElement(): HTMLDivElement;
 }

package/toolbar/toolbar.d.ts

@@ -8,6 +8,6 @@ export interface ToolbarProps extends Omit<React.DetailedHTMLProps<React.HTMLAtt
     children?: React.ReactNode;
 }
 
-export declare class Toolbar extends React.Component<ToolbarProps, any> { 
+export declare class Toolbar extends React.Component<ToolbarProps, any> {
     public getElement(): HTMLDivElement;
 }

package/tooltip/tooltip.cjs.js

@@ -218,24 +218,29 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   };
 
   var getEvents = function getEvents(target) {
-    var showEvent = getTargetOption(target, 'showevent') || props.showEvent;
-    var hideEvent = getTargetOption(target, 'hideevent') || props.hideEvent;
+    var showEvents = [getTargetOption(target, 'showevent') || props.showEvent];
+    var hideEvents = [getTargetOption(target, 'hideevent') || props.hideEvent];
 
     if (isMouseTrack(target)) {
-      showEvent = 'mousemove';
-      hideEvent = 'mouseleave';
+      showEvents = ['mousemove'];
+      hideEvents = ['mouseleave'];
     } else {
       var event = getTargetOption(target, 'event') || props.event;
 
       if (event === 'focus') {
-        showEvent = 'focus';
-        hideEvent = 'blur';
+        showEvents = ['focus'];
+        hideEvents = ['blur'];
+      }
+
+      if (event === 'both') {
+        showEvents = ['focus', 'mouseenter'];
+        hideEvents = ['blur', 'mouseleave'];
       }
     }
 
     return {
-      showEvent: showEvent,
-      hideEvent: hideEvent
+      showEvents: showEvents,
+      hideEvents: hideEvents
     };
   };
 
@@ -448,24 +453,32 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
   var bindTargetEvent = function bindTargetEvent(target) {
     if (target) {
       var _getEvents = getEvents(target),
-          showEvent = _getEvents.showEvent,
-          hideEvent = _getEvents.hideEvent;
+          showEvents = _getEvents.showEvents,
+          hideEvents = _getEvents.hideEvents;
 
       var currentTarget = getTarget(target);
-      currentTarget.addEventListener(showEvent, show);
-      currentTarget.addEventListener(hideEvent, hide);
+      showEvents.forEach(function (event) {
+        return currentTarget.addEventListener(event, show);
+      });
+      hideEvents.forEach(function (event) {
+        return currentTarget.addEventListener(event, hide);
+      });
     }
   };
 
   var unbindTargetEvent = function unbindTargetEvent(target) {
     if (target) {
       var _getEvents2 = getEvents(target),
-          showEvent = _getEvents2.showEvent,
-          hideEvent = _getEvents2.hideEvent;
+          showEvents = _getEvents2.showEvents,
+          hideEvents = _getEvents2.hideEvents;
 
       var currentTarget = getTarget(target);
-      currentTarget.removeEventListener(showEvent, show);
-      currentTarget.removeEventListener(hideEvent, hide);
+      showEvents.forEach(function (event) {
+        return currentTarget.removeEventListener(event, show);
+      });
+      hideEvents.forEach(function (event) {
+        return currentTarget.removeEventListener(event, hide);
+      });
     }
   };
 

package/tooltip/tooltip.cjs.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("primereact/api"),r=require("primereact/hooks"),n=require("primereact/portal"),o=require("primereact/utils");function u(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function a(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var i=a(e),l=u(t);function c(){return c=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},c.apply(this,arguments)}function s(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function f(e){if(Array.isArray(e))return s(e)}function d(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function p(e,t){if(e){if("string"==typeof e)return s(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?s(e,t):void 0}}function v(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function h(e){if(Array.isArray(e))return e}function m(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,o,u=[],a=!0,i=!1;try{for(r=r.call(e);!(a=(n=r.next()).done)&&(u.push(n.value),!t||u.length!==t);a=!0);}catch(e){i=!0,o=e}finally{try{a||null==r.return||r.return()}finally{if(i)throw o}}return u}}function y(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function g(e,t){return h(e)||m(e,t)||p(e,t)||y()}var b=i.memo(i.forwardRef((function(e,t){var u=g(i.useState(!1),2),a=u[0],s=u[1],h=g(i.useState(e.position),2),m=h[0],y=h[1],E=g(i.useState(""),2),w=E[0],T=E[1],x=i.useRef(null),D=i.useRef(null),O=i.useRef(null),H=i.useRef(null),j=i.useRef(!0),S=i.useRef({}),I=i.useRef(null),k=g(r.useResizeListener({listener:function(e){!o.DomHandler.isTouchDevice()&&K(e)}}),2),A=k[0],L=k[1],C=g(r.useOverlayScrollListener({target:O.current,listener:function(e){K(e)},when:a}),2),U=C[0],N=C[1],P=function(t){return M(t,"mousetrack")||e.mouseTrack},R=function(t){return"true"===M(t,"disabled")||_(t,"disabled")||e.disabled},Z=function(t){return M(t,"showondisabled")||e.showOnDisabled},W=function(){return M(O.current,"autohide")||e.autoHide},M=function(e,t){return _(e,"data-pr-".concat(t))?e.getAttribute("data-pr-".concat(t)):null},_=function(e,t){return e&&e.hasAttribute(t)},q=function(t){var r=M(t,"showevent")||e.showEvent,n=M(t,"hideevent")||e.hideEvent;P(t)?(r="mousemove",n="mouseleave"):"focus"===(M(t,"event")||e.event)&&(r="focus",n="blur");return{showEvent:r,hideEvent:n}},B=function(t){return{top:M(t,"mousetracktop")||e.mouseTrackTop,left:M(t,"mousetrackleft")||e.mouseTrackLeft}},F=function(t,r){if(D.current){var n=M(t,"tooltip")||e.content;n?(D.current.innerHTML="",D.current.appendChild(document.createTextNode(n)),r()):e.children&&r()}},z=function(t){F(O.current,(function(){var r=I.current,n=r.pageX,u=r.pageY;e.autoZIndex&&!o.ZIndexUtils.get(x.current)&&o.ZIndexUtils.set("tooltip",x.current,l.default.autoZIndex,e.baseZIndex||l.default.zIndex.tooltip),x.current.style.left="",x.current.style.top="",W()&&(x.current.style.pointerEvents="none"),P(O.current)&&!H.current&&(H.current={width:o.DomHandler.getOuterWidth(x.current),height:o.DomHandler.getOuterHeight(x.current)}),X(O.current,{x:n,y:u},t)}))},Y=function(t){O.current=t.currentTarget;var r,n=R(O.current);(r=Z(O.current)&&n?O.current.firstChild:O.current,!(e.content||M(r,"tooltip")||e.children))||n||(I.current=t,a?ee("updateDelay",z):te(e.onBeforeShow,{originalEvent:t,target:O.current})&&ee("showDelay",(function(){s(!0),te(e.onShow,{originalEvent:t,target:O.current})})))},K=function(t){(re(),a)&&(te(e.onBeforeHide,{originalEvent:t,target:O.current})&&ee("hideDelay",(function(){(W()||!1!==j.current)&&(o.ZIndexUtils.clear(x.current),o.DomHandler.removeClass(x.current,"p-tooltip-active"),s(!1),te(e.onHide,{originalEvent:t,target:O.current}))})))},X=function(t,r,n){var u=0,a=0,i=n||m;if(P(t)&&r){var l={width:o.DomHandler.getOuterWidth(x.current),height:o.DomHandler.getOuterHeight(x.current)};u=r.x,a=r.y;var c=B(t),s=c.top,f=c.left;switch(i){case"left":u-=l.width+f,a-=l.height/2-s;break;case"right":u+=f,a-=l.height/2-s;break;case"top":u-=l.width/2-f,a-=l.height+s;break;case"bottom":u-=l.width/2-f,a+=s}u<=0||H.current.width>l.width?(x.current.style.left="0px",x.current.style.right=window.innerWidth-l.width-u+"px"):(x.current.style.right="",x.current.style.left=u+"px"),x.current.style.top=a+"px",o.DomHandler.addClass(x.current,"p-tooltip-active")}else{var d=o.DomHandler.findCollisionPosition(i),p=M(t,"my")||e.my||d.my,v=M(t,"at")||e.at||d.at;x.current.style.padding="0px",o.DomHandler.flipfitCollision(x.current,t,p,v,(function(t){var r=t.at,n=r.x,u=e.at?"center"!==n&&n!==t.my.x?n:r.y:t.at["".concat(d.axis)];x.current.style.padding="",y(u),$(u),o.DomHandler.addClass(x.current,"p-tooltip-active")}))}},$=function(e){if(x.current){var t=getComputedStyle(x.current);"left"===e?x.current.style.left=parseFloat(t.left)-2*parseFloat(t.paddingLeft)+"px":"top"===e&&(x.current.style.top=parseFloat(t.top)-2*parseFloat(t.paddingTop)+"px")}},G=function(){W()||(j.current=!1)},J=function(e){W()||(j.current=!0,K(e))},Q=function(e){if(e){var t=q(e),r=t.showEvent,n=t.hideEvent,o=ne(e);o.addEventListener(r,Y),o.addEventListener(n,K)}},V=function(e){if(e){var t=q(e),r=t.showEvent,n=t.hideEvent,o=ne(e);o.removeEventListener(r,Y),o.removeEventListener(n,K)}},ee=function(t,r){re();var n=M(O.current,t.toLowerCase())||e[t];n?S.current["".concat(t)]=setTimeout((function(){return r()}),n):r()},te=function(e){if(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];var o=e.apply(void 0,r);return void 0===o&&(o=!0),o}return!0},re=function(){Object.values(S.current).forEach((function(e){return clearTimeout(e)}))},ne=function(e){if(e){if(Z(e)){if(e.hasWrapper)return e.parentElement;var t=document.createElement("span");return e.parentNode.insertBefore(t,e),t.appendChild(e),e.hasWrapper=!0,t}var r;return e.hasWrapper&&((r=e.parentElement).replaceWith.apply(r,f(n=e.parentElement.childNodes)||d(n)||p(n)||v()),delete e.hasWrapper),e}var n;return null},oe=function(e){ae(e),ue(e)},ue=function(t){ie(t||e.target,Q)},ae=function(t){ie(t||e.target,V)},ie=function(e,t){if(e=o.ObjectUtils.getRefElement(e))if(o.DomHandler.isElement(e))t(e);else{var r=function(e){o.DomHandler.find(document,e).forEach((function(e){t(e)}))};e instanceof Array?e.forEach((function(e){r(e)})):r(e)}};i.useEffect((function(){a&&O.current&&R(O.current)&&K()})),r.useMountEffect((function(){ue()})),r.useUpdateEffect((function(){return ue(),function(){ae()}}),[Y,K,e.target]),r.useUpdateEffect((function(){if(a){var t=M(O.current,"position")||m,r=M(O.current,"classname");y(t),T(r),z(t),A(),U()}else y(e.position),T(""),O.current=null,H.current=null,j.current=!0;return function(){L(),N()}}),[a]),r.useUpdateEffect((function(){a&&ee("updateDelay",(function(){F(O.current,(function(){X(O.current)}))}))}),[e.content]),r.useUnmountEffect((function(){re(),ae(),o.ZIndexUtils.clear(x.current)})),i.useImperativeHandle(t,(function(){return{props:e,updateTargetEvents:oe,loadTargetEvents:ue,unloadTargetEvents:ae,getElement:function(){return x.current},getTarget:function(){return O.current}}}));var le,ce,se,fe,de,pe,ve;if(a){var he=(de=o.ObjectUtils.findDiffKeys(e,b.defaultProps),pe=o.classNames("p-tooltip p-component",(le={},ce="p-tooltip-".concat(m),se=!0,ce in le?Object.defineProperty(le,ce,{value:se,enumerable:!0,configurable:!0,writable:!0}):le[ce]=se,le),e.className,w),fe=O.current,ve=!(e.content||M(fe,"tooltip")),i.createElement("div",c({id:e.id,ref:x,className:pe,style:e.style,role:"tooltip","aria-hidden":a},de,{onMouseEnter:G,onMouseLeave:J}),i.createElement("div",{className:"p-tooltip-arrow"}),i.createElement("div",{ref:D,className:"p-tooltip-text"},ve&&e.children)));return i.createElement(n.Portal,{element:he,appendTo:e.appendTo,visible:!0})}return null})));b.displayName="Tooltip",b.defaultProps={__TYPE:"Tooltip",id:null,target:null,content:null,disabled:!1,className:null,style:null,appendTo:null,position:"right",my:null,at:null,event:null,showEvent:"mouseenter",hideEvent:"mouseleave",autoZIndex:!0,baseZIndex:0,mouseTrack:!1,mouseTrackTop:5,mouseTrackLeft:5,showDelay:0,updateDelay:0,hideDelay:0,autoHide:!0,showOnDisabled:!1,onBeforeShow:null,onBeforeHide:null,onShow:null,onHide:null},exports.Tooltip=b;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("primereact/api"),r=require("primereact/hooks"),n=require("primereact/portal"),o=require("primereact/utils");function u(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function a(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var i=a(e),l=u(t);function c(){return c=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},c.apply(this,arguments)}function s(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function f(e){if(Array.isArray(e))return s(e)}function d(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function p(e,t){if(e){if("string"==typeof e)return s(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?s(e,t):void 0}}function h(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function v(e){if(Array.isArray(e))return e}function m(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,o,u=[],a=!0,i=!1;try{for(r=r.call(e);!(a=(n=r.next()).done)&&(u.push(n.value),!t||u.length!==t);a=!0);}catch(e){i=!0,o=e}finally{try{a||null==r.return||r.return()}finally{if(i)throw o}}return u}}function y(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function g(e,t){return v(e)||m(e,t)||p(e,t)||y()}var b=i.memo(i.forwardRef((function(e,t){var u=g(i.useState(!1),2),a=u[0],s=u[1],v=g(i.useState(e.position),2),m=v[0],y=v[1],E=g(i.useState(""),2),w=E[0],T=E[1],x=i.useRef(null),D=i.useRef(null),O=i.useRef(null),H=i.useRef(null),j=i.useRef(!0),S=i.useRef({}),I=i.useRef(null),k=g(r.useResizeListener({listener:function(e){!o.DomHandler.isTouchDevice()&&K(e)}}),2),A=k[0],L=k[1],C=g(r.useOverlayScrollListener({target:O.current,listener:function(e){K(e)},when:a}),2),U=C[0],N=C[1],P=function(t){return M(t,"mousetrack")||e.mouseTrack},R=function(t){return"true"===M(t,"disabled")||_(t,"disabled")||e.disabled},Z=function(t){return M(t,"showondisabled")||e.showOnDisabled},W=function(){return M(O.current,"autohide")||e.autoHide},M=function(e,t){return _(e,"data-pr-".concat(t))?e.getAttribute("data-pr-".concat(t)):null},_=function(e,t){return e&&e.hasAttribute(t)},q=function(t){var r=[M(t,"showevent")||e.showEvent],n=[M(t,"hideevent")||e.hideEvent];if(P(t))r=["mousemove"],n=["mouseleave"];else{var o=M(t,"event")||e.event;"focus"===o&&(r=["focus"],n=["blur"]),"both"===o&&(r=["focus","mouseenter"],n=["blur","mouseleave"])}return{showEvents:r,hideEvents:n}},B=function(t){return{top:M(t,"mousetracktop")||e.mouseTrackTop,left:M(t,"mousetrackleft")||e.mouseTrackLeft}},F=function(t,r){if(D.current){var n=M(t,"tooltip")||e.content;n?(D.current.innerHTML="",D.current.appendChild(document.createTextNode(n)),r()):e.children&&r()}},z=function(t){F(O.current,(function(){var r=I.current,n=r.pageX,u=r.pageY;e.autoZIndex&&!o.ZIndexUtils.get(x.current)&&o.ZIndexUtils.set("tooltip",x.current,l.default.autoZIndex,e.baseZIndex||l.default.zIndex.tooltip),x.current.style.left="",x.current.style.top="",W()&&(x.current.style.pointerEvents="none"),P(O.current)&&!H.current&&(H.current={width:o.DomHandler.getOuterWidth(x.current),height:o.DomHandler.getOuterHeight(x.current)}),X(O.current,{x:n,y:u},t)}))},Y=function(t){O.current=t.currentTarget;var r,n=R(O.current);(r=Z(O.current)&&n?O.current.firstChild:O.current,!(e.content||M(r,"tooltip")||e.children))||n||(I.current=t,a?ee("updateDelay",z):te(e.onBeforeShow,{originalEvent:t,target:O.current})&&ee("showDelay",(function(){s(!0),te(e.onShow,{originalEvent:t,target:O.current})})))},K=function(t){(re(),a)&&(te(e.onBeforeHide,{originalEvent:t,target:O.current})&&ee("hideDelay",(function(){(W()||!1!==j.current)&&(o.ZIndexUtils.clear(x.current),o.DomHandler.removeClass(x.current,"p-tooltip-active"),s(!1),te(e.onHide,{originalEvent:t,target:O.current}))})))},X=function(t,r,n){var u=0,a=0,i=n||m;if(P(t)&&r){var l={width:o.DomHandler.getOuterWidth(x.current),height:o.DomHandler.getOuterHeight(x.current)};u=r.x,a=r.y;var c=B(t),s=c.top,f=c.left;switch(i){case"left":u-=l.width+f,a-=l.height/2-s;break;case"right":u+=f,a-=l.height/2-s;break;case"top":u-=l.width/2-f,a-=l.height+s;break;case"bottom":u-=l.width/2-f,a+=s}u<=0||H.current.width>l.width?(x.current.style.left="0px",x.current.style.right=window.innerWidth-l.width-u+"px"):(x.current.style.right="",x.current.style.left=u+"px"),x.current.style.top=a+"px",o.DomHandler.addClass(x.current,"p-tooltip-active")}else{var d=o.DomHandler.findCollisionPosition(i),p=M(t,"my")||e.my||d.my,h=M(t,"at")||e.at||d.at;x.current.style.padding="0px",o.DomHandler.flipfitCollision(x.current,t,p,h,(function(t){var r=t.at,n=r.x,u=e.at?"center"!==n&&n!==t.my.x?n:r.y:t.at["".concat(d.axis)];x.current.style.padding="",y(u),$(u),o.DomHandler.addClass(x.current,"p-tooltip-active")}))}},$=function(e){if(x.current){var t=getComputedStyle(x.current);"left"===e?x.current.style.left=parseFloat(t.left)-2*parseFloat(t.paddingLeft)+"px":"top"===e&&(x.current.style.top=parseFloat(t.top)-2*parseFloat(t.paddingTop)+"px")}},G=function(){W()||(j.current=!1)},J=function(e){W()||(j.current=!0,K(e))},Q=function(e){if(e){var t=q(e),r=t.showEvents,n=t.hideEvents,o=ne(e);r.forEach((function(e){return o.addEventListener(e,Y)})),n.forEach((function(e){return o.addEventListener(e,K)}))}},V=function(e){if(e){var t=q(e),r=t.showEvents,n=t.hideEvents,o=ne(e);r.forEach((function(e){return o.removeEventListener(e,Y)})),n.forEach((function(e){return o.removeEventListener(e,K)}))}},ee=function(t,r){re();var n=M(O.current,t.toLowerCase())||e[t];n?S.current["".concat(t)]=setTimeout((function(){return r()}),n):r()},te=function(e){if(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];var o=e.apply(void 0,r);return void 0===o&&(o=!0),o}return!0},re=function(){Object.values(S.current).forEach((function(e){return clearTimeout(e)}))},ne=function(e){if(e){if(Z(e)){if(e.hasWrapper)return e.parentElement;var t=document.createElement("span");return e.parentNode.insertBefore(t,e),t.appendChild(e),e.hasWrapper=!0,t}var r;return e.hasWrapper&&((r=e.parentElement).replaceWith.apply(r,f(n=e.parentElement.childNodes)||d(n)||p(n)||h()),delete e.hasWrapper),e}var n;return null},oe=function(e){ae(e),ue(e)},ue=function(t){ie(t||e.target,Q)},ae=function(t){ie(t||e.target,V)},ie=function(e,t){if(e=o.ObjectUtils.getRefElement(e))if(o.DomHandler.isElement(e))t(e);else{var r=function(e){o.DomHandler.find(document,e).forEach((function(e){t(e)}))};e instanceof Array?e.forEach((function(e){r(e)})):r(e)}};i.useEffect((function(){a&&O.current&&R(O.current)&&K()})),r.useMountEffect((function(){ue()})),r.useUpdateEffect((function(){return ue(),function(){ae()}}),[Y,K,e.target]),r.useUpdateEffect((function(){if(a){var t=M(O.current,"position")||m,r=M(O.current,"classname");y(t),T(r),z(t),A(),U()}else y(e.position),T(""),O.current=null,H.current=null,j.current=!0;return function(){L(),N()}}),[a]),r.useUpdateEffect((function(){a&&ee("updateDelay",(function(){F(O.current,(function(){X(O.current)}))}))}),[e.content]),r.useUnmountEffect((function(){re(),ae(),o.ZIndexUtils.clear(x.current)})),i.useImperativeHandle(t,(function(){return{props:e,updateTargetEvents:oe,loadTargetEvents:ue,unloadTargetEvents:ae,getElement:function(){return x.current},getTarget:function(){return O.current}}}));var le,ce,se,fe,de,pe,he;if(a){var ve=(de=o.ObjectUtils.findDiffKeys(e,b.defaultProps),pe=o.classNames("p-tooltip p-component",(le={},ce="p-tooltip-".concat(m),se=!0,ce in le?Object.defineProperty(le,ce,{value:se,enumerable:!0,configurable:!0,writable:!0}):le[ce]=se,le),e.className,w),fe=O.current,he=!(e.content||M(fe,"tooltip")),i.createElement("div",c({id:e.id,ref:x,className:pe,style:e.style,role:"tooltip","aria-hidden":a},de,{onMouseEnter:G,onMouseLeave:J}),i.createElement("div",{className:"p-tooltip-arrow"}),i.createElement("div",{ref:D,className:"p-tooltip-text"},he&&e.children)));return i.createElement(n.Portal,{element:ve,appendTo:e.appendTo,visible:!0})}return null})));b.displayName="Tooltip",b.defaultProps={__TYPE:"Tooltip",id:null,target:null,content:null,disabled:!1,className:null,style:null,appendTo:null,position:"right",my:null,at:null,event:null,showEvent:"mouseenter",hideEvent:"mouseleave",autoZIndex:!0,baseZIndex:0,mouseTrack:!1,mouseTrackTop:5,mouseTrackLeft:5,showDelay:0,updateDelay:0,hideDelay:0,autoHide:!0,showOnDisabled:!1,onBeforeShow:null,onBeforeHide:null,onShow:null,onHide:null},exports.Tooltip=b;

package/tooltip/tooltip.esm.js

@@ -191,24 +191,29 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
   };
 
   var getEvents = function getEvents(target) {
-    var showEvent = getTargetOption(target, 'showevent') || props.showEvent;
-    var hideEvent = getTargetOption(target, 'hideevent') || props.hideEvent;
+    var showEvents = [getTargetOption(target, 'showevent') || props.showEvent];
+    var hideEvents = [getTargetOption(target, 'hideevent') || props.hideEvent];
 
     if (isMouseTrack(target)) {
-      showEvent = 'mousemove';
-      hideEvent = 'mouseleave';
+      showEvents = ['mousemove'];
+      hideEvents = ['mouseleave'];
     } else {
       var event = getTargetOption(target, 'event') || props.event;
 
       if (event === 'focus') {
-        showEvent = 'focus';
-        hideEvent = 'blur';
+        showEvents = ['focus'];
+        hideEvents = ['blur'];
+      }
+
+      if (event === 'both') {
+        showEvents = ['focus', 'mouseenter'];
+        hideEvents = ['blur', 'mouseleave'];
       }
     }
 
     return {
-      showEvent: showEvent,
-      hideEvent: hideEvent
+      showEvents: showEvents,
+      hideEvents: hideEvents
     };
   };
 
@@ -421,24 +426,32 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
   var bindTargetEvent = function bindTargetEvent(target) {
     if (target) {
       var _getEvents = getEvents(target),
-          showEvent = _getEvents.showEvent,
-          hideEvent = _getEvents.hideEvent;
+          showEvents = _getEvents.showEvents,
+          hideEvents = _getEvents.hideEvents;
 
       var currentTarget = getTarget(target);
-      currentTarget.addEventListener(showEvent, show);
-      currentTarget.addEventListener(hideEvent, hide);
+      showEvents.forEach(function (event) {
+        return currentTarget.addEventListener(event, show);
+      });
+      hideEvents.forEach(function (event) {
+        return currentTarget.addEventListener(event, hide);
+      });
     }
   };
 
   var unbindTargetEvent = function unbindTargetEvent(target) {
     if (target) {
       var _getEvents2 = getEvents(target),
-          showEvent = _getEvents2.showEvent,
-          hideEvent = _getEvents2.hideEvent;
+          showEvents = _getEvents2.showEvents,
+          hideEvents = _getEvents2.hideEvents;
 
       var currentTarget = getTarget(target);
-      currentTarget.removeEventListener(showEvent, show);
-      currentTarget.removeEventListener(hideEvent, hide);
+      showEvents.forEach(function (event) {
+        return currentTarget.removeEventListener(event, show);
+      });
+      hideEvents.forEach(function (event) {
+        return currentTarget.removeEventListener(event, hide);
+      });
     }
   };