axidio-styleguide-library1-v2 0.0.947 → 0.0.948

package/fesm2022/axidio-styleguide-library1-v2.mjs

@@ -8791,6 +8791,10 @@ class HorizontalGroupedBarWithScrollZoomComponent extends ComponentUniqueId {
                 .selectAll('g.x1.axis1 g.tick text')
                 .attr('class', 'lib-xaxis-labels-texts-weeklycharts')
                 .attr('y', function () {
+                // Minimize gap in maximized (fullscreen) view for weekly charts
+                if (self.chartConfiguration.isFullScreen) {
+                    return short_tick_length_bg;
+                }
                 if (alternate_text) {
                     alternate_text = false;
                     return long_tick_length_bg;
@@ -8809,11 +8813,19 @@ class HorizontalGroupedBarWithScrollZoomComponent extends ComponentUniqueId {
                 .attr('y', function (d) {
                 // For grouped bar charts with many bars and xLabel present, do NOT add extra space (avoid overlap)
                 if (subgroups.length > 1 && data.length > 8 && metaData.xLabel) {
+                    // In maximized (fullscreen) view, keep the gap minimal
+                    if (self.chartConfiguration.isFullScreen) {
+                        return short_tick_length_bg;
+                    }
                     return short_tick_length_bg;
                 }
-                // For grouped bar charts with many bars and NO xLabel, add space as before
+                // For grouped bar charts with many bars and NO xLabel, add space as before, but reduce in fullscreen
                 if (subgroups.length > 1 && data.length > 8 && !metaData.xLabel) {
                     const chartHasExtraBottom = (self.chartConfiguration.margin && self.chartConfiguration.margin.bottom >= 40);
+                    if (self.chartConfiguration.isFullScreen) {
+                        // Reduce extra gap in maximized view
+                        return short_tick_length_bg + 2;
+                    }
                     return chartHasExtraBottom ? short_tick_length_bg : short_tick_length_bg + 10;
                 }
                 // Default/fallback logic for other cases
@@ -8826,6 +8838,10 @@ class HorizontalGroupedBarWithScrollZoomComponent extends ComponentUniqueId {
                 if (/\d{2,4}[-\/]\d{2,4}/.test(d) && d.indexOf(' ') > -1) {
                     baseY += 4;
                 }
+                // In maximized view, reduce baseY slightly for grouped bars
+                if (self.chartConfiguration.isFullScreen && subgroups.length > 1) {
+                    baseY = Math.max(short_tick_length_bg, baseY - 10);
+                }
                 return baseY;
             })
                 .attr('x', function (d) {
@@ -9297,10 +9313,7 @@ class HorizontalGroupedBarWithScrollZoomComponent extends ComponentUniqueId {
                 .on('mouseout', handleMouseOut)
                 .on('mouseover', handleMouseOver);
         }
-        const shouldBindMouseEvents = this.chartConfiguration.displayTitleOnTop ||
-            (this.chartConfiguration.textsOnBar === undefined &&
-                this.chartConfiguration.displayTitleOnTop === undefined);
-        if (shouldBindMouseEvents) {
+        if (this.chartConfiguration.displayTitleOnTop) {
             state
                 .selectAll('rect')
                 .on('mouseout', handleMouseOut)
@@ -9422,6 +9435,49 @@ class HorizontalGroupedBarWithScrollZoomComponent extends ComponentUniqueId {
          * display data values on mouse over
          * used by dashboard charts
          */
+        if (this.chartConfiguration.textsOnBar == undefined &&
+            this.chartConfiguration.displayTitleOnTop == undefined) {
+            state
+                .selectAll('rect')
+                .on('mouseout', function (d) {
+                state.selectAll('.barstext').remove();
+            })
+                .on('mouseover', function (d1) {
+                state
+                    .selectAll('text')
+                    .data(function (d) {
+                    let newList = [];
+                    subgroups.map(function (key) {
+                        if (key !== 'name' &&
+                            d1.key == key &&
+                            d1.value == d[key] &&
+                            d1.name == d.name) {
+                            let obj = { key: key, value: d[key], name: d.name };
+                            newList.push(obj);
+                        }
+                    });
+                    return newList;
+                })
+                    .enter()
+                    .append('text')
+                    .attr('fill', 'var(--chart-text-color)')
+                    .attr('class', 'barstext')
+                    .attr('x', function (d) {
+                    return xSubgroup(d.key);
+                })
+                    .attr('y', function (d) {
+                    return y(d.value);
+                })
+                    .attr('style', 'font-size: ' + '.85em' + ';' + ' font-weight:' + 'bold' + ';')
+                    .style('fill', function (d) {
+                    return metaData.colors[d.key];
+                })
+                    .attr('width', self.isZoomedOut ? xSubgroup.bandwidth() : xSubgroup.bandwidth())
+                    .text(function (d) {
+                    return d.value;
+                });
+            });
+        }
         svg
             .append('g')
             .attr('class', 'x2 axis2')