Skip to content

Commit 8635dde

Browse files
committed
refactor(triangle, line): refactor constructors
refactor constructors to call setters at instanciation
1 parent d50ca24 commit 8635dde

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

Sources/Common/DataModel/Line/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,16 @@ function vtkLine(publicAPI, model) {
231231
// Object factory
232232
// ----------------------------------------------------------------------------
233233

234-
const DEFAULT_VALUES = {};
234+
function defaultValues(initialValues) {
235+
return {
236+
...initialValues,
237+
};
238+
}
235239

236240
// ----------------------------------------------------------------------------
237241

238242
export function extend(publicAPI, model, initialValues = {}) {
239-
Object.assign(model, DEFAULT_VALUES, initialValues);
243+
Object.assign(initialValues, defaultValues(initialValues));
240244

241245
vtkCell.extend(publicAPI, model, initialValues);
242246

@@ -245,7 +249,7 @@ export function extend(publicAPI, model, initialValues = {}) {
245249

246250
// ----------------------------------------------------------------------------
247251

248-
export const newInstance = macro.newInstance(extend, 'vtkLine');
252+
export const newInstance = macro.newInstance(extend, 'vtkLine', true);
249253

250254
// ----------------------------------------------------------------------------
251255

Sources/Common/DataModel/Triangle/index.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,12 +573,15 @@ function vtkTriangle(publicAPI, model) {
573573
// Object factory
574574
// ----------------------------------------------------------------------------
575575

576-
const DEFAULT_VALUES = {};
577-
576+
function defaultValues(initialValues) {
577+
return {
578+
...initialValues,
579+
};
580+
}
578581
// ----------------------------------------------------------------------------
579582

580583
export function extend(publicAPI, model, initialValues = {}) {
581-
Object.assign(model, DEFAULT_VALUES, initialValues);
584+
Object.assign(initialValues, defaultValues(initialValues));
582585

583586
vtkCell.extend(publicAPI, model, initialValues);
584587

@@ -587,7 +590,7 @@ export function extend(publicAPI, model, initialValues = {}) {
587590

588591
// ----------------------------------------------------------------------------
589592

590-
export const newInstance = macro.newInstance(extend, 'vtkTriangle');
593+
export const newInstance = macro.newInstance(extend, 'vtkTriangle', true);
591594

592595
// ----------------------------------------------------------------------------
593596

0 commit comments

Comments
 (0)