Siklos/svg-layout-designer-react
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove usage of ContainerModel rather than IContainerModel

Browse source
This commit is contained in:
Eric NGUYEN 2022-11-08 10:25:08 +01:00
parent 1116185b9f
commit a8723ffd27
6 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Components/Editor/Actions/AddContainer.ts
View file

@ -5,7 +5,7 @@
import { AddMethod } from '../../../Enums/AddMethod';
import { IAvailableContainer } from '../../../Interfaces/IAvailableContainer';
import { IConfiguration } from '../../../Interfaces/IConfiguration';
import { IContainerModel, ContainerModel } from '../../../Interfaces/IContainerModel';
import { IContainerModel } from '../../../Interfaces/IContainerModel';
import { IHistoryState } from '../../../Interfaces/IHistoryState';
import { IPattern, GetPattern, ContainerOrPattern } from '../../../Interfaces/IPattern';
import { ISymbolModel } from '../../../Interfaces/ISymbolModel';
@ -125,7 +125,7 @@ function AddNewContainerToParent(
newCounters: Record<string, number>,
symbols: Map<string, ISymbolModel>,
initChilds: boolean = true
): ContainerModel {
): IContainerModel {
const type = availableContainer.Type;
const defaultConfig = configuration.AvailableContainers
@ -170,13 +170,11 @@ function AddNewContainerToParent(
);
// Create the container
const newContainer = new ContainerModel(
defaultProperties,
[],
{
type
}
);
const newContainer: IContainerModel = {
properties: defaultProperties,
children: [],
userData: {}
};
// Register the container in the hashmap
containers.set(newContainer.properties.id, newContainer);
@ -266,7 +264,7 @@ export function AddContainer(
* @returns
*/
function InitializeDefaultChild(
newContainer: ContainerModel,
newContainer: IContainerModel,
configuration: IConfiguration,
containerConfig: IAvailableContainer,
containers: Map<string, IContainerModel>,
@ -297,7 +295,7 @@ function InitializeDefaultChild(
}
function InitializeChildrenWithPattern(
newContainer: ContainerModel,
newContainer: IContainerModel,
configuration: IConfiguration,
containers: Map<string, IContainerModel>,
containerConfig: IAvailableContainer,
@ -338,7 +336,7 @@ function InitializeChildrenWithPattern(
*/
function BuildPatterns(
rootPattern: ContainerOrPattern,
newContainer: ContainerModel,
newContainer: IContainerModel,
configuration: IConfiguration,
containers: Map<string, IContainerModel>,
newCounters: Record<string, number>,

8
src/Components/Editor/Actions/ContainerOperations.ts
View file

@ -1,5 +1,5 @@
import { IHistoryState } from '../../../Interfaces/IHistoryState';
import { ContainerModel, IContainerModel } from '../../../Interfaces/IContainerModel';
import { IContainerModel } from '../../../Interfaces/IContainerModel';
import { FindContainerById, MakeDFSIterator } from '../../../utils/itertools';
import { GetCurrentHistory } from '../Editor';
import { ApplyBehaviors, ApplyBehaviorsOnSiblings, ApplyBehaviorsOnSiblingsChildren } from '../Behaviors/Behaviors';
@ -176,7 +176,7 @@ export function OnPropertyChange(
}
const containers = structuredClone(current.containers);
const container: ContainerModel | undefined = FindContainerById(containers, selected.properties.id);
const container: IContainerModel | undefined = FindContainerById(containers, selected.properties.id);
if (container === null || container === undefined) {
throw new Error('[OnPropertyChange] Container model was not found among children of the main container!');
@ -270,7 +270,7 @@ export function SortChildren(
*/
function SetContainer(
containers: Map<string, IContainerModel>,
container: ContainerModel,
container: IContainerModel,
key: string, value: string | number | boolean | number[],
type: PropertyType,
symbols: Map<string, ISymbolModel>
@ -310,7 +310,7 @@ function SetContainer(
* @param value Value of the property
* @param type Type of the property
*/
function AssignProperty(container: ContainerModel, key: string, value: string | number | boolean | number[], type: PropertyType): void {
function AssignProperty(container: IContainerModel, key: string, value: string | number | boolean | number[], type: PropertyType): void {
switch (type) {
case PropertyType.Style:
(container.properties.style as any)[key] = value;