fix: resize the panel height error after dragging dvider (fix: #4)

nhn · Feb 27, 2018 · 1f5b3bc · 1f5b3bc
1 parent b8762ba
commit 1f5b3bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/js/common/vpanel.js b/src/js/common/vpanel.js
@@ -67,10 +67,11 @@ VPanel.prototype.isSplitter = function() {
 VPanel.prototype.setHeight = function(container, newHeight, force) {
     var maxHeight = this.options.maxHeight;
     var minHeight = this.options.minHeight;
+    var autoHeight = this.options.autoHeight;
     container = container || this.container;
 
     // 한번 force 호출이 일어난 이후에는 force 호출만 허용한다
-    if (!force && this.isHeightForcedSet) {
+    if (!force && this.isHeightForcedSet && !autoHeight) {
         return;
     }
 

diff --git a/test/app/common/vpanel.spec.js b/test/app/common/vpanel.spec.js
@@ -43,4 +43,13 @@ describe('VPanel', function() {
 
         expect(domutil.setData).toHaveBeenCalledWith(container, 'autoHeight', true);
     });
+
+    it('setHeight() can set specified height after force resizing if options.autoHeight is true', function() {
+        inst.options.autoHeight = true;
+        inst.isHeightForcedSet = true;
+
+        inst.setHeight(null, 350);
+
+        expect(container.style.height).toBe('350px');
+    });
 });