primereact 8.1.1 → 8.4.0

package/datascroller/datascroller.cjs.js

@@ -128,6 +128,7 @@ var DataScroller = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__names
       dataToRenderState = _React$useState2[0],
       setDataToRenderState = _React$useState2[1];
 
+  var elementRef = React__namespace.useRef(null);
   var contentRef = React__namespace.useRef(null);
   var value = React__namespace.useRef(props.value);
   var dataToRender = React__namespace.useRef([]);
@@ -252,8 +253,15 @@ var DataScroller = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__names
   });
   React__namespace.useImperativeHandle(ref, function () {
     return {
+      props: props,
       load: load,
-      reset: reset
+      reset: reset,
+      getElement: function getElement() {
+        return elementRef.current;
+      },
+      getContent: function getContent() {
+        return contentRef.current;
+      }
     };
   });
 
@@ -311,6 +319,7 @@ var DataScroller = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__names
   var content = createContent();
   return /*#__PURE__*/React__namespace.createElement("div", _extends({
     id: props.id,
+    ref: elementRef,
     className: className
   }, otherProps), header, content, footer);
 }));

package/datascroller/datascroller.cjs.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),r=require("primereact/api"),t=require("primereact/hooks"),n=require("primereact/utils");function l(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var a=l(e);function o(){return o=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e},o.apply(this,arguments)}function u(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=new Array(r);t<r;t++)n[t]=e[t];return n}function c(e){if(Array.isArray(e))return u(e)}function i(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function s(e,r){if(e){if("string"==typeof e)return u(e,r);var t=Object.prototype.toString.call(e).slice(8,-1);return"Object"===t&&e.constructor&&(t=e.constructor.name),"Map"===t||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?u(e,r):void 0}}function f(){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 d(e){return c(e)||i(e)||s(e)||f()}function m(e){if(Array.isArray(e))return e}function p(e,r){var t=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=t){var n,l,a=[],o=!0,u=!1;try{for(t=t.call(e);!(o=(n=t.next()).done)&&(a.push(n.value),!r||a.length!==r);o=!0);}catch(e){u=!0,l=e}finally{try{o||null==t.return||t.return()}finally{if(u)throw l}}return a}}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.")}var v=a.memo(a.forwardRef((function(e,l){var u,c,i=a.useState([]),f=(c=2,m(u=i)||p(u,c)||s(u,c)||y()),h=f[0],b=f[1],g=a.useRef(null),E=a.useRef(e.value),w=a.useRef([]),O=a.useRef(0),j=a.useRef(null),S=function(){if(e.lazy)e.onLazyLoad&&e.onLazyLoad(L()),O.current+=e.rows;else if(E.current){for(var r=O.current;r<O.current+e.rows&&!(r>=E.current.length);r++)w.current.push(E.current[r]);0!==E.current.length&&(O.current+=e.rows),b(d(w.current))}},H=function(){O.current=0,w.current=[],b(d(w.current)),S()},L=function(){return{first:O.current,rows:e.rows}},N=function(){j.current&&(e.inline&&g.current?g.current.removeEventListener("scroll",j.current):e.loader||window.removeEventListener("scroll",j.current)),j.current=null};t.useMountEffect((function(){S(),e.loader||(e.inline?(j.current=function(){g.current.scrollTop>=g.current.scrollHeight*e.buffer-g.current.clientHeight&&S()},g.current.addEventListener("scroll",j.current)):(j.current=function(){var r=document.body,t=document.documentElement,n=window.pageYOffset||document.documentElement.scrollTop,l=t.clientHeight;n>=Math.max(r.scrollHeight,r.offsetHeight,l,t.scrollHeight,t.offsetHeight)*e.buffer-l&&S()},window.addEventListener("scroll",j.current)))})),t.useUpdateEffect((function(){e.value&&(E.current=e.value,O.current=0,w.current=[],e.lazy?(w.current=E.current,b(d(w.current))):S())}),[e.value]),t.useUpdateEffect((function(){e.loader&&N()}),[e.loader]),t.useUnmountEffect((function(){j.current&&N()})),a.useImperativeHandle(l,(function(){return{load:S,reset:H}}));var A=function(r,t){var n=e.itemTemplate?e.itemTemplate(r):r;return a.createElement("li",{key:t+"_datascrollitem"},n)},M=function(){var t=n.ObjectUtils.getJSXElement(e.emptyMessage,e)||r.localeOption("emptyMessage");return a.createElement("li",null,t)},T=n.ObjectUtils.findDiffKeys(e,v.defaultProps),z=n.classNames("p-datascroller p-component",e.className,{"p-datascroller-inline":e.inline}),P=e.header?a.createElement("div",{className:"p-datascroller-header"},e.header):null,U=e.footer?a.createElement("div",{className:"p-datascroller-footer"},e.footer):null,_=function(){var r=n.ObjectUtils.isNotEmpty(h)?h.map(A):M();return a.createElement("div",{ref:g,className:"p-datascroller-content",style:{maxHeight:e.scrollHeight}},a.createElement("ul",{className:"p-datascroller-list"},r))}();return a.createElement("div",o({id:e.id,className:z},T),P,_,U)})));v.displayName="DataScroller",v.defaultProps={__TYPE:"DataScroller",id:null,value:null,rows:0,inline:!1,scrollHeight:null,loader:!1,buffer:.9,style:null,className:null,onLazyLoad:null,emptyMessage:null,itemTemplate:null,header:null,footer:null,lazy:!1},exports.DataScroller=v;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),r=require("primereact/api"),t=require("primereact/hooks"),n=require("primereact/utils");function l(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var o=l(e);function u(){return u=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e},u.apply(this,arguments)}function a(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=new Array(r);t<r;t++)n[t]=e[t];return n}function c(e){if(Array.isArray(e))return a(e)}function i(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function s(e,r){if(e){if("string"==typeof e)return a(e,r);var t=Object.prototype.toString.call(e).slice(8,-1);return"Object"===t&&e.constructor&&(t=e.constructor.name),"Map"===t||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?a(e,r):void 0}}function f(){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 d(e){return c(e)||i(e)||s(e)||f()}function m(e){if(Array.isArray(e))return e}function p(e,r){var t=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=t){var n,l,o=[],u=!0,a=!1;try{for(t=t.call(e);!(u=(n=t.next()).done)&&(o.push(n.value),!r||o.length!==r);u=!0);}catch(e){a=!0,l=e}finally{try{u||null==t.return||t.return()}finally{if(a)throw l}}return o}}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.")}var v=o.memo(o.forwardRef((function(e,l){var a,c,i=o.useState([]),f=(c=2,m(a=i)||p(a,c)||s(a,c)||y()),h=f[0],b=f[1],g=o.useRef(null),E=o.useRef(null),w=o.useRef(e.value),O=o.useRef([]),j=o.useRef(0),S=o.useRef(null),H=function(){if(e.lazy)e.onLazyLoad&&e.onLazyLoad(N()),j.current+=e.rows;else if(w.current){for(var r=j.current;r<j.current+e.rows&&!(r>=w.current.length);r++)O.current.push(w.current[r]);0!==w.current.length&&(j.current+=e.rows),b(d(O.current))}},L=function(){j.current=0,O.current=[],b(d(O.current)),H()},N=function(){return{first:j.current,rows:e.rows}},A=function(){S.current&&(e.inline&&E.current?E.current.removeEventListener("scroll",S.current):e.loader||window.removeEventListener("scroll",S.current)),S.current=null};t.useMountEffect((function(){H(),e.loader||(e.inline?(S.current=function(){E.current.scrollTop>=E.current.scrollHeight*e.buffer-E.current.clientHeight&&H()},E.current.addEventListener("scroll",S.current)):(S.current=function(){var r=document.body,t=document.documentElement,n=window.pageYOffset||document.documentElement.scrollTop,l=t.clientHeight;n>=Math.max(r.scrollHeight,r.offsetHeight,l,t.scrollHeight,t.offsetHeight)*e.buffer-l&&H()},window.addEventListener("scroll",S.current)))})),t.useUpdateEffect((function(){e.value&&(w.current=e.value,j.current=0,O.current=[],e.lazy?(O.current=w.current,b(d(O.current))):H())}),[e.value]),t.useUpdateEffect((function(){e.loader&&A()}),[e.loader]),t.useUnmountEffect((function(){S.current&&A()})),o.useImperativeHandle(l,(function(){return{props:e,load:H,reset:L,getElement:function(){return g.current},getContent:function(){return E.current}}}));var M=function(r,t){var n=e.itemTemplate?e.itemTemplate(r):r;return o.createElement("li",{key:t+"_datascrollitem"},n)},T=function(){var t=n.ObjectUtils.getJSXElement(e.emptyMessage,e)||r.localeOption("emptyMessage");return o.createElement("li",null,t)},z=n.ObjectUtils.findDiffKeys(e,v.defaultProps),P=n.classNames("p-datascroller p-component",e.className,{"p-datascroller-inline":e.inline}),R=e.header?o.createElement("div",{className:"p-datascroller-header"},e.header):null,U=e.footer?o.createElement("div",{className:"p-datascroller-footer"},e.footer):null,_=function(){var r=n.ObjectUtils.isNotEmpty(h)?h.map(M):T();return o.createElement("div",{ref:E,className:"p-datascroller-content",style:{maxHeight:e.scrollHeight}},o.createElement("ul",{className:"p-datascroller-list"},r))}();return o.createElement("div",u({id:e.id,ref:g,className:P},z),R,_,U)})));v.displayName="DataScroller",v.defaultProps={__TYPE:"DataScroller",id:null,value:null,rows:0,inline:!1,scrollHeight:null,loader:!1,buffer:.9,style:null,className:null,onLazyLoad:null,emptyMessage:null,itemTemplate:null,header:null,footer:null,lazy:!1},exports.DataScroller=v;

package/datascroller/datascroller.d.ts

@@ -7,16 +7,13 @@ interface DataScrollerLazyLoadParams {
     rows: number;
 }
 
-export interface DataScrollerProps {
-    id?: string;
+export interface DataScrollerProps extends Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'ref'> {
     value?: any[];
     rows?: number;
     inline?: boolean;
     scrollHeight?: string;
     loader?: boolean;
     buffer?: number;
-    style?: object;
-    className?: string;
     header?: React.ReactNode;
     footer?: React.ReactNode;
     lazy?: boolean;
@@ -28,4 +25,5 @@ export interface DataScrollerProps {
 
 export declare class DataScroller extends React.Component<DataScrollerProps, any> {
     public load(): void;
+    public getElement(): HTMLDivElement;
 }

package/datascroller/datascroller.esm.js

@@ -104,6 +104,7 @@ var DataScroller = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
       dataToRenderState = _React$useState2[0],
       setDataToRenderState = _React$useState2[1];
 
+  var elementRef = React.useRef(null);
   var contentRef = React.useRef(null);
   var value = React.useRef(props.value);
   var dataToRender = React.useRef([]);
@@ -228,8 +229,15 @@ var DataScroller = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
   });
   React.useImperativeHandle(ref, function () {
     return {
+      props: props,
       load: load,
-      reset: reset
+      reset: reset,
+      getElement: function getElement() {
+        return elementRef.current;
+      },
+      getContent: function getContent() {
+        return contentRef.current;
+      }
     };
   });
 
@@ -287,6 +295,7 @@ var DataScroller = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
   var content = createContent();
   return /*#__PURE__*/React.createElement("div", _extends({
     id: props.id,
+    ref: elementRef,
     className: className
   }, otherProps), header, content, footer);
 }));

package/datascroller/datascroller.esm.min.js

@@ -1 +1 @@
-import*as e from"react";import{localeOption as r}from"primereact/api";import{useMountEffect as t,useUpdateEffect as n,useUnmountEffect as l}from"primereact/hooks";import{ObjectUtils as o,classNames as a}from"primereact/utils";function u(){return u=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e},u.apply(this,arguments)}function c(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=new Array(r);t<r;t++)n[t]=e[t];return n}function i(e){if(Array.isArray(e))return c(e)}function s(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function f(e,r){if(e){if("string"==typeof e)return c(e,r);var t=Object.prototype.toString.call(e).slice(8,-1);return"Object"===t&&e.constructor&&(t=e.constructor.name),"Map"===t||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?c(e,r):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 d(e){return i(e)||s(e)||f(e)||m()}function p(e){if(Array.isArray(e))return e}function y(e,r){var t=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=t){var n,l,o=[],a=!0,u=!1;try{for(t=t.call(e);!(a=(n=t.next()).done)&&(o.push(n.value),!r||o.length!==r);a=!0);}catch(e){u=!0,l=e}finally{try{a||null==t.return||t.return()}finally{if(u)throw l}}return o}}function v(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var h=e.memo(e.forwardRef((function(c,i){var s,m,g=e.useState([]),b=(m=2,p(s=g)||y(s,m)||f(s,m)||v()),w=b[0],E=b[1],S=e.useRef(null),H=e.useRef(c.value),L=e.useRef([]),A=e.useRef(0),N=e.useRef(null),T=function(){if(c.lazy)c.onLazyLoad&&c.onLazyLoad(z()),A.current+=c.rows;else if(H.current){for(var e=A.current;e<A.current+c.rows&&!(e>=H.current.length);e++)L.current.push(H.current[e]);0!==H.current.length&&(A.current+=c.rows),E(d(L.current))}},j=function(){A.current=0,L.current=[],E(d(L.current)),T()},z=function(){return{first:A.current,rows:c.rows}},I=function(){N.current&&(c.inline&&S.current?S.current.removeEventListener("scroll",N.current):c.loader||window.removeEventListener("scroll",N.current)),N.current=null};t((function(){T(),c.loader||(c.inline?(N.current=function(){S.current.scrollTop>=S.current.scrollHeight*c.buffer-S.current.clientHeight&&T()},S.current.addEventListener("scroll",N.current)):(N.current=function(){var e=document.body,r=document.documentElement,t=window.pageYOffset||document.documentElement.scrollTop,n=r.clientHeight;t>=Math.max(e.scrollHeight,e.offsetHeight,n,r.scrollHeight,r.offsetHeight)*c.buffer-n&&T()},window.addEventListener("scroll",N.current)))})),n((function(){c.value&&(H.current=c.value,A.current=0,L.current=[],c.lazy?(L.current=H.current,E(d(L.current))):T())}),[c.value]),n((function(){c.loader&&I()}),[c.loader]),l((function(){N.current&&I()})),e.useImperativeHandle(i,(function(){return{load:T,reset:j}}));var O=function(r,t){var n=c.itemTemplate?c.itemTemplate(r):r;return e.createElement("li",{key:t+"_datascrollitem"},n)},R=function(){var t=o.getJSXElement(c.emptyMessage,c)||r("emptyMessage");return e.createElement("li",null,t)},M=o.findDiffKeys(c,h.defaultProps),x=a("p-datascroller p-component",c.className,{"p-datascroller-inline":c.inline}),P=c.header?e.createElement("div",{className:"p-datascroller-header"},c.header):null,D=c.footer?e.createElement("div",{className:"p-datascroller-footer"},c.footer):null,_=function(){var r=o.isNotEmpty(w)?w.map(O):R();return e.createElement("div",{ref:S,className:"p-datascroller-content",style:{maxHeight:c.scrollHeight}},e.createElement("ul",{className:"p-datascroller-list"},r))}();return e.createElement("div",u({id:c.id,className:x},M),P,_,D)})));h.displayName="DataScroller",h.defaultProps={__TYPE:"DataScroller",id:null,value:null,rows:0,inline:!1,scrollHeight:null,loader:!1,buffer:.9,style:null,className:null,onLazyLoad:null,emptyMessage:null,itemTemplate:null,header:null,footer:null,lazy:!1};export{h as DataScroller};
+import*as e from"react";import{localeOption as r}from"primereact/api";import{useMountEffect as t,useUpdateEffect as n,useUnmountEffect as l}from"primereact/hooks";import{ObjectUtils as o,classNames as a}from"primereact/utils";function u(){return u=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e},u.apply(this,arguments)}function c(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=new Array(r);t<r;t++)n[t]=e[t];return n}function i(e){if(Array.isArray(e))return c(e)}function s(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function f(e,r){if(e){if("string"==typeof e)return c(e,r);var t=Object.prototype.toString.call(e).slice(8,-1);return"Object"===t&&e.constructor&&(t=e.constructor.name),"Map"===t||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?c(e,r):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 d(e){return i(e)||s(e)||f(e)||m()}function p(e){if(Array.isArray(e))return e}function y(e,r){var t=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=t){var n,l,o=[],a=!0,u=!1;try{for(t=t.call(e);!(a=(n=t.next()).done)&&(o.push(n.value),!r||o.length!==r);a=!0);}catch(e){u=!0,l=e}finally{try{a||null==t.return||t.return()}finally{if(u)throw l}}return o}}function v(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var h=e.memo(e.forwardRef((function(c,i){var s,m,g=e.useState([]),b=(m=2,p(s=g)||y(s,m)||f(s,m)||v()),w=b[0],E=b[1],S=e.useRef(null),H=e.useRef(null),L=e.useRef(c.value),A=e.useRef([]),N=e.useRef(0),T=e.useRef(null),R=function(){if(c.lazy)c.onLazyLoad&&c.onLazyLoad(z()),N.current+=c.rows;else if(L.current){for(var e=N.current;e<N.current+c.rows&&!(e>=L.current.length);e++)A.current.push(L.current[e]);0!==L.current.length&&(N.current+=c.rows),E(d(A.current))}},j=function(){N.current=0,A.current=[],E(d(A.current)),R()},z=function(){return{first:N.current,rows:c.rows}},I=function(){T.current&&(c.inline&&H.current?H.current.removeEventListener("scroll",T.current):c.loader||window.removeEventListener("scroll",T.current)),T.current=null};t((function(){R(),c.loader||(c.inline?(T.current=function(){H.current.scrollTop>=H.current.scrollHeight*c.buffer-H.current.clientHeight&&R()},H.current.addEventListener("scroll",T.current)):(T.current=function(){var e=document.body,r=document.documentElement,t=window.pageYOffset||document.documentElement.scrollTop,n=r.clientHeight;t>=Math.max(e.scrollHeight,e.offsetHeight,n,r.scrollHeight,r.offsetHeight)*c.buffer-n&&R()},window.addEventListener("scroll",T.current)))})),n((function(){c.value&&(L.current=c.value,N.current=0,A.current=[],c.lazy?(A.current=L.current,E(d(A.current))):R())}),[c.value]),n((function(){c.loader&&I()}),[c.loader]),l((function(){T.current&&I()})),e.useImperativeHandle(i,(function(){return{props:c,load:R,reset:j,getElement:function(){return S.current},getContent:function(){return H.current}}}));var O=function(r,t){var n=c.itemTemplate?c.itemTemplate(r):r;return e.createElement("li",{key:t+"_datascrollitem"},n)},M=function(){var t=o.getJSXElement(c.emptyMessage,c)||r("emptyMessage");return e.createElement("li",null,t)},x=o.findDiffKeys(c,h.defaultProps),P=a("p-datascroller p-component",c.className,{"p-datascroller-inline":c.inline}),D=c.header?e.createElement("div",{className:"p-datascroller-header"},c.header):null,_=c.footer?e.createElement("div",{className:"p-datascroller-footer"},c.footer):null,k=function(){var r=o.isNotEmpty(w)?w.map(O):M();return e.createElement("div",{ref:H,className:"p-datascroller-content",style:{maxHeight:c.scrollHeight}},e.createElement("ul",{className:"p-datascroller-list"},r))}();return e.createElement("div",u({id:c.id,ref:S,className:P},x),D,k,_)})));h.displayName="DataScroller",h.defaultProps={__TYPE:"DataScroller",id:null,value:null,rows:0,inline:!1,scrollHeight:null,loader:!1,buffer:.9,style:null,className:null,onLazyLoad:null,emptyMessage:null,itemTemplate:null,header:null,footer:null,lazy:!1};export{h as DataScroller};

package/datascroller/datascroller.js

@@ -123,6 +123,7 @@ this.primereact.datascroller = (function (exports, React, api, hooks, utils) {
         dataToRenderState = _React$useState2[0],
         setDataToRenderState = _React$useState2[1];
 
+    var elementRef = React__namespace.useRef(null);
     var contentRef = React__namespace.useRef(null);
     var value = React__namespace.useRef(props.value);
     var dataToRender = React__namespace.useRef([]);
@@ -247,8 +248,15 @@ this.primereact.datascroller = (function (exports, React, api, hooks, utils) {
     });
     React__namespace.useImperativeHandle(ref, function () {
       return {
+        props: props,
         load: load,
-        reset: reset
+        reset: reset,
+        getElement: function getElement() {
+          return elementRef.current;
+        },
+        getContent: function getContent() {
+          return contentRef.current;
+        }
       };
     });
 
@@ -306,6 +314,7 @@ this.primereact.datascroller = (function (exports, React, api, hooks, utils) {
     var content = createContent();
     return /*#__PURE__*/React__namespace.createElement("div", _extends({
       id: props.id,
+      ref: elementRef,
       className: className
     }, otherProps), header, content, footer);
   }));

package/datascroller/datascroller.min.js

@@ -1 +1 @@
-this.primereact=this.primereact||{},this.primereact.datascroller=function(e,r,t,n,l){"use strict";function a(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var o=a(r);function u(){return u=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e},u.apply(this,arguments)}function c(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=new Array(r);t<r;t++)n[t]=e[t];return n}function i(e){if(Array.isArray(e))return c(e)}function s(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function f(e,r){if(e){if("string"==typeof e)return c(e,r);var t=Object.prototype.toString.call(e).slice(8,-1);return"Object"===t&&e.constructor&&(t=e.constructor.name),"Map"===t||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?c(e,r):void 0}}function d(){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 m(e){return i(e)||s(e)||f(e)||d()}function p(e){if(Array.isArray(e))return e}function y(e,r){var t=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=t){var n,l,a=[],o=!0,u=!1;try{for(t=t.call(e);!(o=(n=t.next()).done)&&(a.push(n.value),!r||a.length!==r);o=!0);}catch(e){u=!0,l=e}finally{try{o||null==t.return||t.return()}finally{if(u)throw l}}return a}}function v(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var h=o.memo(o.forwardRef((function(e,r){var a,c,i=o.useState([]),s=(c=2,p(a=i)||y(a,c)||f(a,c)||v()),d=s[0],b=s[1],g=o.useRef(null),E=o.useRef(e.value),w=o.useRef([]),O=o.useRef(0),j=o.useRef(null),S=function(){if(e.lazy)e.onLazyLoad&&e.onLazyLoad(L()),O.current+=e.rows;else if(E.current){for(var r=O.current;r<O.current+e.rows&&!(r>=E.current.length);r++)w.current.push(E.current[r]);0!==E.current.length&&(O.current+=e.rows),b(m(w.current))}},H=function(){O.current=0,w.current=[],b(m(w.current)),S()},L=function(){return{first:O.current,rows:e.rows}},N=function(){j.current&&(e.inline&&g.current?g.current.removeEventListener("scroll",j.current):e.loader||window.removeEventListener("scroll",j.current)),j.current=null};n.useMountEffect((function(){S(),e.loader||(e.inline?(j.current=function(){g.current.scrollTop>=g.current.scrollHeight*e.buffer-g.current.clientHeight&&S()},g.current.addEventListener("scroll",j.current)):(j.current=function(){var r=document.body,t=document.documentElement,n=window.pageYOffset||document.documentElement.scrollTop,l=t.clientHeight;n>=Math.max(r.scrollHeight,r.offsetHeight,l,t.scrollHeight,t.offsetHeight)*e.buffer-l&&S()},window.addEventListener("scroll",j.current)))})),n.useUpdateEffect((function(){e.value&&(E.current=e.value,O.current=0,w.current=[],e.lazy?(w.current=E.current,b(m(w.current))):S())}),[e.value]),n.useUpdateEffect((function(){e.loader&&N()}),[e.loader]),n.useUnmountEffect((function(){j.current&&N()})),o.useImperativeHandle(r,(function(){return{load:S,reset:H}}));var A=function(r,t){var n=e.itemTemplate?e.itemTemplate(r):r;return o.createElement("li",{key:t+"_datascrollitem"},n)},M=function(){var r=l.ObjectUtils.getJSXElement(e.emptyMessage,e)||t.localeOption("emptyMessage");return o.createElement("li",null,r)},T=l.ObjectUtils.findDiffKeys(e,h.defaultProps),z=l.classNames("p-datascroller p-component",e.className,{"p-datascroller-inline":e.inline}),P=e.header?o.createElement("div",{className:"p-datascroller-header"},e.header):null,R=e.footer?o.createElement("div",{className:"p-datascroller-footer"},e.footer):null,U=function(){var r=l.ObjectUtils.isNotEmpty(d)?d.map(A):M();return o.createElement("div",{ref:g,className:"p-datascroller-content",style:{maxHeight:e.scrollHeight}},o.createElement("ul",{className:"p-datascroller-list"},r))}();return o.createElement("div",u({id:e.id,className:z},T),P,U,R)})));return h.displayName="DataScroller",h.defaultProps={__TYPE:"DataScroller",id:null,value:null,rows:0,inline:!1,scrollHeight:null,loader:!1,buffer:.9,style:null,className:null,onLazyLoad:null,emptyMessage:null,itemTemplate:null,header:null,footer:null,lazy:!1},e.DataScroller=h,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.api,primereact.hooks,primereact.utils);
+this.primereact=this.primereact||{},this.primereact.datascroller=function(e,r,t,n,l){"use strict";function a(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,n.get?n:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}var o=a(r);function u(){return u=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e},u.apply(this,arguments)}function c(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=new Array(r);t<r;t++)n[t]=e[t];return n}function i(e){if(Array.isArray(e))return c(e)}function s(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function f(e,r){if(e){if("string"==typeof e)return c(e,r);var t=Object.prototype.toString.call(e).slice(8,-1);return"Object"===t&&e.constructor&&(t=e.constructor.name),"Map"===t||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?c(e,r):void 0}}function d(){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 m(e){return i(e)||s(e)||f(e)||d()}function p(e){if(Array.isArray(e))return e}function y(e,r){var t=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=t){var n,l,a=[],o=!0,u=!1;try{for(t=t.call(e);!(o=(n=t.next()).done)&&(a.push(n.value),!r||a.length!==r);o=!0);}catch(e){u=!0,l=e}finally{try{o||null==t.return||t.return()}finally{if(u)throw l}}return a}}function v(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var h=o.memo(o.forwardRef((function(e,r){var a,c,i=o.useState([]),s=(c=2,p(a=i)||y(a,c)||f(a,c)||v()),d=s[0],b=s[1],g=o.useRef(null),E=o.useRef(null),w=o.useRef(e.value),O=o.useRef([]),j=o.useRef(0),S=o.useRef(null),H=function(){if(e.lazy)e.onLazyLoad&&e.onLazyLoad(N()),j.current+=e.rows;else if(w.current){for(var r=j.current;r<j.current+e.rows&&!(r>=w.current.length);r++)O.current.push(w.current[r]);0!==w.current.length&&(j.current+=e.rows),b(m(O.current))}},L=function(){j.current=0,O.current=[],b(m(O.current)),H()},N=function(){return{first:j.current,rows:e.rows}},A=function(){S.current&&(e.inline&&E.current?E.current.removeEventListener("scroll",S.current):e.loader||window.removeEventListener("scroll",S.current)),S.current=null};n.useMountEffect((function(){H(),e.loader||(e.inline?(S.current=function(){E.current.scrollTop>=E.current.scrollHeight*e.buffer-E.current.clientHeight&&H()},E.current.addEventListener("scroll",S.current)):(S.current=function(){var r=document.body,t=document.documentElement,n=window.pageYOffset||document.documentElement.scrollTop,l=t.clientHeight;n>=Math.max(r.scrollHeight,r.offsetHeight,l,t.scrollHeight,t.offsetHeight)*e.buffer-l&&H()},window.addEventListener("scroll",S.current)))})),n.useUpdateEffect((function(){e.value&&(w.current=e.value,j.current=0,O.current=[],e.lazy?(O.current=w.current,b(m(O.current))):H())}),[e.value]),n.useUpdateEffect((function(){e.loader&&A()}),[e.loader]),n.useUnmountEffect((function(){S.current&&A()})),o.useImperativeHandle(r,(function(){return{props:e,load:H,reset:L,getElement:function(){return g.current},getContent:function(){return E.current}}}));var M=function(r,t){var n=e.itemTemplate?e.itemTemplate(r):r;return o.createElement("li",{key:t+"_datascrollitem"},n)},R=function(){var r=l.ObjectUtils.getJSXElement(e.emptyMessage,e)||t.localeOption("emptyMessage");return o.createElement("li",null,r)},T=l.ObjectUtils.findDiffKeys(e,h.defaultProps),z=l.classNames("p-datascroller p-component",e.className,{"p-datascroller-inline":e.inline}),P=e.header?o.createElement("div",{className:"p-datascroller-header"},e.header):null,U=e.footer?o.createElement("div",{className:"p-datascroller-footer"},e.footer):null,_=function(){var r=l.ObjectUtils.isNotEmpty(d)?d.map(M):R();return o.createElement("div",{ref:E,className:"p-datascroller-content",style:{maxHeight:e.scrollHeight}},o.createElement("ul",{className:"p-datascroller-list"},r))}();return o.createElement("div",u({id:e.id,ref:g,className:z},T),P,_,U)})));return h.displayName="DataScroller",h.defaultProps={__TYPE:"DataScroller",id:null,value:null,rows:0,inline:!1,scrollHeight:null,loader:!1,buffer:.9,style:null,className:null,onLazyLoad:null,emptyMessage:null,itemTemplate:null,header:null,footer:null,lazy:!1},e.DataScroller=h,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.api,primereact.hooks,primereact.utils);

package/datatable/datatable.cjs.js

@@ -259,7 +259,7 @@ var RowRadioButton = /*#__PURE__*/React__namespace.memo(function (props) {
   var onClick = function onClick(event) {
     if (!props.disabled) {
       props.onChange(event);
-      inputRef.current.focus();
+      utils.DomHandler.focus(inputRef.current);
     }
   };
 
@@ -1419,12 +1419,16 @@ var BodyRow = /*#__PURE__*/React__namespace.memo(function (props) {
     }),
     'p-row-odd': props.index % 2 !== 0
   });
+  var style = {
+    height: props.virtualScrollerOptions ? props.virtualScrollerOptions.itemSize : undefined
+  };
   var content = createContent();
   var tabIndex = getTabIndex();
   return /*#__PURE__*/React__namespace.createElement("tr", {
     role: "row",
     tabIndex: tabIndex,
     className: className,
+    style: style,
     onMouseDown: onMouseDown,
     onMouseUp: onMouseUp,
     onClick: onClick,
@@ -1466,14 +1470,14 @@ var _excluded = ["originalEvent"];
 function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var TableBody = /*#__PURE__*/React__namespace.memo(function (props) {
+var TableBody = /*#__PURE__*/React__namespace.memo( /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
   var _React$useState = React__namespace.useState({}),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       rowGroupHeaderStyleObjectState = _React$useState2[0],
       setRowGroupHeaderStyleObjectState = _React$useState2[1];
 
   var elementRef = React__namespace.useRef(null);
-  var ref = React__namespace.useCallback(function (el) {
+  var refCallback = React__namespace.useCallback(function (el) {
     elementRef.current = el;
     props.virtualScrollerContentRef && props.virtualScrollerContentRef(el);
   }, [props]);
@@ -1573,7 +1577,7 @@ var TableBody = /*#__PURE__*/React__namespace.memo(function (props) {
   };
 
   var allowRowDrag = function allowRowDrag(event) {
-    return !allowCellSelection() && allowDrag(event);
+    return !allowCellSelection() && allowDrag(event) || props.reorderableRows;
   };
 
   var allowCellDrag = function allowCellDrag(event) {
@@ -2127,9 +2131,12 @@ var TableBody = /*#__PURE__*/React__namespace.memo(function (props) {
   var onRowDragStart = function onRowDragStart(e) {
     var event = e.originalEvent,
         index = e.index;
-    rowDragging.current = true;
-    draggedRowIndex.current = index;
-    event.dataTransfer.setData('text', 'b'); // For firefox
+
+    if (allowRowDrag(event)) {
+      rowDragging.current = true;
+      draggedRowIndex.current = index;
+      event.dataTransfer.setData('text', 'b'); // For firefox
+    }
   };
 
   var onRowDragOver = function onRowDragOver(e) {
@@ -2525,10 +2532,10 @@ var TableBody = /*#__PURE__*/React__namespace.memo(function (props) {
   var className = utils.classNames('p-datatable-tbody', props.className);
   var content = props.empty ? createEmptyContent() : createContent();
   return /*#__PURE__*/React__namespace.createElement("tbody", {
-    ref: ref,
+    ref: refCallback,
     className: className
   }, content);
-});
+}));
 TableBody.displayName = 'TableBody';
 
 function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -2578,7 +2585,8 @@ var FooterCell = /*#__PURE__*/React__namespace.memo(function (props) {
         styleObject['left'] = left + 'px';
       }
 
-      setStyleObjectState(styleObject);
+      var isSameStyle = styleObjectState['left'] === styleObject['left'] && styleObjectState['right'] === styleObject['right'];
+      !isSameStyle && setStyleObjectState(styleObject);
     }
   };
 
@@ -2701,7 +2709,8 @@ var ColumnFilter = /*#__PURE__*/React__namespace.memo(function (props) {
       unbindOverlayListener = _useOverlayListener2[1];
 
   var hasFilter = function hasFilter() {
-    return filterStoreModel && filterModel && (filterStoreModel.operator ? filterStoreModel.constraints[0].value !== filterModel.constraints[0].value : filterStoreModel.value !== filterModel.value);
+    if (!filterStoreModel || !filterModel) return false;
+    return filterStoreModel.operator ? !isFilterBlank(filterModel.constraints[0].value) && filterStoreModel.constraints[0].value !== filterModel.constraints[0].value : !isFilterBlank(filterModel.value) && filterStoreModel.value !== filterModel.value;
   };
 
   var hasRowFilter = function hasRowFilter() {
@@ -3815,14 +3824,15 @@ var HeaderCell = /*#__PURE__*/React__namespace.memo(function (props) {
     var sortMeta = getSortMeta();
     var style = getStyle();
     var align = getColumnProp('alignHeader') || getColumnProp('align');
+    var frozen = getColumnProp('frozen');
     var className = utils.classNames(getColumnProp('headerClassName'), getColumnProp('className'), _defineProperty({
       'p-sortable-column': getColumnProp('sortable'),
       'p-resizable-column': props.resizableColumns && getColumnProp('resizeable'),
       'p-highlight': sortMeta.sorted,
-      'p-frozen-column': getColumnProp('frozen'),
+      'p-frozen-column': frozen,
       'p-selection-column': getColumnProp('selectionMode'),
       'p-sortable-disabled': getColumnProp('sortable') && _isSortableDisabled,
-      'p-reorderable-column': props.reorderableColumns && getColumnProp('reorderable')
+      'p-reorderable-column': props.reorderableColumns && getColumnProp('reorderable') && !frozen
     }, "p-align-".concat(align), !!align));
     var tabIndex = getColumnProp('sortable') && !_isSortableDisabled ? props.tabIndex : null;
     var colSpan = getColumnProp('colSpan');
@@ -4111,6 +4121,9 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
   var elementRef = React__namespace.useRef(null);
   var tableRef = React__namespace.useRef(null);
   var wrapperRef = React__namespace.useRef(null);
+  var bodyRef = React__namespace.useRef(null);
+  var frozenBodyRef = React__namespace.useRef(null);
+  var virtualScrollerRef = React__namespace.useRef(null);
   var reorderIndicatorUpRef = React__namespace.useRef(null);
   var reorderIndicatorDownRef = React__namespace.useRef(null);
   var colReorderIconWidth = React__namespace.useRef(null);
@@ -4403,6 +4416,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       if (props.resizableColumns) {
         columnWidthsState.current = restoredState.columnWidths;
         tableWidthState.current = restoredState.tableWidth;
+        restoreColumnWidths();
       }
 
       if (props.reorderableColumns) {
@@ -4606,8 +4620,22 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
         }
       } else if (props.columnResizeMode === 'expand') {
         var tableWidth = tableRef.current.offsetWidth + delta + 'px';
-        tableRef.current.style.width = tableWidth;
-        tableRef.current.style.minWidth = tableWidth;
+
+        var updateTableWidth = function updateTableWidth(el) {
+          !!el && (el.style.width = el.style.minWidth = tableWidth);
+        };
+
+        updateTableWidth(tableRef.current);
+
+        if (!isVirtualScrollerDisabled()) {
+          updateTableWidth(bodyRef.current);
+          updateTableWidth(frozenBodyRef.current);
+
+          if (wrapperRef.current) {
+            updateTableWidth(utils.DomHandler.findSingle(wrapperRef.current, '.p-virtualscroller-content'));
+          }
+        }
+
         resizeTableCells(newColumnWidth);
       }
 
@@ -4664,7 +4692,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
     var event = e.originalEvent,
         column = e.column;
 
-    if (props.reorderableColumns && getColumnProp(column, 'reorderable') !== false) {
+    if (props.reorderableColumns && getColumnProp(column, 'reorderable') !== false && !getColumnProp(column, 'frozen')) {
       if (event.target.nodeName === 'INPUT' || event.target.nodeName === 'TEXTAREA' || utils.DomHandler.hasClass(event.target, 'p-column-resizer')) event.currentTarget.draggable = false;else event.currentTarget.draggable = true;
     }
   };
@@ -4727,10 +4755,11 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
   };
 
   var onColumnHeaderDragOver = function onColumnHeaderDragOver(e) {
-    var event = e.originalEvent;
+    var event = e.originalEvent,
+        column = e.column;
     var dropHeader = findParentHeader(event.currentTarget);
 
-    if (props.reorderableColumns && draggedColumnElement.current && dropHeader) {
+    if (props.reorderableColumns && draggedColumnElement.current && dropHeader && !getColumnProp(column, 'frozen')) {
       event.preventDefault();
 
       if (draggedColumnElement.current !== dropHeader) {
@@ -4941,8 +4970,8 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
     return props.removableSort ? props.defaultSortOrder === currentOrder ? currentOrder * -1 : 0 : currentOrder * -1;
   };
 
-  var compareValuesOnSort = function compareValuesOnSort(value1, value2) {
-    return utils.ObjectUtils.sort(value1, value2, 1, PrimeReact__default["default"].locale);
+  var compareValuesOnSort = function compareValuesOnSort(value1, value2, order) {
+    return utils.ObjectUtils.sort(value1, value2, order, PrimeReact__default["default"].locale, PrimeReact__default["default"].nullSortOrder);
   };
 
   var addSortMeta = function addSortMeta(meta, multiSortMeta) {
@@ -4981,6 +5010,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
 
     if (columnSortable.current && columnSortFunction.current) {
       value = columnSortFunction.current({
+        rowData: value,
         field: field,
         order: order
       });
@@ -4988,8 +5018,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       value.sort(function (data1, data2) {
         var value1 = utils.ObjectUtils.resolveFieldData(data1, field);
         var value2 = utils.ObjectUtils.resolveFieldData(data2, field);
-        var result = compareValuesOnSort(value1, value2);
-        return order * result;
+        return compareValuesOnSort(value1, value2, order);
       });
     }
 
@@ -5022,6 +5051,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       var field = columnField.current;
       var order = meta ? meta.order : defaultSortOrder;
       value = columnSortFunction.current({
+        rowData: value,
         field: field,
         order: order
       });
@@ -5042,8 +5072,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       return multiSortMeta.length - 1 > index ? multisortField(data1, data2, multiSortMeta, index + 1) : 0;
     }
 
-    var result = compareValuesOnSort(value1, value2);
-    return multiSortMeta[index].order * result;
+    return compareValuesOnSort(value1, value2, multiSortMeta[index].order);
   };
 
   var onFilterChange = function onFilterChange(filters) {
@@ -5363,6 +5392,17 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
         var sortOrder = localState && localState.sortOrder || getSortOrder();
         var multiSortMeta = localState && localState.multiSortMeta || getMultiSortMeta();
 
+        var _columns3 = getColumns();
+
+        var sortColumn = _columns3.find(function (col) {
+          return col.props.field === sortField;
+        });
+
+        if (sortColumn) {
+          columnSortable.current = sortColumn.props.sortable;
+          columnSortFunction.current = sortColumn.props.sortFunction;
+        }
+
         if (utils.ObjectUtils.isNotEmpty(filters) || props.globalFilter) {
           data = filterLocal(data, filters);
         }
@@ -5422,7 +5462,9 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
     }
   }, [props.responsiveLayout]);
   hooks.useUpdateEffect(function () {
-    filter(props.globalFilter, 'global', 'contains');
+    if (props.globalFilter) {
+      filter(props.globalFilter, 'global', 'contains');
+    }
   }, [props.globalFilter]);
   hooks.useUnmountEffect(function () {
     unbindColumnResizeEvents();
@@ -5431,6 +5473,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
   });
   React__namespace.useImperativeHandle(ref, function () {
     return {
+      props: props,
       reset: reset,
       resetScroll: resetScroll,
       exportCSV: exportCSV,
@@ -5438,7 +5481,16 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       resetColumnOrder: resetColumnOrder,
       closeEditingCell: closeEditingCell,
       restoreTableState: restoreTableState,
-      clearState: clearState
+      clearState: clearState,
+      getElement: function getElement() {
+        return elementRef.current;
+      },
+      getTable: function getTable() {
+        return tableRef.current;
+      },
+      getVirtualScroller: function getVirtualScroller() {
+        return virtualScrollerRef.current;
+      }
     };
   });
 
@@ -5522,7 +5574,9 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
         columns = options.columns,
         contentRef = options.contentRef,
         className = options.className;
+        options.itemSize;
     var frozenBody = props.frozenValue && /*#__PURE__*/React__namespace.createElement(TableBody, {
+      ref: frozenBodyRef,
       value: props.frozenValue,
       className: "p-datatable-frozen-tbody",
       frozenRow: true,
@@ -5560,6 +5614,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       editMode: props.editMode,
       editingRows: props.editingRows,
       onRowReorder: props.onRowReorder,
+      reorderableRows: props.reorderableRows,
       scrollable: props.scrollable,
       rowGroupMode: props.rowGroupMode,
       groupRowsBy: props.groupRowsBy,
@@ -5586,9 +5641,11 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       expandedRowIcon: props.expandedRowIcon,
       collapsedRowIcon: props.collapsedRowIcon,
       rowClassName: props.rowClassName,
+      virtualScrollerOptions: options,
       isVirtualScrollerDisabled: true
     });
     var body = /*#__PURE__*/React__namespace.createElement(TableBody, {
+      ref: bodyRef,
       value: dataToRender(rows),
       className: className,
       empty: empty,
@@ -5627,6 +5684,7 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       editMode: props.editMode,
       editingRows: props.editingRows,
       onRowReorder: props.onRowReorder,
+      reorderableRows: props.reorderableRows,
       scrollable: props.scrollable,
       rowGroupMode: props.rowGroupMode,
       groupRowsBy: props.groupRowsBy,
@@ -5681,10 +5739,15 @@ var DataTable = /*#__PURE__*/React__namespace.forwardRef(function (props, ref) {
       style: {
         maxHeight: _isVirtualScrollerDisabled ? props.scrollHeight : null
       }
-    }, /*#__PURE__*/React__namespace.createElement(virtualscroller.VirtualScroller, _extends({}, virtualScrollerOptions, {
+    }, /*#__PURE__*/React__namespace.createElement(virtualscroller.VirtualScroller, _extends({
+      ref: virtualScrollerRef
+    }, virtualScrollerOptions, {
       items: processedData,
       columns: columns,
-      scrollHeight: props.scrollHeight,
+      style: _objectSpread(_objectSpread({}, virtualScrollerOptions.style), {
+        height: props.scrollHeight !== 'flex' ? props.scrollHeight : undefined
+      }),
+      scrollHeight: props.scrollHeight !== 'flex' ? undefined : '100%',
       disabled: _isVirtualScrollerDisabled,
       loaderDisabled: true,
       showSpacer: false,
@@ -5893,6 +5956,7 @@ DataTable.defaultProps = {
   resizableColumns: false,
   columnResizeMode: 'fit',
   reorderableColumns: false,
+  reorderableRows: false,
   filters: null,
   globalFilter: null,
   filterDelay: 300,