Fixed #4950

primefaces · Jun 28, 2019 · 20db8dc · 20db8dc
1 parent 1ec6784
commit 20db8dc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/src/main/java/org/primefaces/component/datatable/DataTable.java b/src/main/java/org/primefaces/component/datatable/DataTable.java
@@ -1051,7 +1051,7 @@ public String getScrollState() {
         String name = getClientId() + "_scrollState";
         String value = params.get(name);
 
-        return value == null ? "0,0" : value;
+        return value == null ? (isRTL() ? "-1,0" : "0,0") : value;
     }
 
     @Override

diff --git a/src/main/resources/META-INF/resources/primefaces/datatable/datatable.js b/src/main/resources/META-INF/resources/primefaces/datatable/datatable.js
@@ -65,6 +65,8 @@ PrimeFaces.widget.DataTable = PrimeFaces.widget.DeferredWidget.extend({
     },
 
     _render: function() {
+        this.isRTL = this.jq.hasClass('ui-datatable-rtl');
+
         if(this.cfg.scrollable) {
             this.setupScrolling();
         }
@@ -967,7 +969,8 @@ PrimeFaces.widget.DataTable = PrimeFaces.widget.DeferredWidget.extend({
         this.percentageScrollHeight = this.cfg.scrollHeight && (this.cfg.scrollHeight.indexOf('%') !== -1);
         this.percentageScrollWidth = this.cfg.scrollWidth && (this.cfg.scrollWidth.indexOf('%') !== -1);
         var $this = this,
-        scrollBarWidth = this.getScrollbarWidth() + 'px';
+        scrollBarWidth = this.getScrollbarWidth() + 'px',
+        hScrollWidth = this.scrollBody[0].scrollWidth;
 
         if(this.cfg.scrollHeight) {
             if(this.percentageScrollHeight) {
@@ -1025,8 +1028,15 @@ PrimeFaces.widget.DataTable = PrimeFaces.widget.DeferredWidget.extend({
 
         this.scrollBody.on('scroll.dataTable', function() {
             var scrollLeft = $this.scrollBody.scrollLeft();
-            $this.scrollHeaderBox.css('margin-left', -scrollLeft);
-            $this.scrollFooterBox.css('margin-left', -scrollLeft);
+
+            if ($this.isRTL) {
+                $this.scrollHeaderBox.css('margin-right', (scrollLeft - hScrollWidth + this.clientWidth));
+                $this.scrollFooterBox.css('margin-right', (scrollLeft - hScrollWidth + this.clientWidth));
+            }
+            else {
+                $this.scrollHeaderBox.css('margin-left', -scrollLeft);
+                $this.scrollFooterBox.css('margin-left', -scrollLeft);
+            }
 
             if($this.isEmpty()) {
                 return;
@@ -1202,6 +1212,10 @@ PrimeFaces.widget.DataTable = PrimeFaces.widget.DeferredWidget.extend({
         var scrollState = this.scrollStateHolder.val(),
         scrollValues = scrollState.split(',');
 
+        if (scrollValues[0] == '-1') {
+            scrollValues[0] = this.scrollBody[0].scrollWidth;
+        }
+
         this.scrollBody.scrollLeft(scrollValues[0]);
         this.scrollBody.scrollTop(scrollValues[1]);
     },
@@ -3949,7 +3963,8 @@ PrimeFaces.widget.FrozenDataTable = PrimeFaces.widget.DataTable.extend({
         this.frozenThead.find('> tr > th').addClass('ui-frozen-column');
 
         var $this = this,
-        scrollBarWidth = this.getScrollbarWidth() + 'px';
+        scrollBarWidth = this.getScrollbarWidth() + 'px',
+        hScrollWidth = this.scrollBody[0].scrollWidth;
 
         if(this.cfg.scrollHeight) {
             if(this.percentageScrollHeight) {
@@ -4010,8 +4025,16 @@ PrimeFaces.widget.FrozenDataTable = PrimeFaces.widget.DataTable.extend({
         this.scrollBody.scroll(function() {
             var scrollLeft = $this.scrollBody.scrollLeft(),
             scrollTop = $this.scrollBody.scrollTop();
-            $this.scrollHeaderBox.css('margin-left', -scrollLeft);
-            $this.scrollFooterBox.css('margin-left', -scrollLeft);
+
+            if ($this.isRTL) {
+                $this.scrollHeaderBox.css('margin-right', (scrollLeft - hScrollWidth + this.clientWidth));
+                $this.scrollFooterBox.css('margin-right', (scrollLeft - hScrollWidth + this.clientWidth));
+            }
+            else {
+                $this.scrollHeaderBox.css('margin-left', -scrollLeft);
+                $this.scrollFooterBox.css('margin-left', -scrollLeft);
+            }
+
             $this.frozenBody.scrollTop(scrollTop);
 
             if($this.cfg.virtualScroll) {