End/close AppKit sheets attached on window when we hide it (#17968)

AvaloniaUI · Jan 15, 2025 · 6f27eec · 6f27eec
1 parent 06ab709
commit 6f27eec
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -143,6 +143,19 @@
 
     @autoreleasepool {
         if (Window != nullptr) {
+
+            // If window is hidden without ending attached sheet first, it will stuck in "order out" state,
+            // and block any new sheets from being attached.
+            // Additionaly, we don't know if user would define any custom panels, so we only end/close file dialog sheets.
+            auto attachedSheet = Window.attachedSheet;
+            if (attachedSheet
+                && ([attachedSheet isKindOfClass: [NSOpenPanel class]]
+                    || [attachedSheet isKindOfClass: [NSSavePanel class]]))
+            {
+                [Window endSheet:attachedSheet];
+                [attachedSheet close];
+            }
+
             auto frame = [Window frame];
 
             AvnPoint point;