Skip to content

Commit

Permalink
fix(core): solve bug when using nested configs
Browse files Browse the repository at this point in the history
  • Loading branch information
@agviegas
agviegas committed Nov 7, 2024
1 parent 4d4df75 commit 695b226
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 121 deletions.
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@thatopen/components",
"description": "Collection of core functionalities to author BIM apps.",
"version": "2.4.0-alpha.31",
"version": "2.4.0-alpha.32",
"author": "That Open Company",
"contributors": [
"Antonio Gonzalez Viegas (https://github.com/agviegas)",
Expand Down
165 changes: 47 additions & 118 deletions packages/core/src/core/ConfigManager/src/configurator.ts
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
import * as THREE from "three";
import {
ControlsSchema,
ControlEntry,
BooleanSettingsControl,
ColorSettingsControl,
TextSettingsControl,
NumberSettingControl,
SelectSettingControl,
Vector3SettingControl,
TextSetSettingControl,
NoControl,
} from "../../Types";
import { ControlsSchema, ControlsUtils } from "../../Types";
import { Components } from "../../Components";
import { ConfigManager } from "../index";
import { UUID } from "../../../utils";
Expand All @@ -28,12 +17,7 @@ export abstract class Configurator<
uuid: string;

get controls(): U {
const copy: any = {};
for (const name in this._config) {
const entry = this._config[name] as ControlEntry;
copy[name] = this.copyEntry(entry);
}
return copy as U;
return ControlsUtils.copySchema(this._config);
}

constructor(
Expand All @@ -58,116 +42,61 @@ export abstract class Configurator<
}
}

export() {
const serializedData: any = {};
for (const id in this._config) {
const control = this._config[id];

if (control.type === "Color") {
const { r, g, b } = control.value;
serializedData[id] = { ...control, value: { r, g, b } };
} else if (control.type === "Vector3") {
const { x, y, z } = control.value;
serializedData[id] = { ...control, value: { x, y, z } };
} else if (control.type === "TextSet") {
const value = Array.from(control.value);
serializedData[id] = { ...control, value };
} else if (control.type === "Select") {
const options = Array.from(control.options);
serializedData[id] = { ...control, options };
export(controls = this._config as ControlsSchema, exported: any = {}) {
for (const id in controls) {
const control = controls[id];
const isControl = ControlsUtils.isEntry(control);
if (isControl) {
if (control.type === "Color") {
const { r, g, b } = control.value;
exported[id] = { ...control, value: { r, g, b } };
} else if (control.type === "Vector3") {
const { x, y, z } = control.value;
exported[id] = { ...control, value: { x, y, z } };
} else if (control.type === "TextSet") {
const value = Array.from(control.value);
exported[id] = { ...control, value };
} else if (control.type === "Select") {
const options = Array.from(control.options);
exported[id] = { ...control, options };
} else {
exported[id] = { ...control };
}
} else {
serializedData[id] = { ...control };
exported[id] = {};
this.export(control as ControlsSchema, exported[id]);
}
}

return serializedData;
return exported;
}

import(serializedData: any) {
const imported: any = {};

for (const id in serializedData) {
const control = serializedData[id];
if (control.type === "Color") {
const { r, g, b } = control.value;
imported[id] = { ...control, value: new THREE.Color(r, g, b) };
} else if (control.type === "Vector3") {
const { x, y, z } = control.value;
imported[id] = { ...control, value: new THREE.Vector3(x, y, z) };
} else if (control.type === "TextSet") {
imported[id] = { ...control, value: new Set(control.value) };
} else if (control.type === "Select") {
imported[id] = { ...control, options: new Set(control.options) };
import(exported: any, imported: any = {}, first = true) {
for (const id in exported) {
const control = exported[id];
const isControl = ControlsUtils.isEntry(control);
if (isControl) {
if (control.type === "Color") {
const { r, g, b } = control.value;
imported[id] = { ...control, value: new THREE.Color(r, g, b) };
} else if (control.type === "Vector3") {
const { x, y, z } = control.value;
imported[id] = { ...control, value: new THREE.Vector3(x, y, z) };
} else if (control.type === "TextSet") {
imported[id] = { ...control, value: new Set(control.value) };
} else if (control.type === "Select") {
imported[id] = { ...control, options: new Set(control.options) };
} else {
imported[id] = { ...control };
}
} else {
imported[id] = { ...control };
imported[id] = {};
this.import(control, imported[id], false);
}
}

this.set(imported);
}

copyEntry(controlEntry: ControlEntry): ControlEntry {
if (controlEntry.type === "Boolean") {
const entry = controlEntry as BooleanSettingsControl;
return {
type: entry.type,
value: entry.value,
};
}
if (controlEntry.type === "Color") {
const entry = controlEntry as ColorSettingsControl;
return {
type: entry.type,
value: entry.value.clone(),
};
}
if (controlEntry.type === "Text") {
const entry = controlEntry as TextSettingsControl;
return {
type: entry.type,
value: entry.value,
};
}
if (controlEntry.type === "Number") {
const entry = controlEntry as NumberSettingControl;
return {
type: entry.type,
value: entry.value,
min: entry.min,
max: entry.max,
interpolable: entry.interpolable,
};
}
if (controlEntry.type === "Select") {
const entry = controlEntry as SelectSettingControl;
return {
type: entry.type,
value: entry.value,
multiple: entry.multiple,
options: new Set(entry.options),
};
}
if (controlEntry.type === "Vector3") {
const entry = controlEntry as Vector3SettingControl;
return {
type: entry.type,
value: entry.value.clone(),
};
}
if (controlEntry.type === "TextSet") {
const entry = controlEntry as TextSetSettingControl;
return {
type: entry.type,
value: new Set(entry.value),
};
}
if (controlEntry.type === "None") {
const entry = controlEntry as NoControl;
return {
type: entry.type,
value: entry.value,
};
if (first) {
this.set(imported);
}
throw new Error("Invalid entry!");
}
}
97 changes: 97 additions & 0 deletions packages/core/src/core/Types/src/config-types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,100 @@ export type ControlEntry =
export interface ControlsSchema {
[name: string]: ControlEntry | ControlsSchema;
}

export class ControlsUtils {
static isEntry(item: any) {
const types = new Set([
"Boolean",
"Color",
"Text",
"Number",
"Select",
"Vector3",
"TextSet",
"None",
]);
return types.has(item.type);
}

static copySchema<T extends ControlsSchema = ControlsSchema>(
schema: T,
copy: ControlsSchema = {},
) {
for (const name in schema) {
const entry = schema[name];
if (this.isEntry(entry)) {
copy[name] = this.copyEntry(entry as ControlEntry);
} else {
copy[name] = {};
this.copySchema(entry as ControlsSchema, copy[name] as ControlsSchema);
}
}
return copy as T;
}

static copyEntry(controlEntry: ControlEntry): ControlEntry {
if (controlEntry.type === "Boolean") {
const entry = controlEntry as BooleanSettingsControl;
return {
type: entry.type,
value: entry.value,
};
}
if (controlEntry.type === "Color") {
const entry = controlEntry as ColorSettingsControl;
return {
type: entry.type,
value: entry.value.clone(),
};
}
if (controlEntry.type === "Text") {
const entry = controlEntry as TextSettingsControl;
return {
type: entry.type,
value: entry.value,
};
}
if (controlEntry.type === "Number") {
const entry = controlEntry as NumberSettingControl;
return {
type: entry.type,
value: entry.value,
min: entry.min,
max: entry.max,
interpolable: entry.interpolable,
};
}
if (controlEntry.type === "Select") {
const entry = controlEntry as SelectSettingControl;
return {
type: entry.type,
value: entry.value,
multiple: entry.multiple,
options: new Set(entry.options),
};
}
if (controlEntry.type === "Vector3") {
const entry = controlEntry as Vector3SettingControl;
return {
type: entry.type,
value: entry.value.clone(),
};
}
if (controlEntry.type === "TextSet") {
const entry = controlEntry as TextSetSettingControl;
return {
type: entry.type,
value: new Set(entry.value),
};
}
if (controlEntry.type === "None") {
const entry = controlEntry as NoControl;
return {
type: entry.type,
value: entry.value,
};
}
throw new Error("Invalid entry!");
}
}
4 changes: 2 additions & 2 deletions packages/front/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@thatopen/components-front",
"description": "Collection of frontend tools to author BIM apps.",
"version": "2.4.0-alpha.31",
"version": "2.4.0-alpha.32",
"author": "That Open Company",
"contributors": [
"Antonio Gonzalez Viegas (https://github.com/agviegas)",
Expand Down Expand Up @@ -47,7 +47,7 @@
"web-ifc": "0.0.61"
},
"dependencies": {
"@thatopen/components": ">=2.4.0-alpha.30",
"@thatopen/components": ">=2.4.0-alpha.32",
"camera-controls": "2.7.3",
"dexie": "^4.0.4",
"earcut": "^2.2.4",
Expand Down

0 comments on commit 695b226

Please sign in to comment.