Skip to content

Commit f07d4f2

Browse files
mvladicmvladic
committed
Merge branch 'master' of https://github.com/eez-open/studio 
2 parents adb4ddc + 46ba3f4 commit f07d4f2

File tree

15 files changed

+163
-108
lines changed

15 files changed

+163
-108
lines changed

‎packages/project-editor/features/page/PageEditor.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { computed, runInAction, makeObservable } from "mobx";
2+
import { computed, runInAction, makeObservable, observable } from "mobx";
33
import { observer } from "mobx-react";
44
import { IEezObject } from "project-editor/core/object";
55
import { TreeObjectAdapter } from "project-editor/core/objectAdapter";
@@ -96,7 +96,7 @@ export class PageTabState extends FlowTabState {
9696
super(object as Flow);
9797

9898
makeObservable(this, {
99-
//_transform: observable,
99+
_transform: observable,
100100
transform: computed,
101101
frontFace: computed
102102
});

‎packages/project-editor/features/page/PagesNavigation.tsx

+12-12
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export const PageStructure = observer(
185185
);
186186
}
187187

188-
onLockAll = () => {
188+
onLockAll = action(() => {
189189
if (!this.treeAdapter) {
190190
return;
191191
}
@@ -202,9 +202,9 @@ export const PageStructure = observer(
202202
});
203203

204204
this.context.undoManager.setCombineCommands(false);
205-
};
205+
});
206206

207-
onUnlockAll = () => {
207+
onUnlockAll = action(() => {
208208
if (!this.treeAdapter) {
209209
return;
210210
}
@@ -221,7 +221,7 @@ export const PageStructure = observer(
221221
});
222222

223223
this.context.undoManager.setCombineCommands(false);
224-
};
224+
});
225225

226226
get isAnyHidden() {
227227
if (!this.treeAdapter) {
@@ -236,7 +236,7 @@ export const PageStructure = observer(
236236
);
237237
}
238238

239-
onHideAll = () => {
239+
onHideAll = action(() => {
240240
if (!this.treeAdapter) {
241241
return;
242242
}
@@ -253,9 +253,9 @@ export const PageStructure = observer(
253253
});
254254

255255
this.context.undoManager.setCombineCommands(false);
256-
};
256+
});
257257

258-
onShowAll = () => {
258+
onShowAll = action(() => {
259259
if (!this.treeAdapter) {
260260
return;
261261
}
@@ -272,7 +272,7 @@ export const PageStructure = observer(
272272
});
273273

274274
this.context.undoManager.setCombineCommands(false);
275-
};
275+
});
276276

277277
renderItem = (itemId: string) => {
278278
if (!this.treeAdapter) {
@@ -302,11 +302,11 @@ export const PageStructure = observer(
302302
: "Lock this widget"
303303
}
304304
iconSize={14}
305-
onClick={() =>
305+
onClick={action(() =>
306306
this.context.updateObject(widget, {
307307
locked: !widget.locked
308308
})
309-
}
309+
)}
310310
style={{
311311
visibility: widget.locked ? "visible" : "hidden"
312312
}}
@@ -319,7 +319,7 @@ export const PageStructure = observer(
319319
}
320320
title={widget.hiddenInEditor ? "Show" : "Hide"}
321321
iconSize={14}
322-
onClick={() => {
322+
onClick={action(() => {
323323
const hiddenInEditor = !widget.hiddenInEditor;
324324

325325
this.context.undoManager.setCombineCommands(
@@ -349,7 +349,7 @@ export const PageStructure = observer(
349349
this.context.undoManager.setCombineCommands(
350350
false
351351
);
352-
}}
352+
})}
353353
style={{
354354
visibility: widget.hiddenInEditor
355355
? "visible"

‎packages/project-editor/features/page/page.tsx

-8
Original file line numberDiff line numberDiff line change
@@ -999,10 +999,6 @@ export class Page extends Flow {
999999
customWidget
10001000
);
10011001

1002-
this._lvglWidgetsIncludingUserWidgets.forEach(lvglWidget =>
1003-
lvglWidget.lvglPostCreate(runtime)
1004-
);
1005-
10061002
return lvglObj;
10071003
} else {
10081004
const obj = customWidget
@@ -1027,10 +1023,6 @@ export class Page extends Flow {
10271023
.filter(component => component instanceof Widget)
10281024
.map((widget: Widget) => widget.lvglCreate(runtime, obj));
10291025

1030-
this._lvglWidgetsIncludingUserWidgets.forEach(lvglWidget =>
1031-
lvglWidget.lvglPostCreate(runtime)
1032-
);
1033-
10341026
return obj;
10351027
}
10361028
}

‎packages/project-editor/features/style/style.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,8 @@ export class Style extends EezObject {
10711071

10721072
cssDeclarations: computed,
10731073
cssPreview: computed,
1074-
classNames: computed
1074+
classNames: computed,
1075+
dynamicCSS: observable
10751076
});
10761077
}
10771078

‎packages/project-editor/flow/component.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -3897,8 +3897,6 @@ export class Widget extends Component {
38973897
) {
38983898
return 0;
38993899
}
3900-
3901-
lvglPostCreate(runtime: LVGLPageRuntime) {}
39023900
}
39033901

39043902
////////////////////////////////////////////////////////////////////////////////

‎packages/project-editor/flow/components/widgets/dashboard/index.tsx

+15-6
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ export class TextDashboardWidget extends Widget {
226226
<span
227227
className={classNames(
228228
this.style.classNames,
229-
this.style.getConditionalClassNames(flowContext)
229+
this.style.getConditionalClassNames(flowContext),
230+
this.style.getDynamicCSSClassName(flowContext)
230231
)}
231232
onClick={this.onClick(flowContext)}
232233
style={{ opacity: style.opacity }}
@@ -828,7 +829,8 @@ export class NumberInputDashboardWidget extends Widget {
828829
<NumberInputDashboardWidgetElement
829830
className={classNames(
830831
this.style.classNames,
831-
this.style.getConditionalClassNames(flowContext)
832+
this.style.getConditionalClassNames(flowContext),
833+
this.style.getDynamicCSSClassName(flowContext)
832834
)}
833835
component={this}
834836
flowContext={flowContext}
@@ -975,7 +977,8 @@ export class CheckboxWidget extends Widget {
975977
className={classNames(
976978
"form-check",
977979
this.style.classNames,
978-
this.style.getConditionalClassNames(flowContext)
980+
this.style.getConditionalClassNames(flowContext),
981+
this.style.getDynamicCSSClassName(flowContext)
979982
)}
980983
style={{ opacity: style.opacity }}
981984
>
@@ -1154,7 +1157,8 @@ export class RadioWidget extends Widget {
11541157
className={classNames(
11551158
"form-check",
11561159
this.style.classNames,
1157-
this.style.getConditionalClassNames(flowContext)
1160+
this.style.getConditionalClassNames(flowContext),
1161+
this.style.getDynamicCSSClassName(flowContext)
11581162
)}
11591163
style={{ opacity: style.opacity }}
11601164
>
@@ -1300,7 +1304,8 @@ export class SwitchDashboardWidget extends Widget {
13001304
className={classNames(
13011305
"form-check form-switch",
13021306
this.style.classNames,
1303-
this.style.getConditionalClassNames(flowContext)
1307+
this.style.getConditionalClassNames(flowContext),
1308+
this.style.getDynamicCSSClassName(flowContext)
13041309
)}
13051310
style={{ opacity: style.opacity }}
13061311
>
@@ -1993,7 +1998,8 @@ export class ButtonDashboardWidget extends Widget {
19931998
<button
19941999
className={classNames(
19952000
buttonStyle.classNames,
1996-
this.style.getConditionalClassNames(flowContext)
2001+
this.style.getConditionalClassNames(flowContext),
2002+
this.style.getDynamicCSSClassName(flowContext)
19972003
)}
19982004
style={{ opacity: style.opacity }}
19992005
disabled={!buttonEnabled}
@@ -2327,6 +2333,9 @@ const SliderDashboardWidgetElement = observer(
23272333
this.props.component.style.classNames,
23282334
this.props.component.style.getConditionalClassNames(
23292335
flowContext
2336+
),
2337+
this.props.component.style.getDynamicCSSClassName(
2338+
flowContext
23302339
)
23312340
)}
23322341
type="range"

‎packages/project-editor/lvgl/page-runtime.ts

+19-5
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,20 @@ export abstract class LVGLPageRuntime {
485485
}
486486

487487
registerGroupWidget(group: string, groupIndex: number, obj: number) {}
488+
489+
//
490+
postCreateCallbacks: (() => void)[] = [];
491+
492+
addPostCreateCallback(callback: () => void) {
493+
this.postCreateCallbacks.push(callback);
494+
}
495+
496+
lvglCreatePage() {
497+
const pageObj = this.page.lvglCreate(this, 0);
498+
this.postCreateCallbacks.forEach(callback => callback());
499+
this.postCreateCallbacks = [];
500+
return pageObj;
501+
}
488502
}
489503

490504
////////////////////////////////////////////////////////////////////////////////
@@ -596,7 +610,7 @@ export class LVGLPageEditorRuntime extends LVGLPageRuntime {
596610

597611
this.createStyles();
598612

599-
const pageObj = this.page.lvglCreate(this, 0);
613+
const pageObj = this.lvglCreatePage();
600614
if (!pageObj) {
601615
console.error("pageObj is undefined");
602616
}
@@ -776,7 +790,7 @@ export class LVGLNonActivePageViewerRuntime extends LVGLPageRuntime {
776790

777791
this.createStyles();
778792

779-
const pageObj = this.page.lvglCreate(this, 0);
793+
const pageObj = this.lvglCreatePage();
780794
this.wasm._lvglScreenLoad(-1, pageObj);
781795
runInAction(() => {
782796
this.page._lvglRuntime = this;
@@ -1062,7 +1076,7 @@ export class LVGLPageViewerRuntime extends LVGLPageRuntime {
10621076

10631077
this.createStyles();
10641078

1065-
const pageObj = this.page.lvglCreate(this, 0);
1079+
const pageObj = this.lvglCreatePage();
10661080
this.pageStates.get(this.page)!.pageObj = pageObj;
10671081

10681082
this.wasm._lvglAddScreenLoadedEventHandler(pageObj);
@@ -1360,7 +1374,7 @@ export class LVGLStylesEditorRuntime extends LVGLPageRuntime {
13601374
}
13611375
});
13621376

1363-
const pageObj = this.page.lvglCreate(this, 0);
1377+
const pageObj = this.lvglCreatePage();
13641378
if (!pageObj) {
13651379
console.error("pageObj is undefined");
13661380
return;
@@ -1574,7 +1588,7 @@ export class LVGLReflectEditorRuntime extends LVGLPageRuntime {
15741588
-(new Date().getTimezoneOffset() / 60) * 100
15751589
);
15761590

1577-
const pageObj = this.page.lvglCreate(this, 0);
1591+
const pageObj = this.lvglCreatePage();
15781592
if (!pageObj) {
15791593
console.error("pageObj is undefined");
15801594
return;

‎packages/project-editor/lvgl/style-catalog.tsx

+12-12
Original file line numberDiff line numberDiff line change
@@ -660,9 +660,9 @@ const grid_column_align_property_info: LVGLPropertyInfo = makeEnumPropertyInfo(
660660
CENTER: LV_GRID_ALIGN_CENTER,
661661
END: LV_GRID_ALIGN_END,
662662
STRETCH: LV_GRID_ALIGN_STRETCH,
663-
EVENLY: LV_GRID_ALIGN_SPACE_EVENLY,
664-
AROUND: LV_GRID_ALIGN_SPACE_AROUND,
665-
BETWEEN: LV_GRID_ALIGN_SPACE_BETWEEN
663+
SPACE_EVENLY: LV_GRID_ALIGN_SPACE_EVENLY,
664+
SPACE_AROUND: LV_GRID_ALIGN_SPACE_AROUND,
665+
SPACE_BETWEEN: LV_GRID_ALIGN_SPACE_BETWEEN
666666
},
667667
"LV_GRID_ALIGN_"
668668
);
@@ -683,9 +683,9 @@ const grid_row_align_property_info: LVGLPropertyInfo = makeEnumPropertyInfo(
683683
CENTER: LV_GRID_ALIGN_CENTER,
684684
END: LV_GRID_ALIGN_END,
685685
STRETCH: LV_GRID_ALIGN_STRETCH,
686-
EVENLY: LV_GRID_ALIGN_SPACE_EVENLY,
687-
AROUND: LV_GRID_ALIGN_SPACE_AROUND,
688-
BETWEEN: LV_GRID_ALIGN_SPACE_BETWEEN
686+
SPACE_EVENLY: LV_GRID_ALIGN_SPACE_EVENLY,
687+
SPACE_AROUND: LV_GRID_ALIGN_SPACE_AROUND,
688+
SPACE_BETWEEN: LV_GRID_ALIGN_SPACE_BETWEEN
689689
},
690690
"LV_GRID_ALIGN_"
691691
);
@@ -803,9 +803,9 @@ const grid_cell_x_align_property_info: LVGLPropertyInfo = makeEnumPropertyInfo(
803803
CENTER: LV_GRID_ALIGN_CENTER,
804804
END: LV_GRID_ALIGN_END,
805805
STRETCH: LV_GRID_ALIGN_STRETCH,
806-
EVENLY: LV_GRID_ALIGN_SPACE_EVENLY,
807-
AROUND: LV_GRID_ALIGN_SPACE_AROUND,
808-
BETWEEN: LV_GRID_ALIGN_SPACE_BETWEEN
806+
SPACE_EVENLY: LV_GRID_ALIGN_SPACE_EVENLY,
807+
SPACE_AROUND: LV_GRID_ALIGN_SPACE_AROUND,
808+
SPACE_BETWEEN: LV_GRID_ALIGN_SPACE_BETWEEN
809809
},
810810
"LV_GRID_ALIGN_"
811811
);
@@ -857,9 +857,9 @@ const grid_cell_y_align_property_info: LVGLPropertyInfo = makeEnumPropertyInfo(
857857
CENTER: LV_GRID_ALIGN_CENTER,
858858
END: LV_GRID_ALIGN_END,
859859
STRETCH: LV_GRID_ALIGN_STRETCH,
860-
EVENLY: LV_GRID_ALIGN_SPACE_EVENLY,
861-
AROUND: LV_GRID_ALIGN_SPACE_AROUND,
862-
BETWEEN: LV_GRID_ALIGN_SPACE_BETWEEN
860+
SPACE_EVENLY: LV_GRID_ALIGN_SPACE_EVENLY,
861+
SPACE_AROUND: LV_GRID_ALIGN_SPACE_AROUND,
862+
SPACE_BETWEEN: LV_GRID_ALIGN_SPACE_BETWEEN
863863
},
864864
"LV_GRID_ALIGN_"
865865
);

‎packages/project-editor/lvgl/style-definition.tsx

+34-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,40 @@ export class LVGLStylesDefinition extends EezObject {
9797
}
9898
}
9999
],
100-
defaultValue: {}
100+
defaultValue: {},
101+
102+
beforeLoadHook(object, jsObject) {
103+
if (jsObject.definition) {
104+
Object.keys(jsObject.definition).forEach(part => {
105+
Object.keys(jsObject.definition[part]).forEach(state => {
106+
Object.keys(jsObject.definition[part][state]).forEach(
107+
propertyName => {
108+
if (
109+
propertyName == "grid_column_align" ||
110+
propertyName == "grid_row_align" ||
111+
propertyName == "grid_cell_x_align" ||
112+
propertyName == "grid_cell_y_align"
113+
) {
114+
const value =
115+
jsObject.definition[part][state][
116+
propertyName
117+
];
118+
if (
119+
value == "EVENLY" ||
120+
value == "AROUND" ||
121+
value == "BETWEEN"
122+
) {
123+
jsObject.definition[part][state][
124+
propertyName
125+
] = "SPACE_" + value;
126+
}
127+
}
128+
}
129+
);
130+
});
131+
});
132+
}
133+
}
101134
};
102135

103136
override makeEditable() {

0 commit comments

Comments
 (0)