fixes

Author: mvladic

packages/project-editor/flow/FlowStructureTab.tsx

@@ -16,7 +16,6 @@ import {
 import { visitObjects } from "project-editor/core/search";
 import {
     getProjectStore,
-    getAncestorOfType,
     ProjectStore,
     createObject,
     getClass,
@@ -419,22 +418,23 @@ export class FlowFragment extends EezObject {
                     | ContainerWidget
                     | SelectWidget
                     | LVGLWidget
-                    | undefined = getAncestorOfType(
-                    getParent(getParent(object)),
-                    ContainerWidget.classInfo
-                ) as ContainerWidget | undefined;
-
-                if (!containerAncestor) {
-                    containerAncestor = getAncestorOfType(
-                        getParent(getParent(object)),
-                        SelectWidget.classInfo
-                    ) as SelectWidget | undefined;
-                    if (!containerAncestor) {
-                        containerAncestor = getAncestorOfType(
-                            getParent(getParent(object)),
-                            ProjectEditor.LVGLWidgetClass.classInfo
-                        ) as LVGLWidget | undefined;
+                    | undefined;
+
+                let testObject: IEezObject = object;
+                while (testObject) {
+                    if (
+                        testObject instanceof
+                            ProjectEditor.ContainerWidgetClass ||
+                        testObject instanceof ProjectEditor.SelectWidgetClass ||
+                        testObject instanceof
+                            ProjectEditor.LVGLPanelWidgetClass ||
+                        testObject instanceof
+                            ProjectEditor.LVGLContainerWidgetClass
+                    ) {
+                        containerAncestor = testObject;
+                        break;
                     }
+                    testObject = getParent(testObject);
                 }
 
                 if (containerAncestor) {

packages/project-editor/flow/flow.tsx

@@ -95,6 +95,7 @@ export {
     LVGLArcWidget,
     LVGLBarWidget,
     LVGLButtonMatrixWidget,
+    LVGLContainerWidget,
     LVGLDropdownWidget,
     LVGLImageWidget,
     LVGLLabelWidget,

packages/project-editor/lvgl/widgets/index.ts

@@ -77,6 +77,7 @@ import "project-editor/flow/components/widgets/eez-gui";
 import {
     LVGLWidget,
     LVGLScreenWidget,
+    LVGLContainerWidget,
     LVGLPanelWidget,
     LVGLUserWidgetWidget,
     LVGLTabWidget,
@@ -195,6 +196,7 @@ export async function createProjectEditor(
         ColorClass: Color,
         LVGLWidgetClass: LVGLWidget,
         LVGLScreenWidgetClass: LVGLScreenWidget,
+        LVGLContainerWidgetClass: LVGLContainerWidget,
         LVGLPanelWidgetClass: LVGLPanelWidget,
         LVGLUserWidgetWidgetClass: LVGLUserWidgetWidget,
         LVGLTabviewWidgetClass: LVGLTabviewWidget,

packages/project-editor/project-editor-create.tsx

@@ -79,6 +79,7 @@ import type { EmbeddedPropertyGrid } from "project-editor/ui-components/Property
 import type {
     LVGLWidget,
     LVGLScreenWidget,
+    LVGLContainerWidget,
     LVGLPanelWidget,
     LVGLUserWidgetWidget,
     LVGLTabWidget,
@@ -152,6 +153,7 @@ export interface IProjectEditor {
     ColorClass: typeof Color;
     LVGLWidgetClass: typeof LVGLWidget;
     LVGLScreenWidgetClass: typeof LVGLScreenWidget;
+    LVGLContainerWidgetClass: typeof LVGLContainerWidget;
     LVGLPanelWidgetClass: typeof LVGLPanelWidget;
     LVGLUserWidgetWidgetClass: typeof LVGLUserWidgetWidget;
     LVGLTabviewWidgetClass: typeof LVGLTabviewWidget;

packages/project-editor/project-editor-interface.tsx

@@ -31,7 +31,6 @@ import { ActiveFlowsPanel } from "project-editor/flow/debugger/ActiveFlowsPanel"
 import { LogsPanel } from "project-editor/flow/debugger/LogsPanel";
 import { ListNavigation } from "project-editor/ui-components/ListNavigation";
 import { VariablesTab } from "project-editor/features/variable/VariablesNavigation";
-import { FlowStructureTab } from "project-editor/flow/FlowStructureTab";
 import { StylesTab } from "project-editor/features/style/StylesNavigation";
 import { FontsTab } from "project-editor/features/font/FontsNavigation";
 import { BitmapsTab } from "project-editor/features/bitmap/BitmapsNavigation";
@@ -48,6 +47,7 @@ import {
 } from "home/extensions-manager/extensions-manager";
 import { LVGLGroupsTab } from "project-editor/lvgl/groups";
 import { settingsController } from "home/settings";
+import { PageStructure } from "project-editor/features/page/PagesNavigation";
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -147,7 +147,7 @@ const Content = observer(
             }
 
             if (component === "flow-structure") {
-                return <FlowStructureTab />;
+                return <PageStructure />;
             }
 
             if (component === "variables") {

packages/project-editor/project/ui/ProjectEditor.tsx

@@ -325,7 +325,7 @@ export class EditorsStore {
             if (
                 parentNode &&
                 parentNode instanceof FlexLayout.TabSetNode &&
-                parentNode.isActive() &&
+                (parentNode.isActive() || !this.activeEditor) &&
                 parentNode.getSelectedNode() == tab
             ) {
                 activeEditor = editor;

packages/project-editor/store/editor.ts

@@ -424,6 +424,9 @@ export const Property = observer(
                             !isNaN(newValue.value) &&
                             newValue.value.toString() !== this._value.toString()
                         ) {
+                            runInAction(() => {
+                                this._value = newValue.value.toString();
+                            });
                             this.props.updateObject({
                                 [this.props.propertyInfo.name]: newValue.value
                             });