@syncfusion/ej2-layouts 19.4.52 → 20.1.58

package/dist/es6/ej2-layouts.es2015.js

@@ -1036,7 +1036,7 @@ let Splitter = class Splitter extends Component {
                         paneMinRange = this.convertPercentageToPixel(this.paneSettings[i].min);
                     }
                     minValue = this.convertPixelToNumber((paneMinRange).toString());
-                    if (this.allPanes[i].offsetWidth < minValue) {
+                    if ((this.orientation === 'Horizontal' ? this.allPanes[i].offsetWidth : this.allPanes[i].offsetHeight) < minValue) {
                         if (i === paneIndex) {
                             updatePane = this.allPanes[i];
                             flexPane = this.allPanes[i + 1];
@@ -1045,12 +1045,15 @@ let Splitter = class Splitter extends Component {
                             updatePane = this.allPanes[i];
                             flexPane = this.allPanes[i - 1];
                         }
-                        const sizeDiff = minValue - this.allPanes[i].offsetWidth;
+                        const sizeDiff = minValue - (this.orientation === 'Horizontal' ?
+                            this.allPanes[i].offsetWidth : this.allPanes[i].offsetHeight);
                         const isPercent = updatePane.style.flexBasis.indexOf('%') > -1;
-                        updatePane.style.flexBasis = isPercent ? this.convertPixelToPercentage(updatePane.offsetWidth + sizeDiff) + '%'
-                            : (updatePane.offsetWidth + sizeDiff) + 'px';
+                        let updatePaneOffset = this.orientation === 'Horizontal' ? updatePane.offsetWidth : updatePane.offsetHeight;
+                        updatePane.style.flexBasis = isPercent ? this.convertPixelToPercentage(updatePaneOffset + sizeDiff) + '%'
+                            : (updatePaneOffset + sizeDiff) + 'px';
+                        let flexPaneOffset = this.orientation === 'Horizontal' ? flexPane.offsetWidth : flexPane.offsetHeight;
                         flexPane.style.flexBasis = flexPane.style.flexBasis.indexOf('%') > -1 ?
-                            this.convertPixelToPercentage(flexPane.offsetWidth - sizeDiff) + '%' : (flexPane.offsetWidth - sizeDiff) + 'px';
+                            this.convertPixelToPercentage(flexPaneOffset - sizeDiff) + '%' : (flexPaneOffset - sizeDiff) + 'px';
                     }
                 }
             }
@@ -1174,22 +1177,20 @@ let Splitter = class Splitter extends Component {
         const visiblePane = collapseCount === this.allPanes.length - 2;
         const panes = this.allPanes;
         for (let i = 0; i < panes.length; i++) {
-            if (panes[i].classList.contains(EXPAND_PANE)) {
-                panes[i].style.flexGrow = '1';
-            }
-            else if (panes[i].classList.contains(COLLAPSE_PANE)) {
-                panes[i].style.flexGrow = '0';
-            }
-            else {
-                panes[i].style.flexGrow = '';
-            }
+            panes[i].style.flexGrow = '';
             if (status && !this.nextPane.classList.contains(COLLAPSE_PANE)) {
                 this.nextPane.style.flexGrow = '1';
             }
-            if (visiblePane && !this.allPanes[i].classList.contains(COLLAPSE_PANE) && this.paneSettings[i].size &&
+            if (visiblePane && this.allPanes[i].classList.contains(COLLAPSE_PANE) && this.paneSettings[i].size &&
                 i !== this.allPanes.length - 1) {
                 panes[i].style.flexGrow = '';
             }
+            if (panes[i].classList.contains(EXPAND_PANE)) {
+                panes[i].style.flexGrow = '1';
+            }
+            else if (panes[i].classList.contains(COLLAPSE_PANE)) {
+                panes[i].style.flexGrow = '0';
+            }
         }
     }
     hideTargetBarIcon(targetBar, targetArrow) {
@@ -1841,7 +1842,7 @@ let Splitter = class Splitter extends Component {
         }
     }
     validateDraggedPosition(draggedPos, prevPaneHeightWidth, nextPaneHeightWidth) {
-        const separatorTopLeft = (this.orientation === 'Horizontal') ? this.currentSeparator.offsetLeft + window.scrollX :
+        const separatorTopLeft = (this.orientation === 'Horizontal') ? this.currentSeparator.offsetLeft :
             this.currentSeparator.offsetTop;
         const prePaneRange = separatorTopLeft - prevPaneHeightWidth;
         const nextPaneRange = nextPaneHeightWidth + separatorTopLeft;