Skip to content

Commit 5bca0d1

Browse files
committed
fix: error on getDataSetByLabel
1 parent df79bb4 commit 5bca0d1

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/charting/data/ChartData.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AxisDependency } from '../components/YAxis';
33
import { IValueFormatter } from '../formatter/IValueFormatter';
44
import { Highlight } from '../highlight/Highlight';
55
import { IDataSet } from '../interfaces/datasets/IDataSet';
6+
import { DataSet } from './DataSet';
67

78
export abstract class ChartData<U extends Entry, T extends IDataSet<U>> {
89
/**
@@ -271,11 +272,12 @@ export abstract class ChartData<U extends Entry, T extends IDataSet<U>> {
271272
* @param ignorecase if true, the search is not case-sensitive
272273
* @return
273274
*/
274-
protected getDataSetIndexByLabel(dataSets, label, ignorecase) {
275+
protected getDataSetIndexByLabel(dataSets: T[], label: string, ignorecase) {
275276
if (ignorecase) {
276-
for (let i = 0; i < dataSets.length; i++) if (label.equalsIgnoreCase(dataSets[i].getLabel())) return i;
277+
const toTest = label.toLowerCase();
278+
for (let i = 0; i < dataSets.length; i++) if (toTest === dataSets[i].getLabel()?.toLowerCase()) return i;
277279
} else {
278-
for (let i = 0; i < dataSets.length; i++) if (label.equals(dataSets[i].getLabel())) return i;
280+
for (let i = 0; i < dataSets.length; i++) if (label === dataSets[i].getLabel()) return i;
279281
}
280282

281283
return -1;

src/charting/data/PieData.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ export class PieData extends ChartData<PieEntry, PieDataSet> {
4545
return index === 0 ? this.getDataSet() : null;
4646
}
4747

48-
public getDataSetByLabel(label, ignoreCase): PieDataSet {
49-
return ignoreCase ? (label.equalsIgnoreCase(this.mDataSets[0].getLabel()) ? this.mDataSets[0] : null) : label.equals(this.mDataSets[0].getLabel()) ? this.mDataSets[0] : null;
48+
public getDataSetByLabel(label: string, ignoreCase): PieDataSet {
49+
return ignoreCase ? (label?.toLowerCase() === this.mDataSets[0].getLabel()?.toLowerCase() ? this.mDataSets[0] : null) : label === this.mDataSets[0].getLabel() ? this.mDataSets[0] : null;
5050
}
5151

5252
public getEntryForHighlight(highlight: Highlight): Entry {

0 commit comments

Comments
 (0)