@carbon/charts 0.30.5 → 0.30.9

package/model-pie.js

@@ -12,12 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 // Internal Imports
-import * as Configuration from "./configuration";
 import { ChartModel } from "./model";
-import { Tools } from "./tools";
-import * as colorPalettes from "./services/colorPalettes";
-// D3 Imports
-import { scaleOrdinal } from "d3-scale";
 /** The charting model layer which includes mainly the chart data and options,
  * as well as some misc. information to be shared among components */
 var PieChartModel = /** @class */ (function (_super) {
@@ -26,109 +21,9 @@ var PieChartModel = /** @class */ (function (_super) {
         return _super.call(this, services) || this;
     }
     PieChartModel.prototype.sanitize = function (data) {
+        var tabularData = this.getTabularData(data);
         // Sort data based on value
-        // and sort labels based on the data value order
-        var dataset = Tools.getProperty(data, "datasets", 0);
-        if (dataset) {
-            var sortedLabelsAndValues = data.labels.map(function (label, i) {
-                return {
-                    label: label,
-                    value: dataset.data[i],
-                    fillColor: dataset.fillColors ? dataset.fillColors[i] : undefined
-                };
-            }).sort(function (a, b) { return b.value - a.value; });
-            dataset.data = sortedLabelsAndValues.map(function (d) { return d.value; });
-            data.labels = sortedLabelsAndValues.map(function (d) { return d.label; });
-            if (dataset.fillColors) {
-                dataset.fillColors = sortedLabelsAndValues.map(function (d) { return d.fillColor; });
-            }
-        }
-        return data;
-    };
-    PieChartModel.prototype.generateDataLabels = function (newData) {
-        var dataLabels = {};
-        newData.labels.forEach(function (label) {
-            dataLabels[label] = Configuration.legend.items.status.ACTIVE;
-        });
-        return dataLabels;
-    };
-    PieChartModel.prototype.getDisplayData = function () {
-        var ACTIVE = Configuration.legend.items.status.ACTIVE;
-        var dataLabels = this.get("dataLabels");
-        if (!this.get("data")) {
-            return null;
-        }
-        // Remove datasets that have been disabled
-        var displayData = Tools.clone(this.get("data"));
-        var dataset = displayData.datasets[0];
-        // Remove data values that correspond to labels that are disabled
-        dataset.data = dataset.data.filter(function (datum, i) {
-            var label = displayData.labels[i];
-            return dataLabels[label] === ACTIVE;
-        });
-        // Remove labels that are disabled
-        displayData.labels = displayData.labels.filter(function (label) { return dataLabels[label] === ACTIVE; });
-        return displayData;
-    };
-    /*
-     * Data labels
-    */
-    PieChartModel.prototype.toggleDataLabel = function (changedLabel) {
-        var _a = Configuration.legend.items.status, ACTIVE = _a.ACTIVE, DISABLED = _a.DISABLED;
-        var dataLabels = this.get("dataLabels");
-        var hasDeactivatedItems = Object.keys(dataLabels).some(function (label) { return dataLabels[label] === DISABLED; });
-        var activeItems = Object.keys(dataLabels).filter(function (label) { return dataLabels[label] === ACTIVE; });
-        // If there are deactivated items, toggle "changedLabel"
-        if (hasDeactivatedItems) {
-            // If the only active item is being toggled
-            // Activate all items
-            if (activeItems.length === 1 && activeItems[0] === changedLabel) {
-                // If every item is active, then enable "changedLabel" and disable all other items
-                Object.keys(dataLabels).forEach(function (label) {
-                    dataLabels[label] = ACTIVE;
-                });
-            }
-            else {
-                dataLabels[changedLabel] = dataLabels[changedLabel] === DISABLED ? ACTIVE : DISABLED;
-            }
-        }
-        else {
-            // If every item is active, then enable "changedLabel" and disable all other items
-            Object.keys(dataLabels).forEach(function (label) {
-                dataLabels[label] = (label === changedLabel ? ACTIVE : DISABLED);
-            });
-        }
-        // Update model
-        this.set({
-            dataLabels: dataLabels
-        });
-    };
-    /*
-     * Fill scales
-    */
-    PieChartModel.prototype.setColorScale = function () {
-        var dataset = this.getDisplayData().datasets[0];
-        if (dataset.fillColors) {
-            this.colorScale = scaleOrdinal().range(dataset.fillColors).domain(this.allDataLabels);
-        }
-        else {
-            var colors = colorPalettes.DEFAULT;
-            this.colorScale = scaleOrdinal().range(colors).domain(this.allDataLabels);
-        }
-    };
-    PieChartModel.prototype.getFillColor = function (label) {
-        var options = this.getOptions();
-        if (options.getFillColor) {
-            return options.getFillColor(label);
-        }
-        return this.getFillScale()(label);
-    };
-    PieChartModel.prototype.getStrokeColor = function (label) {
-        var options = this.getOptions();
-        if (options.getStrokeColor) {
-            return options.getStrokeColor(label);
-        }
-        return this.colorScale(label);
+        return tabularData.sort(function (a, b) { return b.value - a.value; });
     };
     return PieChartModel;
 }(ChartModel));

package/model-pie.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-pie.js","sourceRoot":"","sources":["model-pie.ts"],"names":[],"mappings":"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","sourcesContent":["// Internal Imports\nimport * as Configuration from \"./configuration\";\nimport { ChartModel } from \"./model\";\nimport { Tools } from \"./tools\";\nimport * as colorPalettes from \"./services/colorPalettes\";\n\n// D3 Imports\nimport { scaleOrdinal } from \"d3-scale\";\n\n/** The charting model layer which includes mainly the chart data and options,\n * as well as some misc. information to be shared among components */\nexport class PieChartModel extends ChartModel {\n\tconstructor(services: any) {\n\t\tsuper(services);\n\t}\n\n\tsanitize(data) {\n\t\t// Sort data based on value\n\t\t// and sort labels based on the data value order\n\t\tconst dataset = Tools.getProperty(data, \"datasets\", 0);\n\t\tif (dataset) {\n\t\t\tconst sortedLabelsAndValues = data.labels.map((label, i) => {\n\t\t\t\treturn {\n\t\t\t\t\tlabel,\n\t\t\t\t\tvalue: dataset.data[i],\n\t\t\t\t\tfillColor: dataset.fillColors ? dataset.fillColors[i] : undefined\n\t\t\t\t};\n\t\t\t}).sort((a: any, b: any) => b.value - a.value);\n\n\t\t\tdataset.data = sortedLabelsAndValues.map(d => d.value);\n\t\t\tdata.labels = sortedLabelsAndValues.map(d => d.label);\n\n\t\t\tif (dataset.fillColors) {\n\t\t\t\tdataset.fillColors = sortedLabelsAndValues.map(d => d.fillColor);\n\t\t\t}\n\t\t}\n\n\t\treturn data;\n\t}\n\n\tgenerateDataLabels(newData) {\n\t\tconst dataLabels = {};\n\t\tnewData.labels.forEach(label => {\n\t\t\tdataLabels[label] = Configuration.legend.items.status.ACTIVE;\n\t\t});\n\n\t\treturn dataLabels;\n\t}\n\n\tgetDisplayData() {\n\t\tconst { ACTIVE } = Configuration.legend.items.status;\n\t\tconst dataLabels = this.get(\"dataLabels\");\n\n\t\tif (!this.get(\"data\")) {\n\t\t\treturn null;\n\t\t}\n\n\t\t// Remove datasets that have been disabled\n\t\tconst displayData = Tools.clone(this.get(\"data\"));\n\t\tconst dataset = displayData.datasets[0];\n\n\t\t// Remove data values that correspond to labels that are disabled\n\t\tdataset.data = dataset.data.filter((datum, i) => {\n\t\t\tconst label = displayData.labels[i];\n\n\t\t\treturn dataLabels[label] === ACTIVE;\n\t\t});\n\n\t\t// Remove labels that are disabled\n\t\tdisplayData.labels = displayData.labels.filter(label => dataLabels[label] === ACTIVE);\n\n\t\treturn displayData;\n\t}\n\n\n\t/*\n\t * Data labels\n\t*/\n\ttoggleDataLabel(changedLabel: string) {\n\t\tconst { ACTIVE, DISABLED } = Configuration.legend.items.status;\n\t\tconst dataLabels = this.get(\"dataLabels\");\n\n\t\tconst hasDeactivatedItems = Object.keys(dataLabels).some(label => dataLabels[label] === DISABLED);\n\t\tconst activeItems = Object.keys(dataLabels).filter(label => dataLabels[label] === ACTIVE);\n\t\t// If there are deactivated items, toggle \"changedLabel\"\n\t\tif (hasDeactivatedItems) {\n\t\t\t// If the only active item is being toggled\n\t\t\t// Activate all items\n\t\t\tif (activeItems.length === 1 && activeItems[0] === changedLabel) {\n\t\t\t\t// If every item is active, then enable \"changedLabel\" and disable all other items\n\t\t\t\tObject.keys(dataLabels).forEach(label => {\n\t\t\t\t\tdataLabels[label] = ACTIVE;\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\tdataLabels[changedLabel] = dataLabels[changedLabel] === DISABLED ? ACTIVE : DISABLED;\n\t\t\t}\n\t\t} else {\n\t\t\t// If every item is active, then enable \"changedLabel\" and disable all other items\n\t\t\tObject.keys(dataLabels).forEach(label => {\n\t\t\t\tdataLabels[label] = (label === changedLabel ? ACTIVE : DISABLED);\n\t\t\t});\n\t\t}\n\n\t\t// Update model\n\t\tthis.set({\n\t\t\tdataLabels\n\t\t});\n\t}\n\n\t/*\n\t * Fill scales\n\t*/\n\tsetColorScale() {\n\t\tconst dataset = this.getDisplayData().datasets[0];\n\t\tif (dataset.fillColors) {\n\t\t\tthis.colorScale = scaleOrdinal().range(dataset.fillColors).domain(this.allDataLabels);\n\t\t} else {\n\t\t\tconst colors = colorPalettes.DEFAULT;\n\t\t\tthis.colorScale = scaleOrdinal().range(colors).domain(this.allDataLabels);\n\t\t}\n\t}\n\n\n\tgetFillColor(label: string) {\n\t\tconst options = this.getOptions();\n\t\tif (options.getFillColor) {\n\t\t\treturn options.getFillColor(label);\n\t\t}\n\n\t\treturn this.getFillScale()(label);\n\t}\n\n\tgetStrokeColor(label: string) {\n\t\tconst options = this.getOptions();\n\t\tif (options.getStrokeColor) {\n\t\t\treturn options.getStrokeColor(label);\n\t\t}\n\n\t\treturn this.colorScale(label);\n\t}\n}\n"]}
+{"version":3,"file":"model-pie.js","sourceRoot":"","sources":["model-pie.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mBAAmB;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC;qEACqE;AACrE;IAAmC,iCAAU;IAC5C,uBAAY,QAAa;eACxB,kBAAM,QAAQ,CAAC;IAChB,CAAC;IAED,gCAAQ,GAAR,UAAS,IAAI;QACZ,IAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAE9C,2BAA2B;QAC3B,OAAO,WAAW,CAAC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,EAAjB,CAAiB,CAAC,CAAC;IACtD,CAAC;IACF,oBAAC;AAAD,CAAC,AAXD,CAAmC,UAAU,GAW5C","sourcesContent":["// Internal Imports\nimport { ChartModel } from \"./model\";\n\n/** The charting model layer which includes mainly the chart data and options,\n * as well as some misc. information to be shared among components */\nexport class PieChartModel extends ChartModel {\n\tconstructor(services: any) {\n\t\tsuper(services);\n\t}\n\n\tsanitize(data) {\n\t\tconst tabularData = this.getTabularData(data);\n\n\t\t// Sort data based on value\n\t\treturn tabularData.sort((a, b) => b.value - a.value);\n\t}\n}\n"]}

package/model.d.ts

@@ -9,22 +9,41 @@ export declare class ChartModel {
     protected services: any;
     protected state: any;
     /**
-     * A list of all the labels that have existed within the lifetime of the chart
+     * A list of all the data groups that have existed within the lifetime of the chart
      * @type string[]
      */
-    protected allDataLabels: string[];
-    protected patternScale: {};
+    protected allDataGroups: string[];
     protected colorScale: any;
     constructor(services: any);
-    sanitize(data: any): any;
+    /**
+     * Converts data provided in the older format to tabular
+     *
+     */
+    protected transformToTabularData(data: any): any[];
+    protected getTabularData(data: any): any[];
+    protected sanitize(data: any): any[];
     getDisplayData(): any;
     getData(): any;
     /**
      *
      * @param newData The new raw data to be set
      */
-    setData(newData: any): any;
-    generateDataLabels(newData: any): {};
+    setData(newData: any): any[];
+    protected updateAllDataGroups(): void;
+    protected generateDataGroups(data: any): {
+        name: string;
+        status: Number;
+    }[];
+    getDataGroups(): any;
+    getActiveDataGroups(): any;
+    getDataGroupNames(): any;
+    getActiveDataGroupNames(): any;
+    getGroupedData(): {
+        name: string;
+        data: any;
+    }[];
+    getDataValuesGroupedByKeys(): any;
+    getStackedData(): any[][];
     /**
      * @return {Object} The chart's options
      */
@@ -44,17 +63,16 @@ export declare class ChartModel {
     update(): void;
     setUpdateCallback(cb: Function): void;
     toggleDataLabel(changedLabel: string): void;
-    setColorScale(): void;
+    protected setColorScale(): void;
     /**
      * Should the data point be filled?
-     * @param datasetLabel
-     * @param label
+     * @param group
+     * @param key
      * @param value
      * @param defaultFilled the default for this chart
      */
-    getIsFilled(datasetLabel: any, label?: any, data?: any, defaultFilled?: boolean): any;
-    getFillColor(datasetLabel: any, label?: any, data?: any): any;
-    getStrokeColor(datasetLabel: any, label?: any, data?: any): any;
+    getIsFilled(group: any, key?: any, data?: any, defaultFilled?: boolean): any;
+    getFillColor(group: any, key?: any, data?: any): any;
+    getStrokeColor(group: any, key?: any, data?: any): any;
     getFillScale(): any;
-    protected updateAllDataLabels(): void;
 }

package/model.js

@@ -5,6 +5,8 @@ import * as colorPalettes from "./services/colorPalettes";
 import { Events } from "./interfaces";
 // D3
 import { scaleOrdinal } from "d3-scale";
+import { map } from "d3-collection";
+import { stack } from "d3-shape";
 /** The charting model layer which includes mainly the chart data and options,
  * as well as some misc. information to be shared among components */
 var ChartModel = /** @class */ (function () {
@@ -14,34 +16,61 @@ var ChartModel = /** @class */ (function () {
             options: {}
         };
         // Fill scales & fill related objects
-        this.patternScale = {};
         this.colorScale = {};
         this.services = services;
     }
-    ChartModel.prototype.sanitize = function (data) {
-        // Sanitize all dates
-        data.datasets.forEach(function (dataset) {
-            dataset.data = dataset.data.map(function (d) {
-                if (d.date && !d.date.getTime) {
-                    d.date = new Date(d.date);
+    /**
+     * Converts data provided in the older format to tabular
+     *
+     */
+    ChartModel.prototype.transformToTabularData = function (data) {
+        console.warn("We've updated the charting data format to be tabular by default. The current format you're using is deprecated and will be removed in v1.0, read more here https://carbon-design-system.github.io/carbon-charts/?path=/story/tutorials--tabular-data-format");
+        var tabularData = [];
+        var datasets = data.datasets, labels = data.labels;
+        // Loop through all datasets
+        datasets.forEach(function (dataset) {
+            var group = dataset.label;
+            // Update each data point to the new format
+            dataset.data.forEach(function (datum, i) {
+                var updatedDatum = {
+                    group: group,
+                    key: labels[i]
+                };
+                if (isNaN(datum)) {
+                    updatedDatum["value"] = datum.value;
+                    updatedDatum["date"] = datum.date;
                 }
-                return d;
+                else {
+                    updatedDatum["value"] = datum;
+                }
+                tabularData.push(updatedDatum);
             });
         });
+        return tabularData;
+    };
+    ChartModel.prototype.getTabularData = function (data) {
+        // if data is not an array
+        if (!Array.isArray(data)) {
+            return this.transformToTabularData(data);
+        }
         return data;
     };
+    ChartModel.prototype.sanitize = function (data) {
+        return this.getTabularData(data);
+    };
     ChartModel.prototype.getDisplayData = function () {
-        var ACTIVE = Configuration.legend.items.status.ACTIVE;
-        var dataLabels = this.get("dataLabels");
         if (!this.get("data")) {
             return null;
         }
+        var ACTIVE = Configuration.legend.items.status.ACTIVE;
+        var dataGroups = this.getDataGroups();
         // Remove datasets that have been disabled
         var displayData = Tools.clone(this.get("data"));
-        displayData.datasets = displayData.datasets.filter(function (dataset) {
-            return dataLabels[dataset.label] === ACTIVE;
+        var groupMapsTo = this.getOptions().data.groupMapsTo;
+        return displayData.filter(function (datum) {
+            var group = dataGroups.find(function (group) { return group.name === datum[groupMapsTo]; });
+            return group.status === ACTIVE;
         });
-        return displayData;
     };
     ChartModel.prototype.getData = function () {
         return this.get("data");
@@ -52,19 +81,115 @@ var ChartModel = /** @class */ (function () {
      */
     ChartModel.prototype.setData = function (newData) {
         var sanitizedData = this.sanitize(Tools.clone(newData));
-        var dataLabels = this.generateDataLabels(sanitizedData);
+        var dataGroups = this.generateDataGroups(sanitizedData);
         this.set({
             data: sanitizedData,
-            dataLabels: dataLabels
+            dataGroups: dataGroups
         });
         return sanitizedData;
     };
-    ChartModel.prototype.generateDataLabels = function (newData) {
-        var dataLabels = {};
-        newData.datasets.forEach(function (dataset) {
-            dataLabels[dataset.label] = Configuration.legend.items.status.ACTIVE;
+    /*
+     * Data groups
+    */
+    ChartModel.prototype.updateAllDataGroups = function () {
+        // allDataGroups is used to generate a color scale that applies
+        // to all the groups. Now when the data updates, you might remove a group,
+        // and then bring it back in a newer data update, therefore
+        // the order of the groups in allDataGroups matters so that you'd never
+        // have an incorrect color assigned to a group.
+        var _this = this;
+        // Also, a new group should only be added to allDataGroups if
+        // it doesn't currently exist
+        if (!this.allDataGroups) {
+            this.allDataGroups = this.getDataGroupNames();
+        }
+        else {
+            // Loop through current data groups
+            this.getDataGroupNames().forEach(function (dataGroupName) {
+                // If group name hasn't been stored yet, store it
+                if (_this.allDataGroups.indexOf(dataGroupName) === -1) {
+                    _this.allDataGroups.push(dataGroupName);
+                }
+            });
+        }
+    };
+    ChartModel.prototype.generateDataGroups = function (data) {
+        var groupMapsTo = this.getOptions().data.groupMapsTo;
+        var ACTIVE = Configuration.legend.items.status.ACTIVE;
+        var uniqueDataGroups = map(data, function (datum) { return datum[groupMapsTo]; }).keys();
+        return uniqueDataGroups.map(function (groupName) { return ({
+            name: groupName,
+            status: ACTIVE
+        }); });
+    };
+    ChartModel.prototype.getDataGroups = function () {
+        return this.get("dataGroups");
+    };
+    ChartModel.prototype.getActiveDataGroups = function () {
+        var ACTIVE = Configuration.legend.items.status.ACTIVE;
+        return this.getDataGroups().filter(function (dataGroup) { return dataGroup.status === ACTIVE; });
+    };
+    ChartModel.prototype.getDataGroupNames = function () {
+        return this.getDataGroups().map(function (dataGroup) { return dataGroup.name; });
+    };
+    ChartModel.prototype.getActiveDataGroupNames = function () {
+        return this.getActiveDataGroups().map(function (dataGroup) { return dataGroup.name; });
+    };
+    ChartModel.prototype.getGroupedData = function () {
+        var displayData = this.getDisplayData();
+        var groupedData = {};
+        var groupMapsTo = this.getOptions().data.groupMapsTo;
+        displayData.map(function (datum) {
+            var group = datum[groupMapsTo];
+            if (groupedData[group] !== null && groupedData[group] !== undefined) {
+                groupedData[group].push(datum);
+            }
+            else {
+                groupedData[group] = [datum];
+            }
+        });
+        return Object.keys(groupedData)
+            .map(function (groupName) { return ({
+            name: groupName,
+            data: groupedData[groupName]
+        }); });
+    };
+    ChartModel.prototype.getDataValuesGroupedByKeys = function () {
+        var options = this.getOptions();
+        var groupMapsTo = options.data.groupMapsTo;
+        var displayData = this.getDisplayData();
+        var domainIdentifier = this.services.cartesianScales.getDomainIdentifier();
+        var rangeIdentifier = this.services.cartesianScales.getRangeIdentifier();
+        var stackKeys = map(displayData, function (datum) { return datum[domainIdentifier]; }).keys();
+        var dataGroupNames = this.getDataGroupNames();
+        return stackKeys.map(function (key) {
+            var correspondingValues = { sharedStackKey: key };
+            dataGroupNames.forEach(function (dataGroupName) {
+                var correspondingDatum = displayData.find(function (datum) {
+                    return datum[groupMapsTo] === dataGroupName &&
+                        datum[domainIdentifier].toString() === key;
+                });
+                correspondingValues[dataGroupName] = correspondingDatum ? correspondingDatum[rangeIdentifier] : null;
+            });
+            return correspondingValues;
+        });
+    };
+    ChartModel.prototype.getStackedData = function () {
+        var options = this.getOptions();
+        var groupMapsTo = options.data.groupMapsTo;
+        var dataGroupNames = this.getDataGroupNames();
+        var dataValuesGroupedByKeys = this.getDataValuesGroupedByKeys();
+        return stack().keys(dataGroupNames)(dataValuesGroupedByKeys)
+            .map(function (series, i) {
+            // Add data group names to each series
+            return Object.keys(series)
+                .filter(function (key) { return !isNaN(key); })
+                .map(function (key) {
+                var element = series[key];
+                element[groupMapsTo] = dataGroupNames[i];
+                return element;
+            });
         });
-        return dataLabels;
     };
     /**
      * @return {Object} The chart's options
@@ -105,9 +230,9 @@ var ChartModel = /** @class */ (function () {
         if (!this.getDisplayData()) {
             return;
         }
-        this.updateAllDataLabels();
+        this.updateAllDataGroups();
         this.setColorScale();
-        this.services.events.dispatchEvent("model-update");
+        this.services.events.dispatchEvent(Events.Model.UPDATE);
     };
     ChartModel.prototype.setUpdateCallback = function (cb) {
         this.updateCallback = cb;
@@ -117,116 +242,115 @@ var ChartModel = /** @class */ (function () {
     */
     ChartModel.prototype.toggleDataLabel = function (changedLabel) {
         var _a = Configuration.legend.items.status, ACTIVE = _a.ACTIVE, DISABLED = _a.DISABLED;
-        var dataLabels = this.get("dataLabels");
-        var hasDeactivatedItems = Object.keys(dataLabels).some(function (label) { return dataLabels[label] === DISABLED; });
-        var activeItems = Object.keys(dataLabels).filter(function (label) { return dataLabels[label] === ACTIVE; });
+        var dataGroups = this.getDataGroups();
+        var hasDeactivatedItems = dataGroups.some(function (group) { return group.status === DISABLED; });
+        var activeItems = dataGroups.filter(function (group) { return group.status === ACTIVE; });
         // If there are deactivated items, toggle "changedLabel"
         if (hasDeactivatedItems) {
             // If the only active item is being toggled
             // Activate all items
-            if (activeItems.length === 1 && activeItems[0] === changedLabel) {
+            if (activeItems.length === 1 && activeItems[0].name === changedLabel) {
                 // If every item is active, then enable "changedLabel" and disable all other items
-                Object.keys(dataLabels).forEach(function (label) {
-                    dataLabels[label] = ACTIVE;
+                dataGroups.forEach(function (group, i) {
+                    dataGroups[i].status = ACTIVE;
                 });
             }
             else {
-                dataLabels[changedLabel] = dataLabels[changedLabel] === DISABLED ? ACTIVE : DISABLED;
+                var indexToChange = dataGroups.findIndex(function (group) { return group.name === changedLabel; });
+                dataGroups[indexToChange].status = dataGroups[indexToChange].status === DISABLED ? ACTIVE : DISABLED;
             }
         }
         else {
             // If every item is active, then enable "changedLabel" and disable all other items
-            Object.keys(dataLabels).forEach(function (label) {
-                dataLabels[label] = (label === changedLabel ? ACTIVE : DISABLED);
+            dataGroups.forEach(function (group, i) {
+                dataGroups[i].status = (group.name === changedLabel ? ACTIVE : DISABLED);
             });
         }
         // dispatch legend filtering event with the status of all the dataLabels
         this.services.events.dispatchEvent(Events.Legend.ITEMS_UPDATE, {
-            dataLabels: dataLabels
+            dataGroups: dataGroups
         });
         // Update model
         this.set({
-            dataLabels: dataLabels
+            dataGroups: dataGroups
         });
     };
     /*
      * Fill scales
     */
     ChartModel.prototype.setColorScale = function () {
-        var _this = this;
-        if (this.getDisplayData().datasets[0].fillColors) {
-            this.getDisplayData().datasets.forEach(function (dataset) {
-                _this.colorScale[dataset.label] = scaleOrdinal().range(dataset.fillColors).domain(_this.allDataLabels);
-            });
-        }
-        else {
-            var colors_1 = colorPalettes.DEFAULT;
-            this.getData().datasets.forEach(function (dataset, i) {
-                _this.colorScale[dataset.label] = scaleOrdinal().range([colors_1[i]]).domain(_this.allDataLabels);
-            });
+        var defaultColors = colorPalettes.DEFAULT;
+        var options = this.getOptions();
+        var userProvidedScale = Tools.getProperty(options, "color", "scale");
+        // If there is no valid user provided scale, use the default set of colors
+        if (userProvidedScale === null || Object.keys(userProvidedScale).length === 0) {
+            this.colorScale = scaleOrdinal().range(defaultColors)
+                .domain(this.allDataGroups);
+            return;
         }
+        /**
+         * Go through allDataGroups. If a data group has a color value provided
+         * by the user, add that to the color range
+         * If not, add a default color
+         */
+        var colorRange = [];
+        var colorIndex = 0;
+        this.allDataGroups.forEach(function (dataGroup) {
+            if (userProvidedScale[dataGroup]) {
+                colorRange.push(userProvidedScale[dataGroup]);
+            }
+            else {
+                colorRange.push(defaultColors[colorIndex]);
+            }
+            if (colorIndex === defaultColors.length - 1) {
+                colorIndex = 0;
+            }
+            else {
+                colorIndex++;
+            }
+        });
+        this.colorScale = scaleOrdinal().range(colorRange)
+            .domain(this.allDataGroups);
     };
     /**
      * Should the data point be filled?
-     * @param datasetLabel
-     * @param label
+     * @param group
+     * @param key
      * @param value
      * @param defaultFilled the default for this chart
      */
-    ChartModel.prototype.getIsFilled = function (datasetLabel, label, data, defaultFilled) {
+    ChartModel.prototype.getIsFilled = function (group, key, data, defaultFilled) {
         var options = this.getOptions();
         if (options.getIsFilled) {
-            return options.getIsFilled(datasetLabel, label, data, defaultFilled);
+            return options.getIsFilled(group, key, data, defaultFilled);
         }
         else {
             return defaultFilled;
         }
     };
-    ChartModel.prototype.getFillColor = function (datasetLabel, label, data) {
+    ChartModel.prototype.getFillColor = function (group, key, data) {
         var options = this.getOptions();
-        var defaultFillColor = this.getFillScale()[datasetLabel](label);
+        var defaultFillColor = this.getFillScale()(group);
         if (options.getFillColor) {
-            return options.getFillColor(datasetLabel, label, data, defaultFillColor);
+            return options.getFillColor(group, key, data, defaultFillColor);
         }
         else {
             return defaultFillColor;
         }
     };
-    ChartModel.prototype.getStrokeColor = function (datasetLabel, label, data) {
+    ChartModel.prototype.getStrokeColor = function (group, key, data) {
         var options = this.getOptions();
-        var defaultStrokeColor = this.colorScale[datasetLabel](label);
+        var defaultStrokeColor = this.colorScale(group);
         if (options.getStrokeColor) {
-            return options.getStrokeColor(datasetLabel, label, data, defaultStrokeColor);
+            return options.getStrokeColor(group, key, data, defaultStrokeColor);
         }
         else {
             return defaultStrokeColor;
         }
     };
     ChartModel.prototype.getFillScale = function () {
-        // Choose patternScale or colorScale based on the "accessibility" flag
-        // return this.get("options").accessibility ? this.patternScale : this.colorScale;
         return this.colorScale;
     };
-    /*
-     * Data labels
-    */
-    ChartModel.prototype.updateAllDataLabels = function () {
-        var _this = this;
-        // If allDataLabels hasn't been initialized yet
-        // Set it to the current set of chart labels
-        if (!this.allDataLabels) {
-            this.allDataLabels = this.getDisplayData().labels;
-        }
-        else {
-            // Loop through current chart labels
-            this.getDisplayData().labels.forEach(function (label) {
-                // If label hasn't been stored yet, store it
-                if (_this.allDataLabels.indexOf(label) === -1) {
-                    _this.allDataLabels.push(label);
-                }
-            });
-        }
-    };
     return ChartModel;
 }());
 export { ChartModel };