Merge pull request #357 from MOV-AI/FP-2770-scene-closing-button-not-…

…working-when-with-changes

- FP-2770: Scene closing button not working when with changes *

CHANGELOG.md

@@ -1,3 +1,7 @@
+# TBD
+
+- [FP-2770](https://movai.atlassian.net/browse/FP-2770): Scene closing button not working when with changes *
+
 # 1.3.0 - This version contains breaking changes in the lib-ide <-> IDE DataTypes and useDataTypes interface
 
 - [FP-2716](https://movai.atlassian.net/browse/FP-2716): Annotations imported cannot be edited

src/plugins/DocManager/DocManager.js

@@ -248,7 +248,10 @@ class DocManager extends IDEPlugin {
     return this.call(PLUGINS.DIALOG.NAME, PLUGINS.DIALOG.CALL.NEW_DOC, {
       scope,
       placeholder: name,
-      onSubmit: newName => this.doSave(modelKey, callback, newName, opts),
+      onSubmit: newName => {
+        this.doSave(modelKey, callback, newName, opts);
+        this.discardDocChanges({ scope, name: newName });
+      },
       onClose: () => this.saveStack.delete(`${name}_${scope}`)
     });
   }

src/plugins/views/Tabs/hooks/useTabLayout.js

@@ -340,7 +340,7 @@ const useTabLayout = (props, dockRef) => {
    */
   const _onLayoutRemoveTab = useCallback(
     (newLayout, tabId, forceClose) => {
-      const { name, scope, isNew, isDirty } = tabsByIdRef.current.get(tabId);
+      const { name, scope, isNew, isDirty } = tabsByIdRef.current?.get(tabId) ?? {};
 
       if (isDirty && !forceClose) {
         const document = { id: tabId, name, scope, isNew };