@hpcc-js/phosphor 2.20.2 → 2.20.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/phosphor",
-    "version": "2.20.2",
+    "version": "2.20.4",
     "description": "hpcc-js - Viz Phosphor",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -38,10 +38,10 @@
         "update": "npx --yes npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/common": "^2.73.1",
-        "@hpcc-js/other": "^2.17.1",
-        "@hpcc-js/phosphor-shim": "^2.16.0",
-        "@hpcc-js/util": "^2.53.1"
+        "@hpcc-js/common": "^2.73.3",
+        "@hpcc-js/other": "^2.17.3",
+        "@hpcc-js/phosphor-shim": "^2.17.1",
+        "@hpcc-js/util": "^2.53.3"
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.12.0",
@@ -59,5 +59,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "9f7febd34d32c62d1785e7863334773e1967d738"
+    "gitHead": "0907b8d15d369c89483954a1d96e2247ba020cb6"
 }

package/src/DockPanel.css

@@ -1,94 +1,94 @@
-.p-DockPanel-overlay {
-  background: rgba(255, 255, 255, 0.6);
-  border: 1px dashed black;
-  transition-property: top, left, right, bottom;
-  transition-duration: 150ms;
-  transition-timing-function: ease;
-}
-
-.p-TabBar {
-  min-height: 24px;
-  max-height: 24px;
-}
-
-.p-TabBar-content {
-  min-width: 0;
-  min-height: 0;
-  align-items: flex-end;
-}
-
-.p-TabPanel-tabBar .p-TabBar-content {
-  border-bottom: 1px solid #C0C0C0;
-}
-
-.p-TabBar-tab {
-  padding: 0px 10px;
-  background: #E5E5E5;
-  border: 1px solid #C0C0C0;
-  border-bottom: none;
-  font: 12px Helvetica, Arial, sans-serif;
-  flex: 0 1 125px;
-  min-height: 20px;
-  max-height: 20px;
-  min-width: 35px;
-  margin-left: -1px;
-  line-height: 20px;
-}
-
-.p-TabBar-tab.p-mod-current {
-  background: white;
-}
-
-
-.p-TabBar-tab:hover:not(.p-mod-current) {
-  background: #F0F0F0;
-}
-
-
-.p-TabBar-tab:first-child {
-  margin-left: 0;
-}
-
-
-.p-TabBar-tab.p-mod-current {
-  min-height: 23px;
-  max-height: 23px;
-  transform: translateY(1px);
-}
-
-
-.p-TabBar-tabIcon,
-.p-TabBar-tabLabel,
-.p-TabBar-tabCloseIcon {
-  display: inline-block;
-}
-
-
-.p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon {
-  margin-left: 4px;
-}
-
-
-.p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon:before {
-  content: '\f00d';
-  font-family: FontAwesome;
-}
-
-
-.p-TabBar-tab.p-mod-drag-image {
-  min-height: 23px;
-  max-height: 23px;
-  min-width: 125px;
-  border: none;
-  box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
-  transform: translateX(-40%) translateY(-58%);
-}
-
-.p-Widget.p-TabBar.p-DockPanel-tabBar.hide {
-  min-height: 1px !important;
-  max-height: 1px !important;
-}
-
-.p-Widget.p-TabBar.p-DockPanel-tabBar.hide .p-TabBar-tab.p-mod-current {
-  display: none;
-}
+.p-DockPanel-overlay {
+  background: rgba(255, 255, 255, 0.6);
+  border: 1px dashed black;
+  transition-property: top, left, right, bottom;
+  transition-duration: 150ms;
+  transition-timing-function: ease;
+}
+
+.p-TabBar {
+  min-height: 24px;
+  max-height: 24px;
+}
+
+.p-TabBar-content {
+  min-width: 0;
+  min-height: 0;
+  align-items: flex-end;
+}
+
+.p-TabPanel-tabBar .p-TabBar-content {
+  border-bottom: 1px solid #C0C0C0;
+}
+
+.p-TabBar-tab {
+  padding: 0px 10px;
+  background: #E5E5E5;
+  border: 1px solid #C0C0C0;
+  border-bottom: none;
+  font: 12px Helvetica, Arial, sans-serif;
+  flex: 0 1 125px;
+  min-height: 20px;
+  max-height: 20px;
+  min-width: 35px;
+  margin-left: -1px;
+  line-height: 20px;
+}
+
+.p-TabBar-tab.p-mod-current {
+  background: white;
+}
+
+
+.p-TabBar-tab:hover:not(.p-mod-current) {
+  background: #F0F0F0;
+}
+
+
+.p-TabBar-tab:first-child {
+  margin-left: 0;
+}
+
+
+.p-TabBar-tab.p-mod-current {
+  min-height: 23px;
+  max-height: 23px;
+  transform: translateY(1px);
+}
+
+
+.p-TabBar-tabIcon,
+.p-TabBar-tabLabel,
+.p-TabBar-tabCloseIcon {
+  display: inline-block;
+}
+
+
+.p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon {
+  margin-left: 4px;
+}
+
+
+.p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon:before {
+  content: '\f00d';
+  font-family: FontAwesome;
+}
+
+
+.p-TabBar-tab.p-mod-drag-image {
+  min-height: 23px;
+  max-height: 23px;
+  min-width: 125px;
+  border: none;
+  box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
+  transform: translateX(-40%) translateY(-58%);
+}
+
+.p-Widget.p-TabBar.p-DockPanel-tabBar.hide {
+  min-height: 1px !important;
+  max-height: 1px !important;
+}
+
+.p-Widget.p-TabBar.p-DockPanel-tabBar.hide .p-TabBar-tab.p-mod-current {
+  display: none;
+}

package/src/DockPanel.ts

@@ -1,187 +1,187 @@
-import { HTMLWidget, Widget, Utility } from "@hpcc-js/common";
-import { DockPanel as PhosphorDockPanel, IMessageHandler, IMessageHook, Message, MessageLoop, Widget as PWidget } from "@hpcc-js/phosphor-shim";
-import { select as d3Select } from "d3-selection";
-import { PDockPanel } from "./PDockPanel";
-import { IClosable, Msg, WidgetAdapter } from "./WidgetAdapter";
-
-import "../src/DockPanel.css";
-
-export class DockPanel extends HTMLWidget implements IMessageHandler, IMessageHook {
-    private _dock = new PDockPanel({ mode: "multiple-document" });
-
-    constructor() {
-        super();
-        this._tag = "div";
-        this._dock.id = "p" + this.id();
-        MessageLoop.installMessageHook(this, this);
-    }
-
-    protected getWidgetAdapter(widget: Widget): WidgetAdapter | null {
-        let retVal = null;
-        this._dock.content().some(wa => {
-            if (wa.widget === widget) {
-                retVal = wa;
-                return true;
-            }
-            return false;
-        });
-        return retVal;
-    }
-
-    addWidget(widget: Widget, title: string, location: PhosphorDockPanel.InsertMode = "split-right", refWidget?: Widget, closable?: boolean | IClosable, padding: number = 8) {
-        const addMode: PhosphorDockPanel.IAddOptions = { mode: location, ref: this.getWidgetAdapter(refWidget) };
-        const wa = new WidgetAdapter(this, widget, {}, closable);
-        wa.title.label = title;
-        wa.padding = padding;
-        this._dock.addWidget(wa, addMode);
-        this._dock.appendContent(wa);
-        this._dock.tabsMovable = true;
-        return this;
-    }
-
-    removeWidget(widget: Widget) {
-        const wa = this.getWidgetAdapter(widget);
-        if (wa) {
-            widget.target(null);
-            this._dock.removeContent(wa);
-        }
-        return this;
-    }
-
-    isVisible(widget: Widget) {
-        return this.getWidgetAdapter(widget).isVisible;
-    }
-
-    widgetAdapters(): WidgetAdapter[] {
-        return this._dock.content();
-    }
-
-    widgets(): Widget[] {
-        return this._dock.content().map(wa => wa.widget);
-    }
-
-    layout(): object;
-    layout(_: object): this;
-    layout(_?: object): object | this {
-        if (!arguments.length) return this._dock.saveLayout();
-        this._dock.restoreLayout(_ as any);
-        return this;
-    }
-
-    //  Used to delay load a layout during render...
-    private _layoutObj: object = null;
-    layoutObj(_: object | null): this {
-        this._layoutObj = _;
-        return this;
-    }
-
-    private _pPlaceholder;
-    enter(domNode, element) {
-        super.enter(domNode, element);
-        this._pPlaceholder = element.append("div");
-        PWidget.attach(this._dock, this._pPlaceholder.node());
-    }
-
-    _prevHideSingleTabs;
-    update(domNode, element) {
-        super.update(domNode, element);
-
-        this._pPlaceholder
-            .style("width", this.width() + "px")
-            .style("height", this.height() + "px")
-            .style("overflow", "hidden")
-            ;
-
-        element.select(".p-Widget")
-            .style("width", this._pPlaceholder.node().clientWidth + "px")
-            .style("height", this.height() + "px")
-            ;
-
-        this.widgets().forEach(w => w.render());
-    }
-
-    exit(domNode, element) {
-        [...this.widgets()].forEach(w => this.removeWidget(w));
-        super.exit(domNode, element);
-    }
-
-    render(callback?: (w: Widget) => void): this {
-        const context = this;
-        if (this._layoutObj !== null) {
-            this.layout(this._layoutObj);
-            this.layoutObj(null);
-        }
-        return super.render((w) => {
-            this._dock.content().watchRendered(this, callback);
-            this._dock.update();
-            setTimeout(() => {
-                const tabBars = this.element().selectAll(".p-Widget.p-TabBar.p-DockPanel-tabBar");
-                let refit = false;
-                tabBars.each(function () {
-                    const tabBar = d3Select(this);
-                    const tabsCount = (tabBar.node() as HTMLElement).childNodes[0].childNodes.length;
-                    const hide = context.hideSingleTabs() && tabsCount === 1;
-                    if (hide !== tabBar.classed("hide")) {
-                        tabBar.classed("hide", hide);
-                        refit = true;
-                    }
-                });
-                if (refit) {
-                    this._dock.fit();
-                }
-            }, 0);
-        });
-    }
-
-    refit() {
-        this._dock.fit();
-    }
-
-    //  Phosphor Messaging  ---
-    messageHook(handler: IMessageHandler, msg: Message): boolean {
-        if (handler === this) {
-            this.processMessage(msg);
-        }
-        return true;
-    }
-
-    private _lazyLayoutChanged = Utility.debounce(async () => {
-        this.layoutChanged();
-    }, 1000);
-
-    _prevActive: Widget;
-    processMessage(msg: Message): void {
-        switch (msg.type) {
-            case Msg.WAActivateRequest.type:
-                const wa = (msg as Msg.WAActivateRequest).wa;
-                const widget = wa.widget;
-                if (this._prevActive !== widget) {
-                    this._prevActive = widget;
-                    this.childActivation(widget, wa);
-                }
-                break;
-            case Msg.WALayoutChanged.type:
-                this._lazyLayoutChanged();
-                break;
-        }
-    }
-
-    active(): Widget {
-        return this._prevActive;
-    }
-
-    //  Events  ---
-    childActivation(w: Widget, wa: WidgetAdapter) {
-    }
-
-    layoutChanged() {
-    }
-}
-DockPanel.prototype._class += " phosphor_DockPanel";
-
-export interface DockPanel {
-    hideSingleTabs(): boolean;
-    hideSingleTabs(_: boolean): this;
-}
-
-DockPanel.prototype.publish("hideSingleTabs", false, "boolean");
+import { HTMLWidget, Widget, Utility } from "@hpcc-js/common";
+import { DockPanel as PhosphorDockPanel, IMessageHandler, IMessageHook, Message, MessageLoop, Widget as PWidget } from "@hpcc-js/phosphor-shim";
+import { select as d3Select } from "d3-selection";
+import { PDockPanel } from "./PDockPanel";
+import { IClosable, Msg, WidgetAdapter } from "./WidgetAdapter";
+
+import "../src/DockPanel.css";
+
+export class DockPanel extends HTMLWidget implements IMessageHandler, IMessageHook {
+    private _dock = new PDockPanel({ mode: "multiple-document" });
+
+    constructor() {
+        super();
+        this._tag = "div";
+        this._dock.id = "p" + this.id();
+        MessageLoop.installMessageHook(this, this);
+    }
+
+    protected getWidgetAdapter(widget: Widget): WidgetAdapter | null {
+        let retVal = null;
+        this._dock.content().some(wa => {
+            if (wa.widget === widget) {
+                retVal = wa;
+                return true;
+            }
+            return false;
+        });
+        return retVal;
+    }
+
+    addWidget(widget: Widget, title: string, location: PhosphorDockPanel.InsertMode = "split-right", refWidget?: Widget, closable?: boolean | IClosable, padding: number = 8) {
+        const addMode: PhosphorDockPanel.IAddOptions = { mode: location, ref: this.getWidgetAdapter(refWidget) };
+        const wa = new WidgetAdapter(this, widget, {}, closable);
+        wa.title.label = title;
+        wa.padding = padding;
+        this._dock.addWidget(wa, addMode);
+        this._dock.appendContent(wa);
+        this._dock.tabsMovable = true;
+        return this;
+    }
+
+    removeWidget(widget: Widget) {
+        const wa = this.getWidgetAdapter(widget);
+        if (wa) {
+            widget.target(null);
+            this._dock.removeContent(wa);
+        }
+        return this;
+    }
+
+    isVisible(widget: Widget) {
+        return this.getWidgetAdapter(widget).isVisible;
+    }
+
+    widgetAdapters(): WidgetAdapter[] {
+        return this._dock.content();
+    }
+
+    widgets(): Widget[] {
+        return this._dock.content().map(wa => wa.widget);
+    }
+
+    layout(): object;
+    layout(_: object): this;
+    layout(_?: object): object | this {
+        if (!arguments.length) return this._dock.saveLayout();
+        this._dock.restoreLayout(_ as any);
+        return this;
+    }
+
+    //  Used to delay load a layout during render...
+    private _layoutObj: object = null;
+    layoutObj(_: object | null): this {
+        this._layoutObj = _;
+        return this;
+    }
+
+    private _pPlaceholder;
+    enter(domNode, element) {
+        super.enter(domNode, element);
+        this._pPlaceholder = element.append("div");
+        PWidget.attach(this._dock, this._pPlaceholder.node());
+    }
+
+    _prevHideSingleTabs;
+    update(domNode, element) {
+        super.update(domNode, element);
+
+        this._pPlaceholder
+            .style("width", this.width() + "px")
+            .style("height", this.height() + "px")
+            .style("overflow", "hidden")
+            ;
+
+        element.select(".p-Widget")
+            .style("width", this._pPlaceholder.node().clientWidth + "px")
+            .style("height", this.height() + "px")
+            ;
+
+        this.widgets().forEach(w => w.render());
+    }
+
+    exit(domNode, element) {
+        [...this.widgets()].forEach(w => this.removeWidget(w));
+        super.exit(domNode, element);
+    }
+
+    render(callback?: (w: Widget) => void): this {
+        const context = this;
+        if (this._layoutObj !== null) {
+            this.layout(this._layoutObj);
+            this.layoutObj(null);
+        }
+        return super.render((w) => {
+            this._dock.content().watchRendered(this, callback);
+            this._dock.update();
+            setTimeout(() => {
+                const tabBars = this.element().selectAll(".p-Widget.p-TabBar.p-DockPanel-tabBar");
+                let refit = false;
+                tabBars.each(function () {
+                    const tabBar = d3Select(this);
+                    const tabsCount = (tabBar.node() as HTMLElement).childNodes[0].childNodes.length;
+                    const hide = context.hideSingleTabs() && tabsCount === 1;
+                    if (hide !== tabBar.classed("hide")) {
+                        tabBar.classed("hide", hide);
+                        refit = true;
+                    }
+                });
+                if (refit) {
+                    this._dock.fit();
+                }
+            }, 0);
+        });
+    }
+
+    refit() {
+        this._dock.fit();
+    }
+
+    //  Phosphor Messaging  ---
+    messageHook(handler: IMessageHandler, msg: Message): boolean {
+        if (handler === this) {
+            this.processMessage(msg);
+        }
+        return true;
+    }
+
+    private _lazyLayoutChanged = Utility.debounce(async () => {
+        this.layoutChanged();
+    }, 1000);
+
+    _prevActive: Widget;
+    processMessage(msg: Message): void {
+        switch (msg.type) {
+            case Msg.WAActivateRequest.type:
+                const wa = (msg as Msg.WAActivateRequest).wa;
+                const widget = wa.widget;
+                if (this._prevActive !== widget) {
+                    this._prevActive = widget;
+                    this.childActivation(widget, wa);
+                }
+                break;
+            case Msg.WALayoutChanged.type:
+                this._lazyLayoutChanged();
+                break;
+        }
+    }
+
+    active(): Widget {
+        return this._prevActive;
+    }
+
+    //  Events  ---
+    childActivation(w: Widget, wa: WidgetAdapter) {
+    }
+
+    layoutChanged() {
+    }
+}
+DockPanel.prototype._class += " phosphor_DockPanel";
+
+export interface DockPanel {
+    hideSingleTabs(): boolean;
+    hideSingleTabs(_: boolean): this;
+}
+
+DockPanel.prototype.publish("hideSingleTabs", false, "boolean");