Close deleted variant tab.

4ian · Feb 28, 2025 · eccdb98 · eccdb98
1 parent 4695b9d
commit eccdb98
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 4 deletions.
diff --git a/newIDE/app/src/MainFrame/EditorContainers/BaseEditor.js b/newIDE/app/src/MainFrame/EditorContainers/BaseEditor.js
@@ -153,6 +153,11 @@ export type RenderEditorContainerProps = {|
     eventsBasedObjectName: string,
     variantName: string
   ) => void,
+  onDeleteEventsBasedObjectVariant: (
+    eventsFunctionsExtension: gdEventsFunctionsExtension,
+    eventBasedObject: gdEventsBasedObject,
+    variant: gdEventsBasedObjectVariant
+  ) => void,
 |};
 
 export type RenderEditorContainerPropsWithRef = {|

diff --git a/newIDE/app/src/MainFrame/EditorContainers/CustomObjectEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/CustomObjectEditorContainer.js
@@ -240,6 +240,9 @@ export class CustomObjectEditorContainer extends React.Component<RenderEditorCon
           }
           onExtractAsEventBasedObject={this.props.onExtractAsEventBasedObject}
           onOpenEventBasedObjectEditor={this.props.onOpenEventBasedObjectEditor}
+          onDeleteEventsBasedObjectVariant={
+            this.props.onDeleteEventsBasedObjectVariant
+          }
         />
       </div>
     );

diff --git a/newIDE/app/src/MainFrame/EditorContainers/ExternalLayoutEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/ExternalLayoutEditorContainer.js
@@ -265,6 +265,7 @@ export class ExternalLayoutEditorContainer extends React.Component<
             }
             // Nothing to do as events-based objects can't have external layout.
             onEventsBasedObjectChildrenEdited={() => {}}
+            onDeleteEventsBasedObjectVariant={() => {}}
           />
         )}
         {!layout && (

diff --git a/newIDE/app/src/MainFrame/EditorContainers/SceneEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/SceneEditorContainer.js
@@ -150,6 +150,9 @@ export class SceneEditorContainer extends React.Component<RenderEditorContainerP
         onExtractAsExternalLayout={this.props.onExtractAsExternalLayout}
         onExtractAsEventBasedObject={this.props.onExtractAsEventBasedObject}
         onOpenEventBasedObjectEditor={this.props.onOpenEventBasedObjectEditor}
+        onDeleteEventsBasedObjectVariant={
+          this.props.onDeleteEventsBasedObjectVariant
+        }
         onObjectEdited={objectWithContext =>
           this.props.onSceneObjectEdited(layout, objectWithContext)
         }

diff --git a/newIDE/app/src/MainFrame/EditorTabs/EditorTabsHandler.js b/newIDE/app/src/MainFrame/EditorTabs/EditorTabsHandler.js
@@ -374,6 +374,29 @@ export const closeCustomObjectTab = (
   });
 };
 
+export const closeEventsBasedObjectVariantTab = (
+  state: EditorTabsState,
+  eventsFunctionsExtensionName: string,
+  eventsBasedObjectName: string,
+  eventsBasedObjectVariantName: string
+) => {
+  return closeTabsExceptIf(state, editorTab => {
+    const editor = editorTab.editorRef;
+    if (editor instanceof CustomObjectEditorContainer) {
+      return (
+        (!editor.getEventsFunctionsExtensionName() ||
+          editor.getEventsFunctionsExtensionName() !==
+            eventsFunctionsExtensionName) &&
+        (!editor.getEventsBasedObjectName() ||
+          editor.getEventsBasedObjectName() !== eventsBasedObjectName) &&
+        (!editor.getVariantName() ||
+          editor.getVariantName() !== eventsBasedObjectVariantName)
+      );
+    }
+    return true;
+  });
+};
+
 export const getEventsFunctionsExtensionEditor = (
   state: EditorTabsState,
   eventsFunctionsExtension: gdEventsFunctionsExtension

diff --git a/newIDE/app/src/MainFrame/index.js b/newIDE/app/src/MainFrame/index.js
@@ -38,6 +38,7 @@ import {
   closeExternalEventsTabs,
   closeEventsFunctionsExtensionTabs,
   closeCustomObjectTab,
+  closeEventsBasedObjectVariantTab,
   saveUiSettings,
   type EditorTabsState,
   type EditorTab,
@@ -1548,6 +1549,29 @@ const MainFrame = (props: Props) => {
     }));
   };
 
+  const deleteEventsBasedObjectVariant = (
+    eventsFunctionsExtension: gdEventsFunctionsExtension,
+    eventBasedObject: gdEventsBasedObject,
+    variant: gdEventsBasedObjectVariant
+  ): void => {
+    const variants = eventBasedObject.getVariants();
+    const variantName = variant.getName();
+    if (!variants.hasVariantNamed(variantName)) {
+      return;
+    }
+    variants.removeVariant(variantName);
+
+    setState(state => ({
+      ...state,
+      editorTabs: closeEventsBasedObjectVariantTab(
+        state.editorTabs,
+        eventsFunctionsExtension.getName(),
+        eventBasedObject.getName(),
+        variantName
+      ),
+    }));
+  };
+
   const setPreviewedLayout = (
     previewLayoutName: ?string,
     previewExternalLayoutName?: ?string
@@ -3886,6 +3910,7 @@ const MainFrame = (props: Props) => {
                         ''
                       ),
                     onOpenEventBasedObjectEditor: onOpenEventBasedObjectEditor,
+                    onDeleteEventsBasedObjectVariant: deleteEventsBasedObjectVariant,
                     onEventsBasedObjectChildrenEdited: onEventsBasedObjectChildrenEdited,
                     onSceneObjectEdited: onSceneObjectEdited,
                     gamesList,

diff --git a/newIDE/app/src/ObjectEditor/Editors/CustomObjectPropertiesEditor/index.js b/newIDE/app/src/ObjectEditor/Editors/CustomObjectPropertiesEditor/index.js
@@ -108,6 +108,7 @@ const CustomObjectPropertiesEditor = (props: Props) => {
     renderObjectNameField,
     isChildObject,
     onOpenEventBasedObjectEditor,
+    onDeleteEventsBasedObjectVariant,
   } = props;
 
   const { isMobile } = useResponsiveWindowSize();
@@ -254,19 +255,37 @@ const CustomObjectPropertiesEditor = (props: Props) => {
 
   const deleteVariant = React.useCallback(
     () => {
-      if (!eventBasedObject) {
+      if (!eventBasedObject || !onDeleteEventsBasedObjectVariant) {
         return;
       }
       const variants = eventBasedObject.getVariants();
       const selectedVariantName = customObjectConfiguration.getVariantName();
       if (variants.hasVariantNamed(selectedVariantName)) {
-        // TODO Close the variant tabs before deleting it.
         customObjectConfiguration.setVariantName('');
-        variants.removeVariant(selectedVariantName);
+        const extensionName = gd.PlatformExtension.getExtensionFromFullObjectType(
+          customObjectConfiguration.getType()
+        );
+        if (!project.hasEventsFunctionsExtensionNamed(extensionName)) {
+          return;
+        }
+        const eventBasedExtension = project.getEventsFunctionsExtension(
+          extensionName
+        );
+        onDeleteEventsBasedObjectVariant(
+          eventBasedExtension,
+          eventBasedObject,
+          variants.getVariant(selectedVariantName)
+        );
         forceUpdate();
       }
     },
-    [customObjectConfiguration, eventBasedObject, forceUpdate]
+    [
+      customObjectConfiguration,
+      eventBasedObject,
+      forceUpdate,
+      onDeleteEventsBasedObjectVariant,
+      project,
+    ]
   );
 
   return (

diff --git a/newIDE/app/src/ObjectEditor/Editors/EditorProps.flow.js b/newIDE/app/src/ObjectEditor/Editors/EditorProps.flow.js
@@ -42,4 +42,9 @@ export type EditorProps = {|
     eventsBasedObjectName: string,
     variantName: string
   ) => void,
+  onDeleteEventsBasedObjectVariant?: (
+    eventsFunctionsExtension: gdEventsFunctionsExtension,
+    eventBasedObject: gdEventsBasedObject,
+    variant: gdEventsBasedObjectVariant
+  ) => void,
 |};
diff --git a/newIDE/app/src/ObjectEditor/ObjectEditorDialog.js b/newIDE/app/src/ObjectEditor/ObjectEditorDialog.js
@@ -65,6 +65,11 @@ type Props = {|
     eventsBasedObjectName: string,
     variantName: string
   ) => void,
+  onDeleteEventsBasedObjectVariant: (
+    eventsFunctionsExtension: gdEventsFunctionsExtension,
+    eventBasedObject: gdEventsBasedObject,
+    variant: gdEventsBasedObjectVariant
+  ) => void,
 |};
 
 type InnerDialogProps = {|
@@ -94,6 +99,7 @@ const InnerDialog = (props: InnerDialogProps) => {
     onUpdateBehaviorsSharedData,
     onComputeAllVariableNames,
     onOpenEventBasedObjectEditor,
+    onDeleteEventsBasedObjectVariant,
   } = props;
   const [currentTab, setCurrentTab] = React.useState<ObjectEditorTab>(
     initialTab || 'properties'
@@ -289,6 +295,7 @@ const InnerDialog = (props: InnerDialogProps) => {
               />
             )}
             onOpenEventBasedObjectEditor={onOpenEventBasedObjectEditor}
+            onDeleteEventsBasedObjectVariant={onDeleteEventsBasedObjectVariant}
           />
         </Column>
       ) : null}

diff --git a/newIDE/app/src/SceneEditor/index.js b/newIDE/app/src/SceneEditor/index.js
@@ -137,6 +137,11 @@ type Props = {|
     eventsBasedObjectName: string,
     variantName: string
   ) => void,
+  onDeleteEventsBasedObjectVariant: (
+    eventsFunctionsExtension: gdEventsFunctionsExtension,
+    eventBasedObject: gdEventsBasedObject,
+    variant: gdEventsBasedObjectVariant
+  ) => void,
 
   // Preview:
   hotReloadPreviewButtonProps: HotReloadPreviewButtonProps,
@@ -2129,6 +2134,9 @@ export default class SceneEditor extends React.Component<Props, State> {
                         onOpenEventBasedObjectEditor={
                           this.props.onOpenEventBasedObjectEditor
                         }
+                        onDeleteEventsBasedObjectVariant={
+                          this.props.onDeleteEventsBasedObjectVariant
+                        }
                       />
                     )}
                   </React.Fragment>

diff --git a/newIDE/app/src/stories/componentStories/ObjectEditor/ObjectEditorDialog.stories.js b/newIDE/app/src/stories/componentStories/ObjectEditor/ObjectEditorDialog.stories.js
@@ -45,6 +45,9 @@ export const CustomObject = () => (
       onOpenEventBasedObjectEditor={() =>
         action('Open event-based object editor')
       }
+      onDeleteEventsBasedObjectVariant={() =>
+        action('Delete event-based object variant')
+      }
     />
   </DragAndDropContextProvider>
 );
@@ -79,6 +82,9 @@ export const StandardObject = () => (
       onOpenEventBasedObjectEditor={() =>
         action('Open event-based object editor')
       }
+      onDeleteEventsBasedObjectVariant={() =>
+        action('Delete event-based object variant')
+      }
     />
   </DragAndDropContextProvider>
 );