fix(layout): user logicalSize when determining component visibility (#…

…368)
qlik-oss · Apr 8, 2019 · dfb6a91 · dfb6a91
1 parent 76b3874
commit dfb6a91
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/packages/picasso.js/src/core/layout/dock/__tests__/dock-layout.spec.js b/packages/picasso.js/src/core/layout/dock/__tests__/dock-layout.spec.js
@@ -635,6 +635,31 @@ describe('Dock Layout', () => {
         height: 1000
       });
     });
+
+    it('should use logicalSize when determining visiblity of components', () => {
+      const container = createRect(0, 0, 1000, 2000);
+      const settings = {
+        layoutModes: {
+          S: { width: 800, height: 100 }
+        },
+        logicalSize: {
+          x: 0,
+          y: 0,
+          width: 799,
+          height: 100
+        }
+      };
+
+      const leftComp = componentMock({ dock: 'left', size: 100, minimumLayoutMode: { width: 'S', height: 'S' } });
+      const mainComp = componentMock();
+
+      dl.settings(settings);
+
+      const { visible, hidden } = dl.layout(container, [mainComp, leftComp]);
+
+      expect(visible).to.include(mainComp);
+      expect(hidden).to.include(leftComp);
+    });
   });
 
   describe('edgeBleed', () => {

diff --git a/packages/picasso.js/src/core/layout/dock/docker.js b/packages/picasso.js/src/core/layout/dock/docker.js
@@ -420,7 +420,7 @@ function dockLayout(initialSettings) {
 
     const { logicalContainerRect, containerRect } = resolveContainerRects(rect, settings);
 
-    const [visible, hidden] = filterComponents(components, settings, containerRect);
+    const [visible, hidden] = filterComponents(components, settings, logicalContainerRect);
 
     const reducedRect = reduceLayoutRect({
       layoutRect: logicalContainerRect,