Fix extension not regenerated after extracting instances to a custom …

…object
4ian · Oct 11, 2024 · 7a4aea6 · 7a4aea6
1 parent 82a6aba
commit 7a4aea6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/newIDE/app/src/MainFrame/index.js b/newIDE/app/src/MainFrame/index.js
@@ -2056,6 +2056,12 @@ const MainFrame = (props: Props) => {
     }
     const eventsBasedObject = eventsBasedObjects.get(eventsBasedObjectName);
     openCustomObjectEditor(eventsFunctionsExtension, eventsBasedObject);
+
+    // Trigger reloading of extensions as an extension was modified (or even added)
+    // to create the custom object.
+    eventsFunctionsExtensionsState.loadProjectEventsFunctionsExtensions(
+      currentProject
+    );
   };
 
   const onEventsBasedObjectChildrenEdited = React.useCallback(
@@ -3587,9 +3593,9 @@ const MainFrame = (props: Props) => {
                     onOpenPreferences: () => openPreferencesDialog(true),
                     onOpenAbout: () => openAboutDialog(true),
                     selectInAppTutorial: selectInAppTutorial,
-                    onLoadEventsFunctionsExtensions: () => {
+                    onLoadEventsFunctionsExtensions: async () => {
                       if (isProjectClosedSoAvoidReloadingExtensions) {
-                        return Promise.resolve();
+                        return;
                       }
                       return eventsFunctionsExtensionsState.loadProjectEventsFunctionsExtensions(
                         currentProject

diff --git a/newIDE/app/src/SceneEditor/index.js b/newIDE/app/src/SceneEditor/index.js
@@ -1398,6 +1398,12 @@ export default class SceneEditor extends React.Component<Props, State> {
         },
         accelerator: 'CmdOrCtrl+D',
       },
+      {
+        label: i18n._(t`Delete`),
+        click: () => this.deleteSelection(),
+        enabled: hasSelectedInstances,
+        accelerator: 'Delete',
+      },
       { type: 'separator' },
       {
         label: i18n._(t`Bring to front`),
@@ -1415,26 +1421,28 @@ export default class SceneEditor extends React.Component<Props, State> {
       },
       { type: 'separator' },
       {
-        label: i18n._(t`Extract as a custom object`),
-        click: () => this.setState({ extractAsCustomObjectDialogOpen: true }),
-        enabled: hasSelectedInstances,
-      },
-      this.props.layout && {
-        label: i18n._(t`Extract as an external layout`),
-        click: () => this.setState({ extractAsExternalLayoutDialogOpen: true }),
-        enabled: hasSelectedInstances,
+        label: i18n._(t`Extract`),
+        submenu: [
+          {
+            label: i18n._(t`Extract as a custom object`),
+            click: () =>
+              this.setState({ extractAsCustomObjectDialogOpen: true }),
+            enabled: hasSelectedInstances,
+          },
+          this.props.layout && {
+            label: i18n._(t`Extract as an external layout`),
+            click: () =>
+              this.setState({ extractAsExternalLayoutDialogOpen: true }),
+            enabled: hasSelectedInstances,
+          },
+        ].filter(Boolean),
       },
+      { type: 'separator' },
       {
         label: i18n._(t`Show/Hide instance properties`),
         click: () => this.toggleProperties(),
         enabled: hasSelectedInstances,
       },
-      {
-        label: i18n._(t`Delete`),
-        click: () => this.deleteSelection(),
-        enabled: hasSelectedInstances,
-        accelerator: 'Delete',
-      },
     ].filter(Boolean);
   };