Skip to content

Commit d58fa8e

Browse files
committed
fix: made the __designer part optional
1 parent f024002 commit d58fa8e

File tree

5 files changed

+12
-18
lines changed

5 files changed

+12
-18
lines changed

packages/designer/src/Components/Drawers/SlideTreeItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const SlideTreeItem: React.FC<SlideTreeItemProps> = ({ setView, setActiveSlide,
5555
}
5656

5757
old.layout.slides[id] = { title: "New Slide", schemaName: "NewSlide", logicalName: "newslide" };
58-
old.__designer.activeSlide = id;
58+
old.__designer = { ...old.__designer ?? {}, activeSlide: id };
5959
return { ...old };
6060
});
6161
};

packages/designer/src/Components/Header/QuickFormSettingsViewHeader.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,9 @@ export const QuickFormSettingsViewHeader: React.FC = () => {
6060
let logicalName = schemaName.toLowerCase();
6161

6262
old.questions[activeQuestion] = { ...old.questions[activeQuestion], schemaName, logicalName, displayName };
63-
// if (text !== activeQuestion)
64-
// delete old.questions[activeQuestion];
65-
66-
if (!old.__designer)
67-
old.__designer = {};
68-
69-
old.__designer.activeQuestion = text;
63+
64+
65+
old.__designer = { ...old.__designer ?? {}, activeQuestion: text };
7066

7167
return { ...old };
7268
});

packages/designer/src/Components/Views/QuickFormLayoutView.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export const QuickFormLayoutView = ({ dispatch, slideId, layout }: {
177177

178178
if (oldName !== name) {
179179
dispatch(old => {
180-
const oldslideid = old.__designer.activeSlide!;
180+
const oldslideid = old.__designer?.activeSlide!;
181181
let title = name;
182182
let schemaName = removeNonAlphanumeric(title);
183183
let logicalName = schemaName.toLowerCase();
@@ -190,10 +190,9 @@ export const QuickFormLayoutView = ({ dispatch, slideId, layout }: {
190190

191191
old.layout.slides[oldslideid] = { ...old.layout.slides[oldslideid], title, schemaName, logicalName };
192192

193-
if (!old.__designer)
194-
old.__designer = {};
195193

196-
old.__designer.activeSlide = oldslideid;
194+
old.__designer = { ...old.__designer ?? {}, activeSlide: oldslideid };
195+
197196
return { ...old };
198197
});
199198
}
@@ -213,7 +212,7 @@ export const QuickFormLayoutView = ({ dispatch, slideId, layout }: {
213212
if (!quickform.layout.slides)
214213
quickform.layout.slides = {};
215214

216-
let slide = quickform.layout.slides[quickform.__designer.activeSlide!];
215+
let slide = quickform.layout.slides[quickform.__designer?.activeSlide!];
217216
if (!slide)
218217
return quickform;
219218

packages/designer/src/Components/Views/QuickFormQuestionsView.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,9 @@ export const QuickFormQuestionsView: React.FC<{
8989
old.questions[logicalName] = { ...old.questions[currentQuestion], text, schemaName, logicalName };
9090
delete old.questions[currentQuestion];
9191

92-
if (!old.__designer)
93-
old.__designer = {};
94-
95-
old.__designer.activeQuestion = logicalName;
92+
93+
old.__designer = { ...old.__designer ?? {}, activeQuestion: logicalName };
94+
9695
} else {
9796
old.questions[currentQuestion] = { ...question, text: data.value };
9897
}

packages/designer/src/Hooks/useDocument.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ declare module "@eavfw/quickform-core" {
1919
displayName?: string;
2020
}
2121
interface QuickFormDefinition {
22-
__designer: QuickFormDesignerState,
22+
__designer?: QuickFormDesignerState,
2323
designerLocale?: Locale,
2424
}
2525
}

0 commit comments

Comments
 (0)