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

Revert "Restore InitializeDefaultChild"

Browse source 
This reverts commit 4aad6b2f4c.
This commit is contained in:
Siklos 2022-09-15 09:31:34 +02:00
parent 4aad6b2f4c
commit 012c826461
1 changed files with 10 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,7 +193,8 @@ function AddNewContainerToParent(
newContainer, newContainer,
configuration, configuration,
containerConfig, containerConfig,
newCounters newCounters,
symbols
); );
} else { } else {
InitializeChildrenWithPattern( InitializeChildrenWithPattern(
@ -256,7 +257,8 @@ function InitializeDefaultChild(
newContainer: ContainerModel, newContainer: ContainerModel,
configuration: IConfiguration, configuration: IConfiguration,
containerConfig: IAvailableContainer, containerConfig: IAvailableContainer,
newCounters: Record<string, number> newCounters: Record<string, number>,
symbols: Map<string, ISymbolModel>
): void { ): void {
if (containerConfig.DefaultChildType === undefined) { if (containerConfig.DefaultChildType === undefined) {
return; return;
@ -277,45 +279,15 @@ function InitializeDefaultChild(
seen.add(currentConfig.Type); seen.add(currentConfig.Type);
/// TODO: REFACTOR this with AddContainerToParent /// const newChildContainer = AddNewContainerToParent(
const left: number = currentConfig.Margin?.left ?? 0; currentConfig,
const bottom: number = currentConfig.Margin?.bottom ?? 0; configuration,
const top: number = currentConfig.Margin?.top ?? 0;
const right: number = currentConfig.Margin?.right ?? 0;
let x = currentConfig.X ?? 0;
let y = currentConfig.Y ?? 0;
let width = currentConfig.Width ?? currentConfig.MaxWidth ?? currentConfig.MinWidth ?? parent.properties.width;
let height = currentConfig.Height ?? parent.properties.height;
({ x, y, width, height } = ApplyMargin(x, y, width, height, left, bottom, top, right));
UpdateCounters(newCounters, currentConfig.Type);
const count = newCounters[currentConfig.Type];
const defaultChildProperties = GetDefaultContainerProps(
currentConfig.Type,
count,
parent, parent,
x, 0, 0,
y, newCounters,
width, symbols
height,
currentConfig
); );
// Create the container
const newChildContainer = new ContainerModel(
parent,
defaultChildProperties,
[],
{
type: currentConfig.Type
}
);
// And push it the the parent children
parent.children.push(newChildContainer);
/// ///
// iterate // iterate
depth++; depth++;
parent = newChildContainer; parent = newChildContainer;