Prevent wrong toolbar actions being shown when navigating tabs (#8268)

ClementPasteau · web-flow · commit 63dede5f614c · 2026-02-13T10:48:57.000+01:00
diff --git a/newIDE/app/src/MainFrame/EditorContainers/CustomObjectEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/CustomObjectEditorContainer.js
@@ -136,7 +136,13 @@ export class CustomObjectEditorContainer extends React.Component<RenderEditorCon
   }
 
   updateToolbar() {
-    if (this.editor) this.editor.updateToolbar();
+    if (this.editor) {
+      this.editor.updateToolbar();
+    } else {
+      // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar
+      // from the previous editor (e.g., HomePage)
+      this.props.setToolbar(null);
+    }
   }
 
   forceUpdateEditor() {
diff --git a/newIDE/app/src/MainFrame/EditorContainers/DebuggerEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/DebuggerEditorContainer.js
@@ -50,7 +50,13 @@ export class DebuggerEditorContainer extends React.Component<
   }
 
   updateToolbar() {
-    if (this.editor) this.editor.updateToolbar();
+    if (this.editor) {
+      this.editor.updateToolbar();
+    } else {
+      // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar
+      // from the previous editor (e.g., HomePage)
+      this.props.setToolbar(null);
+    }
   }
 
   forceUpdateEditor() {
diff --git a/newIDE/app/src/MainFrame/EditorContainers/EventsEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/EventsEditorContainer.js
@@ -54,7 +54,13 @@ export class EventsEditorContainer extends React.Component<RenderEditorContainer
   }
 
   updateToolbar() {
-    if (this.editor) this.editor.updateToolbar();
+    if (this.editor) {
+      this.editor.updateToolbar();
+    } else {
+      // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar
+      // from the previous editor (e.g., HomePage)
+      this.props.setToolbar(null);
+    }
   }
 
   forceUpdateEditor() {
diff --git a/newIDE/app/src/MainFrame/EditorContainers/EventsFunctionsExtensionEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/EventsFunctionsExtensionEditorContainer.js
@@ -39,7 +39,13 @@ export class EventsFunctionsExtensionEditorContainer extends React.Component<Ren
   }
 
   updateToolbar() {
-    if (this.editor) this.editor.updateToolbar();
+    if (this.editor) {
+      this.editor.updateToolbar();
+    } else {
+      // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar
+      // from the previous editor (e.g., HomePage)
+      this.props.setToolbar(null);
+    }
   }
 
   forceUpdateEditor() {
diff --git a/newIDE/app/src/MainFrame/EditorContainers/ExternalEventsEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/ExternalEventsEditorContainer.js
@@ -84,7 +84,13 @@ export class ExternalEventsEditorContainer extends React.Component<
   }
 
   updateToolbar() {
-    if (this.editor) this.editor.updateToolbar();
+    if (this.editor) {
+      this.editor.updateToolbar();
+    } else {
+      // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar
+      // from the previous editor (e.g., HomePage)
+      this.props.setToolbar(null);
+    }
   }
 
   forceUpdateEditor() {
diff --git a/newIDE/app/src/MainFrame/EditorContainers/ExternalLayoutEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/ExternalLayoutEditorContainer.js
@@ -154,7 +154,13 @@ export class ExternalLayoutEditorContainer extends React.Component<
   }
 
   updateToolbar() {
-    if (this.editor) this.editor.updateToolbar();
+    if (this.editor) {
+      this.editor.updateToolbar();
+    } else {
+      // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar
+      // from the previous editor (e.g., HomePage when opening external layout from home page)
+      this.props.setToolbar(null);
+    }
   }
 
   forceUpdateEditor() {
diff --git a/newIDE/app/src/MainFrame/EditorContainers/ResourcesEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/ResourcesEditorContainer.js
@@ -34,7 +34,13 @@ export class ResourcesEditorContainer extends React.Component<RenderEditorContai
   }
 
   updateToolbar() {
-    if (this.editor) this.editor.updateToolbar();
+    if (this.editor) {
+      this.editor.updateToolbar();
+    } else {
+      // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar
+      // from the previous editor (e.g., HomePage)
+      this.props.setToolbar(null);
+    }
   }
 
   forceUpdateEditor() {
diff --git a/newIDE/app/src/MainFrame/EditorContainers/SceneEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/SceneEditorContainer.js
@@ -101,7 +101,13 @@ export class SceneEditorContainer extends React.Component<RenderEditorContainerP
   }
 
   updateToolbar() {
-    if (this.editor) this.editor.updateToolbar();
+    if (this.editor) {
+      this.editor.updateToolbar();
+    } else {
+      // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar
+      // from the previous editor (e.g., HomePage when opening scene from home page)
+      this.props.setToolbar(null);
+    }
   }
 
   forceUpdateEditor() {

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,13 @@ export class CustomObjectEditorContainer extends React.Component<RenderEditorCon`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`updateToolbar() {`
`139`		`- if (this.editor) this.editor.updateToolbar();`
	`139`	`+ if (this.editor) {`
	`140`	`+ this.editor.updateToolbar();`
	`141`	`+ } else {`
	`142`	`+ // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar`
	`143`	`+ // from the previous editor (e.g., HomePage)`
	`144`	`+ this.props.setToolbar(null);`
	`145`	`+ }`
`140`	`146`	`}`
`141`	`147`
`142`	`148`	`forceUpdateEditor() {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,13 @@ export class DebuggerEditorContainer extends React.Component<`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`updateToolbar() {`
`53`		`- if (this.editor) this.editor.updateToolbar();`
	`53`	`+ if (this.editor) {`
	`54`	`+ this.editor.updateToolbar();`
	`55`	`+ } else {`
	`56`	`+ // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar`
	`57`	`+ // from the previous editor (e.g., HomePage)`
	`58`	`+ this.props.setToolbar(null);`
	`59`	`+ }`
`54`	`60`	`}`
`55`	`61`
`56`	`62`	`forceUpdateEditor() {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,13 @@ export class EventsEditorContainer extends React.Component<RenderEditorContainer`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`updateToolbar() {`
`57`		`- if (this.editor) this.editor.updateToolbar();`
	`57`	`+ if (this.editor) {`
	`58`	`+ this.editor.updateToolbar();`
	`59`	`+ } else {`
	`60`	`+ // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar`
	`61`	`+ // from the previous editor (e.g., HomePage)`
	`62`	`+ this.props.setToolbar(null);`
	`63`	`+ }`
`58`	`64`	`}`
`59`	`65`
`60`	`66`	`forceUpdateEditor() {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,13 @@ export class EventsFunctionsExtensionEditorContainer extends React.Component<Ren`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`updateToolbar() {`
`42`		`- if (this.editor) this.editor.updateToolbar();`
	`42`	`+ if (this.editor) {`
	`43`	`+ this.editor.updateToolbar();`
	`44`	`+ } else {`
	`45`	`+ // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar`
	`46`	`+ // from the previous editor (e.g., HomePage)`
	`47`	`+ this.props.setToolbar(null);`
	`48`	`+ }`
`43`	`49`	`}`
`44`	`50`
`45`	`51`	`forceUpdateEditor() {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,13 @@ export class ExternalEventsEditorContainer extends React.Component<`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`updateToolbar() {`
`87`		`- if (this.editor) this.editor.updateToolbar();`
	`87`	`+ if (this.editor) {`
	`88`	`+ this.editor.updateToolbar();`
	`89`	`+ } else {`
	`90`	`+ // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar`
	`91`	`+ // from the previous editor (e.g., HomePage)`
	`92`	`+ this.props.setToolbar(null);`
	`93`	`+ }`
`88`	`94`	`}`
`89`	`95`
`90`	`96`	`forceUpdateEditor() {`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,13 @@ export class ExternalLayoutEditorContainer extends React.Component<`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`updateToolbar() {`
`157`		`- if (this.editor) this.editor.updateToolbar();`
	`157`	`+ if (this.editor) {`
	`158`	`+ this.editor.updateToolbar();`
	`159`	`+ } else {`
	`160`	`+ // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar`
	`161`	`+ // from the previous editor (e.g., HomePage when opening external layout from home page)`
	`162`	`+ this.props.setToolbar(null);`
	`163`	`+ }`
`158`	`164`	`}`
`159`	`165`
`160`	`166`	`forceUpdateEditor() {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,13 @@ export class ResourcesEditorContainer extends React.Component<RenderEditorContai`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`updateToolbar() {`
`37`		`- if (this.editor) this.editor.updateToolbar();`
	`37`	`+ if (this.editor) {`
	`38`	`+ this.editor.updateToolbar();`
	`39`	`+ } else {`
	`40`	`+ // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar`
	`41`	`+ // from the previous editor (e.g., HomePage)`
	`42`	`+ this.props.setToolbar(null);`
	`43`	`+ }`
`38`	`44`	`}`
`39`	`45`
`40`	`46`	`forceUpdateEditor() {`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,13 @@ export class SceneEditorContainer extends React.Component<RenderEditorContainerP`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`updateToolbar() {`
`104`		`- if (this.editor) this.editor.updateToolbar();`
	`104`	`+ if (this.editor) {`
	`105`	`+ this.editor.updateToolbar();`
	`106`	`+ } else {`
	`107`	`+ // Clear the toolbar if the editor is not ready yet to avoid showing stale toolbar`
	`108`	`+ // from the previous editor (e.g., HomePage when opening scene from home page)`
	`109`	`+ this.props.setToolbar(null);`
	`110`	`+ }`
`105`	`111`	`}`
`106`	`112`
`107`	`113`	`forceUpdateEditor() {`