Merge pull request #831 from finos/workspace-fixes

Fix `PerspectiveWorkspace` when tabbed views are moved to master
finos · Dec 4, 2019 · fc2e189 · fc2e189
2 parents 837336d + 791e3da
commit fc2e189
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/packages/perspective-phosphor/src/theme/material/menu.less b/packages/perspective-phosphor/src/theme/material/menu.less
@@ -147,3 +147,8 @@
     content: "cast";
     font-family: "Material Icons";
 }
+
+.p-MenuItem-detail:before {
+    content: "notes";
+    font-family: "Material Icons";
+}
diff --git a/packages/perspective-phosphor/src/ts/widget.ts b/packages/perspective-phosphor/src/ts/widget.ts
@@ -86,8 +86,6 @@ export class PerspectiveWidget extends Widget {
         // do computed last
         this.computed_columns = computed_columns;
         this.filters = filters;
-
-        this._displayed = false;
     }
 
     /**********************/
@@ -120,9 +118,7 @@ export class PerspectiveWidget extends Widget {
     }
 
     notifyResize(): void {
-        if (this.isAttached && !this.displayed) {
-            this._displayed = true;
-        } else if (this.isAttached) {
+        if (this.isVisible) {
             this.viewer.notifyResize();
         }
     }
@@ -327,7 +323,7 @@ export class PerspectiveWidget extends Widget {
             this.node.classList.add(PSP_CONTAINER_CLASS);
             this.node.classList.remove(PSP_CONTAINER_CLASS_DARK);
         }
-        if (this._displayed) {
+        if (this.isAttached) {
             this.viewer.restyleElement();
         }
     }
@@ -344,14 +340,10 @@ export class PerspectiveWidget extends Widget {
         }
     }
 
-    toggleConfig() {
+    toggleConfig(): void {
         this._viewer.toggleConfig();
     }
 
-    get displayed(): boolean {
-        return this._displayed;
-    }
-
     static createNode(node: HTMLDivElement): PerspectiveViewer {
         node.classList.add("p-Widget");
         node.classList.add(PSP_CONTAINER_CLASS);
@@ -387,5 +379,4 @@ export class PerspectiveWidget extends Widget {
     private _client: boolean;
     private _dark: boolean;
     private _editable: boolean;
-    private _displayed: boolean;
 }
diff --git a/packages/perspective-phosphor/src/ts/workspace/workspace.ts b/packages/perspective-phosphor/src/ts/workspace/workspace.ts
@@ -98,6 +98,7 @@ export class PerspectiveWorkspace extends SplitPanel {
         }
 
         this.masterpanel.addWidget(widget);
+        widget.isHidden && widget.show();
         widget.viewer.restyleElement();
 
         widget.viewer.addEventListener("perspective-click", this.onPerspectiveClick);