@designsystem-se/af 35.4.1-beta.0 → 35.4.1-beta.1

package/dist/collection/components/_chart/bar-chart/bar-chart.js

@@ -13,13 +13,14 @@ import { BarChartVariation } from "./bar-chart-variation.enum";
 export class barChart {
     constructor() {
         // States
-        this._loading = false;
-        this._placeholderTicks = ['0', '1', '2', '3', '4', '5', '6', '7'];
+        this.loading = false;
+        this.placeholderTicks = ['0', '1', '2', '3', '4', '5', '6', '7'];
         // Width of data at each tick, if we have two data series that have values att same tick, this will be 2 for example. defaults to 1;
         this.dataWidth = 1;
+        // Bar gap when using multiple bars for each point, this will be doubled, since it is applied on both bars
         this.barGap = 0;
-        this._dims = {};
-        this._margin = {
+        this.dims = {};
+        this.margin = {
             bottom: 0,
             top: 6,
             left: 5,
@@ -30,7 +31,7 @@ export class barChart {
         this.yTickSize = 0;
         this.xTickSize = 5;
         // Width of the largets X-tick-value
-        this._tickWidth = 1;
+        this.tickWidth = 1;
         // Transition
         this.defaultDuration = 400;
         // Text and formats
@@ -39,141 +40,171 @@ export class barChart {
         // Observer for watching size changes when in line chart mode
         this.barChartObserver = new ResizeObserver((entries) => {
             entries.forEach(() => {
-                if (this._loading)
+                if (this.loading)
                     return this.loadingResize();
                 this.resize();
             });
         });
-        // Observer for watching size changes when in table mode
-        this.tableObserver = new ResizeObserver((entries) => {
-            entries.forEach(() => {
-                d3.select(this._legendDiv).style('width', this._dims.width + 'px');
-                this.resizeTable();
+        this.highlightBars = (serie) => {
+            this.barChartContainer.selectAll('.bar')
+                .attr('fill', (barData) => this.colorFunction(barData.serie))
+                .transition('color')
+                .duration(150)
+                .attr('fill', (barData) => {
+                if (barData.serie === serie)
+                    return this.colorFunction(barData.serie);
+                else
+                    return this.evalColorVar('--digi--color--background--secondary-accent');
             });
-        });
+            d3.select(this.legendDiv).selectAll('.legendChip').transition('colorLegend').duration(150).style('opacity', (title) => title === serie ? 1 : 0.25);
+        };
+        this.resetBarColor = () => {
+            this.barChartContainer.selectAll('.bar').transition('color').duration(150).attr('fill', (barData) => this.colorFunction(barData.serie));
+            d3.select(this.legendDiv).selectAll('.legendChip').transition('colorLegend').duration(150).style('opacity', 1);
+        };
         // Resizing chart while loading
         this.loadingResize = () => {
             const newHeight = this.setDims();
             this.setMargins(true);
-            this._svg.attr('width', this._dims.width).attr('height', this._dims.height);
-            this._barChartContainer.attr('transform', `translate(${this._margin.left + this.tickPadding + this.yTickSize},0)`);
-            this._margin.right =
-                this.getTextSize(this._xScale.domain()[1].toLocaleString()) / 2 +
+            this.svg.attr('width', this.dims.width).attr('height', this.dims.height);
+            this.barChartContainer.attr('transform', `translate(${this.margin.left + this.tickPadding + this.yTickSize},0)`);
+            this.margin.right =
+                this.getTextSize(this.xScale.domain()[1].toLocaleString()) / 2 +
                     this.yTickSize +
                     this.tickPadding;
             // If there is a new height
             if (newHeight) {
                 // Update y-axis with potentially new height (might want to do a check here)
                 this.afVariation === BarChartVariation.Horizontal
-                    ? this._yScale.range([
-                        this._margin.top,
-                        this._dims.height - this._margin.bottom
+                    ? this.yScale.range([
+                        this.margin.top,
+                        this.dims.height - this.margin.bottom
                     ])
-                    : this._yScale.range([
-                        this._dims.height - this._margin.bottom,
-                        this._margin.top
+                    : this.yScale.range([
+                        this.dims.height - this.margin.bottom,
+                        this.margin.top
                     ]);
-                this._xAxisHandle.attr('transform', `translate(0,${this._dims.height - this._margin.bottom})`);
+                this.xAxisHandle.attr('transform', `translate(0,${this.dims.height - this.margin.bottom})`);
             }
             // Update x-axis with new width
-            this._xScale.range([
+            this.xScale.range([
                 0,
-                this._dims.width - this._margin.right - this._margin.left
+                this.dims.width - this.margin.right - this.margin.left
             ]);
-            this._barSelection
+            this.barSelection
                 .attr('x', this.xFunction)
                 .attr('width', this.widthFunction);
             this.setValueTicks();
         };
+        this.highlightBarGroup = (_event, datum) => {
+            if (typeof datum === 'string') {
+                const barGroupID = '#' + this.barGroupID(datum);
+                this.barChartContainer.select(barGroupID).selectAll('.bar').transition('color')
+                    .duration(20)
+                    .attr('fill', (d) => {
+                    return this.adjustColor(this.colorFunction(d.serie), 50);
+                });
+            }
+        };
+        this.unHighlightBarGroup = () => {
+            this.barSelection.selectAll('.bar').transition('color')
+                .duration(100)
+                .attr('fill', (d) => {
+                return this.colorFunction(d.serie);
+            });
+        };
         // Adding click listener for tool tip text
         this.setTickInteraction = () => {
             if (this.afVariation === BarChartVariation.Horizontal) {
-                this._yAxisHandle
+                this.yAxisHandle
                     .selectAll('text')
                     .style('cursor', 'pointer')
                     .on('click', this.openTooltip)
-                    .on('mouseenter', this.hover)
-                    .on('mouseleave', this.hoverOut);
+                    .on('mouseenter', this.highlightBarGroup)
+                    .on('mouseleave', this.unHighlightBarGroup);
             }
             else {
-                this._xAxisHandle
+                this.xAxisHandle
                     .selectAll('text')
                     .style('cursor', 'pointer')
                     .on('click', this.openTooltip)
-                    .on('mouseenter', this.hover)
-                    .on('mouseleave', this.hoverOut);
+                    .on('mouseenter', this.highlightBarGroup)
+                    .on('mouseleave', this.unHighlightBarGroup);
             }
         };
         // Setting Y-scale
         this.setYScale = (empty) => {
             var _a, _b, _c;
             if (this.afVariation == BarChartVariation.Horizontal) {
-                this._yScale = d3
+                this.yScale = d3
                     .scaleBand(empty
                     ? ['0', '1', '2', '3', '4', '5', '6', '7']
-                    : this._chartData.data.xValueNames, [this._margin.top, this._dims.height - this._margin.bottom])
+                    : this.chartData.data.xValueNames, [this.margin.top, this.dims.height - this.margin.bottom])
                     .paddingOuter(0.1)
                     .paddingInner(0.1);
-                this._yAxis = d3.axisLeft(this._yScale);
+                this.yAxis = d3.axisLeft(this.yScale);
             }
             else {
-                this._yScale = d3
+                this.yScale = d3
                     .scaleLinear()
-                    .domain(empty ? [0, 10] : [this._minVal, this._maxVal])
-                    .nice(((_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.numberOfReferenceLines)
-                    ? (_c = this._chartData) === null || _c === void 0 ? void 0 : _c.meta.numberOfReferenceLines
+                    .domain(empty ? [0, 10] : [this.minVal, this.maxVal])
+                    .nice(((_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.numberOfReferenceLines)
+                    ? (_c = this.chartData) === null || _c === void 0 ? void 0 : _c.meta.numberOfReferenceLines
                     : 3);
-                this._yScale.range([
-                    this._dims.height - this._margin.bottom,
-                    this._margin.top
+                this.yScale.range([
+                    this.dims.height - this.margin.bottom,
+                    this.margin.top
                 ]);
-                this._yAxis = d3.axisLeft(this._yScale);
+                this.yAxis = d3.axisLeft(this.yScale);
             }
         };
         // Setting X-Scale
         this.setXScale = (empty) => {
             // Horizontal
             if (this.afVariation == BarChartVariation.Horizontal) {
-                this._xScale = d3
+                this.xScale = d3
                     .scaleLinear()
-                    .domain(empty ? [0, 10] : [this._minVal, this._maxVal])
+                    .domain(empty ? [0, 10] : [this.minVal, this.maxVal])
                     .nice(3);
-                this._margin.right =
-                    this.getTextSize(this._xScale.domain()[1].toLocaleString()) / 2 +
+                this.margin.right =
+                    this.getTextSize(this.xScale.domain()[1].toLocaleString()) / 2 +
                         this.yTickSize +
                         this.tickPadding;
-                this._xScale.range([
+                this.xScale.range([
                     0,
-                    this._dims.width - this._margin.right - this._margin.left
+                    this.dims.width - this.margin.right - this.margin.left
                 ]);
                 // Initializing actual axis
-                this._xAxis = d3.axisBottom(this._xScale);
-                this._tickWidth = this.getLargestText(this._xScale.ticks().map((tick) => tick.toLocaleString()));
+                this.xAxis = d3.axisBottom(this.xScale);
+                this.tickWidth = this.getLargestText(this.xScale.ticks().map((tick) => tick.toLocaleString()));
             }
             else {
                 // Vertical
-                this._xScale = d3
+                this.xScale = d3
                     .scaleBand()
-                    .domain(empty ? this._placeholderTicks : this._chartData.data.xValueNames)
-                    .range([0, this._dims.width - this._margin.right - this._margin.left])
+                    .domain(empty ? this.placeholderTicks : this.chartData.data.xValueNames)
+                    .range([0, this.dims.width - this.margin.right - this.margin.left])
                     .paddingOuter(0.1)
                     .paddingInner(0.1);
-                this._xAxis = d3.axisBottom(this._xScale);
+                this.xAxis = d3.axisBottom(this.xScale);
             }
         };
         // Stores all tick text sizes in an indexable array
         this.tickSizes = () => {
             // Initializing tick size array
-            this._namedTickSizes = [];
-            this._ellipsisSize = this.getTextSize('...');
-            if (this._chartData && this._chartData.data) {
-                for (let i = 0; i < this._chartData.data.xValueNames.length; i++) {
-                    this._namedTickSizes.push(Math.ceil(this.getTextSize(this._chartData.data.xValueNames[i])));
+            this.namedTickSizes = [];
+            this.ellipsisSize = this.getTextSize('...');
+            if (this.chartData && this.chartData.data) {
+                for (let i = 0; i < this.chartData.data.xValueNames.length; i++) {
+                    this.namedTickSizes.push(Math.ceil(this.getTextSize(this.chartData.data.xValueNames[i])));
                 }
             }
         };
+        this.barGroupID = (key) => {
+            return 'barGroup' + key.replace(/[^A-Z0-9]+/gi, '');
+        };
         this.updateBars = (fromLoading) => {
-            this._barChartContainer
+            this.barChartContainer
                 .selectAll('.barGroup')
                 .data(this.mappedData)
                 .join((enter) => {
@@ -181,7 +212,7 @@ export class barChart {
                 const tempSelection = enter
                     .append('g')
                     .attr('class', 'barGroup')
-                    .attr('id', (d) => 'barGroup' + d.key.replace(/[^A-Z0-9]+/gi, '_'));
+                    .attr('id', (d) => 'barGroup' + d.key.replace(/[^A-Z0-9]+/gi, ''));
                 tempSelection
                     .append('rect')
                     .attr('class', 'bar')
@@ -189,16 +220,16 @@ export class barChart {
                     .attr('ry', 4)
                     .attr('rx', 4)
                     .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                    ? this._yScale(d.key)
-                    : this._dims.height - this._margin.bottom)
+                    ? this.yScale(d.key)
+                    : this.dims.height - this.margin.bottom)
                     .attr('x', (d) => this.afVariation === BarChartVariation.Horizontal
                     ? 2
-                    : this._xScale(d.key))
+                    : this.xScale(d.key))
                     .attr('width', () => this.afVariation === BarChartVariation.Horizontal
                     ? 0
-                    : this._xScale.bandwidth())
+                    : this.xScale.bandwidth())
                     .attr('height', () => this.afVariation === BarChartVariation.Horizontal
-                    ? this._yScale.bandwidth()
+                    ? this.yScale.bandwidth()
                     : 0)
                     .on('mouseenter', this.hover)
                     .on('mouseleave', this.hoverOut)
@@ -210,7 +241,7 @@ export class barChart {
                     .attr('y', this.yFunction)
                     .attr('height', this.heightFunction)
                     .attr('fill', '#00005a');
-                if (!((_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels))
+                if (!((_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels))
                     return tempSelection;
                 tempSelection
                     .append('text')
@@ -221,32 +252,32 @@ export class barChart {
                     .attr('text-anchor', 'end')
                     .style('pointer-events', 'none')
                     .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                    ? this._yScale(d.key) + this._yScale.bandwidth() / 2
-                    : this._dims.height - this._margin.bottom)
+                    ? this.yScale(d.key) + this.yScale.bandwidth() / 2
+                    : this.dims.height - this.margin.bottom)
                     .attr('x', (d) => this.afVariation === BarChartVariation.Horizontal
                     ? 2
-                    : this._xScale(d.key) + this._xScale.bandwidth() / 2)
+                    : this.xScale(d.key) + this.xScale.bandwidth() / 2)
                     .transition()
                     .duration(this.defaultDuration)
                     .ease(d3.easePolyInOut)
                     .attr('font-size', this.fontSize)
                     .attr('font-weight', '600')
                     .attr('x', (d) => this.afVariation === BarChartVariation.Horizontal
-                    ? this._xScale(d.value)
-                    : this._xScale(d.key) + this._xScale.bandwidth() / 2)
+                    ? this.xScale(d.value)
+                    : this.xScale(d.key) + this.xScale.bandwidth() / 2)
                     .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                    ? this._yScale(d.key) + this._yScale.bandwidth() / 2
-                    : this._yScale(d.value))
+                    ? this.yScale(d.key) + this.yScale.bandwidth() / 2
+                    : this.yScale(d.value))
                     .attr('text-anchor', (d) => {
                     if (this.afVariation === BarChartVariation.Vertical)
                         return 'middle';
-                    return this._xScale(d.value) < d.len + this.tickPadding * 2
+                    return this.xScale(d.value) < d.len + this.tickPadding * 2
                         ? 'start'
                         : 'end';
                 })
                     .attr('dx', (d) => {
                     if (this.afVariation === BarChartVariation.Horizontal)
-                        return this._xScale(d.value) < d.len + this.tickPadding * 2
+                        return this.xScale(d.value) < d.len + this.tickPadding * 2
                             ? this.tickPadding
                             : -this.tickPadding;
                     return 0;
@@ -254,7 +285,7 @@ export class barChart {
                     .attr('fill', (d) => {
                     if (this.afVariation === BarChartVariation.Vertical)
                         return 'black';
-                    return this._xScale(d.value) < d.len + this.tickPadding * 2
+                    return this.xScale(d.value) < d.len + this.tickPadding * 2
                         ? 'black'
                         : 'white';
                 })
@@ -267,12 +298,12 @@ export class barChart {
                         ? parseFloat(nodelist[i].textContent.replace(/\s/g, ''))
                         : 0;
                     const interpolatedValue = d3.interpolate(oldnum, d.value);
-                    return (t) => (nodelist[i].textContent = parseInt(interpolatedValue(t)).toLocaleString(undefined, this._numberFormat));
+                    return (t) => (nodelist[i].textContent = parseInt(interpolatedValue(t)).toLocaleString(undefined, this.numberFormat));
                 });
                 return tempSelection;
             }, (update) => {
                 // Update ids to bars
-                update.attr('id', (d) => 'barGroup' + d.key.replace(/[^A-Z0-9]+/gi, '_'));
+                update.attr('id', (d) => 'barGroup' + d.key.replace(/[^A-Z0-9]+/gi, ''));
                 // Mouse interaction to updated loading bars
                 if (fromLoading) {
                     update
@@ -282,11 +313,11 @@ export class barChart {
                         .on('click', this.openTooltip)
                         .attr('x', this.xFunction)
                         .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                        ? this._yScale(d.key)
-                        : this._dims.height - this._margin.bottom)
+                        ? this.yScale(d.key)
+                        : this.dims.height - this.margin.bottom)
                         .attr('width', this.widthFunction)
                         .attr('height', () => this.afVariation === BarChartVariation.Horizontal
-                        ? this._yScale.bandwidth()
+                        ? this.yScale.bandwidth()
                         : 0)
                         .attr('fill', '#00005a')
                         .transition()
@@ -294,7 +325,7 @@ export class barChart {
                         .ease(d3.easePolyInOut)
                         .attr('y', this.yFunction)
                         .attr('height', this.heightFunction)
-                        .on('end', () => this.barChartObserver.observe(this._chartDiv)); // Reset barchartObserver
+                        .on('end', () => this.barChartObserver.observe(this.chartDiv)); // Reset barchartObserver
                 }
                 else {
                     update
@@ -310,28 +341,28 @@ export class barChart {
                 }
                 return update
                     .select('text')
-                    .style('display', () => { var _a, _b; return ((_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels) ? null : 'none'; })
+                    .style('display', () => { var _a, _b; return ((_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels) ? null : 'none'; })
                     .transition()
                     .duration(this.defaultDuration)
                     .ease(d3.easePolyInOut)
                     .attr('font-size', this.fontSize)
                     .attr('font-weight', '600')
                     .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                    ? this._yScale(d.key) + this._yScale.bandwidth() / 2
-                    : this._yScale(d.value))
+                    ? this.yScale(d.key) + this.yScale.bandwidth() / 2
+                    : this.yScale(d.value))
                     .attr('x', (d) => this.afVariation === BarChartVariation.Horizontal
-                    ? this._xScale(d.value)
-                    : this._xScale(d.key) + this._xScale.bandwidth() / 2)
+                    ? this.xScale(d.value)
+                    : this.xScale(d.key) + this.xScale.bandwidth() / 2)
                     .attr('text-anchor', (d) => {
                     if (this.afVariation === BarChartVariation.Vertical)
                         return 'middle';
-                    return this._xScale(d.value) < d.len + this.tickPadding * 2
+                    return this.xScale(d.value) < d.len + this.tickPadding * 2
                         ? 'start'
                         : 'end';
                 })
                     .attr('dx', (d) => {
                     if (this.afVariation === BarChartVariation.Horizontal)
-                        return this._xScale(d.value) < d.len + this.tickPadding * 2
+                        return this.xScale(d.value) < d.len + this.tickPadding * 2
                             ? this.tickPadding
                             : -this.tickPadding;
                     return 0;
@@ -339,7 +370,7 @@ export class barChart {
                     .attr('fill', (d) => {
                     if (this.afVariation === BarChartVariation.Vertical)
                         return 'black';
-                    return this._xScale(d.value) < d.len + this.tickPadding * 2
+                    return this.xScale(d.value) < d.len + this.tickPadding * 2
                         ? 'black'
                         : 'white';
                 })
@@ -352,27 +383,27 @@ export class barChart {
                         ? parseFloat(nodelist[i].textContent.replace(/\s/g, ''))
                         : 0;
                     const interpolatedValue = d3.interpolate(oldnum, d.value);
-                    return (t) => (nodelist[i].textContent = parseInt(interpolatedValue(t)).toLocaleString(undefined, this._numberFormat));
+                    return (t) => (nodelist[i].textContent = parseInt(interpolatedValue(t)).toLocaleString(undefined, this.numberFormat));
                 });
             }, (exit) => exit.remove());
-            this._barSelection = this._barChartContainer.selectAll('rect');
-            this._textSelection = this._barChartContainer.selectAll('.barText');
+            this.barSelection = this.barChartContainer.selectAll('rect');
+            this.textSelection = this.barChartContainer.selectAll('.barText');
         };
         // Setting position of text according to bar size
         this.adjustBarText = () => {
             var _a, _b;
-            if (!((_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels))
+            if (!((_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels))
                 return;
-            this._textSelection
+            this.textSelection
                 .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                ? this._yScale(d.key) + this._yScale.bandwidth() / 2
-                : this._yScale(d.value))
+                ? this.yScale(d.key) + this.yScale.bandwidth() / 2
+                : this.yScale(d.value))
                 .attr('x', (d) => this.afVariation === BarChartVariation.Horizontal
-                ? this._xScale(d.value)
-                : this._xScale(d.key) + this._xScale.bandwidth() / 2)
+                ? this.xScale(d.value)
+                : this.xScale(d.key) + this.xScale.bandwidth() / 2)
                 .attr('dx', (d) => {
                 if (this.afVariation === BarChartVariation.Horizontal)
-                    return this._xScale(d.value) < d.len + this.tickPadding * 2
+                    return this.xScale(d.value) < d.len + this.tickPadding * 2
                         ? this.tickPadding
                         : -this.tickPadding;
                 return 0;
@@ -380,26 +411,26 @@ export class barChart {
                 .attr('fill', (d) => {
                 if (this.afVariation === BarChartVariation.Vertical)
                     return 'black';
-                return this._xScale(d.value) < d.len + this.tickPadding * 2
+                return this.xScale(d.value) < d.len + this.tickPadding * 2
                     ? 'black'
                     : 'white';
             })
                 .attr('text-anchor', (d) => {
                 if (this.afVariation === BarChartVariation.Vertical)
                     return 'middle';
-                return this._xScale(d.value) < d.len + this.tickPadding * 2
+                return this.xScale(d.value) < d.len + this.tickPadding * 2
                     ? 'start'
                     : 'end';
             });
         };
         this.reshapeData = () => {
             const toReturn = [];
-            if (this._loading) {
-                this._placeholderTicks.forEach((key) => {
+            if (this.loading || !this.chartData) {
+                this.placeholderTicks.forEach((key) => {
                     const tick = { key: key, series: [] };
                     tick.series.push({
                         key: key,
-                        serie: '',
+                        serie: 'loading',
                         value: Math.floor(Math.random() * (9 - 2 + 1) + 2),
                         len: 0
                     });
@@ -407,9 +438,9 @@ export class barChart {
                 });
                 return toReturn;
             }
-            this._chartData.data.xValueNames.forEach((key, index) => {
+            this.chartData.data.xValueNames.forEach((key, index) => {
                 const tick = { key: key, series: [] };
-                this._chartData.data.series.forEach((serie) => {
+                this.chartData.data.series.forEach((serie) => {
                     if (serie.yValues[index]) {
                         tick.series.push({
                             key: key,
@@ -424,137 +455,140 @@ export class barChart {
             return toReturn;
         };
         this.adjustBarSize = () => {
-            this._barSelection.selectAll('.bar')
+            this.barSelection.selectAll('.bar')
                 .attr('x', this.xFunction)
                 .attr('y', this.yFunction)
                 .attr('width', this.widthFunction)
                 .attr('height', this.heightFunction);
         };
+        this.evalColorVar = (colorVar) => {
+            return getComputedStyle(document.documentElement)
+                .getPropertyValue(colorVar)
+                .trim()
+                .toLocaleLowerCase();
+        };
         // Handling x positioning of bars
         this.xFunction = (d, i) => {
             return this.afVariation === BarChartVariation.Horizontal
-                ? (d.value > 0 ? this._xScale(0) : this._xScale(d.value))
-                : this._xScale(d.key) + ((this._xScale.bandwidth() / this.dataWidth) * i + (this.barGap * i));
+                ? (d.value > 0 ? this.xScale(0) : this.xScale(d.value))
+                : this.xScale(d.key) + ((this.xScale.bandwidth() / this.dataWidth) * i + (this.barGap * i));
         };
         // Handling y positioning of bars
         this.yFunction = (d, i) => {
             if (!d.value)
                 return 0;
             return this.afVariation === BarChartVariation.Horizontal
-                ? this._yScale(d.key) + ((this._yScale.bandwidth() / this.dataWidth) * i + (this.barGap * i))
-                : (d.value < 0 ? this._yScale(0) : this._yScale(d.value));
+                ? this.yScale(d.key) + ((this.yScale.bandwidth() / this.dataWidth) * i + (this.barGap * i))
+                : (d.value < 0 ? this.yScale(0) : this.yScale(d.value));
         };
         // Handling height for bars
         this.heightFunction = (d) => {
             if (!d.value)
                 return 0;
             return this.afVariation === BarChartVariation.Horizontal
-                ? this._yScale.bandwidth() / this.dataWidth - (this.barGap)
-                : (d.value < 0 ? this._yScale(d.value) - this._yScale(0) : this._yScale(0) - this._yScale(d.value));
+                ? this.yScale.bandwidth() / this.dataWidth - (this.barGap)
+                : (d.value < 0 ? this.yScale(d.value) - this.yScale(0) : this.yScale(0) - this.yScale(d.value));
         };
         // Handling width for bars
         this.widthFunction = (d) => {
             return this.afVariation === BarChartVariation.Horizontal
-                ? Math.abs(this._xScale(0) - this._xScale(d.value))
-                : this._xScale.bandwidth() / this.dataWidth - (this.barGap);
-        };
-        // Resize table
-        this.resizeTable = () => {
-            this.setDims();
-            this.setTableDimensions();
+                ? Math.abs(this.xScale(0) - this.xScale(d.value))
+                : this.xScale.bandwidth() / this.dataWidth - (this.barGap);
         };
         // Setting dimension variable
         this.setDims = (onlyHeight = false) => {
             // Get title dimensions
-            const tempTitle = d3.select(this._titleDiv).node().getBoundingClientRect(), tempLegend = d3.select(this._legendDiv).node().getBoundingClientRect();
-            const prevHeight = this._dims.height;
+            const tempTitle = d3.select(this.titleDiv).node().getBoundingClientRect(), tempLegend = d3.select(this.legendDiv).node().getBoundingClientRect();
+            const prevHeight = this.dims.height;
             if (!onlyHeight)
-                this._dims = d3.select(this._chartDiv).node().getBoundingClientRect();
-            this._dims.height =
-                this._maxHeight - tempLegend.height - tempTitle.height - 1.75 * this._rem;
-            return prevHeight != this._dims.height;
+                this.dims = d3.select(this.chartDiv).node().getBoundingClientRect();
+            this.dims.height =
+                this.maxHeight - tempLegend.height - tempTitle.height - 1.75 * this.rem;
+            return prevHeight != this.dims.height;
         };
         // Setting margins given text size
         this.setMargins = (fromLoading) => {
             var _a;
-            this._pixelSize =
+            this.pixelSize =
                 Number(window
                     .getComputedStyle(document.body)
                     .getPropertyValue('font-size')
                     .match(/\d+/)[0]) * Number(this.fontSize.replace(/[^\d.]|\.(?=.*\.)/g, ''));
             // Getting the longest word, assuming it will also be the widest in terms of pixels
             if (this.afVariation === BarChartVariation.Horizontal) {
-                const left = ((_a = this._chartData) === null || _a === void 0 ? void 0 : _a.data) &&
-                    this.getLargestText(this._chartData.data.xValueNames)
-                    ? this.getLargestText(this._chartData.data.xValueNames)
+                const left = ((_a = this.chartData) === null || _a === void 0 ? void 0 : _a.data) &&
+                    this.getLargestText(this.chartData.data.xValueNames)
+                    ? this.getLargestText(this.chartData.data.xValueNames)
                     : 0;
-                this._margin.left = left;
+                this.margin.left = left;
+                this.margin.bottom = this.pixelSize + this.tickPadding + this.xTickSize;
             }
-            else
-                this._margin.left = this.getLargestText(fromLoading
+            else {
+                this.margin.left = this.getLargestText(fromLoading
                     ? ['0', '10']
                     : [
-                        this._minVal ? this._tempScale[0].toLocaleString() : '0',
-                        this._maxVal ? this._tempScale[1].toLocaleString() : '10'
+                        this.minVal ? this.tempScale[0].toLocaleString() : '0',
+                        this.maxVal ? this.tempScale[1].toLocaleString() : '10'
                     ]);
-            if (this._margin.left > this._dims.width / 4) {
-                this._margin.left = Math.floor(this._dims.width / 4);
-                this._margin.ellipsis = true;
+                this.margin.bottom = this.pixelSize;
+            }
+            if (this.margin.left > this.dims.width / 4) {
+                this.margin.left = Math.floor(this.dims.width / 4);
+                this.margin.ellipsis = true;
             }
             else
-                this._margin.ellipsis = false;
-            this._margin.bottom = this._pixelSize + this.tickPadding + this.xTickSize;
+                this.margin.ellipsis = false;
         };
         // Adjusting y-ticks
         this.setNamedTicks = (transition = false) => {
             if (this.afVariation == BarChartVariation.Horizontal) {
                 if (!transition) {
-                    this._yAxisHandle
+                    this.yAxisHandle
                         .style('font-size', this.fontSize)
                         .style('font-family', 'Open Sans')
-                        .call(this._yAxis
+                        .call(this.yAxis
                         .tickPadding(this.tickPadding)
                         .tickSize(this.yTickSize)
                         .tickSizeOuter(0)
                         .tickFormat((d, i) => {
-                        if (!this._margin.ellipsis)
+                        if (!this.margin.ellipsis)
                             return d.toLocaleString();
                         // Adding ellipsis to text
-                        const size = this._namedTickSizes[i] + this.tickPadding + this.yTickSize;
-                        const mSize = this._margin.left;
+                        const size = this.namedTickSizes[i] + this.tickPadding + this.yTickSize;
+                        const mSize = this.margin.left;
                         if (size < mSize)
                             return d.toLocaleString();
-                        const newSize = this.getTextSize(d.slice(0, Math.max(Math.floor((mSize / (size + this._ellipsisSize)) * d.length), 3)) + '...');
+                        const newSize = this.getTextSize(d.slice(0, Math.max(Math.floor((mSize / (size + this.ellipsisSize)) * d.length), 3)) + '...');
                         let adjustment = 0;
                         if (newSize > mSize) {
                             adjustment = Math.ceil((newSize - mSize) / (size / d.length));
                         }
                         // Slicing the text up, saving atleast 3 characters
                         return (d
-                            .slice(0, Math.max(Math.floor((mSize / (size + this._ellipsisSize)) * d.length) - adjustment, 3))
+                            .slice(0, Math.max(Math.floor((mSize / (size + this.ellipsisSize)) * d.length) - adjustment, 3))
                             .trim() + '...');
                     }));
                 }
                 else {
-                    this._yAxisHandle
+                    this.yAxisHandle
                         .style('font-size', this.fontSize)
                         .style('font-family', 'Open Sans')
                         .transition()
                         .duration(this.defaultDuration)
-                        .call(this._yAxis
+                        .call(this.yAxis
                         .tickPadding(this.tickPadding)
                         .tickSize(this.yTickSize)
                         .tickSizeOuter(0)
                         .tickFormat((d, i) => {
-                        if (!this._margin.ellipsis)
+                        if (!this.margin.ellipsis)
                             return d;
                         // Adding ellipsis to text
-                        const size = this._namedTickSizes[i] + this.tickPadding + this.yTickSize;
-                        const mSize = this._margin.left;
+                        const size = this.namedTickSizes[i] + this.tickPadding + this.yTickSize;
+                        const mSize = this.margin.left;
                         if (size < mSize)
                             return d;
                         const newSize = this.getTextSize(d
-                            .slice(0, Math.max(Math.floor((mSize / (size + this._ellipsisSize)) * d.length), 3))
+                            .slice(0, Math.max(Math.floor((mSize / (size + this.ellipsisSize)) * d.length), 3))
                             .trim() + '...');
                         let adjustment = 0;
                         if (newSize > mSize) {
@@ -562,26 +596,26 @@ export class barChart {
                         }
                         // Slicing the text up, saving atleast 3 characters
                         return (d
-                            .slice(0, Math.max(Math.floor((mSize / (size + this._ellipsisSize)) * d.length) - adjustment, 3))
+                            .slice(0, Math.max(Math.floor((mSize / (size + this.ellipsisSize)) * d.length) - adjustment, 3))
                             .trim() + '...');
                     }));
                 }
             }
             else {
                 //Calculating every n:th text to show
-                let nTh = Math.round(this._chartData.data.xValues.length /
-                    ((this._dims.width - this._margin.left - this._margin.right) / 90 - 1));
-                if (Math.floor(this._chartData.data.xValues.length / nTh) < 4) {
-                    nTh = Math.round(this._chartData.data.xValues.length / 4);
+                let nTh = Math.max(Math.round(this.chartData.data.xValues.length /
+                    ((this.dims.width - this.margin.left - this.margin.right) / 90 - 1)), 1);
+                if (Math.floor(this.chartData.data.xValues.length / nTh) < 4) {
+                    nTh = Math.round(this.chartData.data.xValues.length / 4);
                 }
-                const allowedWidth = (this._dims.width - this._margin.left - this._margin.right) /
-                    Math.floor(this._chartData.data.xValues.length / nTh + 1);
+                const allowedWidth = (this.dims.width - this.margin.left - this.margin.right) /
+                    Math.floor(this.chartData.data.xValues.length / nTh + 1);
                 if (!transition) {
-                    this._xAxisHandle
+                    this.xAxisHandle
                         .style('font-size', this.fontSize)
                         .style('font-family', 'Open Sans')
-                        .call(this._xAxis
-                        .tickValues(this._xScale.domain().filter((...[, i]) => {
+                        .call(this.xAxis
+                        .tickValues(this.xScale.domain().filter((...[, i]) => {
                         if (i == 0)
                             return true;
                         else {
@@ -593,23 +627,23 @@ export class barChart {
                         .tickSizeOuter(0)
                         .tickFormat((d, i) => {
                         const index = i * nTh;
-                        if (this._namedTickSizes[index] < allowedWidth)
+                        if (this.namedTickSizes[index] < allowedWidth)
                             return d;
                         return (d.slice(0, Math.max(Math.floor((allowedWidth /
-                            (this._namedTickSizes[index] +
-                                this._ellipsisSize +
+                            (this.namedTickSizes[index] +
+                                this.ellipsisSize +
                                 5)) *
                             d.length), 3)) + '...');
                     }));
                 }
                 else {
-                    this._xAxisHandle
+                    this.xAxisHandle
                         .style('font-size', this.fontSize)
                         .style('font-family', 'Open Sans')
                         .transition()
                         .duration(this.defaultDuration)
-                        .call(this._xAxis
-                        .tickValues(this._xScale.domain().filter((...[, i]) => {
+                        .call(this.xAxis
+                        .tickValues(this.xScale.domain().filter((...[, i]) => {
                         if (i == 0)
                             return true;
                         else {
@@ -621,11 +655,11 @@ export class barChart {
                         .tickSizeOuter(0)
                         .tickFormat((d, i) => {
                         const index = i * nTh;
-                        if (this._namedTickSizes[index] < allowedWidth)
+                        if (this.namedTickSizes[index] < allowedWidth)
                             return d;
                         return (d.slice(0, Math.max(Math.floor((allowedWidth /
-                            (this._namedTickSizes[index] +
-                                this._ellipsisSize +
+                            (this.namedTickSizes[index] +
+                                this.ellipsisSize +
                                 5)) *
                             d.length), 3)) + '...');
                     }));
@@ -635,30 +669,30 @@ export class barChart {
         // Positioning the ticks of the value bearing axis
         this.setValueTicks = (transition = false) => {
             var _a, _b;
-            if (((_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) && ((_b = this._chartData) === null || _b === void 0 ? void 0 : _b.meta.hideXAxis)) {
+            if (((_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) && ((_b = this.chartData) === null || _b === void 0 ? void 0 : _b.meta.hideXAxis)) {
                 this.afVariation === BarChartVariation.Horizontal
-                    ? this._xAxisHandle.attr('display', 'none')
-                    : this._yAxisHandle.attr('display', 'none');
+                    ? this.xAxisHandle.attr('display', 'none')
+                    : this.yAxisHandle.attr('display', 'none');
                 return;
             }
             let toCall, tickSize, handle;
             if (this.afVariation === BarChartVariation.Horizontal) {
-                this._xAxisHandle.attr('display', null);
-                toCall = this._xAxis;
-                tickSize = -(this._dims.height - this._margin.top - this._margin.bottom);
-                handle = this._xAxisHandle;
+                this.xAxisHandle.attr('display', null);
+                toCall = this.xAxis;
+                tickSize = -(this.dims.height - this.margin.top - this.margin.bottom);
+                handle = this.xAxisHandle;
             }
             else {
-                this._yAxisHandle.attr('display', null);
-                toCall = this._yAxis;
-                tickSize = -(this._dims.width - this._margin.left - this._margin.right);
-                handle = this._yAxisHandle;
+                this.yAxisHandle.attr('display', null);
+                toCall = this.yAxis;
+                tickSize = -(this.dims.width - this.margin.left - this.margin.right);
+                handle = this.yAxisHandle;
             }
             // Computing the amount of ticks to show
-            const ticks = Math.min(Math.floor((this._dims.width - this._margin.left - this._margin.right) /
-                (this._tickWidth + this.xTickSize)) - 2, this.afVariation == BarChartVariation.Horizontal
-                ? this._xScale.ticks().length
-                : this._yScale.ticks().length);
+            const ticks = Math.min(Math.floor((this.dims.width - this.margin.left - this.margin.right) /
+                (this.tickWidth + this.xTickSize)) - 2, this.afVariation == BarChartVariation.Horizontal
+                ? this.xScale.ticks().length
+                : this.yScale.ticks().length);
             if (!transition) {
                 handle
                     .style('font-size', this.fontSize)
@@ -689,124 +723,154 @@ export class barChart {
             }
             handle.selectAll('line').attr('stroke', 'lightgray');
             if (this.afVariation === BarChartVariation.Vertical)
-                this._yAxisHandle.select('.domain').attr('display', 'none');
+                this.yAxisHandle.select('.domain').attr('display', 'none');
         };
         // Highlight bar
         this.hover = (event) => {
             d3.select(event.target)
-                .transition('hover')
+                .transition('color')
                 .duration(20)
-                .attr('fill', (d) => event.target.tagName === 'rect'
-                ? `hsl(from ${this.colorFunction(d.serie)} h s calc(l + 10))`
-                : 'var(--digi--color--background--interactive--hover--tertiary)');
+                .attr('fill', (d) => {
+                return event.target.tagName === 'rect'
+                    ? this.adjustColor(this.colorFunction(d.serie), 50)
+                    : this.evalColorVar('--digi--color--background--interactive--hover--tertiary');
+            });
         };
         // Removing highlight from bar
         this.hoverOut = (event) => {
             d3.select(event.target)
-                .transition('hover')
+                .transition('color')
                 .duration(this.defaultDuration)
                 .attr('fill', (d) => event.target.tagName === 'rect' ? this.colorFunction(d.serie) : '#333333');
         };
         this.openTooltip = (...[, d]) => {
             // If type is string, the user has clicked on a y-axis tick
             if (typeof d === 'string') {
-                this._tooltipData = this._barChartContainer
-                    .select(`#barGroup${d.replace(/[^A-Z0-9]+/gi, '_')}`)
+                this.tooltipData = this.barChartContainer
+                    .select(`#${this.barGroupID(d)}`)
                     .datum();
             }
             else
-                this._tooltipData = d;
-            const tooltipBody = this._tooltip.select('.tooltipBody');
+                this.tooltipData = d;
+            const tooltipBody = this.tooltip.select('.tooltipBody');
             tooltipBody
-                .select(this._tooltipHeading)
-                .style('margin', '0 0.75rem 0 0 ')
-                .style('font-weight', 500)
-                .html(this._tooltipData.key);
+                .select('.tooltipHeading')
+                .html(this.tooltipData.key);
             tooltipBody
                 .selectAll('div')
-                .data([this._tooltipData])
+                .data(this.tooltipData.series ? this.tooltipData.series : [this.tooltipData])
                 .join('div')
                 .style('display', 'flex')
                 .style('flex-direction', 'row')
                 .style('flex-wrap', 'nowrap')
                 .style('white-space', 'nowrap')
                 .style('justify-content', 'space-between')
-                .html((d) => d.value.toLocaleString());
-            this._tooltip.style('display', 'flex');
-            this.positionTooltip(this._tooltipData);
+                .style('margin', '0.25rem 0')
+                .html((d) => {
+                return `<span>${d.serie}: <b style="font-weight:600;">${d.value.toLocaleString(undefined, this.numberFormat)}</b></span>`;
+            });
+            this.tooltip.style('visibility', 'visible');
+            this.positionTooltip(this.tooltipData);
         };
         this.closeTooltip = () => {
-            this._tooltip.style('display', 'none');
+            this.tooltip.style('visibility', 'hidden');
         };
         // Positions tooltip in horizontal mode
         this.positionTooltip = (data) => {
-            const width = this._tooltip.node().getBoundingClientRect().width;
-            const height = this._tooltip.node().getBoundingClientRect().height + 8;
-            const diff = this._xScale(data.value) / 2 - width / 2;
-            if (this.afVariation === BarChartVariation.Horizontal) {
-                this._tooltip
-                    .style('transform', `translate(${this._margin.left + this.tickPadding + Math.max(diff, -4)}px, ${this._yScale(data.key) + this._yScale.bandwidth() + this._yScale.paddingInner() * this._yScale.bandwidth()}px )`)
-                    .style('max-width', this._xScale.range()[1] + 'px');
-                this._tooltip
-                    .select('digi-icon-caret-up')
-                    .style('position', 'absolute')
-                    .style('--digi--icon--color', 'white')
-                    .style('top', '-11px')
-                    .style('left', '0')
-                    .style('transform', `translate(${diff > 0 ? width / 2 - 10 : this._xScale(data.value) / 2}px,0)`);
+            var _a;
+            const width = this.tooltip.node().getBoundingClientRect().width;
+            // Single bar
+            if ('serie' in data) {
+                if (this.afVariation === BarChartVariation.Horizontal) {
+                    const diff = this.xScale(data.value) / 2 - width / 2;
+                    this.tooltip
+                        .style('transform', `translate(${this.margin.left + this.tickPadding + Math.max(diff, -4)}px, ${this.yScale(data.key) + this.yScale.bandwidth() + this.yScale.paddingInner() * this.yScale.bandwidth()}px )`)
+                        .style('max-width', this.xScale.range()[1] + 'px');
+                    this.tooltip
+                        .select('digi-icon-caret-up')
+                        .style('position', 'absolute')
+                        .style('top', '-12px')
+                        .style('left', '0')
+                        .style('transform', `translate(${diff > 0 ? width / 2 - 10 : this.xScale(data.value) / 2}px,0)`);
+                }
+                else {
+                    const index = (_a = this.mappedData.find(xPoint => xPoint.key === data.key)) === null || _a === void 0 ? void 0 : _a.series.findIndex(serie => serie.serie === data.serie);
+                    const barIndex = ((this.xScale.bandwidth() / this.dataWidth) * (index ? index + 1 : 1)) - (this.xScale.bandwidth() / this.dataWidth) / 2;
+                    // This should be where the x-axis starts
+                    const xStart = this.margin.left + this.tickPadding + this.yTickSize;
+                    // Creating adjustment for tooltip to not appear outside of chart
+                    const spaceToSVGEdge = 5;
+                    const inlineAdjustment = (this.dims.width - spaceToSVGEdge) < (this.xScale(data.key) + xStart + barIndex + width / 2) ? (((this.xScale(data.key) + xStart + barIndex + width / 2) - (this.dims.width - spaceToSVGEdge)) / width) * 100 : 0;
+                    this.tooltip
+                        .style('transform', `translate( calc(${this.xScale(data.key) + xStart + barIndex}px - ${50 + inlineAdjustment}%), calc(-100% + ${(data.value > 0 ? this.yScale(data.value) : this.yScale(0)) - 2}px) )`);
+                    this.tooltip
+                        .select('digi-icon-caret-down')
+                        .style('position', 'absolute')
+                        .style('left', `calc(${50 + inlineAdjustment}% - 6px)`)
+                        .style('bottom', '-12px');
+                }
             }
             else {
-                this._tooltip
-                    .style('transform', `translate(${this._margin.left + this.tickPadding + this._xScale(data.key) + this._xScale.bandwidth() / 2 - width / 2}px, ${this._yScale(data.value) - height}px )`)
-                    .style('max-width', this._xScale.range()[1] + 'px');
-                this._tooltip
-                    .select('digi-icon-caret-down')
-                    .style('position', 'absolute')
-                    .style('--digi--icon--color', 'white')
-                    .style('left', '0')
-                    .style('bottom', '-11px')
-                    .style('transform', `translate(${width / 2 - 6}px,0)`);
+                if (this.afVariation === BarChartVariation.Horizontal) {
+                    console.log('helloo');
+                }
+                else {
+                    const xStart = this.margin.left + this.tickPadding + this.yTickSize;
+                    const translatePoint = this.xScale(data.key) + xStart + this.xScale.bandwidth() / 2;
+                    const yMax = d3.max(data.series.map(elem => elem.value));
+                    // Creating adjustment for tooltip to not appear outside of chart
+                    const spaceToSVGEdge = 5;
+                    const inlineAdjustment = (this.dims.width - spaceToSVGEdge) < (translatePoint + width / 2) ? (((translatePoint + width / 2) - (this.dims.width - spaceToSVGEdge)) / width) * 100 : 0;
+                    this.tooltip
+                        .style('transform', `translate( calc(${this.xScale(data.key) + xStart + this.xScale.bandwidth() / 2}px - ${50 + inlineAdjustment}%), calc(-100% + ${this.yScale(yMax && yMax > 0 ? yMax : 0) - 1}px) )`);
+                    this.tooltip
+                        .select('digi-icon-caret-down')
+                        .style('position', 'absolute')
+                        .style('left', `calc(${50 + inlineAdjustment}% - 6px)`)
+                        .style('bottom', '-12px');
+                }
             }
         };
         // Once texts has fully loaded, we can recompute some sizes
         this.recomputeTextSize = () => {
             var _a, _b;
             if (this.afVariation == BarChartVariation.Horizontal)
-                this._tickWidth = this.getLargestText(this._xScale.ticks().map((tick) => tick.toLocaleString()));
+                this.tickWidth = this.getLargestText(this.xScale.ticks().map((tick) => tick.toLocaleString()));
             this.tickSizes();
-            this._barChartContainer.selectAll('.barGroup').data(this.mappedData);
-            if ((_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels)
-                this._textSelection.remove();
+            this.barChartContainer.selectAll('.barGroup').data(this.mappedData);
+            if ((_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels)
+                this.textSelection.remove();
             this.initBarText();
         };
         // Removes resize observer for chart and inits table
         this.activateTable = (event) => {
             this.closeTooltip();
             this.barChartObserver.disconnect();
-            this.tableObserver.observe(this._chartDiv);
-            this._status.innerHTML = '<p>Visas som tabell</p>';
-            d3.select(this._host).select('.tableButton').style('display', 'none');
-            d3.select(this._host).select('.chartButton').style('display', null);
+            this.status.innerHTML = '<p>Visas som tabell</p>';
+            d3.select(this.host).select('.tableButton').style('display', 'none');
+            d3.select(this.host).select('.chartButton').style('display', null);
             event.target.nextSibling.lastChild.focus();
             const duration = 150;
-            this._svg
+            this.svg
                 .attr('opacity', 1)
                 .transition('fadeout')
                 .duration(duration)
                 .attr('opacity', 0)
                 .on('end', () => {
-                this._svg.remove();
-                this._legendDiv.style['display'] = 'none';
-                this._tableDiv.style['display'] = 'block';
+                this.svg.remove();
+                d3.select(this.legendDiv).select('.legend').selectAll('.legendChip').remove();
+                this.legendDiv.style['display'] = 'none';
+                this.tableDiv.style['display'] = 'block';
                 this.setTableContent();
                 this.setTableDimensions();
-                d3.select(this._tableDiv)
+                d3.select(this.tableDiv)
                     .style('opacity', 0)
                     .transition('fadein')
                     .duration(duration)
                     .style('opacity', 1);
+                this.chartDiv.style['display'] = 'none';
             });
-            d3.select(this._legendDiv)
+            d3.select(this.legendDiv)
                 .style('opacity', 1)
                 .transition('fadeout')
                 .duration(duration)
@@ -814,12 +878,12 @@ export class barChart {
         };
         // Removes observer and calls init functions for line chart
         this.reInitChart = (event) => {
-            this.tableObserver.disconnect();
-            this._status.innerHTML = '<p>Visas som diagram</p>';
-            d3.select(this._host).select('.tableButton').style('display', null);
-            d3.select(this._host).select('.chartButton').style('display', 'none');
+            this.status.innerHTML = '<p>Visas som diagram</p>';
+            d3.select(this.host).select('.tableButton').style('display', null);
+            d3.select(this.host).select('.chartButton').style('display', 'none');
             event.target.previousSibling.lastChild.focus();
-            const table = d3.select(this._tableDiv);
+            const table = d3.select(this.tableDiv);
+            const duration = 150;
             table
                 .style('opacity', 1)
                 .transition()
@@ -827,12 +891,19 @@ export class barChart {
                 .style('opacity', 0)
                 .on('end', () => {
                 table.style('display', 'none');
+                this.chartDiv.style['display'] = 'flex';
+                this.legendDiv.style['display'] = 'grid';
                 this.initChain();
-                this._svg
+                this.svg
                     .attr('opacity', 0)
                     .transition()
-                    .duration(150)
+                    .duration(duration)
                     .attr('opacity', 1);
+                d3.select(this.legendDiv)
+                    .style('opacity', 0)
+                    .transition('fadeout')
+                    .duration(duration)
+                    .style('opacity', 1);
             });
         };
         this.afVariation = BarChartVariation.Vertical;
@@ -842,9 +913,9 @@ export class barChart {
     }
     afChartDataUpdate(data) {
         if (typeof data != 'string')
-            this._chartData = data;
+            this.chartData = data;
         else
-            this._chartData = JSON.parse(data);
+            this.chartData = JSON.parse(data);
         this.mappedData = this.reshapeData();
         // checking for width of each tick
         this.mappedData.forEach((elem) => {
@@ -857,73 +928,98 @@ export class barChart {
     initSvg() {
         var _a, _b, _c, _d, _e, _f, _g;
         // Fetch number formatting
-        this._numberFormat = {
-            maximumSignificantDigits: (_c = (_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.labelProperties) === null || _c === void 0 ? void 0 : _c.significantDigits,
-            notation: ((_f = (_e = (_d = this._chartData) === null || _d === void 0 ? void 0 : _d.meta) === null || _e === void 0 ? void 0 : _e.labelProperties) === null || _f === void 0 ? void 0 : _f.shortHand)
+        this.numberFormat = {
+            maximumSignificantDigits: (_c = (_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.labelProperties) === null || _c === void 0 ? void 0 : _c.significantDigits,
+            notation: ((_f = (_e = (_d = this.chartData) === null || _d === void 0 ? void 0 : _d.meta) === null || _e === void 0 ? void 0 : _e.labelProperties) === null || _f === void 0 ? void 0 : _f.shortHand)
                 ? 'compact'
                 : 'standard'
         };
-        d3.select(this._chartDiv).select('svg').remove();
-        this._maxHeight = (_g = d3
-            .select(this._host)
+        d3.select(this.chartDiv).select('.chartSVG').remove();
+        this.maxHeight = (_g = d3
+            .select(this.host)
             .node()
             .parentNode) === null || _g === void 0 ? void 0 : _g.getBoundingClientRect().height;
-        this.barChartObserver.observe(this._chartDiv);
+        this.barChartObserver.observe(this.chartDiv);
         // Getting rem-size
-        this._rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
-        this.setMinMax();
+        this.rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
         this.setDims();
+        this.setMinMax();
         this.setMargins();
         // Appending svg
-        this._svg = d3
-            .select(this._chartDiv)
+        this.svg = d3
+            .select(this.chartDiv)
             .append('svg')
+            .attr('class', 'chartSVG')
             .attr('aria-hidden', true)
             .attr('role', 'img')
-            .attr('aria-label', this._chartData && this._chartData.title
-            ? 'Stapeldiagram om ' + this._chartData.title.toLowerCase()
-            : 'Stapeldiagram');
-        this._svg.attr('width', this._dims.width).attr('height', this._dims.height);
+            .attr('aria-label', this.chartData && this.chartData.title
+            ? 'Stapeldiagram om ' + this.chartData.title.toLowerCase()
+            : 'Stapeldiagram')
+            .attr('style', 'display: flex;min-width: 0;width: 100%;height: auto;');
+    }
+    initLegend() {
+        const rectSize = 18;
+        const legendChips = d3.select(this.legendDiv).select('.legend')
+            .style('margin-left', `${this.margin.left + this.tickPadding + this.yTickSize}px`)
+            .selectAll('.legendChip')
+            .data(this.chartData.data.series.map(serie => serie.title))
+            .join('div')
+            .attr('class', 'legendChip')
+            .style('display', 'flex')
+            .style('flex-direction', 'row')
+            .style('align-items', 'center')
+            .style('gap', '0.25rem')
+            .style('cursor', 'default')
+            .on('mouseenter', (_event, serie) => this.highlightBars(serie))
+            .on('mouseleave', this.resetBarColor);
+        legendChips.append('svg')
+            .attr('width', rectSize)
+            .attr('height', rectSize)
+            .append('rect')
+            .attr('x', 0)
+            .attr('y', 0)
+            .attr('width', rectSize)
+            .attr('height', rectSize)
+            .attr('rx', 4)
+            .attr('ry', 4)
+            .attr('fill', (title) => this.colorFunction(title));
+        legendChips.append('span').text((d) => d);
     }
     initToolTip() {
         // Getting handle for tooltip
-        this._tooltip = d3.select('#' + this.afId);
-        this._tooltip.select('.close').on('click', this.closeTooltip);
-        this._tooltipHeading =
-            'h' + (parseInt(this.afHeadingLevel.replace(/\D/g, '')) + 1); // increment heading level by one
+        this.tooltip = d3.select('#' + this.afId);
+        this.tooltip.select('.close').on('click', this.closeTooltip);
         // Add heading placeholder for heading
-        this._tooltip
-            .selectAll('.tooltipBody')
-            .append(this._tooltipHeading)
+        this.tooltip
+            .select('.tooltipBody')
+            .append('h' + (parseInt(this.afHeadingLevel.replace(/\D/g, '')) + 1)) // increment heading level by one
             .attr('class', 'tooltipHeading') // Adding class to try to dodge global css classes
             .style('font-size', '1rem')
-            .style('margin', '0 0.75rem')
+            .style('margin', '0 0.75rem 0.5rem 0 ')
             .style('font-weight', '500');
+        this.tooltip.style('visibility', 'hidden');
     }
     initEmpty() {
-        d3.select(this._chartDiv).select('svg').remove();
-        this._maxHeight = d3
-            .select(this._host)
+        d3.select(this.chartDiv).select('svg').remove();
+        this.maxHeight = d3
+            .select(this.host)
             .node()
             .parentNode.getBoundingClientRect().height;
-        this.barChartObserver.observe(this._chartDiv);
+        this.barChartObserver.observe(this.chartDiv);
         // Getting rem-size
-        this._rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
-        //this.setMinMax();
-        this.setDims();
+        this.rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
         this.setMargins();
         // Appending svg
-        this._svg = d3
-            .select(this._chartDiv)
+        this.svg = d3
+            .select(this.chartDiv)
             .append('svg')
             .attr('aria-hidden', true)
             .attr('role', 'img')
-            .attr('aria-label', this._chartData && this._chartData.title
-            ? 'Stapeldiagram om ' + this._chartData.title.toLowerCase()
+            .attr('aria-label', this.chartData && this.chartData.title
+            ? 'Stapeldiagram om ' + this.chartData.title.toLowerCase()
             : 'Stapeldiagram');
-        this._svg.attr('width', this._dims.width).attr('height', this._dims.height);
         // Hide unusable components
-        d3.select(this._titleDiv)
+        d3.select(this.titleDiv)
             .select(this.afHeadingLevel)
             .html(`${_t.loading}...`);
         this.initYAxis(true);
@@ -931,62 +1027,60 @@ export class barChart {
         this.loadingState(true);
     }
     loadingState(empty) {
-        this._loading = true;
+        this.loading = true;
         // close potentially open tooltip
-        if (this._tooltip)
+        if (this.tooltip)
             this.closeTooltip();
-        d3.select(this._host).select('.tableButton').style('display', 'none');
+        d3.select(this.host).select('.tableButton').style('display', 'none');
         const newHeight = this.setDims();
         this.transitionTitle();
-        this._xAxisHandle.selectAll('.tick').remove();
-        this._xAxisHandle.select('path').remove();
-        this._svg
+        this.xAxisHandle.selectAll('.tick').remove();
+        this.xAxisHandle.select('path').remove();
+        this.svg
             .transition()
             .duration(400)
-            .attr('width', this._dims.width)
-            .attr('height', this._dims.height)
-            .attr('aria-label', this._chartData && this._chartData.title
-            ? 'Stapeldiagram om ' + this._chartData.title.toLowerCase()
+            .attr('aria-label', this.chartData && this.chartData.title
+            ? 'Stapeldiagram om ' + this.chartData.title.toLowerCase()
             : 'Stapeldiagram');
         this.setMargins(true);
-        d3.select(this._titleDiv)
+        d3.select(this.titleDiv)
             .select(this.afHeadingLevel)
             .html(`${_t.loading}...`);
         // Waiting with observing for changes until transition to regular bars is complete
-        this._barChartContainer
+        this.barChartContainer
             .transition('position')
             .duration(this.defaultDuration)
             .ease(d3.easePolyInOut)
-            .attr('transform', `translate(${this._margin.left + this.tickPadding + this.yTickSize},0)`);
+            .attr('transform', `translate(${this.margin.left + this.tickPadding + this.yTickSize},0)`);
         // If there is a new height
         if (newHeight) {
             // Update y-axis with potentially new height (might want to do a check here)
             this.afVariation === BarChartVariation.Horizontal
-                ? this._yScale.range([
-                    this._margin.top,
-                    this._dims.height - this._margin.bottom
+                ? this.yScale.range([
+                    this.margin.top,
+                    this.dims.height - this.margin.bottom
                 ])
-                : this._yScale.range([
-                    this._dims.height - this._margin.bottom,
-                    this._margin.top
+                : this.yScale.range([
+                    this.dims.height - this.margin.bottom,
+                    this.margin.top
                 ]);
-            this._xAxisHandle.attr('transform', `translate(0,${this._dims.height - this._margin.bottom})`);
+            this.xAxisHandle.attr('transform', `translate(0,${this.dims.height - this.margin.bottom})`);
         }
         const animateBars = () => {
-            this._barChartContainer.selectAll('.barGroup').remove();
-            this._barSelection = this._barChartContainer
+            this.barChartContainer.selectAll('.barGroup').remove();
+            this.barSelection = this.barChartContainer
                 .selectAll('barGroup')
                 .data(this.mappedData)
                 .join('g')
                 .attr('class', 'barGroup')
-                .attr('id', (d) => 'barGroup' + d.key.replace(/[^A-Z0-9]+/gi, '_'))
+                .attr('id', (d) => 'barGroup' + d.key.replace(/[^A-Z0-9]+/gi, ''))
                 .append('rect')
                 .attr('class', 'bar')
                 .style('cursor', 'pointer');
-            this._barSelection
+            this.barSelection
                 .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                ? this._yScale(d.key)
-                : this._dims.height - this._margin.bottom)
+                ? this.yScale(d.key)
+                : this.dims.height - this.margin.bottom)
                 .attr('x', this.xFunction)
                 .attr('ry', 4)
                 .attr('rx', 4)
@@ -998,29 +1092,29 @@ export class barChart {
                 .delay((...[, i]) => i * 150)
                 .attr('y', this.yFunction)
                 .attr('height', this.heightFunction);
-            this._barSelection
+            this.barSelection
                 .transition()
                 .duration(400)
                 .ease(d3.easeLinear)
                 .delay((...[, i]) => i * 150 + 400)
                 .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                ? this._yScale(d.key)
-                : this._dims.height - this._margin.bottom)
+                ? this.yScale(d.key)
+                : this.dims.height - this.margin.bottom)
                 .attr('height', () => 0)
                 .on('end', (...[, i]) => {
-                if (i === this._placeholderTicks.length - 1)
+                if (i === this.placeholderTicks.length - 1)
                     animateBars();
             });
         };
         const flattenBars = () => {
-            this._barChartContainer
+            this.barChartContainer
                 .selectAll('rect')
                 .transition()
                 .duration(200)
                 .ease(d3.easeLinear)
                 .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                ? this._yScale(d.key)
-                : this._dims.height - this._margin.bottom)
+                ? this.yScale(d.key)
+                : this.dims.height - this.margin.bottom)
                 .attr('height', () => 0)
                 .on('end', (...[, i]) => {
                 if (i != 0)
@@ -1028,7 +1122,7 @@ export class barChart {
                 this.setYScale(true);
                 this.setValueTicks();
                 this.setXScale(true);
-                this.barChartObserver.observe(this._chartDiv);
+                this.barChartObserver.observe(this.chartDiv);
                 animateBars();
             });
         };
@@ -1038,20 +1132,20 @@ export class barChart {
             flattenBars();
     }
     transitionTitle() {
-        const height = d3.select(this._titleDiv).style('height');
-        d3.select(this._titleDiv)
-            .style('height', this._prevHeight)
+        const height = d3.select(this.titleDiv).style('height');
+        d3.select(this.titleDiv)
+            .style('height', this.prevHeight)
             .transition('adjust')
             .duration(400)
             .style('height', height)
-            .on('end', () => d3.select(this._titleDiv).style('height', null));
+            .on('end', () => d3.select(this.titleDiv).style('height', null));
     }
     initYAxis(empty) {
         this.setYScale(empty);
-        this._barChartContainer = this._svg
+        this.barChartContainer = this.svg
             .append('g')
-            .attr('transform', `translate(${this._margin.left + this.tickPadding + this.yTickSize},0)`);
-        this._yAxisHandle = this._barChartContainer.append('g');
+            .attr('transform', `translate(${this.margin.left + this.tickPadding + this.yTickSize},0)`);
+        this.yAxisHandle = this.barChartContainer.append('g');
         if (this.afVariation === BarChartVariation.Horizontal) {
             this.tickSizes();
             this.setNamedTicks();
@@ -1063,32 +1157,32 @@ export class barChart {
     // Sets the largest and smallest value from series 0, Should only be used when not loading
     setMinMax() {
         var _a, _b, _c, _d, _e, _f, _g;
-        const max = d3.max((_a = this._chartData) === null || _a === void 0 ? void 0 : _a.data.series[0].yValues)
-            ? d3.max((_b = this._chartData) === null || _b === void 0 ? void 0 : _b.data.series[0].yValues)
+        const max = d3.max((_a = this.chartData) === null || _a === void 0 ? void 0 : _a.data.series[0].yValues)
+            ? d3.max((_b = this.chartData) === null || _b === void 0 ? void 0 : _b.data.series[0].yValues)
             : 0;
-        const min = d3.min([0, d3.min((_c = this._chartData) === null || _c === void 0 ? void 0 : _c.data.series[0].yValues)])
-            ? d3.min([0, d3.min((_d = this._chartData) === null || _d === void 0 ? void 0 : _d.data.series[0].yValues)])
+        const min = d3.min([0, d3.min((_c = this.chartData) === null || _c === void 0 ? void 0 : _c.data.series[0].yValues)])
+            ? d3.min([0, d3.min((_d = this.chartData) === null || _d === void 0 ? void 0 : _d.data.series[0].yValues)])
             : 0;
-        this._maxVal = max;
-        this._minVal = min;
-        this._tempScale = d3
+        this.maxVal = max;
+        this.minVal = min;
+        this.tempScale = d3
             .scaleLinear()
-            .domain([this._minVal, this._maxVal])
-            .nice(((_f = (_e = this._chartData) === null || _e === void 0 ? void 0 : _e.meta) === null || _f === void 0 ? void 0 : _f.numberOfReferenceLines)
-            ? (_g = this._chartData) === null || _g === void 0 ? void 0 : _g.meta.numberOfReferenceLines
+            .domain([this.minVal, this.maxVal])
+            .nice(((_f = (_e = this.chartData) === null || _e === void 0 ? void 0 : _e.meta) === null || _f === void 0 ? void 0 : _f.numberOfReferenceLines)
+            ? (_g = this.chartData) === null || _g === void 0 ? void 0 : _g.meta.numberOfReferenceLines
             : 3)
             .domain();
     }
     // Setting up x-axis, getting margin.right in this function
     initXAxis(empty) {
         this.setXScale(empty);
-        this._xAxisHandle = this._barChartContainer
+        this.xAxisHandle = this.barChartContainer
             .append('g')
-            .attr('transform', `translate(0,${this._dims.height - this._margin.bottom})`);
+            .attr('transform', `translate(0,${this.dims.height - this.margin.bottom})`);
         if (this.afVariation === BarChartVariation.Horizontal) {
             this.setValueTicks();
             // Removing first tick, because it aligns with y-axis domain
-            //this._xAxisHandle.select('.tick').select('line').remove();
+            //this.xAxisHandle.select('.tick').select('line').remove();
         }
         else {
             if (!empty) {
@@ -1100,15 +1194,13 @@ export class barChart {
     }
     // Initializing bars, can only handle one series of bars for now
     initBars() {
-        this._barSelection = this._barChartContainer
+        this.barSelection = this.barChartContainer
             .selectAll('barGroup')
             .data(this.mappedData)
             .join('g')
             .attr('class', 'barGroup')
-            .attr('id', (d) => {
-            return 'barGroup' + d.key.replace(/[^A-Z0-9]+/gi, '_');
-        });
-        this._barSelection.selectAll('.barGroup')
+            .attr('id', (d) => this.barGroupID(d.key));
+        this.barSelection.selectAll('.barGroup')
             .data((d) => {
             return d.series;
         })
@@ -1128,32 +1220,33 @@ export class barChart {
     }
     initBarText() {
         var _a, _b;
-        if (!((_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels))
+        if (!((_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels))
             return;
-        this._textSelection = this._barChartContainer
+        this.textSelection = this.barChartContainer
             .selectAll('.barGroup')
             .append('text');
-        this._textSelection
+        this.textSelection
             .text((d) => {
-            return d.value ? d.value.toLocaleString(undefined, this._numberFormat) : undefined;
+            return d.value ? d.value.toLocaleString(undefined, this.numberFormat) : undefined;
         })
             .attr('class', 'barText')
             .attr('font-size', this.fontSize)
             .attr('font-weight', '600')
             .attr('text-anchor', 'end')
             .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-            ? this._yScale(d.key) + this._yScale.bandwidth() / 2
-            : this._yScale(d.value))
+            ? this.yScale(d.key) + this.yScale.bandwidth() / 2
+            : this.yScale(d.value))
             .attr('x', (d) => this.afVariation === BarChartVariation.Horizontal
-            ? this._xScale(d)
-            : this._xScale(d.key) + this._xScale.bandwidth())
+            ? this.xScale(d)
+            : this.xScale(d.key) + this.xScale.bandwidth())
             .attr('dy', () => this.afVariation == BarChartVariation.Horizontal ? '0.35em' : '-0.25em')
             .style('pointer-events', 'none')
-            .style('display', () => { var _a, _b; return ((_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels) ? null : 'none'; });
+            .style('display', () => { var _a, _b; return ((_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.valueLabels) ? null : 'none'; });
         this.adjustBarText();
     }
     initChain() {
         this.initSvg();
+        this.initLegend();
         this.initToolTip();
         this.initYAxis();
         this.initXAxis();
@@ -1163,18 +1256,18 @@ export class barChart {
     async updateChain() {
         var _a, _b, _c, _d, _e, _f;
         // Fetch number formatting
-        this._numberFormat = {
-            maximumSignificantDigits: (_c = (_b = (_a = this._chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.labelProperties) === null || _c === void 0 ? void 0 : _c.significantDigits,
-            notation: ((_f = (_e = (_d = this._chartData) === null || _d === void 0 ? void 0 : _d.meta) === null || _e === void 0 ? void 0 : _e.labelProperties) === null || _f === void 0 ? void 0 : _f.shortHand)
+        this.numberFormat = {
+            maximumSignificantDigits: (_c = (_b = (_a = this.chartData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.labelProperties) === null || _c === void 0 ? void 0 : _c.significantDigits,
+            notation: ((_f = (_e = (_d = this.chartData) === null || _d === void 0 ? void 0 : _d.meta) === null || _e === void 0 ? void 0 : _e.labelProperties) === null || _f === void 0 ? void 0 : _f.shortHand)
                 ? 'compact'
                 : 'standard'
         };
-        if (this._tooltip)
+        if (this.tooltip)
             this.closeTooltip();
         // Check whether we are in table mode or not
-        if (this._tableDiv.style['display'] == 'block') {
-            if (!this._chartData.title) {
-                d3.select(this._titleDiv)
+        if (this.tableDiv.style['display'] == 'block') {
+            if (!this.chartData.title) {
+                d3.select(this.titleDiv)
                     .select(this.afHeadingLevel)
                     .html(`${_t.loading}...`);
             }
@@ -1186,9 +1279,9 @@ export class barChart {
         }
         else {
             // displaying legend again
-            if (this._loading) {
-                d3.select(this._host).select('.tableButton').style('display', null);
-                d3.select(this._legendDiv).style('display', null);
+            if (this.loading) {
+                d3.select(this.host).select('.tableButton').style('display', null);
+                d3.select(this.legendDiv).style('display', null);
                 this.initToolTip();
             }
             // Disconnect resize observer while adjusting things
@@ -1196,73 +1289,69 @@ export class barChart {
             this.setMinMax();
             const newHeight = this.setDims();
             this.transitionTitle();
-            this._svg
-                .transition()
-                .duration(400)
-                .attr('width', this._dims.width)
-                .attr('height', this._dims.height)
-                .attr('aria-label', this._chartData && this._chartData.title
-                ? 'Stapeldiagram om ' + this._chartData.title.toLowerCase()
+            this.svg
+                .attr('aria-label', this.chartData && this.chartData.title
+                ? 'Stapeldiagram om ' + this.chartData.title.toLowerCase()
                 : 'Stapeldiagram');
             this.setMargins();
             // Waiting with observing for changes until transition to regular bars is complete
-            this._barChartContainer
+            this.barChartContainer
                 .transition('position')
                 .duration(this.defaultDuration)
                 .ease(d3.easePolyInOut)
-                .attr('transform', `translate(${this._margin.left + this.tickPadding + this.yTickSize},0)`);
-            if (!this._loading)
-                this._barChartContainer.on('end', () => this.barChartObserver.observe(this._chartDiv));
+                .attr('transform', `translate(${this.margin.left + this.tickPadding + this.yTickSize},0)`);
+            if (!this.loading)
+                this.barChartContainer.on('end', () => this.barChartObserver.observe(this.chartDiv));
             // If there is a new height
             if (newHeight) {
                 // Update y-axis with potentially new height (might want to do a check here)
                 this.afVariation === BarChartVariation.Horizontal
-                    ? this._yScale.range([
-                        this._margin.top,
-                        this._dims.height - this._margin.bottom
+                    ? this.yScale.range([
+                        this.margin.top,
+                        this.dims.height - this.margin.bottom
                     ])
-                    : this._yScale.range([
-                        this._dims.height - this._margin.bottom,
-                        this._margin.top
+                    : this.yScale.range([
+                        this.dims.height - this.margin.bottom,
+                        this.margin.top
                     ]);
-                this._xAxisHandle.attr('transform', `translate(0,${this._dims.height - this._margin.bottom})`);
+                this.xAxisHandle.attr('transform', `translate(0,${this.dims.height - this.margin.bottom})`);
             }
             this.tickSizes();
             this.setYScale();
             this.setXScale();
             this.setTickInteraction();
-            this._tickWidth = this.getLargestText(this.afVariation == BarChartVariation.Horizontal
-                ? this._xScale.ticks().map((tick) => tick.toLocaleString())
-                : this._yScale.ticks().map((tick) => tick.toLocaleString()));
+            this.tickWidth = this.getLargestText(this.afVariation == BarChartVariation.Horizontal
+                ? this.xScale.ticks().map((tick) => tick.toLocaleString())
+                : this.yScale.ticks().map((tick) => tick.toLocaleString()));
             this.setValueTicks(true);
-            if (this._loading) {
-                d3.select(this._legendDiv)
+            if (this.loading) {
+                d3.select(this.legendDiv)
                     .style('opacity', 0)
                     .transition()
                     .duration(400)
                     .ease(d3.easePolyInOut)
                     .style('opacity', 1);
-                this._margin.right =
-                    this.getTextSize(this._xScale.domain()[1].toLocaleString()) / 2 +
+                this.margin.right =
+                    this.getTextSize(this.xScale.domain()[1].toLocaleString()) / 2 +
                         this.yTickSize +
                         this.tickPadding;
                 // Update x-axis with new width
-                this._xScale.range([
+                this.xScale.range([
                     0,
-                    this._dims.width - this._margin.right - this._margin.left
+                    this.dims.width - this.margin.right - this.margin.left
                 ]);
                 this.setNamedTicks(true);
                 // Stop animation
-                this._barSelection.selectAll('.barGroup').on('end', null);
-                this._loading = false;
-                this._barSelection
+                this.barSelection.selectAll('.barGroup').on('end', null);
+                this.loading = false;
+                this.barSelection
                     .transition()
                     .duration(this.defaultDuration)
                     .attr('y', (d) => this.afVariation === BarChartVariation.Horizontal
-                    ? this._yScale(d.key)
-                    : this._dims.height - this._margin.bottom)
+                    ? this.yScale(d.key)
+                    : this.dims.height - this.margin.bottom)
                     .attr('height', () => 0)
-                    .on('end', (...[, i]) => i === this._placeholderTicks.length - 1
+                    .on('end', (...[, i]) => i === this.placeholderTicks.length - 1
                     ? this.updateBars(true)
                     : null);
                 this.setTickInteraction();
@@ -1277,51 +1366,50 @@ export class barChart {
     // Getting correct color given index or name of data serie
     colorFunction(input) {
         if (typeof input === 'number')
-            return `var(${this.colorPalettes[input]})`;
+            return this.evalColorVar(this.colorPalettes[input]);
         else {
-            const index = this._chartData.data.series.findIndex((serie) => serie.title === input);
+            const index = this.chartData.data.series.findIndex((serie) => serie.title === input);
             if (index > 0)
-                return `var(${this.colorPalettes[index]})`;
+                return this.evalColorVar(this.colorPalettes[index]);
             else
-                return `var(${this.colorPalettes[0]})`;
+                return this.evalColorVar(this.colorPalettes[0]);
         }
     }
     // Resizing bar chart
     resize() {
-        var _a;
         const newHeight = this.setDims();
-        this.setMargins();
-        (_a = this._svg) === null || _a === void 0 ? void 0 : _a.attr('width', this._dims.width).attr('height', this._dims.height);
-        this._barChartContainer.attr('transform', `translate(${this._margin.left + this.tickPadding + this.yTickSize},0)`);
-        this._margin.right =
-            this.getTextSize(this._xScale.domain()[1].toLocaleString()) / 2 +
+        //this.setMargins();
+        this.barChartContainer.attr('transform', `translate(${this.margin.left + this.tickPadding + this.yTickSize},0)`);
+        this.margin.right =
+            this.getTextSize(this.xScale.domain()[1].toLocaleString()) / 2 +
                 this.yTickSize +
                 this.tickPadding;
         // If there is a new height
         if (newHeight) {
             // Update y-axis with potentially new height (might want to do a check here)
             this.afVariation === BarChartVariation.Horizontal
-                ? this._yScale.range([
-                    this._margin.top,
-                    this._dims.height - this._margin.bottom
+                ? this.yScale.range([
+                    this.margin.top,
+                    this.dims.height - this.margin.bottom
                 ])
-                : this._yScale.range([
-                    this._dims.height - this._margin.bottom,
-                    this._margin.top
+                : this.yScale.range([
+                    this.dims.height - this.margin.bottom,
+                    this.margin.top
                 ]);
-            this._xAxisHandle.attr('transform', `translate(0,${this._dims.height - this._margin.bottom})`);
+            this.xAxisHandle.attr('transform', `translate(0,${this.dims.height - this.margin.bottom})`);
         }
         // Update x-axis with new width
-        this._xScale.range([
+        this.xScale.range([
             0,
-            this._dims.width - this._margin.right - this._margin.left
+            this.dims.width - this.margin.right - this.margin.left
         ]);
         this.setNamedTicks();
         this.setValueTicks();
+        this.setTickInteraction();
         this.adjustBarSize();
         this.adjustBarText();
-        if (this._tooltipData)
-            this.positionTooltip(this._tooltipData);
+        if (this.tooltip.style('visibility') !== 'hidden')
+            this.positionTooltip(this.tooltipData);
     }
     // Returns the longest text from an array of strings
     getLargestText(array) {
@@ -1334,30 +1422,33 @@ export class barChart {
         });
         return width;
     }
+    adjustColor(color, amount) {
+        return '#' + color.replace(/^#/, '').replace(/../g, color => ('0' + Math.min(255, Math.max(0, parseInt(color, 16) + amount)).toString(16)).substr(-2));
+    }
     componentWillLoad() {
         this.afChartDataUpdate(this.afChartData);
     }
     componentDidLoad() {
-        if (!this._chartData || Object.keys(this._chartData).length === 0) {
-            this._loading = true;
+        if (!this.chartData || Object.keys(this.chartData).length === 0) {
+            this.loading = true;
             return this.initEmpty();
         }
         this.initChain();
         document.fonts.ready.then(() => {
             this.recomputeTextSize();
             this.setNamedTicks();
-            this._barChartContainer.attr('transform', `translate(${this._margin.left + this.tickPadding + this.yTickSize},0)`);
+            this.barChartContainer.attr('transform', `translate(${this.margin.left + this.tickPadding + this.yTickSize},0)`);
         });
     }
     disconnectedCallback() {
         this.barChartObserver.disconnect();
     }
     componentWillUpdate() {
-        this._prevHeight = d3.select(this._titleDiv).style('height');
+        this.prevHeight = d3.select(this.titleDiv).style('height');
     }
     componentDidUpdate() {
-        if (this._tableDiv.style['display'] != 'block' &&
-            Object.keys(this._chartData).length === 0) {
+        if (this.tableDiv.style['display'] != 'block' &&
+            Object.keys(this.chartData).length === 0) {
             // Disconnect old barchartobserver while doing resizing
             this.barChartObserver.disconnect();
             return this.loadingState();
@@ -1374,7 +1465,7 @@ export class barChart {
     // Returns pixelwidth of text given the current fontSize (costly function using .each)
     getTextSize(text) {
         const textWidth = [];
-        const svg = d3.select(this._chartDiv).append('svg');
+        const svg = d3.select(this.chartDiv).append('svg');
         svg
             .selectAll('dummyText')
             .data([text])
@@ -1389,21 +1480,18 @@ export class barChart {
         svg.remove().exit();
         return textWidth[0];
     }
-    // Setting table content from this._chartData
+    // Setting table content from this.chartData
     setTableContent() {
-        this._tableDiv.innerHTML = `<digi-table af-size="small" af-variation="primary"> <table><caption>${this._chartData.title}</caption><thead><tr>${this.headings()}</tr></thead><tbody>${this.tableBody()}</tbody></table></digi-table>`;
+        this.tableDiv.innerHTML = `<digi-table af-size="small" style="width:100%" af-variation="primary"> <table><caption>${this.chartData.title}</caption><thead><tr>${this.headings()}</tr></thead><tbody>${this.tableBody()}</tbody></table></digi-table>`;
     }
     setTableDimensions() {
-        const table = d3.select(this._tableDiv);
-        table
-            // The last value is for compensating the padding set on the table element, changing padding in css, will need change in these two lines
-            .style('height', this._dims.height + 'px');
-        table.style('width', this._dims.width - this._rem * 0.65 + 'px');
+        const table = d3.select(this.tableDiv);
+        table.style('display', 'flex').style('height', '100%').style('width', '100%');
     }
     // Extracting all headings from data and returning a string with <th>-elements with headings
     headings() {
-        let headingsString = `<th scope="col">${this._chartData.x}</th>`;
-        this._chartData.data.series.forEach((elem) => {
+        let headingsString = `<th scope="col">${this.chartData.x}</th>`;
+        this.chartData.data.series.forEach((elem) => {
             headingsString = headingsString.concat(`<th scope="col">${elem.title}</th>`);
         });
         return headingsString;
@@ -1411,13 +1499,13 @@ export class barChart {
     // Building the table body
     tableBody() {
         let body = '';
-        if (this._chartData && this._chartData.data) {
-            const loopable = this._chartData.data.xValueNames
-                ? this._chartData.data.xValueNames
-                : this._chartData.data.xValues;
+        if (this.chartData && this.chartData.data) {
+            const loopable = this.chartData.data.xValueNames
+                ? this.chartData.data.xValueNames
+                : this.chartData.data.xValues;
             loopable.forEach((elem, index) => {
                 let cells = '';
-                this._chartData.data.series.forEach((serie) => {
+                this.chartData.data.series.forEach((serie) => {
                     cells = cells.concat(`<td>${serie.yValues[index] != null ? serie.yValues[index].toLocaleString() : '-'}</td>`);
                 });
                 body = body.concat(`<tr><th scope='row'>${elem}${cells}</th></tr>`);
@@ -1429,18 +1517,18 @@ export class barChart {
         var _a, _b, _c, _d, _e;
         // Setting header
         let heading = '';
-        if (this._chartData) {
-            if (!this._chartData.subTitle)
-                heading = `<${this.afHeadingLevel}>${this._chartData.title}</${this.afHeadingLevel}>`;
+        if (this.chartData) {
+            if (!this.chartData.subTitle)
+                heading = `<${this.afHeadingLevel}>${this.chartData.title}</${this.afHeadingLevel}>`;
             else {
-                if (!this._chartData.infoText)
-                    heading = `<${this.afHeadingLevel}>${this._chartData.title}</${this.afHeadingLevel}><p>${this._chartData.subTitle}</p>`;
+                if (!this.chartData.infoText)
+                    heading = `<${this.afHeadingLevel}>${this.chartData.title}</${this.afHeadingLevel}><p>${this.chartData.subTitle}</p>`;
                 else
-                    heading = `<${this.afHeadingLevel}>${this._chartData.title}</${this.afHeadingLevel}><p>${(_a = this._chartData) === null || _a === void 0 ? void 0 : _a.subTitle}
-				<span style="display:block;margin-top:0.25rem;font-size:0.875rem;color:var(--digi--global--color--neutral--grayscale--darkest-3)">${this._chartData.infoText}</span></p>`;
+                    heading = `<${this.afHeadingLevel}>${this.chartData.title}</${this.afHeadingLevel}><p>${(_a = this.chartData) === null || _a === void 0 ? void 0 : _a.subTitle}
+				<span style="display:block;margin-top:0.25rem;font-size:0.875rem;color:var(--digi--global--color--neutral--grayscale--darkest-3)">${this.chartData.infoText}</span></p>`;
             }
         }
-        return (h(Host, { key: 'a1e4aaa788766d54c691e95b7e70932b0e7d2b05', ref: (el) => (this._host = el) }, h("div", { key: '2fac926d196acaa20ab5f438968e3c98c08dd104', class: "topWrapper", ref: (el) => (this._titleDiv = el) }, h("digi-typography", { key: '16d8cbd0f03a2a2d24d3366ab1b3eaed797dd361', class: "chartTitle", innerHTML: heading }), h("digi-button", { key: '22a93add4a7f1ea3965ce496f2b5cbf488b01314', class: "buttonWrapper tableButton", "af-size": "medium", "af-variation": "function", "af-full-width": "false", onAfOnClick: this.activateTable, afAriaLabel: `Visa tabell ${((_b = this._chartData) === null || _b === void 0 ? void 0 : _b.title) ? (_c = this._chartData) === null || _c === void 0 ? void 0 : _c.title.toLowerCase() : ''}` }, h("digi-icon-table", { key: '152938d206dc00e2fb88b52d332960cbeda2c045', slot: "icon" }), "Visa tabell"), h("digi-button", { key: '66db213ee1c4cb169c7c257853a15a468bf2a83e', style: { display: 'none' }, class: "buttonWrapper chartButton", "af-size": "medium", "af-variation": "function", "af-full-width": "false", onAfOnClick: this.reInitChart, afAriaLabel: `Visa diagram ${((_d = this._chartData) === null || _d === void 0 ? void 0 : _d.title) ? (_e = this._chartData) === null || _e === void 0 ? void 0 : _e.title.toLowerCase() : ''}` }, h("digi-icon-chart", { key: 'ac4b8adad6ace97f50591cd39b8b0082d067f069', slot: "icon" }), "Visa diagram"), h("div", { key: 'b28e00a40b5c1a2919146ec4815f23a14fdfac50', class: "scChartStatus", role: "status", ref: (el) => (this._status = el) })), h("div", { key: '63f80744faa1d4b3d7d62bece3b5c446eda3ae7b', class: "chartTooltip", id: this.afId }, h("div", { key: '8c9fa9388b9bfc071c4a594275159eb36a8ec43b', class: "tooltipBody" }), h("digi-icon-x", { key: '252d12a937e5276381fa40ec3bb4e77c259da9c1', class: "close" }), this.afVariation === BarChartVariation.Horizontal ? (h("digi-icon-caret-up", null)) : (h("digi-icon-caret-down", null))), h("div", { key: '9b70433c310882bd0a06784ca1fa21c5b2dd9e52', ref: (el) => (this._chartDiv = el) }, " "), h("div", { key: '459e38448e29eea1fa7a10de7f3f1f06b6404eab', class: "legend", ref: (el) => (this._legendDiv = el) }), h("div", { key: 'cc655054cb3c3688c75060ebbdf6c3f8ea4ad712', class: "table", ref: (el) => (this._tableDiv = el) }, ' ')));
+        return (h(Host, { key: 'adbf9f1c26a8816a8d4b585b0fc7a0b9100bf252', ref: (el) => (this.host = el) }, h("div", { key: 'ee28dc5914be751e08c73253b80fd257c2e17bbb', class: "topWrapper", ref: (el) => (this.titleDiv = el) }, h("digi-typography", { key: '6a0b051d3c26e9c34fb59d4ee323a10d1cb542e1', class: "chartTitle", innerHTML: heading }), h("digi-button", { key: '9e11623f0b35f394dc3655067625a37771f648d1', class: "buttonWrapper tableButton", "af-size": "medium", "af-variation": "function", "af-full-width": "false", onAfOnClick: this.activateTable, afAriaLabel: `Visa tabell ${((_b = this.chartData) === null || _b === void 0 ? void 0 : _b.title) ? (_c = this.chartData) === null || _c === void 0 ? void 0 : _c.title.toLowerCase() : ''}` }, h("digi-icon-table", { key: '6e00e771521a10c0213ae6267ea2879c7ccc4b3c', slot: "icon" }), "Visa tabell"), h("digi-button", { key: 'a1eec7299c9cd273ceffa1f1689ee0c6297ce0a1', style: { display: 'none' }, class: "buttonWrapper chartButton", "af-size": "medium", "af-variation": "function", "af-full-width": "false", onAfOnClick: this.reInitChart, afAriaLabel: `Visa diagram ${((_d = this.chartData) === null || _d === void 0 ? void 0 : _d.title) ? (_e = this.chartData) === null || _e === void 0 ? void 0 : _e.title.toLowerCase() : ''}` }, h("digi-icon-chart", { key: '5361af6d17e4cd7d6217afd48c4a474fd905c8de', slot: "icon" }), "Visa diagram"), h("div", { key: '2efe2244c2105390580779f60a7c1accd5135d49', class: "scChartStatus", role: "status", ref: (el) => (this.status = el) })), h("div", { key: '48f2316efe396309fd73510a2eea011c137e24ed', class: "svgWrap", ref: (el) => (this.chartDiv = el) }, h("div", { key: '4f2f494517979cbb9de43945d5ffe17acbe6c814', class: "chartTooltip", id: this.afId }, h("div", { key: '36db97d0dcd4e2009cd33b4125b631eddae039ae', class: "tooltipBody" }), h("digi-icon-x", { key: 'b3ac9ec4b6cd6c2c666d475929c10c0aaba2b9e1', class: "close" }), this.afVariation === BarChartVariation.Horizontal ? (h("digi-icon-caret-up", { class: "caret" })) : (h("digi-icon-caret-down", { class: "caret" })))), h("div", { key: 'f96ed8b4c527ba32de5dd5bdb58c367435ecbc04', class: "legendWrap", ref: (el) => (this.legendDiv = el) }, h("div", { key: '3911352915f02a33231c2e0604a5073fb7203bd3', class: "legend" })), h("div", { key: '29c613f6af6e23b05748e230bad4c00156f30fd6', class: "table", ref: (el) => (this.tableDiv = el) }, ' ')));
     }
     static get is() { return "digi-bar-chart"; }
     static get encapsulation() { return "scoped"; }
@@ -1526,13 +1614,13 @@ export class barChart {
                 "type": "string",
                 "mutable": true,
                 "complexType": {
-                    "original": "ChartLineData | string",
-                    "resolved": "ChartLineData | string",
+                    "original": "BarChartData | string",
+                    "resolved": "BarChartData | string",
                     "references": {
-                        "ChartLineData": {
+                        "BarChartData": {
                             "location": "import",
-                            "path": "../chart-line/chart-line-data.interface",
-                            "id": "src/components/_chart/chart-line/chart-line-data.interface.ts::ChartLineData"
+                            "path": "../interfaces/bar-chart-data.interface",
+                            "id": "src/components/_chart/interfaces/bar-chart-data.interface.ts::BarChartData"
                         }
                     }
                 },
@@ -1540,7 +1628,7 @@ export class barChart {
                 "optional": false,
                 "docs": {
                     "tags": [],
-                    "text": "Datan som ska visas upp i stapeldiagrammet, kan vara av antingen typen ChartLineData, eller str\u00E4ngifierad ChartLineData"
+                    "text": "Datan som ska visas upp i stapeldiagrammet, kan vara av antingen typen BarChartData, eller str\u00E4ngifierad BarChartData"
                 },
                 "getter": false,
                 "setter": false,