Race condiition fixed for fix:9104

excalidraw-app/share/ShareDialog.tsx

@@ -165,9 +165,7 @@ const ActiveRoomDialog = ({
           onClick={() => {
             trackEvent("share", "room closed");
             collabAPI.stopCollaboration().then(() => {
-              if (!collabAPI.isCollaborating()) {
               handleClose();
-              }
             });
           }}
         />

packages/excalidraw/components/App.tsx

@@ -2250,7 +2250,7 @@ class App extends React.Component<AppProps, AppState> {
       this.setState((state) => ({
         ...getDefaultAppState(),
         isLoading: opts?.resetLoadingState ? false : state.isLoading,
-        theme: this.state.theme,
+        theme: state.theme,
       }));
       this.resetStore();
       this.resetHistory();
@@ -2874,10 +2874,23 @@ class App extends React.Component<AppProps, AppState> {
     // init, which would trigger onChange with empty elements, which would then
     // override whatever is in localStorage currently.
     if (!this.state.isLoading) {
+      // Only trigger onChange when there are actual changes to elements or important app state
+      const prevElements = this.scene.getElementsIncludingDeleted();
+      const hasElementChanges = elements.length !== prevElements.length ||
+        elements.some((element, index) => element !== prevElements[index]);
+      
+      const hasImportantStateChanges = 
+        this.state.selectedElementIds !== prevState.selectedElementIds ||
+        this.state.width !== prevState.width ||
+        this.state.height !== prevState.height ||
+        this.state.editingTextElement !== prevState.editingTextElement;
+
+      if (hasElementChanges || hasImportantStateChanges) {
         this.props.onChange?.(elements, this.state, this.files);
         this.onChangeEmitter.trigger(elements, this.state, this.files);
       }
     }
+  }
 
   private renderInteractiveSceneCallback = ({
     atLeastOneVisibleElement,