Fix InitializeDefaultChild not using AddNewContainerToParent and ignoring subchildren

This commit is contained in:
Siklos 2022-09-15 09:33:42 +02:00
parent 012c826461
commit 0d557624f7

View file

@ -264,22 +264,15 @@ function InitializeDefaultChild(
return; return;
} }
let currentConfig = configuration.AvailableContainers const currentConfig = configuration.AvailableContainers
.find(option => option.Type === containerConfig.DefaultChildType); .find(option => option.Type === containerConfig.DefaultChildType);
let parent = newContainer; const parent = newContainer;
let depth = 0;
const seen = new Set<string>([containerConfig.Type]);
while (currentConfig !== undefined && if (currentConfig === undefined) {
depth <= DEFAULTCHILDTYPE_MAX_DEPTH
) {
if (!DEFAULTCHILDTYPE_ALLOW_CYCLIC && seen.has(currentConfig.Type)) {
return; return;
} }
seen.add(currentConfig.Type); AddNewContainerToParent(
const newChildContainer = AddNewContainerToParent(
currentConfig, currentConfig,
configuration, configuration,
parent, parent,
@ -287,13 +280,6 @@ function InitializeDefaultChild(
newCounters, newCounters,
symbols symbols
); );
// iterate
depth++;
parent = newChildContainer;
currentConfig = configuration.AvailableContainers
.find(option => option.Type === (currentConfig as IAvailableContainer).DefaultChildType);
}
} }
function InitializeChildrenWithPattern( function InitializeChildrenWithPattern(