primereact 8.1.1 → 8.2.0

package/tooltip/tooltip.cjs.js

@@ -152,6 +152,11 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
       positionState = _React$useState4[0],
       setPositionState = _React$useState4[1];
 
+  var _React$useState5 = React__namespace.useState(''),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      classNameState = _React$useState6[0],
+      setClassNameState = _React$useState6[1];
+
   var elementRef = React__namespace.useRef(null);
   var textRef = React__namespace.useRef(null);
   var currentTargetRef = React__namespace.useRef(null);
@@ -270,7 +275,7 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
       return;
     }
 
-    var updateTooltipState = function updateTooltipState() {
+    var updateTooltipState = function updateTooltipState(position) {
       updateText(currentTargetRef.current, function () {
         if (props.autoZIndex && !utils.ZIndexUtils.get(elementRef.current)) {
           utils.ZIndexUtils.set('tooltip', elementRef.current, PrimeReact__default["default"].autoZIndex, props.baseZIndex || PrimeReact__default["default"].zIndex['tooltip']);
@@ -293,7 +298,7 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
         align(currentTargetRef.current, {
           x: e.pageX,
           y: e.pageY
-        });
+        }, position);
       });
     };
 
@@ -308,16 +313,16 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
 
       if (success) {
         applyDelay('showDelay', function () {
+          var position = getPosition(currentTargetRef.current);
+          var classname = getTargetOption(currentTargetRef.current, 'classname');
           setVisibleState(true);
-          setPositionState(getPosition(currentTargetRef.current));
-          setTimeout(function () {
-            return updateTooltipState();
-          }, 0);
+          setPositionState(position);
+          setClassNameState(classname);
+          updateTooltipState(position);
           sendCallback(props.onShow, {
             originalEvent: e,
             target: currentTargetRef.current
           });
-          utils.DomHandler.addClass(currentTargetRef.current, getTargetOption(currentTargetRef.current, 'classname'));
         });
       }
     }
@@ -327,7 +332,6 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
     clearTimeouts();
 
     if (visibleState) {
-      utils.DomHandler.removeClass(currentTargetRef.current, getTargetOption(currentTargetRef.current, 'classname'));
       var success = sendCallback(props.onBeforeHide, {
         originalEvent: e,
         target: currentTargetRef.current
@@ -343,6 +347,7 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
           utils.DomHandler.removeClass(elementRef.current, 'p-tooltip-active');
           setVisibleState(false);
           setPositionState(props.position);
+          setClassNameState('');
           currentTargetRef.current = null;
           containerSize.current = null;
           allowHide.current = true;
@@ -355,9 +360,10 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
     }
   };
 
-  var align = function align(target, coordinate) {
+  var align = function align(target, coordinate, position) {
     var left = 0,
-        top = 0;
+        top = 0,
+        currentPosition = position || positionState;
 
     if (isMouseTrack(target) && coordinate) {
       var _containerSize = {
@@ -371,7 +377,7 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
           mouseTrackTop = _getMouseTrackPositio.top,
           mouseTrackLeft = _getMouseTrackPositio.left;
 
-      switch (positionState) {
+      switch (currentPosition) {
         case 'left':
           left -= _containerSize.width + mouseTrackLeft;
           top -= _containerSize.height / 2 - mouseTrackTop;
@@ -404,28 +410,28 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
       elementRef.current.style.top = top + 'px';
       utils.DomHandler.addClass(elementRef.current, 'p-tooltip-active');
     } else {
-      var pos = utils.DomHandler.findCollisionPosition(positionState);
+      var pos = utils.DomHandler.findCollisionPosition(currentPosition);
       var my = getTargetOption(target, 'my') || props.my || pos.my;
       var at = getTargetOption(target, 'at') || props.at || pos.at;
       elementRef.current.style.padding = '0px';
-      utils.DomHandler.flipfitCollision(elementRef.current, target, my, at, function (currentPosition) {
-        var _currentPosition$at = currentPosition.at,
-            atX = _currentPosition$at.x,
-            atY = _currentPosition$at.y;
-        var myX = currentPosition.my.x;
-        var newPosition = props.at ? atX !== 'center' && atX !== myX ? atX : atY : currentPosition.at["".concat(pos.axis)];
+      utils.DomHandler.flipfitCollision(elementRef.current, target, my, at, function (calculatedPosition) {
+        var _calculatedPosition$a = calculatedPosition.at,
+            atX = _calculatedPosition$a.x,
+            atY = _calculatedPosition$a.y;
+        var myX = calculatedPosition.my.x;
+        var newPosition = props.at ? atX !== 'center' && atX !== myX ? atX : atY : calculatedPosition.at["".concat(pos.axis)];
         elementRef.current.style.padding = '';
         setPositionState(newPosition);
-        updateContainerPosition();
+        updateContainerPosition(newPosition);
         utils.DomHandler.addClass(elementRef.current, 'p-tooltip-active');
       });
     }
   };
 
-  var updateContainerPosition = function updateContainerPosition() {
+  var updateContainerPosition = function updateContainerPosition(position) {
     if (elementRef.current) {
       var style = getComputedStyle(elementRef.current);
-      if (positionState === 'left') elementRef.current.style.left = parseFloat(style.left) - parseFloat(style.paddingLeft) * 2 + 'px';else if (positionState === 'top') elementRef.current.style.top = parseFloat(style.top) - parseFloat(style.paddingTop) * 2 + 'px';
+      if (position === 'left') elementRef.current.style.left = parseFloat(style.left) - parseFloat(style.paddingLeft) * 2 + 'px';else if (position === 'top') elementRef.current.style.top = parseFloat(style.top) - parseFloat(style.paddingTop) * 2 + 'px';
     }
   };
 
@@ -611,7 +617,7 @@ var Tooltip = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.
 
   var createElement = function createElement() {
     var otherProps = utils.ObjectUtils.findDiffKeys(props, Tooltip.defaultProps);
-    var tooltipClassName = utils.classNames('p-tooltip p-component', _defineProperty({}, "p-tooltip-".concat(positionState), true), props.className);
+    var tooltipClassName = utils.classNames('p-tooltip p-component', _defineProperty({}, "p-tooltip-".concat(positionState), true), props.className, classNameState);
     var empty = isTargetContentEmpty(currentTargetRef.current);
     return /*#__PURE__*/React__namespace.createElement("div", _extends({
       id: props.id,

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 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 h(e){if(Array.isArray(e))return e}function v(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)||v(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),v=h[0],y=h[1],E=i.useRef(null),w=i.useRef(null),T=i.useRef(null),x=i.useRef(null),D=i.useRef(!0),H=i.useRef({}),O=g(r.useResizeListener({listener:function(e){!o.DomHandler.isTouchDevice()&&B(e)}}),2),j=O[0],I=O[1],S=g(r.useOverlayScrollListener({target:T.current,listener:function(e){B(e)},when:a}),2),k=S[0],A=S[1],C=function(t){return P(t,"mousetrack")||e.mouseTrack},L=function(t){return"true"===P(t,"disabled")||R(t,"disabled")||e.disabled},U=function(t){return P(t,"showondisabled")||e.showOnDisabled},N=function(){return P(T.current,"autohide")||e.autoHide},P=function(e,t){return R(e,"data-pr-".concat(t))?e.getAttribute("data-pr-".concat(t)):null},R=function(e,t){return e&&e.hasAttribute(t)},Z=function(t){var r=P(t,"showevent")||e.showEvent,n=P(t,"hideevent")||e.hideEvent;C(t)?(r="mousemove",n="mouseleave"):"focus"===(P(t,"event")||e.event)&&(r="focus",n="blur");return{showEvent:r,hideEvent:n}},W=function(e){return P(e,"position")||v},M=function(t){return{top:P(t,"mousetracktop")||e.mouseTrackTop,left:P(t,"mousetrackleft")||e.mouseTrackLeft}},_=function(t,r){if(w.current){var n=P(t,"tooltip")||e.content;n?(w.current.innerHTML="",w.current.appendChild(document.createTextNode(n)),r()):e.children&&r()}},q=function(t){T.current=t.currentTarget;var r,n=L(T.current);if(!(r=U(T.current)&&n?T.current.firstChild:T.current,!(e.content||P(r,"tooltip")||e.children))&&!n){var u=function(){_(T.current,(function(){e.autoZIndex&&!o.ZIndexUtils.get(E.current)&&o.ZIndexUtils.set("tooltip",E.current,l.default.autoZIndex,e.baseZIndex||l.default.zIndex.tooltip),E.current.style.left="",E.current.style.top="",N()&&(E.current.style.pointerEvents="none"),C(T.current)&&!x.current&&(x.current={width:o.DomHandler.getOuterWidth(E.current),height:o.DomHandler.getOuterHeight(E.current)}),F(T.current,{x:t.pageX,y:t.pageY})}))};if(a)G("updateDelay",u);else J(e.onBeforeShow,{originalEvent:t,target:T.current})&&G("showDelay",(function(){s(!0),y(W(T.current)),setTimeout((function(){return u()}),0),J(e.onShow,{originalEvent:t,target:T.current}),o.DomHandler.addClass(T.current,P(T.current,"classname"))}))}},B=function(t){(Q(),a)&&(o.DomHandler.removeClass(T.current,P(T.current,"classname")),J(e.onBeforeHide,{originalEvent:t,target:T.current})&&G("hideDelay",(function(){(N()||!1!==D.current)&&(o.ZIndexUtils.clear(E.current),o.DomHandler.removeClass(E.current,"p-tooltip-active"),s(!1),y(e.position),T.current=null,x.current=null,D.current=!0,J(e.onHide,{originalEvent:t,target:T.current}))})))},F=function(t,r){var n=0,u=0;if(C(t)&&r){var a={width:o.DomHandler.getOuterWidth(E.current),height:o.DomHandler.getOuterHeight(E.current)};n=r.x,u=r.y;var i=M(t),l=i.top,c=i.left;switch(v){case"left":n-=a.width+c,u-=a.height/2-l;break;case"right":n+=c,u-=a.height/2-l;break;case"top":n-=a.width/2-c,u-=a.height+l;break;case"bottom":n-=a.width/2-c,u+=l}n<=0||x.current.width>a.width?(E.current.style.left="0px",E.current.style.right=window.innerWidth-a.width-n+"px"):(E.current.style.right="",E.current.style.left=n+"px"),E.current.style.top=u+"px",o.DomHandler.addClass(E.current,"p-tooltip-active")}else{var s=o.DomHandler.findCollisionPosition(v),f=P(t,"my")||e.my||s.my,d=P(t,"at")||e.at||s.at;E.current.style.padding="0px",o.DomHandler.flipfitCollision(E.current,t,f,d,(function(t){var r=t.at,n=r.x,u=e.at?"center"!==n&&n!==t.my.x?n:r.y:t.at["".concat(s.axis)];E.current.style.padding="",y(u),z(),o.DomHandler.addClass(E.current,"p-tooltip-active")}))}},z=function(){if(E.current){var e=getComputedStyle(E.current);"left"===v?E.current.style.left=parseFloat(e.left)-2*parseFloat(e.paddingLeft)+"px":"top"===v&&(E.current.style.top=parseFloat(e.top)-2*parseFloat(e.paddingTop)+"px")}},Y=function(){N()||(D.current=!1)},K=function(e){N()||(D.current=!0,B(e))},X=function(e){if(e){var t=Z(e),r=t.showEvent,n=t.hideEvent,o=V(e);o.addEventListener(r,q),o.addEventListener(n,B)}},$=function(e){if(e){var t=Z(e),r=t.showEvent,n=t.hideEvent,o=V(e);o.removeEventListener(r,q),o.removeEventListener(n,B)}},G=function(t,r){Q();var n=P(T.current,t.toLowerCase())||e[t];n?H.current["".concat(t)]=setTimeout((function(){return r()}),n):r()},J=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},Q=function(){Object.keys(H.current).forEach((function(e){return clearTimeout(e)}))},V=function(e){if(e){if(U(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)||m()),delete e.hasWrapper),e}var n;return null},ee=function(e){re(e),te(e)},te=function(t){ne(t||e.target,X)},re=function(t){ne(t||e.target,$)},ne=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&&T.current&&L(T.current)&&B()})),r.useMountEffect((function(){te()})),r.useUpdateEffect((function(){return te(),function(){re()}}),[q,B,e.target]),r.useUpdateEffect((function(){return a&&(j(),k()),function(){I(),A()}}),[a]),r.useUpdateEffect((function(){a&&G("updateDelay",(function(){_(T.current,(function(){F(T.current)}))}))}),[e.content]),r.useUnmountEffect((function(){Q(),re(),o.ZIndexUtils.clear(E.current)})),i.useImperativeHandle(t,(function(){return{updateTargetEvents:ee,loadTargetEvents:te,unloadTargetEvents:re}}));var oe,ue,ae,ie,le,ce,se;if(a){var fe=(le=o.ObjectUtils.findDiffKeys(e,b.defaultProps),ce=o.classNames("p-tooltip p-component",(oe={},ue="p-tooltip-".concat(v),ae=!0,ue in oe?Object.defineProperty(oe,ue,{value:ae,enumerable:!0,configurable:!0,writable:!0}):oe[ue]=ae,oe),e.className),ie=T.current,se=!(e.content||P(ie,"tooltip")),i.createElement("div",c({id:e.id,ref:E,className:ce,style:e.style,role:"tooltip","aria-hidden":a},le,{onMouseEnter:Y,onMouseLeave:K}),i.createElement("div",{className:"p-tooltip-arrow"}),i.createElement("div",{ref:w,className:"p-tooltip-text"},se&&e.children)));return i.createElement(n.Portal,{element:fe,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],x=E[1],T=i.useRef(null),D=i.useRef(null),O=i.useRef(null),H=i.useRef(null),j=i.useRef(!0),S=i.useRef({}),I=g(r.useResizeListener({listener:function(e){!o.DomHandler.isTouchDevice()&&Y(e)}}),2),k=I[0],A=I[1],L=g(r.useOverlayScrollListener({target:O.current,listener:function(e){Y(e)},when:a}),2),C=L[0],U=L[1],N=function(t){return W(t,"mousetrack")||e.mouseTrack},P=function(t){return"true"===W(t,"disabled")||M(t,"disabled")||e.disabled},R=function(t){return W(t,"showondisabled")||e.showOnDisabled},Z=function(){return W(O.current,"autohide")||e.autoHide},W=function(e,t){return M(e,"data-pr-".concat(t))?e.getAttribute("data-pr-".concat(t)):null},M=function(e,t){return e&&e.hasAttribute(t)},_=function(t){var r=W(t,"showevent")||e.showEvent,n=W(t,"hideevent")||e.hideEvent;N(t)?(r="mousemove",n="mouseleave"):"focus"===(W(t,"event")||e.event)&&(r="focus",n="blur");return{showEvent:r,hideEvent:n}},q=function(e){return W(e,"position")||m},B=function(t){return{top:W(t,"mousetracktop")||e.mouseTrackTop,left:W(t,"mousetrackleft")||e.mouseTrackLeft}},F=function(t,r){if(D.current){var n=W(t,"tooltip")||e.content;n?(D.current.innerHTML="",D.current.appendChild(document.createTextNode(n)),r()):e.children&&r()}},z=function(t){O.current=t.currentTarget;var r,n=P(O.current);if(!(r=R(O.current)&&n?O.current.firstChild:O.current,!(e.content||W(r,"tooltip")||e.children))&&!n){var u=function(r){F(O.current,(function(){e.autoZIndex&&!o.ZIndexUtils.get(T.current)&&o.ZIndexUtils.set("tooltip",T.current,l.default.autoZIndex,e.baseZIndex||l.default.zIndex.tooltip),T.current.style.left="",T.current.style.top="",Z()&&(T.current.style.pointerEvents="none"),N(O.current)&&!H.current&&(H.current={width:o.DomHandler.getOuterWidth(T.current),height:o.DomHandler.getOuterHeight(T.current)}),K(O.current,{x:t.pageX,y:t.pageY},r)}))};if(a)V("updateDelay",u);else ee(e.onBeforeShow,{originalEvent:t,target:O.current})&&V("showDelay",(function(){var r=q(O.current),n=W(O.current,"classname");s(!0),y(r),x(n),u(r),ee(e.onShow,{originalEvent:t,target:O.current})}))}},Y=function(t){(te(),a)&&(ee(e.onBeforeHide,{originalEvent:t,target:O.current})&&V("hideDelay",(function(){(Z()||!1!==j.current)&&(o.ZIndexUtils.clear(T.current),o.DomHandler.removeClass(T.current,"p-tooltip-active"),s(!1),y(e.position),x(""),O.current=null,H.current=null,j.current=!0,ee(e.onHide,{originalEvent:t,target:O.current}))})))},K=function(t,r,n){var u=0,a=0,i=n||m;if(N(t)&&r){var l={width:o.DomHandler.getOuterWidth(T.current),height:o.DomHandler.getOuterHeight(T.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?(T.current.style.left="0px",T.current.style.right=window.innerWidth-l.width-u+"px"):(T.current.style.right="",T.current.style.left=u+"px"),T.current.style.top=a+"px",o.DomHandler.addClass(T.current,"p-tooltip-active")}else{var d=o.DomHandler.findCollisionPosition(i),p=W(t,"my")||e.my||d.my,h=W(t,"at")||e.at||d.at;T.current.style.padding="0px",o.DomHandler.flipfitCollision(T.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)];T.current.style.padding="",y(u),X(u),o.DomHandler.addClass(T.current,"p-tooltip-active")}))}},X=function(e){if(T.current){var t=getComputedStyle(T.current);"left"===e?T.current.style.left=parseFloat(t.left)-2*parseFloat(t.paddingLeft)+"px":"top"===e&&(T.current.style.top=parseFloat(t.top)-2*parseFloat(t.paddingTop)+"px")}},$=function(){Z()||(j.current=!1)},G=function(e){Z()||(j.current=!0,Y(e))},J=function(e){if(e){var t=_(e),r=t.showEvent,n=t.hideEvent,o=re(e);o.addEventListener(r,z),o.addEventListener(n,Y)}},Q=function(e){if(e){var t=_(e),r=t.showEvent,n=t.hideEvent,o=re(e);o.removeEventListener(r,z),o.removeEventListener(n,Y)}},V=function(t,r){te();var n=W(O.current,t.toLowerCase())||e[t];n?S.current["".concat(t)]=setTimeout((function(){return r()}),n):r()},ee=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},te=function(){Object.keys(S.current).forEach((function(e){return clearTimeout(e)}))},re=function(e){if(e){if(R(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},ne=function(e){ue(e),oe(e)},oe=function(t){ae(t||e.target,J)},ue=function(t){ae(t||e.target,Q)},ae=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&&P(O.current)&&Y()})),r.useMountEffect((function(){oe()})),r.useUpdateEffect((function(){return oe(),function(){ue()}}),[z,Y,e.target]),r.useUpdateEffect((function(){return a&&(k(),C()),function(){A(),U()}}),[a]),r.useUpdateEffect((function(){a&&V("updateDelay",(function(){F(O.current,(function(){K(O.current)}))}))}),[e.content]),r.useUnmountEffect((function(){te(),ue(),o.ZIndexUtils.clear(T.current)})),i.useImperativeHandle(t,(function(){return{updateTargetEvents:ne,loadTargetEvents:oe,unloadTargetEvents:ue}}));var ie,le,ce,se,fe,de,pe;if(a){var he=(fe=o.ObjectUtils.findDiffKeys(e,b.defaultProps),de=o.classNames("p-tooltip p-component",(ie={},le="p-tooltip-".concat(m),ce=!0,le in ie?Object.defineProperty(ie,le,{value:ce,enumerable:!0,configurable:!0,writable:!0}):ie[le]=ce,ie),e.className,w),se=O.current,pe=!(e.content||W(se,"tooltip")),i.createElement("div",c({id:e.id,ref:T,className:de,style:e.style,role:"tooltip","aria-hidden":a},fe,{onMouseEnter:$,onMouseLeave:G}),i.createElement("div",{className:"p-tooltip-arrow"}),i.createElement("div",{ref:D,className:"p-tooltip-text"},pe&&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;

package/tooltip/tooltip.esm.js

@@ -125,6 +125,11 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
       positionState = _React$useState4[0],
       setPositionState = _React$useState4[1];
 
+  var _React$useState5 = React.useState(''),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      classNameState = _React$useState6[0],
+      setClassNameState = _React$useState6[1];
+
   var elementRef = React.useRef(null);
   var textRef = React.useRef(null);
   var currentTargetRef = React.useRef(null);
@@ -243,7 +248,7 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
       return;
     }
 
-    var updateTooltipState = function updateTooltipState() {
+    var updateTooltipState = function updateTooltipState(position) {
       updateText(currentTargetRef.current, function () {
         if (props.autoZIndex && !ZIndexUtils.get(elementRef.current)) {
           ZIndexUtils.set('tooltip', elementRef.current, PrimeReact.autoZIndex, props.baseZIndex || PrimeReact.zIndex['tooltip']);
@@ -266,7 +271,7 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
         align(currentTargetRef.current, {
           x: e.pageX,
           y: e.pageY
-        });
+        }, position);
       });
     };
 
@@ -281,16 +286,16 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
 
       if (success) {
         applyDelay('showDelay', function () {
+          var position = getPosition(currentTargetRef.current);
+          var classname = getTargetOption(currentTargetRef.current, 'classname');
           setVisibleState(true);
-          setPositionState(getPosition(currentTargetRef.current));
-          setTimeout(function () {
-            return updateTooltipState();
-          }, 0);
+          setPositionState(position);
+          setClassNameState(classname);
+          updateTooltipState(position);
           sendCallback(props.onShow, {
             originalEvent: e,
             target: currentTargetRef.current
           });
-          DomHandler.addClass(currentTargetRef.current, getTargetOption(currentTargetRef.current, 'classname'));
         });
       }
     }
@@ -300,7 +305,6 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
     clearTimeouts();
 
     if (visibleState) {
-      DomHandler.removeClass(currentTargetRef.current, getTargetOption(currentTargetRef.current, 'classname'));
       var success = sendCallback(props.onBeforeHide, {
         originalEvent: e,
         target: currentTargetRef.current
@@ -316,6 +320,7 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
           DomHandler.removeClass(elementRef.current, 'p-tooltip-active');
           setVisibleState(false);
           setPositionState(props.position);
+          setClassNameState('');
           currentTargetRef.current = null;
           containerSize.current = null;
           allowHide.current = true;
@@ -328,9 +333,10 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
     }
   };
 
-  var align = function align(target, coordinate) {
+  var align = function align(target, coordinate, position) {
     var left = 0,
-        top = 0;
+        top = 0,
+        currentPosition = position || positionState;
 
     if (isMouseTrack(target) && coordinate) {
       var _containerSize = {
@@ -344,7 +350,7 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
           mouseTrackTop = _getMouseTrackPositio.top,
           mouseTrackLeft = _getMouseTrackPositio.left;
 
-      switch (positionState) {
+      switch (currentPosition) {
         case 'left':
           left -= _containerSize.width + mouseTrackLeft;
           top -= _containerSize.height / 2 - mouseTrackTop;
@@ -377,28 +383,28 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
       elementRef.current.style.top = top + 'px';
       DomHandler.addClass(elementRef.current, 'p-tooltip-active');
     } else {
-      var pos = DomHandler.findCollisionPosition(positionState);
+      var pos = DomHandler.findCollisionPosition(currentPosition);
       var my = getTargetOption(target, 'my') || props.my || pos.my;
       var at = getTargetOption(target, 'at') || props.at || pos.at;
       elementRef.current.style.padding = '0px';
-      DomHandler.flipfitCollision(elementRef.current, target, my, at, function (currentPosition) {
-        var _currentPosition$at = currentPosition.at,
-            atX = _currentPosition$at.x,
-            atY = _currentPosition$at.y;
-        var myX = currentPosition.my.x;
-        var newPosition = props.at ? atX !== 'center' && atX !== myX ? atX : atY : currentPosition.at["".concat(pos.axis)];
+      DomHandler.flipfitCollision(elementRef.current, target, my, at, function (calculatedPosition) {
+        var _calculatedPosition$a = calculatedPosition.at,
+            atX = _calculatedPosition$a.x,
+            atY = _calculatedPosition$a.y;
+        var myX = calculatedPosition.my.x;
+        var newPosition = props.at ? atX !== 'center' && atX !== myX ? atX : atY : calculatedPosition.at["".concat(pos.axis)];
         elementRef.current.style.padding = '';
         setPositionState(newPosition);
-        updateContainerPosition();
+        updateContainerPosition(newPosition);
         DomHandler.addClass(elementRef.current, 'p-tooltip-active');
       });
     }
   };
 
-  var updateContainerPosition = function updateContainerPosition() {
+  var updateContainerPosition = function updateContainerPosition(position) {
     if (elementRef.current) {
       var style = getComputedStyle(elementRef.current);
-      if (positionState === 'left') elementRef.current.style.left = parseFloat(style.left) - parseFloat(style.paddingLeft) * 2 + 'px';else if (positionState === 'top') elementRef.current.style.top = parseFloat(style.top) - parseFloat(style.paddingTop) * 2 + 'px';
+      if (position === 'left') elementRef.current.style.left = parseFloat(style.left) - parseFloat(style.paddingLeft) * 2 + 'px';else if (position === 'top') elementRef.current.style.top = parseFloat(style.top) - parseFloat(style.paddingTop) * 2 + 'px';
     }
   };
 
@@ -584,7 +590,7 @@ var Tooltip = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (p
 
   var createElement = function createElement() {
     var otherProps = ObjectUtils.findDiffKeys(props, Tooltip.defaultProps);
-    var tooltipClassName = classNames('p-tooltip p-component', _defineProperty({}, "p-tooltip-".concat(positionState), true), props.className);
+    var tooltipClassName = classNames('p-tooltip p-component', _defineProperty({}, "p-tooltip-".concat(positionState), true), props.className, classNameState);
     var empty = isTargetContentEmpty(currentTargetRef.current);
     return /*#__PURE__*/React.createElement("div", _extends({
       id: props.id,

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

@@ -146,6 +146,11 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
         positionState = _React$useState4[0],
         setPositionState = _React$useState4[1];
 
+    var _React$useState5 = React__namespace.useState(''),
+        _React$useState6 = _slicedToArray(_React$useState5, 2),
+        classNameState = _React$useState6[0],
+        setClassNameState = _React$useState6[1];
+
     var elementRef = React__namespace.useRef(null);
     var textRef = React__namespace.useRef(null);
     var currentTargetRef = React__namespace.useRef(null);
@@ -264,7 +269,7 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
         return;
       }
 
-      var updateTooltipState = function updateTooltipState() {
+      var updateTooltipState = function updateTooltipState(position) {
         updateText(currentTargetRef.current, function () {
           if (props.autoZIndex && !utils.ZIndexUtils.get(elementRef.current)) {
             utils.ZIndexUtils.set('tooltip', elementRef.current, PrimeReact__default["default"].autoZIndex, props.baseZIndex || PrimeReact__default["default"].zIndex['tooltip']);
@@ -287,7 +292,7 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
           align(currentTargetRef.current, {
             x: e.pageX,
             y: e.pageY
-          });
+          }, position);
         });
       };
 
@@ -302,16 +307,16 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
 
         if (success) {
           applyDelay('showDelay', function () {
+            var position = getPosition(currentTargetRef.current);
+            var classname = getTargetOption(currentTargetRef.current, 'classname');
             setVisibleState(true);
-            setPositionState(getPosition(currentTargetRef.current));
-            setTimeout(function () {
-              return updateTooltipState();
-            }, 0);
+            setPositionState(position);
+            setClassNameState(classname);
+            updateTooltipState(position);
             sendCallback(props.onShow, {
               originalEvent: e,
               target: currentTargetRef.current
             });
-            utils.DomHandler.addClass(currentTargetRef.current, getTargetOption(currentTargetRef.current, 'classname'));
           });
         }
       }
@@ -321,7 +326,6 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
       clearTimeouts();
 
       if (visibleState) {
-        utils.DomHandler.removeClass(currentTargetRef.current, getTargetOption(currentTargetRef.current, 'classname'));
         var success = sendCallback(props.onBeforeHide, {
           originalEvent: e,
           target: currentTargetRef.current
@@ -337,6 +341,7 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
             utils.DomHandler.removeClass(elementRef.current, 'p-tooltip-active');
             setVisibleState(false);
             setPositionState(props.position);
+            setClassNameState('');
             currentTargetRef.current = null;
             containerSize.current = null;
             allowHide.current = true;
@@ -349,9 +354,10 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
       }
     };
 
-    var align = function align(target, coordinate) {
+    var align = function align(target, coordinate, position) {
       var left = 0,
-          top = 0;
+          top = 0,
+          currentPosition = position || positionState;
 
       if (isMouseTrack(target) && coordinate) {
         var _containerSize = {
@@ -365,7 +371,7 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
             mouseTrackTop = _getMouseTrackPositio.top,
             mouseTrackLeft = _getMouseTrackPositio.left;
 
-        switch (positionState) {
+        switch (currentPosition) {
           case 'left':
             left -= _containerSize.width + mouseTrackLeft;
             top -= _containerSize.height / 2 - mouseTrackTop;
@@ -398,28 +404,28 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
         elementRef.current.style.top = top + 'px';
         utils.DomHandler.addClass(elementRef.current, 'p-tooltip-active');
       } else {
-        var pos = utils.DomHandler.findCollisionPosition(positionState);
+        var pos = utils.DomHandler.findCollisionPosition(currentPosition);
         var my = getTargetOption(target, 'my') || props.my || pos.my;
         var at = getTargetOption(target, 'at') || props.at || pos.at;
         elementRef.current.style.padding = '0px';
-        utils.DomHandler.flipfitCollision(elementRef.current, target, my, at, function (currentPosition) {
-          var _currentPosition$at = currentPosition.at,
-              atX = _currentPosition$at.x,
-              atY = _currentPosition$at.y;
-          var myX = currentPosition.my.x;
-          var newPosition = props.at ? atX !== 'center' && atX !== myX ? atX : atY : currentPosition.at["".concat(pos.axis)];
+        utils.DomHandler.flipfitCollision(elementRef.current, target, my, at, function (calculatedPosition) {
+          var _calculatedPosition$a = calculatedPosition.at,
+              atX = _calculatedPosition$a.x,
+              atY = _calculatedPosition$a.y;
+          var myX = calculatedPosition.my.x;
+          var newPosition = props.at ? atX !== 'center' && atX !== myX ? atX : atY : calculatedPosition.at["".concat(pos.axis)];
           elementRef.current.style.padding = '';
           setPositionState(newPosition);
-          updateContainerPosition();
+          updateContainerPosition(newPosition);
           utils.DomHandler.addClass(elementRef.current, 'p-tooltip-active');
         });
       }
     };
 
-    var updateContainerPosition = function updateContainerPosition() {
+    var updateContainerPosition = function updateContainerPosition(position) {
       if (elementRef.current) {
         var style = getComputedStyle(elementRef.current);
-        if (positionState === 'left') elementRef.current.style.left = parseFloat(style.left) - parseFloat(style.paddingLeft) * 2 + 'px';else if (positionState === 'top') elementRef.current.style.top = parseFloat(style.top) - parseFloat(style.paddingTop) * 2 + 'px';
+        if (position === 'left') elementRef.current.style.left = parseFloat(style.left) - parseFloat(style.paddingLeft) * 2 + 'px';else if (position === 'top') elementRef.current.style.top = parseFloat(style.top) - parseFloat(style.paddingTop) * 2 + 'px';
       }
     };
 
@@ -605,7 +611,7 @@ this.primereact.tooltip = (function (exports, React, PrimeReact, hooks, portal,
 
     var createElement = function createElement() {
       var otherProps = utils.ObjectUtils.findDiffKeys(props, Tooltip.defaultProps);
-      var tooltipClassName = utils.classNames('p-tooltip p-component', _defineProperty({}, "p-tooltip-".concat(positionState), true), props.className);
+      var tooltipClassName = utils.classNames('p-tooltip p-component', _defineProperty({}, "p-tooltip-".concat(positionState), true), props.className, classNameState);
       var empty = isTargetContentEmpty(currentTargetRef.current);
       return /*#__PURE__*/React__namespace.createElement("div", _extends({
         id: props.id,

package/tooltip/tooltip.min.js

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

@@ -221,6 +221,14 @@ var UITreeNode = /*#__PURE__*/React__namespace.memo(function (props) {
         } else {
           var nextNodeElement = nodeElement.nextElementSibling;
 
+          while (nextNodeElement) {
+            if (!utils.DomHandler.hasClass(nextNodeElement, 'p-treenode-droppoint')) {
+              break;
+            }
+
+            nextNodeElement = nextNodeElement.nextElementSibling;
+          }
+
           if (nextNodeElement) {
             focusNode(nextNodeElement);
           } else {
@@ -292,7 +300,7 @@ var UITreeNode = /*#__PURE__*/React__namespace.memo(function (props) {
   };
 
   var focusNode = function focusNode(element) {
-    element.children[0].focus();
+    element && element.children[0] && element.children[0].focus();
   };
 
   var onClick = function onClick(event) {