Merge branch 'master' into foamtree-update

Author: stanislawosinski

CHANGELOG.md

@@ -12,6 +12,14 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 
 ## UNRELEASED
 
+* **Improvement**
+  * Keep treemap labels visible during zooming animations for better user experience ([#414](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/414) by [@
+    stanislawosinski](https://github.com/stanislawosinski))
+    
+* **Bug Fix**
+  * Don't show an empty tooltip when hovering over the FoamTree attribution group or between top-level groups ([#413](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/413) by [@
+    stanislawosinski](https://github.com/stanislawosinski))
+
 * **Internal**
   * Upgrade FoamTree to version 3.5.0, replace vendor dependency with an NPM package ([#412](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/412) by [@
     stanislawosinski](https://github.com/stanislawosinski))

client/components/Treemap.jsx

@@ -62,6 +62,7 @@ export default class Treemap extends Component {
       maxGroupLevelsDrawn: Infinity,
       maxGroupLabelLevelsDrawn: Infinity,
       maxGroupLevelsAttached: Infinity,
+      wireframeLabelDrawing: 'always',
       groupMinDiameter: 0,
       groupLabelVerticalPadding: 0.2,
       rolloutDuration: 0,
@@ -105,9 +106,12 @@ export default class Treemap extends Component {
       },
       onGroupDoubleClick: preventDefault,
       onGroupHover(event) {
-        // Ignoring hovering on `FoamTree` branding group
-        if (event.group && event.group.attribution) {
+        // Ignoring hovering on `FoamTree` branding group and the root group
+        if (event.group && (event.group.attribution || event.group === this.get('dataObject'))) {
           event.preventDefault();
+          if (props.onMouseLeave) {
+            props.onMouseLeave.call(component, event);
+          }
           return;
         }