Skip to content

Commit b0964cb

Browse files
committed
fix issue causing delay in generateCode and remove console logs
1 parent 65fe34e commit b0964cb

File tree

1 file changed

+24
-28
lines changed

1 file changed

+24
-28
lines changed

app/src/reducers/componentReducer.ts

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ const reducer = (state: State, action: Action) => {
225225
};
226226

227227
const nextComponentId = state.nextComponentId + 1;
228-
console.log('add component', components)
229228
return {
230229
...state,
231230
components,
@@ -244,7 +243,6 @@ const reducer = (state: State, action: Action) => {
244243

245244
const parentComponentId: number = state.canvasFocus.componentId;
246245
const components = [...state.components];
247-
console.log('add child', components)
248246

249247
// find component (an object) that we're adding a child to
250248
const parentComponent = findComponent(components, parentComponentId);
@@ -314,28 +312,26 @@ const reducer = (state: State, action: Action) => {
314312
directParent.children.push(newChild);
315313
}
316314

317-
parentComponent.code = generateCode(
318-
components,
319-
parentComponentId,
320-
[...state.rootComponents],
321-
state.projectType,
322-
state.HTMLTypes
323-
);
324-
325315
const canvasFocus = {
326316
...state.canvasFocus,
327317
componentId: state.canvasFocus.componentId,
328318
childId: newChild.childId
329319
};
330320
const nextChildId = state.nextChildId + 1;
331321
let nextTopSeparatorId = state.nextTopSeparatorId + 1;
332-
console.log('canvasFocus', canvasFocus)
333-
console.log('components',components)
334322
// let addChildArray = components[0].children;
335323
let addChildArray = components[canvasFocus.componentId-1].children
336324
addChildArray = manageSeparators.mergeSeparator(addChildArray, 1);
337325
if (directParent && directParent.name === 'separator') nextTopSeparatorId = manageSeparators.handleSeparators(addChildArray, 'add');
338326
components[canvasFocus.componentId-1].children = addChildArray;
327+
328+
parentComponent.code = generateCode(
329+
components,
330+
parentComponentId,
331+
[...state.rootComponents],
332+
state.projectType,
333+
state.HTMLTypes
334+
);
339335

340336
return { ...state, components, nextChildId, canvasFocus, nextTopSeparatorId };
341337
}
@@ -373,6 +369,11 @@ const reducer = (state: State, action: Action) => {
373369
const directParent = findChild(component, newParentChildId);
374370
directParent.children.push(child);
375371
}
372+
373+
let nextTopSeparatorId = state.nextTopSeparatorId;
374+
375+
components[state.canvasFocus.componentId-1].children = manageSeparators.mergeSeparator(components[state.canvasFocus.componentId-1].children, 0);
376+
nextTopSeparatorId = manageSeparators.handleSeparators(components[state.canvasFocus.componentId-1].children, 'change position')
376377

377378
component.code = generateCode(
378379
components,
@@ -381,11 +382,7 @@ const reducer = (state: State, action: Action) => {
381382
state.projectType,
382383
state.HTMLTypes
383384
);
384-
385-
let nextTopSeparatorId = state.nextTopSeparatorId;
386-
387-
components[state.canvasFocus.componentId-1].children = manageSeparators.mergeSeparator(components[state.canvasFocus.componentId-1].children, 0);
388-
nextTopSeparatorId = manageSeparators.handleSeparators(components[state.canvasFocus.componentId-1].children, 'change position')
385+
389386
return { ...state, components, nextTopSeparatorId };
390387
}
391388
// Change the focus component and child
@@ -442,19 +439,18 @@ const reducer = (state: State, action: Action) => {
442439

443440
// delete the element from its former parent's children array
444441
directParent.children.splice(childIndexValue, 1);
445-
446-
component.code = generateCode(
447-
components,
448-
state.canvasFocus.componentId,
449-
[...state.rootComponents],
450-
state.projectType,
451-
state.HTMLTypes
452-
);
453-
454-
442+
455443
const canvasFocus = { ...state.canvasFocus, childId: null };
456-
console.log('before invoking handleSep')
457444
let nextTopSeparatorId = manageSeparators.handleSeparators(components[canvasFocus.componentId-1].children, 'delete')
445+
446+
component.code = generateCode(
447+
components,
448+
state.canvasFocus.componentId,
449+
[...state.rootComponents],
450+
state.projectType,
451+
state.HTMLTypes
452+
);
453+
458454
return { ...state, components, canvasFocus, nextTopSeparatorId };
459455
}
460456

0 commit comments

Comments
 (0)