Skip to content

The documentation and type correctness of dataElementType #12169 #12172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abhijitshyamal005 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

The documentation and type correctness of dataElementType #12169 #12172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
264816c
The documentation and type correctness of dataElementType #12169
abhijitshyamal005 Jan 7, 2026
6825566
soluction.patch
abhijitshyamal005 Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added solution.patch
View file
Open in desktop
Binary file not shown.
15 changes: 12 additions & 3 deletions src/core/core.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,19 @@ class Chart {
meta.controller.linkScales();
} else {
const ControllerClass = registry.getController(type);
const {datasetElementType, dataElementType} = defaults.datasets[type];
let defaultDataElementType = defaults.datasets[type].dataElementType;
let defaultDatasetElementType = defaults.datasets[type].datasetElementType;

if (defaultDataElementType === undefined) {
defaultDataElementType = ControllerClass.dataElementType;
}
if (defaultDatasetElementType === undefined) {
defaultDatasetElementType = ControllerClass.datasetElementType;
}

Object.assign(ControllerClass, {
dataElementType: registry.getElement(dataElementType),
datasetElementType: datasetElementType && registry.getElement(datasetElementType)
dataElementType: defaultDataElementType ? registry.getElement(defaultDataElementType) : defaultDataElementType,
datasetElementType: defaultDatasetElementType ? registry.getElement(defaultDatasetElementType) : defaultDatasetElementType
});
meta.controller = new ControllerClass(this, i);
newControllers.push(meta.controller);
Expand Down
14 changes: 11 additions & 3 deletions src/core/core.datasetController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ export default class DatasetController {
this.supportsDecimation = false;
this.$context = undefined;
this._syncList = [];
this.datasetElementType = new.target.datasetElementType;
this.dataElementType = new.target.dataElementType;
this.datasetElementType = valueOrDefault(new.target.datasetElementType, null);
this.dataElementType = valueOrDefault(new.target.dataElementType, null);

this.initialize();
}
Expand Down Expand Up @@ -786,6 +786,9 @@ export default class DatasetController {
* @protected
*/
resolveDatasetElementOptions(mode) {
if (!this.datasetElementType) {
return {};
}
return this._resolveElementOptions(this.datasetElementType.id, mode);
}

Expand All @@ -795,6 +798,9 @@ export default class DatasetController {
* @protected
*/
resolveDataElementOptions(index, mode) {
if (!this.dataElementType) {
return {};
}
return this._resolveElementOptions(this.dataElementType.id, mode, index);
}

Expand Down Expand Up @@ -982,7 +988,9 @@ export default class DatasetController {
}

if (numData > numMeta) {
this._insertElements(numMeta, numData - numMeta, resetNewElements);
if (this.dataElementType) {
this._insertElements(numMeta, numData - numMeta, resetNewElements);
}
} else if (numData < numMeta) {
this._removeElements(numData, numMeta - numData);
}
Expand Down