primereact 8.4.0 → 8.6.0

package/toolbar/toolbar.js

@@ -23,7 +23,7 @@ this.primereact.toolbar = (function (exports, React, utils) {
   var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
   function _extends() {
-    _extends = Object.assign || function (target) {
+    _extends = Object.assign ? Object.assign.bind() : function (target) {
       for (var i = 1; i < arguments.length; i++) {
         var source = arguments[i];
 
@@ -36,7 +36,6 @@ this.primereact.toolbar = (function (exports, React, utils) {
 
       return target;
     };
-
     return _extends.apply(this, arguments);
   }
 

package/toolbar/toolbar.min.js

@@ -1 +1 @@
-this.primereact=this.primereact||{},this.primereact.toolbar=function(e,t,r){"use strict";function l(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var l=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,l.get?l:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var a=l(t);function n(){return n=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var l in r)Object.prototype.hasOwnProperty.call(r,l)&&(e[l]=r[l])}return e},n.apply(this,arguments)}var o=a.memo(a.forwardRef((function(e,t){var l=a.useRef(null),i=r.ObjectUtils.findDiffKeys(e,o.defaultProps),c=r.classNames("p-toolbar p-component",e.className),s=r.ObjectUtils.getJSXElement(e.left,e),u=r.ObjectUtils.getJSXElement(e.right,e);return a.useImperativeHandle(t,(function(){return{props:e,getElement:function(){return l.current}}})),a.createElement("div",n({id:e.id,ref:l,className:c,style:e.style,role:"toolbar"},i),a.createElement("div",{className:"p-toolbar-group-left"},s),a.createElement("div",{className:"p-toolbar-group-right"},u))})));return o.displayName="Toolbar",o.defaultProps={__TYPE:"Toolbar",id:null,style:null,className:null,left:null,right:null},e.Toolbar=o,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.utils);
+this.primereact=this.primereact||{},this.primereact.toolbar=function(e,t,r){"use strict";function l(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var l=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,l.get?l:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var n=l(t);function a(){return a=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var l in r)Object.prototype.hasOwnProperty.call(r,l)&&(e[l]=r[l])}return e},a.apply(this,arguments)}var o=n.memo(n.forwardRef((function(e,t){var l=n.useRef(null),i=r.ObjectUtils.findDiffKeys(e,o.defaultProps),c=r.classNames("p-toolbar p-component",e.className),s=r.ObjectUtils.getJSXElement(e.left,e),u=r.ObjectUtils.getJSXElement(e.right,e);return n.useImperativeHandle(t,(function(){return{props:e,getElement:function(){return l.current}}})),n.createElement("div",a({id:e.id,ref:l,className:c,style:e.style,role:"toolbar"},i),n.createElement("div",{className:"p-toolbar-group-left"},s),n.createElement("div",{className:"p-toolbar-group-right"},u))})));return o.displayName="Toolbar",o.defaultProps={__TYPE:"Toolbar",id:null,style:null,className:null,left:null,right:null},e.Toolbar=o,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.utils);

package/tooltip/tooltip.cjs.js

@@ -32,7 +32,7 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var PrimeReact__default = /*#__PURE__*/_interopDefaultLegacy(PrimeReact);
 
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
 
@@ -45,7 +45,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -218,24 +217,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 +452,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),c=u(t);function l(){return l=Object.assign?Object.assign.bind():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},l.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,c.default.autoZIndex,e.baseZIndex||c.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 c={width:o.DomHandler.getOuterWidth(x.current),height:o.DomHandler.getOuterHeight(x.current)};u=r.x,a=r.y;var l=B(t),s=l.top,f=l.left;switch(i){case"left":u-=c.width+f,a-=c.height/2-s;break;case"right":u+=f,a-=c.height/2-s;break;case"top":u-=c.width/2-f,a-=c.height+s;break;case"bottom":u-=c.width/2-f,a+=s}u<=0||H.current.width>c.width?(x.current.style.left="0px",x.current.style.right=window.innerWidth-c.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 ce,le,se,fe,de,pe,he;if(a){var ve=(de=o.ObjectUtils.findDiffKeys(e,b.defaultProps),pe=o.classNames("p-tooltip p-component",(ce={},le="p-tooltip-".concat(m),se=!0,le in ce?Object.defineProperty(ce,le,{value:se,enumerable:!0,configurable:!0,writable:!0}):ce[le]=se,ce),e.className,w),fe=O.current,he=!(e.content||M(fe,"tooltip")),i.createElement("div",l({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

@@ -5,7 +5,7 @@ import { Portal } from 'primereact/portal';
 import { DomHandler, ZIndexUtils, ObjectUtils, classNames } from 'primereact/utils';
 
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
 
@@ -18,7 +18,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -191,24 +190,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 +425,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);
+      });
     }
   };
 

package/tooltip/tooltip.esm.min.js

@@ -1 +1 @@
-import*as e from"react";import t from"primereact/api";import{useResizeListener as r,useOverlayScrollListener as n,useMountEffect as o,useUpdateEffect as u,useUnmountEffect as i}from"primereact/hooks";import{Portal as a}from"primereact/portal";import{DomHandler as c,ZIndexUtils as l,ObjectUtils as s,classNames as f}from"primereact/utils";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 d(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 h(e){if(Array.isArray(e))return d(e)}function m(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 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)?d(e,t):void 0}}function y(){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){if(Array.isArray(e))return e}function E(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,o,u=[],i=!0,a=!1;try{for(r=r.call(e);!(i=(n=r.next()).done)&&(u.push(n.value),!t||u.length!==t);i=!0);}catch(e){a=!0,o=e}finally{try{i||null==r.return||r.return()}finally{if(a)throw o}}return u}}function b(){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 g(e)||E(e,t)||v(e,t)||b()}var T=e.memo(e.forwardRef((function(d,g){var E=w(e.useState(!1),2),b=E[0],x=E[1],S=w(e.useState(d.position),2),k=S[0],A=S[1],O=w(e.useState(""),2),I=O[0],C=O[1],D=e.useRef(null),H=e.useRef(null),L=e.useRef(null),N=e.useRef(null),R=e.useRef(!0),j=e.useRef({}),W=e.useRef(null),P=w(r({listener:function(e){!c.isTouchDevice()&&ee(e)}}),2),B=P[0],Z=P[1],F=w(n({target:L.current,listener:function(e){ee(e)},when:b}),2),M=F[0],Y=F[1],_=function(e){return X(e,"mousetrack")||d.mouseTrack},z=function(e){return"true"===X(e,"disabled")||$(e,"disabled")||d.disabled},K=function(e){return X(e,"showondisabled")||d.showOnDisabled},U=function(){return X(L.current,"autohide")||d.autoHide},X=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(e){var t=X(e,"showevent")||d.showEvent,r=X(e,"hideevent")||d.hideEvent;_(e)?(t="mousemove",r="mouseleave"):"focus"===(X(e,"event")||d.event)&&(t="focus",r="blur");return{showEvent:t,hideEvent:r}},G=function(e){return{top:X(e,"mousetracktop")||d.mouseTrackTop,left:X(e,"mousetrackleft")||d.mouseTrackLeft}},J=function(e,t){if(H.current){var r=X(e,"tooltip")||d.content;r?(H.current.innerHTML="",H.current.appendChild(document.createTextNode(r)),t()):d.children&&t()}},Q=function(e){J(L.current,(function(){var r=W.current,n=r.pageX,o=r.pageY;d.autoZIndex&&!l.get(D.current)&&l.set("tooltip",D.current,t.autoZIndex,d.baseZIndex||t.zIndex.tooltip),D.current.style.left="",D.current.style.top="",U()&&(D.current.style.pointerEvents="none"),_(L.current)&&!N.current&&(N.current={width:c.getOuterWidth(D.current),height:c.getOuterHeight(D.current)}),te(L.current,{x:n,y:o},e)}))},V=function(e){L.current=e.currentTarget;var t,r=z(L.current);(t=K(L.current)&&r?L.current.firstChild:L.current,!(d.content||X(t,"tooltip")||d.children))||r||(W.current=e,b?ae("updateDelay",Q):ce(d.onBeforeShow,{originalEvent:e,target:L.current})&&ae("showDelay",(function(){x(!0),ce(d.onShow,{originalEvent:e,target:L.current})})))},ee=function(e){(le(),b)&&(ce(d.onBeforeHide,{originalEvent:e,target:L.current})&&ae("hideDelay",(function(){(U()||!1!==R.current)&&(l.clear(D.current),c.removeClass(D.current,"p-tooltip-active"),x(!1),ce(d.onHide,{originalEvent:e,target:L.current}))})))},te=function(e,t,r){var n=0,o=0,u=r||k;if(_(e)&&t){var i={width:c.getOuterWidth(D.current),height:c.getOuterHeight(D.current)};n=t.x,o=t.y;var a=G(e),l=a.top,s=a.left;switch(u){case"left":n-=i.width+s,o-=i.height/2-l;break;case"right":n+=s,o-=i.height/2-l;break;case"top":n-=i.width/2-s,o-=i.height+l;break;case"bottom":n-=i.width/2-s,o+=l}n<=0||N.current.width>i.width?(D.current.style.left="0px",D.current.style.right=window.innerWidth-i.width-n+"px"):(D.current.style.right="",D.current.style.left=n+"px"),D.current.style.top=o+"px",c.addClass(D.current,"p-tooltip-active")}else{var f=c.findCollisionPosition(u),p=X(e,"my")||d.my||f.my,h=X(e,"at")||d.at||f.at;D.current.style.padding="0px",c.flipfitCollision(D.current,e,p,h,(function(e){var t=e.at,r=t.x,n=d.at?"center"!==r&&r!==e.my.x?r:t.y:e.at["".concat(f.axis)];D.current.style.padding="",A(n),re(n),c.addClass(D.current,"p-tooltip-active")}))}},re=function(e){if(D.current){var t=getComputedStyle(D.current);"left"===e?D.current.style.left=parseFloat(t.left)-2*parseFloat(t.paddingLeft)+"px":"top"===e&&(D.current.style.top=parseFloat(t.top)-2*parseFloat(t.paddingTop)+"px")}},ne=function(){U()||(R.current=!1)},oe=function(e){U()||(R.current=!0,ee(e))},ue=function(e){if(e){var t=q(e),r=t.showEvent,n=t.hideEvent,o=se(e);o.addEventListener(r,V),o.addEventListener(n,ee)}},ie=function(e){if(e){var t=q(e),r=t.showEvent,n=t.hideEvent,o=se(e);o.removeEventListener(r,V),o.removeEventListener(n,ee)}},ae=function(e,t){le();var r=X(L.current,e.toLowerCase())||d[e];r?j.current["".concat(e)]=setTimeout((function(){return t()}),r):t()},ce=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},le=function(){Object.values(j.current).forEach((function(e){return clearTimeout(e)}))},se=function(e){if(e){if(K(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,h(n=e.parentElement.childNodes)||m(n)||v(n)||y()),delete e.hasWrapper),e}var n;return null},fe=function(e){de(e),pe(e)},pe=function(e){he(e||d.target,ue)},de=function(e){he(e||d.target,ie)},he=function(e,t){if(e=s.getRefElement(e))if(c.isElement(e))t(e);else{var r=function(e){c.find(document,e).forEach((function(e){t(e)}))};e instanceof Array?e.forEach((function(e){r(e)})):r(e)}};e.useEffect((function(){b&&L.current&&z(L.current)&&ee()})),o((function(){pe()})),u((function(){return pe(),function(){de()}}),[V,ee,d.target]),u((function(){if(b){var e=X(L.current,"position")||k,t=X(L.current,"classname");A(e),C(t),Q(e),B(),M()}else A(d.position),C(""),L.current=null,N.current=null,R.current=!0;return function(){Z(),Y()}}),[b]),u((function(){b&&ae("updateDelay",(function(){J(L.current,(function(){te(L.current)}))}))}),[d.content]),i((function(){le(),de(),l.clear(D.current)})),e.useImperativeHandle(g,(function(){return{props:d,updateTargetEvents:fe,loadTargetEvents:pe,unloadTargetEvents:de,getElement:function(){return D.current},getTarget:function(){return L.current}}}));var me,ve,ye,ge,Ee,be,we;if(b){var Te=(Ee=s.findDiffKeys(d,T.defaultProps),be=f("p-tooltip p-component",(me={},ve="p-tooltip-".concat(k),ye=!0,ve in me?Object.defineProperty(me,ve,{value:ye,enumerable:!0,configurable:!0,writable:!0}):me[ve]=ye,me),d.className,I),ge=L.current,we=!(d.content||X(ge,"tooltip")),e.createElement("div",p({id:d.id,ref:D,className:be,style:d.style,role:"tooltip","aria-hidden":b},Ee,{onMouseEnter:ne,onMouseLeave:oe}),e.createElement("div",{className:"p-tooltip-arrow"}),e.createElement("div",{ref:H,className:"p-tooltip-text"},we&&d.children)));return e.createElement(a,{element:Te,appendTo:d.appendTo,visible:!0})}return null})));T.displayName="Tooltip",T.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};export{T as Tooltip};
+import*as e from"react";import t from"primereact/api";import{useResizeListener as r,useOverlayScrollListener as n,useMountEffect as o,useUpdateEffect as u,useUnmountEffect as i}from"primereact/hooks";import{Portal as a}from"primereact/portal";import{DomHandler as c,ZIndexUtils as l,ObjectUtils as s,classNames as f}from"primereact/utils";function p(){return p=Object.assign?Object.assign.bind():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 d(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 h(e){if(Array.isArray(e))return d(e)}function m(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 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)?d(e,t):void 0}}function y(){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){if(Array.isArray(e))return e}function E(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,o,u=[],i=!0,a=!1;try{for(r=r.call(e);!(i=(n=r.next()).done)&&(u.push(n.value),!t||u.length!==t);i=!0);}catch(e){a=!0,o=e}finally{try{i||null==r.return||r.return()}finally{if(a)throw o}}return u}}function b(){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 g(e)||E(e,t)||v(e,t)||b()}var T=e.memo(e.forwardRef((function(d,g){var E=w(e.useState(!1),2),b=E[0],x=E[1],S=w(e.useState(d.position),2),O=S[0],k=S[1],A=w(e.useState(""),2),I=A[0],C=A[1],D=e.useRef(null),H=e.useRef(null),L=e.useRef(null),j=e.useRef(null),N=e.useRef(!0),R=e.useRef({}),W=e.useRef(null),P=w(r({listener:function(e){!c.isTouchDevice()&&ee(e)}}),2),B=P[0],Z=P[1],F=w(n({target:L.current,listener:function(e){ee(e)},when:b}),2),M=F[0],Y=F[1],_=function(e){return X(e,"mousetrack")||d.mouseTrack},z=function(e){return"true"===X(e,"disabled")||$(e,"disabled")||d.disabled},K=function(e){return X(e,"showondisabled")||d.showOnDisabled},U=function(){return X(L.current,"autohide")||d.autoHide},X=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(e){var t=[X(e,"showevent")||d.showEvent],r=[X(e,"hideevent")||d.hideEvent];if(_(e))t=["mousemove"],r=["mouseleave"];else{var n=X(e,"event")||d.event;"focus"===n&&(t=["focus"],r=["blur"]),"both"===n&&(t=["focus","mouseenter"],r=["blur","mouseleave"])}return{showEvents:t,hideEvents:r}},G=function(e){return{top:X(e,"mousetracktop")||d.mouseTrackTop,left:X(e,"mousetrackleft")||d.mouseTrackLeft}},J=function(e,t){if(H.current){var r=X(e,"tooltip")||d.content;r?(H.current.innerHTML="",H.current.appendChild(document.createTextNode(r)),t()):d.children&&t()}},Q=function(e){J(L.current,(function(){var r=W.current,n=r.pageX,o=r.pageY;d.autoZIndex&&!l.get(D.current)&&l.set("tooltip",D.current,t.autoZIndex,d.baseZIndex||t.zIndex.tooltip),D.current.style.left="",D.current.style.top="",U()&&(D.current.style.pointerEvents="none"),_(L.current)&&!j.current&&(j.current={width:c.getOuterWidth(D.current),height:c.getOuterHeight(D.current)}),te(L.current,{x:n,y:o},e)}))},V=function(e){L.current=e.currentTarget;var t,r=z(L.current);(t=K(L.current)&&r?L.current.firstChild:L.current,!(d.content||X(t,"tooltip")||d.children))||r||(W.current=e,b?ae("updateDelay",Q):ce(d.onBeforeShow,{originalEvent:e,target:L.current})&&ae("showDelay",(function(){x(!0),ce(d.onShow,{originalEvent:e,target:L.current})})))},ee=function(e){(le(),b)&&(ce(d.onBeforeHide,{originalEvent:e,target:L.current})&&ae("hideDelay",(function(){(U()||!1!==N.current)&&(l.clear(D.current),c.removeClass(D.current,"p-tooltip-active"),x(!1),ce(d.onHide,{originalEvent:e,target:L.current}))})))},te=function(e,t,r){var n=0,o=0,u=r||O;if(_(e)&&t){var i={width:c.getOuterWidth(D.current),height:c.getOuterHeight(D.current)};n=t.x,o=t.y;var a=G(e),l=a.top,s=a.left;switch(u){case"left":n-=i.width+s,o-=i.height/2-l;break;case"right":n+=s,o-=i.height/2-l;break;case"top":n-=i.width/2-s,o-=i.height+l;break;case"bottom":n-=i.width/2-s,o+=l}n<=0||j.current.width>i.width?(D.current.style.left="0px",D.current.style.right=window.innerWidth-i.width-n+"px"):(D.current.style.right="",D.current.style.left=n+"px"),D.current.style.top=o+"px",c.addClass(D.current,"p-tooltip-active")}else{var f=c.findCollisionPosition(u),p=X(e,"my")||d.my||f.my,h=X(e,"at")||d.at||f.at;D.current.style.padding="0px",c.flipfitCollision(D.current,e,p,h,(function(e){var t=e.at,r=t.x,n=d.at?"center"!==r&&r!==e.my.x?r:t.y:e.at["".concat(f.axis)];D.current.style.padding="",k(n),re(n),c.addClass(D.current,"p-tooltip-active")}))}},re=function(e){if(D.current){var t=getComputedStyle(D.current);"left"===e?D.current.style.left=parseFloat(t.left)-2*parseFloat(t.paddingLeft)+"px":"top"===e&&(D.current.style.top=parseFloat(t.top)-2*parseFloat(t.paddingTop)+"px")}},ne=function(){U()||(N.current=!1)},oe=function(e){U()||(N.current=!0,ee(e))},ue=function(e){if(e){var t=q(e),r=t.showEvents,n=t.hideEvents,o=se(e);r.forEach((function(e){return o.addEventListener(e,V)})),n.forEach((function(e){return o.addEventListener(e,ee)}))}},ie=function(e){if(e){var t=q(e),r=t.showEvents,n=t.hideEvents,o=se(e);r.forEach((function(e){return o.removeEventListener(e,V)})),n.forEach((function(e){return o.removeEventListener(e,ee)}))}},ae=function(e,t){le();var r=X(L.current,e.toLowerCase())||d[e];r?R.current["".concat(e)]=setTimeout((function(){return t()}),r):t()},ce=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},le=function(){Object.values(R.current).forEach((function(e){return clearTimeout(e)}))},se=function(e){if(e){if(K(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,h(n=e.parentElement.childNodes)||m(n)||v(n)||y()),delete e.hasWrapper),e}var n;return null},fe=function(e){de(e),pe(e)},pe=function(e){he(e||d.target,ue)},de=function(e){he(e||d.target,ie)},he=function(e,t){if(e=s.getRefElement(e))if(c.isElement(e))t(e);else{var r=function(e){c.find(document,e).forEach((function(e){t(e)}))};e instanceof Array?e.forEach((function(e){r(e)})):r(e)}};e.useEffect((function(){b&&L.current&&z(L.current)&&ee()})),o((function(){pe()})),u((function(){return pe(),function(){de()}}),[V,ee,d.target]),u((function(){if(b){var e=X(L.current,"position")||O,t=X(L.current,"classname");k(e),C(t),Q(e),B(),M()}else k(d.position),C(""),L.current=null,j.current=null,N.current=!0;return function(){Z(),Y()}}),[b]),u((function(){b&&ae("updateDelay",(function(){J(L.current,(function(){te(L.current)}))}))}),[d.content]),i((function(){le(),de(),l.clear(D.current)})),e.useImperativeHandle(g,(function(){return{props:d,updateTargetEvents:fe,loadTargetEvents:pe,unloadTargetEvents:de,getElement:function(){return D.current},getTarget:function(){return L.current}}}));var me,ve,ye,ge,Ee,be,we;if(b){var Te=(Ee=s.findDiffKeys(d,T.defaultProps),be=f("p-tooltip p-component",(me={},ve="p-tooltip-".concat(O),ye=!0,ve in me?Object.defineProperty(me,ve,{value:ye,enumerable:!0,configurable:!0,writable:!0}):me[ve]=ye,me),d.className,I),ge=L.current,we=!(d.content||X(ge,"tooltip")),e.createElement("div",p({id:d.id,ref:D,className:be,style:d.style,role:"tooltip","aria-hidden":b},Ee,{onMouseEnter:ne,onMouseLeave:oe}),e.createElement("div",{className:"p-tooltip-arrow"}),e.createElement("div",{ref:H,className:"p-tooltip-text"},we&&d.children)));return e.createElement(a,{element:Te,appendTo:d.appendTo,visible:!0})}return null})));T.displayName="Tooltip",T.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};export{T as Tooltip};

package/tooltip/tooltip.js

@@ -26,7 +26,7 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
   var PrimeReact__default = /*#__PURE__*/_interopDefaultLegacy(PrimeReact);
 
   function _extends() {
-    _extends = Object.assign || function (target) {
+    _extends = Object.assign ? Object.assign.bind() : function (target) {
       for (var i = 1; i < arguments.length; i++) {
         var source = arguments[i];
 
@@ -39,7 +39,6 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
 
       return target;
     };
-
     return _extends.apply(this, arguments);
   }
 
@@ -212,24 +211,29 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
     };
 
     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
       };
     };
 
@@ -442,24 +446,32 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
     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.min.js

@@ -1 +1 @@
-this.primereact=this.primereact||{},this.primereact.tooltip=function(e,t,r,n,o,u){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function i(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 l=i(t),c=a(r);function s(){return s=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},s.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 d(e){if(Array.isArray(e))return f(e)}function p(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function h(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 m(){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 y(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 g(){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 b(e,t){return v(e)||y(e,t)||h(e,t)||g()}var E=l.memo(l.forwardRef((function(e,t){var r=b(l.useState(!1),2),a=r[0],i=r[1],f=b(l.useState(e.position),2),v=f[0],y=f[1],g=b(l.useState(""),2),w=g[0],T=g[1],x=l.useRef(null),D=l.useRef(null),O=l.useRef(null),H=l.useRef(null),j=l.useRef(!0),S=l.useRef({}),I=l.useRef(null),k=b(n.useResizeListener({listener:function(e){!u.DomHandler.isTouchDevice()&&X(e)}}),2),A=k[0],L=k[1],C=b(n.useOverlayScrollListener({target:O.current,listener:function(e){X(e)},when:a}),2),R=C[0],U=C[1],N=function(t){return M(t,"mousetrack")||e.mouseTrack},P=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)},B=function(t){var r=M(t,"showevent")||e.showEvent,n=M(t,"hideevent")||e.hideEvent;N(t)?(r="mousemove",n="mouseleave"):"focus"===(M(t,"event")||e.event)&&(r="focus",n="blur");return{showEvent:r,hideEvent:n}},F=function(t){return{top:M(t,"mousetracktop")||e.mouseTrackTop,left:M(t,"mousetrackleft")||e.mouseTrackLeft}},z=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()}},Y=function(t){z(O.current,(function(){var r=I.current,n=r.pageX,o=r.pageY;e.autoZIndex&&!u.ZIndexUtils.get(x.current)&&u.ZIndexUtils.set("tooltip",x.current,c.default.autoZIndex,e.baseZIndex||c.default.zIndex.tooltip),x.current.style.left="",x.current.style.top="",W()&&(x.current.style.pointerEvents="none"),N(O.current)&&!H.current&&(H.current={width:u.DomHandler.getOuterWidth(x.current),height:u.DomHandler.getOuterHeight(x.current)}),$(O.current,{x:n,y:o},t)}))},K=function(t){O.current=t.currentTarget;var r,n=P(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",Y):te(e.onBeforeShow,{originalEvent:t,target:O.current})&&ee("showDelay",(function(){i(!0),te(e.onShow,{originalEvent:t,target:O.current})})))},X=function(t){(re(),a)&&(te(e.onBeforeHide,{originalEvent:t,target:O.current})&&ee("hideDelay",(function(){(W()||!1!==j.current)&&(u.ZIndexUtils.clear(x.current),u.DomHandler.removeClass(x.current,"p-tooltip-active"),i(!1),te(e.onHide,{originalEvent:t,target:O.current}))})))},$=function(t,r,n){var o=0,a=0,i=n||v;if(N(t)&&r){var l={width:u.DomHandler.getOuterWidth(x.current),height:u.DomHandler.getOuterHeight(x.current)};o=r.x,a=r.y;var c=F(t),s=c.top,f=c.left;switch(i){case"left":o-=l.width+f,a-=l.height/2-s;break;case"right":o+=f,a-=l.height/2-s;break;case"top":o-=l.width/2-f,a-=l.height+s;break;case"bottom":o-=l.width/2-f,a+=s}o<=0||H.current.width>l.width?(x.current.style.left="0px",x.current.style.right=window.innerWidth-l.width-o+"px"):(x.current.style.right="",x.current.style.left=o+"px"),x.current.style.top=a+"px",u.DomHandler.addClass(x.current,"p-tooltip-active")}else{var d=u.DomHandler.findCollisionPosition(i),p=M(t,"my")||e.my||d.my,h=M(t,"at")||e.at||d.at;x.current.style.padding="0px",u.DomHandler.flipfitCollision(x.current,t,p,h,(function(t){var r=t.at,n=r.x,o=e.at?"center"!==n&&n!==t.my.x?n:r.y:t.at["".concat(d.axis)];x.current.style.padding="",y(o),q(o),u.DomHandler.addClass(x.current,"p-tooltip-active")}))}},q=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,X(e))},Q=function(e){if(e){var t=B(e),r=t.showEvent,n=t.hideEvent,o=ne(e);o.addEventListener(r,K),o.addEventListener(n,X)}},V=function(e){if(e){var t=B(e),r=t.showEvent,n=t.hideEvent,o=ne(e);o.removeEventListener(r,K),o.removeEventListener(n,X)}},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,d(n=e.parentElement.childNodes)||p(n)||h(n)||m()),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=u.ObjectUtils.getRefElement(e))if(u.DomHandler.isElement(e))t(e);else{var r=function(e){u.DomHandler.find(document,e).forEach((function(e){t(e)}))};e instanceof Array?e.forEach((function(e){r(e)})):r(e)}};l.useEffect((function(){a&&O.current&&P(O.current)&&X()})),n.useMountEffect((function(){ue()})),n.useUpdateEffect((function(){return ue(),function(){ae()}}),[K,X,e.target]),n.useUpdateEffect((function(){if(a){var t=M(O.current,"position")||v,r=M(O.current,"classname");y(t),T(r),Y(t),A(),R()}else y(e.position),T(""),O.current=null,H.current=null,j.current=!0;return function(){L(),U()}}),[a]),n.useUpdateEffect((function(){a&&ee("updateDelay",(function(){z(O.current,(function(){$(O.current)}))}))}),[e.content]),n.useUnmountEffect((function(){re(),ae(),u.ZIndexUtils.clear(x.current)})),l.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 me=(de=u.ObjectUtils.findDiffKeys(e,E.defaultProps),pe=u.classNames("p-tooltip p-component",(le={},ce="p-tooltip-".concat(v),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")),l.createElement("div",s({id:e.id,ref:x,className:pe,style:e.style,role:"tooltip","aria-hidden":a},de,{onMouseEnter:G,onMouseLeave:J}),l.createElement("div",{className:"p-tooltip-arrow"}),l.createElement("div",{ref:D,className:"p-tooltip-text"},he&&e.children)));return l.createElement(o.Portal,{element:me,appendTo:e.appendTo,visible:!0})}return null})));return E.displayName="Tooltip",E.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},e.Tooltip=E,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.api,primereact.hooks,primereact.portal,primereact.utils);
+this.primereact=this.primereact||{},this.primereact.tooltip=function(e,t,r,n,o,u){"use strict";function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function i(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 c=i(t),l=a(r);function s(){return s=Object.assign?Object.assign.bind():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},s.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 d(e){if(Array.isArray(e))return f(e)}function p(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function h(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 m(){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 y(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 g(){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 b(e,t){return v(e)||y(e,t)||h(e,t)||g()}var E=c.memo(c.forwardRef((function(e,t){var r=b(c.useState(!1),2),a=r[0],i=r[1],f=b(c.useState(e.position),2),v=f[0],y=f[1],g=b(c.useState(""),2),w=g[0],T=g[1],x=c.useRef(null),D=c.useRef(null),O=c.useRef(null),H=c.useRef(null),j=c.useRef(!0),S=c.useRef({}),I=c.useRef(null),k=b(n.useResizeListener({listener:function(e){!u.DomHandler.isTouchDevice()&&X(e)}}),2),A=k[0],L=k[1],C=b(n.useOverlayScrollListener({target:O.current,listener:function(e){X(e)},when:a}),2),R=C[0],U=C[1],N=function(t){return M(t,"mousetrack")||e.mouseTrack},P=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)},B=function(t){var r=[M(t,"showevent")||e.showEvent],n=[M(t,"hideevent")||e.hideEvent];if(N(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}},F=function(t){return{top:M(t,"mousetracktop")||e.mouseTrackTop,left:M(t,"mousetrackleft")||e.mouseTrackLeft}},z=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()}},Y=function(t){z(O.current,(function(){var r=I.current,n=r.pageX,o=r.pageY;e.autoZIndex&&!u.ZIndexUtils.get(x.current)&&u.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"),N(O.current)&&!H.current&&(H.current={width:u.DomHandler.getOuterWidth(x.current),height:u.DomHandler.getOuterHeight(x.current)}),$(O.current,{x:n,y:o},t)}))},K=function(t){O.current=t.currentTarget;var r,n=P(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",Y):te(e.onBeforeShow,{originalEvent:t,target:O.current})&&ee("showDelay",(function(){i(!0),te(e.onShow,{originalEvent:t,target:O.current})})))},X=function(t){(re(),a)&&(te(e.onBeforeHide,{originalEvent:t,target:O.current})&&ee("hideDelay",(function(){(W()||!1!==j.current)&&(u.ZIndexUtils.clear(x.current),u.DomHandler.removeClass(x.current,"p-tooltip-active"),i(!1),te(e.onHide,{originalEvent:t,target:O.current}))})))},$=function(t,r,n){var o=0,a=0,i=n||v;if(N(t)&&r){var c={width:u.DomHandler.getOuterWidth(x.current),height:u.DomHandler.getOuterHeight(x.current)};o=r.x,a=r.y;var l=F(t),s=l.top,f=l.left;switch(i){case"left":o-=c.width+f,a-=c.height/2-s;break;case"right":o+=f,a-=c.height/2-s;break;case"top":o-=c.width/2-f,a-=c.height+s;break;case"bottom":o-=c.width/2-f,a+=s}o<=0||H.current.width>c.width?(x.current.style.left="0px",x.current.style.right=window.innerWidth-c.width-o+"px"):(x.current.style.right="",x.current.style.left=o+"px"),x.current.style.top=a+"px",u.DomHandler.addClass(x.current,"p-tooltip-active")}else{var d=u.DomHandler.findCollisionPosition(i),p=M(t,"my")||e.my||d.my,h=M(t,"at")||e.at||d.at;x.current.style.padding="0px",u.DomHandler.flipfitCollision(x.current,t,p,h,(function(t){var r=t.at,n=r.x,o=e.at?"center"!==n&&n!==t.my.x?n:r.y:t.at["".concat(d.axis)];x.current.style.padding="",y(o),q(o),u.DomHandler.addClass(x.current,"p-tooltip-active")}))}},q=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,X(e))},Q=function(e){if(e){var t=B(e),r=t.showEvents,n=t.hideEvents,o=ne(e);r.forEach((function(e){return o.addEventListener(e,K)})),n.forEach((function(e){return o.addEventListener(e,X)}))}},V=function(e){if(e){var t=B(e),r=t.showEvents,n=t.hideEvents,o=ne(e);r.forEach((function(e){return o.removeEventListener(e,K)})),n.forEach((function(e){return o.removeEventListener(e,X)}))}},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,d(n=e.parentElement.childNodes)||p(n)||h(n)||m()),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=u.ObjectUtils.getRefElement(e))if(u.DomHandler.isElement(e))t(e);else{var r=function(e){u.DomHandler.find(document,e).forEach((function(e){t(e)}))};e instanceof Array?e.forEach((function(e){r(e)})):r(e)}};c.useEffect((function(){a&&O.current&&P(O.current)&&X()})),n.useMountEffect((function(){ue()})),n.useUpdateEffect((function(){return ue(),function(){ae()}}),[K,X,e.target]),n.useUpdateEffect((function(){if(a){var t=M(O.current,"position")||v,r=M(O.current,"classname");y(t),T(r),Y(t),A(),R()}else y(e.position),T(""),O.current=null,H.current=null,j.current=!0;return function(){L(),U()}}),[a]),n.useUpdateEffect((function(){a&&ee("updateDelay",(function(){z(O.current,(function(){$(O.current)}))}))}),[e.content]),n.useUnmountEffect((function(){re(),ae(),u.ZIndexUtils.clear(x.current)})),c.useImperativeHandle(t,(function(){return{props:e,updateTargetEvents:oe,loadTargetEvents:ue,unloadTargetEvents:ae,getElement:function(){return x.current},getTarget:function(){return O.current}}}));var ce,le,se,fe,de,pe,he;if(a){var me=(de=u.ObjectUtils.findDiffKeys(e,E.defaultProps),pe=u.classNames("p-tooltip p-component",(ce={},le="p-tooltip-".concat(v),se=!0,le in ce?Object.defineProperty(ce,le,{value:se,enumerable:!0,configurable:!0,writable:!0}):ce[le]=se,ce),e.className,w),fe=O.current,he=!(e.content||M(fe,"tooltip")),c.createElement("div",s({id:e.id,ref:x,className:pe,style:e.style,role:"tooltip","aria-hidden":a},de,{onMouseEnter:G,onMouseLeave:J}),c.createElement("div",{className:"p-tooltip-arrow"}),c.createElement("div",{ref:D,className:"p-tooltip-text"},he&&e.children)));return c.createElement(o.Portal,{element:me,appendTo:e.appendTo,visible:!0})}return null})));return E.displayName="Tooltip",E.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},e.Tooltip=E,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.api,primereact.hooks,primereact.portal,primereact.utils);

package/tooltip/tooltipoptions.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 
 type TooltipPositionType = 'top' | 'bottom' | 'left' | 'right';
 
-type TooltipEventType = 'hover' | 'focus';
+type TooltipEventType = 'hover' | 'focus' | 'both';
 
 type TooltipAppendToType = 'self' | HTMLElement | undefined | null;
 

package/tree/tree.cjs.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var utils = require('primereact/utils');
+var api = require('primereact/api');
 var ripple = require('primereact/ripple');
 
 function _interopNamespace(e) {
@@ -27,7 +28,7 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
 
@@ -40,7 +41,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -646,7 +646,7 @@ var UITreeNode = /*#__PURE__*/React__namespace.memo(function (props) {
   };
 
   var onDragStart = function onDragStart(event) {
-    event.dataTransfer.setData("text", props.dragdropScope);
+    event.dataTransfer.setData('text', props.dragdropScope);
     event.dataTransfer.setData(props.dragdropScope, props.dragdropScope);
 
     if (props.onDragStart) {
@@ -726,6 +726,7 @@ var UITreeNode = /*#__PURE__*/React__namespace.memo(function (props) {
   };
 
   var createToggler = function createToggler() {
+    var label = expanded ? api.ariaLabel('collapseLabel') : api.ariaLabel('expandLabel');
     var iconClassName = utils.classNames('p-tree-toggler-icon pi pi-fw', {
       'pi-chevron-right': !expanded,
       'pi-chevron-down': expanded
@@ -734,9 +735,11 @@ var UITreeNode = /*#__PURE__*/React__namespace.memo(function (props) {
       type: "button",
       className: "p-tree-toggler p-link",
       tabIndex: -1,
-      onClick: onTogglerClick
+      onClick: onTogglerClick,
+      "aria-label": label
     }, /*#__PURE__*/React__namespace.createElement("span", {
-      className: iconClassName
+      className: iconClassName,
+      "aria-hidden": "true"
     }), /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null));
 
     if (props.togglerTemplate) {
@@ -1272,13 +1275,11 @@ var Tree = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.for
     if (props.value) {
       var rootNodes = createRootChildren();
       var contentClass = utils.classNames('p-tree-container', props.contentClassName);
-      return /*#__PURE__*/React__namespace.createElement("ul", {
+      return /*#__PURE__*/React__namespace.createElement("ul", _extends({
         className: contentClass,
         role: "tree",
-        "aria-label": props.ariaLabel,
-        "aria-labelledby": props.ariaLabelledBy,
         style: props.contentStyle
-      }, rootNodes);
+      }, ariaProps), rootNodes);
     }
 
     return null;
@@ -1372,6 +1373,7 @@ var Tree = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.for
   };
 
   var otherProps = utils.ObjectUtils.findDiffKeys(props, Tree.defaultProps);
+  var ariaProps = utils.ObjectUtils.reduceKeys(otherProps, utils.DomHandler.ARIA_PROPS);
   var className = utils.classNames('p-tree p-component', props.className, {
     'p-tree-selectable': props.selectionMode,
     'p-tree-loading': props.loading,