Fixed primefaces#2456 - When scrollable and virtual Scroller are enab…

…led at the same time, the scroll style is incorrect when the scrollHeight is changed
melloware · Nov 21, 2021 · 8461882 · 8461882
1 parent b00fa14
commit 8461882
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/components/datatable/DataTable.js b/src/components/datatable/DataTable.js
@@ -1694,7 +1694,7 @@ export class DataTable extends Component {
 
         return (
             <div className="p-datatable-wrapper" style={{ maxHeight: isVirtualScrollerDisabled ? this.props.scrollHeight : '' }}>
-                <VirtualScroller {...virtualScrollerOptions} items={processedData} columns={columns} style={{ height: this.props.scrollHeight }}
+                <VirtualScroller {...virtualScrollerOptions} items={processedData} columns={columns} scrollHeight={this.props.scrollHeight}
                     disabled={isVirtualScrollerDisabled} loaderDisabled showSpacer={false}
                     contentTemplate={(options) => {
                         const ref = (el) => { this.table = el; options.spacerRef && options.spacerRef(el) };

diff --git a/src/components/virtualscroller/VirtualScroller.js b/src/components/virtualscroller/VirtualScroller.js
@@ -513,6 +513,11 @@ export class VirtualScroller extends Component {
         return [];
     }
 
+    isPropChanged(prevProps) {
+        const props = ['itemSize', 'scrollHeight'];
+        return props.some((p) => !ObjectUtils.equals(prevProps[p], this.props[p]));
+    }
+
     init() {
         this.setSize();
         this.calculateOptions();
@@ -524,7 +529,7 @@ export class VirtualScroller extends Component {
     }
 
     componentDidUpdate(prevProps, prevState) {
-        if (!ObjectUtils.equals(prevProps.itemSize, this.props.itemSize) || (!prevProps.items || prevProps.items.length !== (this.props.items || []).length)) {
+        if ((!prevProps.items || prevProps.items.length !== (this.props.items || []).length) || this.isPropChanged(prevProps)) {
             this.init();
         }