Merge branch 'develop' into fix/overwrite-id

unipept · Apr 30, 2021 · 241f94d · 241f94d
2 parents 2de4d0b + 229f31e
commit 241f94d
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 21 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,7 @@
+examples
+docs
+.github
+jest-setup.js
+jest.config.js
+snapshotResolver.js
+unipept-visualizations.iml
diff --git a/dist/test/TestConsts.d.ts b/dist/test/TestConsts.d.ts
@@ -0,0 +1,10 @@
+export declare type ImageSnapshotSettings = {
+    comparisonMethod: string;
+    customSnapshotsDir: string;
+    customDiffDir: string;
+    failureThreshold: number;
+    failureThresholdType: string;
+};
+export default class TestConsts {
+    static resolveImageSnapshotFolder(path: string): ImageSnapshotSettings;
+}
diff --git a/dist/test/TestDataGenerator.d.ts b/dist/test/TestDataGenerator.d.ts
@@ -0,0 +1,3 @@
+export default class TestDataGenerator {
+    generateSmall2DDataset(): number[][];
+}
diff --git a/dist/test/TestUtils.d.ts b/dist/test/TestUtils.d.ts
@@ -0,0 +1,15 @@
+export declare function sleep(ms: number): Promise<unknown>;
+/**
+ * This function waits a specified amount of time for promises to be fullfilled before returning.
+ *
+ * @param ms How many ms should we wait before continueing test execution?
+ */
+export declare function waitForPromises(ms: number): Promise<void>;
+/**
+ * This function returns only when the given condition evaluates to true, or when the given timeout has been exceeded.
+ *
+ * @param condition
+ * @param timeout
+ * @param interval
+ */
+export declare function waitForCondition(condition: () => boolean, timeout?: number, interval?: number): Promise<void>;
diff --git a/dist/unipept-visualizations.js b/dist/unipept-visualizations.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "unipept-visualizations",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "description": "The Unipept visualisation library",
     "homepage": "https://github.com/unipept/unipept-visualizations",
     "bugs": "https://github.com/unipept/unipept-visualizations/issues",

diff --git a/src/visualizations/heatmap/HeatmapSettings.ts b/src/visualizations/heatmap/HeatmapSettings.ts
@@ -140,22 +140,22 @@ export default class HeatmapSettings extends Settings {
     ) => string = (value: HeatmapValue, row: HeatmapFeature, column: HeatmapFeature) => {
         return `
             <style>
-                .tooltip {
+                .unipept-tooltip {
                     padding: 10px;
                     border-radius: 5px; 
                     background: rgba(0, 0, 0, 0.8); 
                     color: #fff;
                 }
                 
-                .tooltip div,a {
+                .unipept-tooltip div, .unipept-tooltip a {
                     font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
                 }
                 
-                .tooltip div {
+                .unipept-tooltip div {
                     font-weight: bold;
                 }
             </style>
-            <div class="tooltip">
+            <div class="unipept-tooltip">
                 <div>
                     ${this.getTooltipTitle(value, row, column)}
                 </div>

diff --git a/src/visualizations/sunburst/SunburstSettings.ts b/src/visualizations/sunburst/SunburstSettings.ts
@@ -83,7 +83,7 @@ export default class SunburstSettings extends Settings {
                     color: #fff;
                 }
                 
-                .unipept-tooltip div,a {
+                .unipept-tooltip div, .unipept-tooltip a {
                     font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
                 }
                 

diff --git a/src/visualizations/treemap/TreemapSettings.ts b/src/visualizations/treemap/TreemapSettings.ts
@@ -66,7 +66,7 @@ export default class TreemapSettings extends Settings {
                     color: #fff;
                 }
                 
-                .unipept-tooltip div,a {
+                .unipept-tooltip div, .unipept-tooltip a {
                     font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
                 }
                 

diff --git a/src/visualizations/treeview/Treeview.ts b/src/visualizations/treeview/Treeview.ts
@@ -137,16 +137,19 @@ export default class Treeview {
     private initialExpand(root: HPN<TreeviewNode>): void {
         if (!this.settings.enableAutoExpand) {
             root.data.expand(this.settings.levelsToExpand);
-        } else {
-            root.data.expand(1);
-            let allowedCount = root.data.count * (this.settings.enableAutoExpand ? this.settings.autoExpandValue : 0.8);
-            const pq = new MaxCountHeap<HPN<TreeviewNode>>(root.children, (a: HPN<TreeviewNode>, b: HPN<TreeviewNode>) => b.data.count - a.data.count);
-            while (allowedCount > 0 && pq.size() > 0) {
-                const toExpand = pq.remove();
-                allowedCount -= toExpand.data.count;
-                toExpand.data.expand(1);
-                toExpand.children?.forEach((d: HPN<TreeviewNode>, i: number) => pq.add(d));
-            }
+            return;
+        }
+
+        root.data.expand(1);
+        let allowedCount = root.data.count * (this.settings.enableAutoExpand ? this.settings.autoExpandValue : 0.8);
+        const pq = new MaxCountHeap<HPN<TreeviewNode>>([...(root.children || [])], (a: HPN<TreeviewNode>, b: HPN<TreeviewNode>) => b.data.count - a.data.count);
+        while (allowedCount > 0 && pq.size() > 0) {
+            const toExpand = pq.remove();
+            allowedCount -= toExpand.data.count;
+            toExpand.data.expand(1);
+            toExpand.children?.forEach((d: HPN<TreeviewNode>, i: number) => {
+                pq.add(d);
+            });
         }
     }
 
@@ -225,7 +228,7 @@ export default class Treeview {
         // Animate the fill and stroke of each circle (these circles make up the nodes that are rendered).
         nodeUpdate.select("circle")
             .attr("r", (d: HPN<TreeviewNode>) => this.computeNodeSize(d))
-            .style("fill-opacity", (d: HPN<TreeviewNode>) => d.data.isCollapsed() ? 1 : 0)
+            .style("fill-opacity", (d: HPN<TreeviewNode>) => d.children && d.children[0].data.isCollapsed() ? 1 : 0)
             .style("stroke", (d: HPN<TreeviewNode>) => this.settings.nodeStrokeColor(d.data))
             .style("fill", (d: HPN<TreeviewNode>) => this.settings.nodeFillColor(d.data));
 

diff --git a/src/visualizations/treeview/TreeviewSettings.ts b/src/visualizations/treeview/TreeviewSettings.ts
@@ -132,7 +132,7 @@ export default class TreeviewSettings extends Settings {
                     color: #fff;
                 }
                 
-                .unipept-tooltip div,a {
+                .unipept-tooltip div, .unipept-tooltip a {
                     font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
                 }