@legendapp/spark 0.0.1-next.2 → 0.0.1-next.4

package/vendor/node_modules/@legendapp/spark-desktop-config/schema.json

@@ -11,47 +11,94 @@
       "type": "string"
     },
     "name": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "projectId": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "version": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "window": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "width": {
-          "type": "number",
-          "minimum": 100,
-          "maximum": 20000
-        },
-        "height": {
-          "type": "number",
-          "minimum": 100,
-          "maximum": 20000
-        },
-        "minWidth": {
-          "type": "number",
-          "minimum": 100,
-          "maximum": 20000
-        },
-        "minHeight": {
-          "type": "number",
-          "minimum": 100,
-          "maximum": 20000
+        "size": {
+          "type": "object",
+          "required": [
+            "width",
+            "height"
+          ],
+          "additionalProperties": false,
+          "properties": {
+            "width": {
+              "type": "number",
+              "minimum": 100,
+              "maximum": 20000
+            },
+            "height": {
+              "type": "number",
+              "minimum": 100,
+              "maximum": 20000
+            }
+          }
         },
-        "maxWidth": {
-          "type": "number",
-          "minimum": 100,
-          "maximum": 20000
+        "minSize": {
+          "anyOf": [
+            {
+              "type": "object",
+              "required": [
+                "width",
+                "height"
+              ],
+              "additionalProperties": false,
+              "properties": {
+                "width": {
+                  "type": "number",
+                  "minimum": 100,
+                  "maximum": 20000
+                },
+                "height": {
+                  "type": "number",
+                  "minimum": 100,
+                  "maximum": 20000
+                }
+              }
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
-        "maxHeight": {
-          "type": "number",
-          "minimum": 100,
-          "maximum": 20000
+        "maxSize": {
+          "anyOf": [
+            {
+              "type": "object",
+              "required": [
+                "width",
+                "height"
+              ],
+              "additionalProperties": false,
+              "properties": {
+                "width": {
+                  "type": "number",
+                  "minimum": 100,
+                  "maximum": 20000
+                },
+                "height": {
+                  "type": "number",
+                  "minimum": 100,
+                  "maximum": 20000
+                }
+              }
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "resizable": {
           "type": "boolean"
@@ -71,10 +118,7 @@
         "hasShadow": {
           "type": "boolean"
         },
-        "trafficLights": {
-          "type": "boolean"
-        },
-        "restoreFrame": {
+        "restoreBounds": {
           "type": "boolean"
         },
         "titleBarStyle": {
@@ -92,21 +136,36 @@
             "dark"
           ]
         },
-        "material": {
-          "enum": [
-            "none",
-            "sidebar",
-            "windowBackground",
-            "hudWindow",
-            "popover"
-          ]
-        },
         "title": {
           "type": "string"
         },
         "backgroundColor": {
           "type": "string",
           "pattern": "^#[0-9a-fA-F]{6}([0-9a-fA-F]{2})?$"
+        },
+        "macos": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "backgroundMaterial": {
+              "enum": [
+                "none",
+                "sidebar",
+                "windowBackground",
+                "hudWindow",
+                "popover"
+              ]
+            },
+            "titleBar": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "trafficLights": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
         }
       }
     },
@@ -117,7 +176,8 @@
       ],
       "properties": {
         "bundleIdentifier": {
-          "type": "string"
+          "type": "string",
+          "pattern": "^[A-Za-z0-9-]+(?:\\.[A-Za-z0-9-]+)+$"
         },
         "buildNumber": {
           "type": "string"
@@ -127,8 +187,92 @@
         },
         "infoPlist": {
           "type": "object"
+        },
+        "lifecycle": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "plugins": {
+              "type": "array",
+              "uniqueItems": true,
+              "items": {
+                "type": "string",
+                "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+              }
+            },
+            "mainWindow": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "hidden": {
+                  "type": "boolean"
+                },
+                "glass": {
+                  "type": "boolean"
+                },
+                "autosaveName": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "closeBehavior": {
+                  "enum": [
+                    "close",
+                    "hide",
+                    "request"
+                  ]
+                },
+                "reopenBehavior": {
+                  "enum": [
+                    "default",
+                    "manual",
+                    "visibleWindows"
+                  ]
+                },
+                "toolbarStyle": {
+                  "enum": [
+                    "unified",
+                    "expanded"
+                  ]
+                },
+                "titlebarSeparatorStyle": {
+                  "enum": [
+                    "automatic",
+                    "none",
+                    "line",
+                    "shadow"
+                  ]
+                },
+                "backgroundColors": {
+                  "type": "object",
+                  "required": [
+                    "light",
+                    "dark"
+                  ],
+                  "additionalProperties": false,
+                  "properties": {
+                    "light": {
+                      "type": "string",
+                      "pattern": "^#[0-9a-fA-F]{6}([0-9a-fA-F]{2})?$"
+                    },
+                    "dark": {
+                      "type": "string",
+                      "pattern": "^#[0-9a-fA-F]{6}([0-9a-fA-F]{2})?$"
+                    }
+                  }
+                }
+              }
+            },
+            "appearance": {
+              "enum": [
+                "system",
+                "light",
+                "dark"
+              ]
+            }
+          }
         }
-      }
+      },
+      "additionalProperties": false
     },
     "scheme": {
       "oneOf": [
@@ -144,7 +288,35 @@
       ]
     },
     "documentTypes": {
-      "type": "array"
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "name",
+          "contentTypes"
+        ],
+        "additionalProperties": false,
+        "properties": {
+          "name": {
+            "type": "string",
+            "minLength": 1
+          },
+          "contentTypes": {
+            "type": "array",
+            "minItems": 1,
+            "items": {
+              "type": "string",
+              "pattern": "\\."
+            }
+          },
+          "role": {
+            "enum": [
+              "Editor",
+              "Viewer"
+            ]
+          }
+        }
+      }
     },
     "menuBarOnly": {
       "type": "boolean"
@@ -160,9 +332,11 @@
           "type": "string"
         },
         "publicKey": {
-          "type": "string"
+          "type": "string",
+          "pattern": "^[A-Za-z0-9+/]{43}=$"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "include": {
       "type": "array",
@@ -212,7 +386,30 @@
       }
     },
     "signing": {
-      "type": "object"
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "macos": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "identity": {
+              "type": "string",
+              "minLength": 1
+            },
+            "teamId": {
+              "type": "string",
+              "minLength": 1
+            },
+            "entitlementsByPath": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "object"
+              }
+            }
+          }
+        }
+      }
     },
     "expo": {
       "type": "object"
@@ -260,19 +457,40 @@
   "allOf": [
     {
       "if": {
-        "properties": {
-          "platforms": {
-            "const": [
-              "windows"
+        "allOf": [
+          {
+            "not": {
+              "required": [
+                "extends"
+              ]
+            }
+          },
+          {
+            "anyOf": [
+              {
+                "not": {
+                  "required": [
+                    "platforms"
+                  ]
+                }
+              },
+              {
+                "properties": {
+                  "platforms": {
+                    "contains": {
+                      "const": "macos"
+                    }
+                  }
+                },
+                "required": [
+                  "platforms"
+                ]
+              }
             ]
           }
-        },
-        "required": [
-          "platforms"
         ]
       },
-      "then": {},
-      "else": {
+      "then": {
         "required": [
           "macos"
         ]

package/vendor/node_modules/@legendapp/spark-desktop-config/updates.cjs

@@ -2,6 +2,7 @@ function updateConfiguration(expo) {
   const updates = expo.extra?.spark?.updates;
   if (updates === undefined) return undefined;
   if (!updates || typeof updates !== "object" || Array.isArray(updates)) throw new Error("extra.spark.updates must be an object");
+  for (const key of Object.keys(updates)) if (!["feedURL", "publicKey"].includes(key)) throw new Error(`Unknown updates field: ${key}`);
   let url;
   try { url = new URL(updates.feedURL); } catch { throw new Error("Updates need an HTTPS feedURL"); }
   if (url.protocol !== "https:" || !url.hostname || url.username || url.password || url.search || url.hash || !url.pathname.endsWith(".xml")) throw new Error("Update feedURL must be an HTTPS .xml URL without credentials, query or fragment");

package/vendor/node_modules/@legendapp/spark-desktop-config/validation.cjs

@@ -0,0 +1,35 @@
+const platforms = ["macos", "windows", "ios", "android", "web"];
+function object(value, name, keys) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`${name} must be an object`);
+  if (keys) for (const key of Object.keys(value)) if (!keys.includes(key)) throw new Error(`Unknown ${name} field: ${key}`);
+}
+function validatePlatforms(value) {
+  if (!Array.isArray(value) || !value.length || new Set(value).size !== value.length || value.some(p => !platforms.includes(p))) throw new Error("platforms must list unique supported targets: macos, windows, ios, android, web");
+  return value;
+}
+function validateOwned(value) {
+  if (value.macos !== undefined) {
+    object(value.macos, "macos", ["bundleIdentifier", "buildNumber", "entitlements", "infoPlist", "lifecycle"]);
+    if (typeof value.macos.bundleIdentifier !== "string" || !/^[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+$/.test(value.macos.bundleIdentifier)) throw new Error("macos.bundleIdentifier must be a reverse-DNS identifier");
+    if (value.macos.buildNumber !== undefined && typeof value.macos.buildNumber !== "string") throw new Error("macos.buildNumber must be a string");
+    for (const key of ["entitlements", "infoPlist"]) if (value.macos[key] !== undefined) object(value.macos[key], `macos.${key}`);
+    require("./lifecycle.cjs").validateLifecycle(value.macos.lifecycle);
+  }
+  if (value.documentTypes !== undefined) {
+    if (!Array.isArray(value.documentTypes)) throw new Error("documentTypes must be an array");
+    for (const document of value.documentTypes) object(document, "documentType", ["name", "contentTypes", "role"]);
+  }
+  if (value.signing !== undefined) {
+    object(value.signing, "signing", ["macos"]);
+    const macos = value.signing.macos;
+    if (macos !== undefined) {
+      object(macos, "signing.macos", ["identity", "teamId", "entitlementsByPath"]);
+      for (const key of ["identity", "teamId"]) if (macos[key] !== undefined && (typeof macos[key] !== "string" || !macos[key].trim())) throw new Error(`signing.macos.${key} must be a nonempty string`);
+      if (macos.entitlementsByPath !== undefined) {
+        object(macos.entitlementsByPath, "entitlementsByPath");
+        for (const [path, entitlements] of Object.entries(macos.entitlementsByPath)) object(entitlements, `entitlementsByPath.${path}`);
+      }
+    }
+  }
+}
+module.exports = { validateOwned, validatePlatforms };

package/vendor/node_modules/@legendapp/spark-desktop-config/windows.plugin.cjs

@@ -1,3 +1,4 @@
+const { nativeWindowOptions } = require("@legendapp/spark-window-options");
 const { statePath } = require("./config.cjs");
 const fs = require('node:fs');
 const path = require('node:path');
@@ -34,7 +35,7 @@ module.exports = config => {
     const { expo } = require('./config.cjs').readConfig(root);
     const defaults = metadata.mode === 'dev' ? {
       SPARK_PROJECT_ID: expo.extra.spark.projectId, SPARK_PROJECT_NAME: expo.name,
-      SPARK_PROJECT_VERSION: expo.version, SPARK_WINDOW_CONFIG: JSON.stringify(expo.extra.spark.window ?? {}),
+      SPARK_PROJECT_VERSION: expo.version, SPARK_WINDOW_CONFIG: JSON.stringify(nativeWindowOptions(expo.extra.spark.window ?? {})),
       SPARK_SESSION_FILE: statePath(root, 'windows-connection.json', 'windows'),
     } : {};
     mod.modResults.contents = patchHost(mod.modResults.contents, fs.readFileSync(require.resolve('@legendapp/spark-desktop-host/windows/runtime.inc'), 'utf8') + '\n' + fs.readFileSync(require.resolve('@legendapp/spark-desktop-host/windows/application.inc'), 'utf8') + '\n' + fs.readFileSync(require.resolve('@legendapp/spark-desktop-host/windows/notifications.inc'), 'utf8') + (Object.hasOwn(metadata.modules ?? {}, '@react-native-runtimes/core') ? '\n' + fs.readFileSync(require.resolve('@legendapp/spark-desktop-host/windows/runtimes.inc'), 'utf8') : ''), metadata, defaults);

package/vendor/node_modules/@legendapp/spark-desktop-host/AppDelegate.mm

@@ -1,6 +1,9 @@
 #import "AppDelegate.h"
 #import <RNDesktopApp/SparkDesktop.h>
 #import <React/RCTBundleURLProvider.h>
+#import <React/RCTUIKit.h>
+#import <QuartzCore/QuartzCore.h>
+#include <cxxreact/ReactMarker.h>
 #import <React-RCTAppDelegate/RCTRootViewFactory.h>
 #import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
 
@@ -9,14 +12,51 @@
 #import <React/RCTReloadCommand.h>
 #endif
 
+@interface AppDelegate () <NSWindowDelegate>
+@property (nonatomic, assign) BOOL sparkPrimaryInstance;
+@property (nonatomic, weak) NSWindow *sparkLastFocusedWindow;
+@property (nonatomic, strong) NSColor *sparkStartupColor;
+@end
+
 @implementation AppDelegate
+- (void)applicationWillFinishLaunching:(NSNotification *)notification {
+  self.sparkPrimaryInstance = SparkAcquireInstance();
+  if (!self.sparkPrimaryInstance) { [NSApp terminate:nil]; return; }
+  facebook::react::ReactMarker::logMarkerDone(facebook::react::ReactMarker::APP_STARTUP_START, CACurrentMediaTime() * 1000);
+  [self sparkPrepareMainMenu];
+  SparkPrepareApplication();
+  [self sparkPrepareMainWindow];
+  [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(sparkWindowDidBecomeKey:)
+    name:NSWindowDidBecomeKeyNotification object:nil];
+}
+- (void)sparkPrepareMainMenu {
+  NSString *name = SparkContext()[@"name"];
+  NSMenuItem *applicationItem = NSApp.mainMenu.itemArray.firstObject;
+  applicationItem.title = name;
+  NSMenu *menu = applicationItem.submenu;
+  menu.title = name;
+  for (NSMenuItem *item in menu.itemArray) {
+    if (item.isAlternate) continue;
+    if (item.action == @selector(orderFrontStandardAboutPanel:)) item.title = [@"About " stringByAppendingString:name];
+    else if (item.action == @selector(hide:)) item.title = [@"Hide " stringByAppendingString:name];
+    else if (item.action == @selector(terminate:)) item.title = [@"Quit " stringByAppendingString:name];
+  }
+  for (NSMenuItem *item in NSApp.helpMenu.itemArray)
+    if (item.action == @selector(showHelp:)) item.title = [name stringByAppendingString:@" Help"];
+}
+- (void)sparkWindowDidBecomeKey:(NSNotification *)note {
+  NSWindow *window = note.object;
+  if (window != self.window && ![window isKindOfClass:NSPanel.class] && !window.sheet) self.sparkLastFocusedWindow = window;
+}
+- (void)dealloc { [NSNotificationCenter.defaultCenter removeObserver:self]; }
+
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
-  if (!SparkAcquireInstance()) { [NSApp terminate:nil]; return; }
+  if (!self.sparkPrimaryInstance) return;
   SparkMarkLaunchComplete();
   self.moduleName = @"main";
   self.dependencyProvider = [RCTAppDependencyProvider new];
-  self.initialProps = SparkInitialProps(@"main", @{});
+  self.initialProps = SparkInitialProps(@"main", self.initialProps ?: @{});
 #if __has_include(<NativeComposeThreadedRuntime/ThreadedRuntime.h>)
   [ThreadedRuntime configureWithReactNativeDelegate:self launchOptions:@{}];
   // Fired before React Native enumerates reload listeners, so workers are
@@ -24,34 +64,112 @@
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sparkResetRuntimes:)
     name:RCTTriggerReloadCommandNotification object:nil];
 #endif
+  facebook::react::ReactMarker::logMarkerDone(facebook::react::ReactMarker::INIT_REACT_RUNTIME_START, CACurrentMediaTime() * 1000);
   [super applicationDidFinishLaunching:notification];
 }
 #if __has_include(<NativeComposeThreadedRuntime/ThreadedRuntime.h>)
 - (void)sparkResetRuntimes:(NSNotification *)notification { [ThreadedRuntime destroyAllRuntimes]; }
-- (void)applicationWillTerminate:(NSNotification *)notification { [ThreadedRuntime destroyAllRuntimes]; }
 #endif
-- (void)loadReactNativeWindow:(NSDictionary *)launchOptions {
-  NSView *root = [self.rootViewFactory viewWithModuleName:self.moduleName initialProperties:self.initialProps launchOptions:launchOptions];
+- (void)applicationWillTerminate:(NSNotification *)notification {
+  SparkEmit(@{ @"type": @"willQuit" });
+#if __has_include(<NativeComposeThreadedRuntime/ThreadedRuntime.h>)
+  [ThreadedRuntime destroyAllRuntimes];
+#endif
+}
+- (void)sparkPrepareMainWindow {
+  if (self.window) return;
+  NSDictionary *policy = SparkLifecycleConfiguration()[@"mainWindow"] ?: @{};
+  NSDictionary *options = SparkWindowConfiguration();
   self.window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1000, 700)
     styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable
     backing:NSBackingStoreBuffered defer:NO];
   self.window.releasedWhenClosed = NO;
   self.window.identifier = @"spark.main";
   self.window.title = SparkContext()[@"name"];
-  root.frame = NSMakeRect(0, 0, 1000, 700);
-  self.window.contentView = SparkWindowContent(root);
-  NSDictionary *options = SparkWindowConfiguration();
+  self.window.delegate = self;
   SparkApplyWindowOptions(self.window, options);
   SparkRestoreWindow(self.window, @"main", options);
-  if (![[NSBundle.mainBundle objectForInfoDictionaryKey:@"SparkMenuBarOnly"] boolValue]) [self.window makeKeyAndOrderFront:nil];
+  NSString *autosave = policy[@"autosaveName"];
+  if (autosave.length) { [self.window setFrameAutosaveName:autosave]; [self.window setFrameUsingName:autosave]; }
+  if (policy[@"toolbarStyle"]) {
+    self.window.toolbar = [[NSToolbar alloc] initWithIdentifier:@"main"];
+    self.window.toolbar.displayMode = NSToolbarDisplayModeIconOnly;
+    self.window.toolbar.showsBaselineSeparator = NO;
+    self.window.toolbarStyle = [policy[@"toolbarStyle"] isEqual:@"unified"] ? NSWindowToolbarStyleUnified : NSWindowToolbarStyleExpanded;
+  }
+  NSDictionary *separators = @{ @"automatic": @(NSTitlebarSeparatorStyleAutomatic), @"none": @(NSTitlebarSeparatorStyleNone), @"line": @(NSTitlebarSeparatorStyleLine), @"shadow": @(NSTitlebarSeparatorStyleShadow) };
+  if (policy[@"titlebarSeparatorStyle"]) self.window.titlebarSeparatorStyle = (NSTitlebarSeparatorStyle)[separators[policy[@"titlebarSeparatorStyle"]] integerValue];
+  NSDictionary *colors = policy[@"backgroundColors"];
+  if (colors && ![options[@"transparent"] boolValue]) {
+    NSString *appearance = options[@"appearance"];
+    BOOL dark = [appearance isEqual:@"dark"] || (![appearance isEqual:@"light"] && [[[NSUserDefaults.standardUserDefaults stringForKey:@"AppleInterfaceStyle"] lowercaseString] isEqualToString:@"dark"]);
+    SparkApplyWindowOptions(self.window, @{ @"backgroundColor": colors[dark ? @"dark" : @"light"] });
+  }
+  self.sparkStartupColor = self.window.backgroundColor;
+  NSView *placeholder = [[NSView alloc] initWithFrame:self.window.contentView.bounds];
+  placeholder.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+  placeholder.wantsLayer = YES; placeholder.layer.backgroundColor = self.sparkStartupColor.CGColor;
+  self.window.contentView = placeholder;
+  SparkPrepareMainWindow(self.window);
+  if (![policy[@"hidden"] boolValue] && ![[NSBundle.mainBundle objectForInfoDictionaryKey:@"SparkMenuBarOnly"] boolValue]) {
+    [self.window makeKeyAndOrderFront:nil]; [self.window displayIfNeeded]; SparkRecordMainWindowShown();
+  }
+}
+- (void)loadReactNativeWindow:(NSDictionary *)launchOptions {
+  [self sparkPrepareMainWindow];
+  NSView *root = [self.rootViewFactory viewWithModuleName:self.moduleName initialProperties:self.initialProps launchOptions:launchOptions];
+  root.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+  NSDictionary *options = SparkWindowConfiguration();
+  if ([options[@"transparent"] boolValue] || options[@"backgroundColor"] || SparkLifecycleConfiguration()[@"mainWindow"][@"backgroundColors"])
+    ((RCTUIView *)root).backgroundColor = self.sparkStartupColor;
+  __weak NSWindow *weakWindow = self.window;
+  SparkAttachMainRootView(root, self.window, ^{
+    NSWindow *window = weakWindow;
+    if (!window) return;
+    root.frame = window.contentView.bounds;
+    if ([SparkLifecycleConfiguration()[@"mainWindow"][@"glass"] boolValue]) {
+      if (@available(macOS 26.0, *)) {
+        NSGlassEffectView *glass = [[NSGlassEffectView alloc] initWithFrame:root.frame];
+        glass.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+        glass.contentView = root; window.contentView = glass;
+      } else window.contentView = root;
+    } else {
+      window.contentView = SparkWindowContent(root);
+      // An empty patch styles the newly attached content without overwriting
+      // restored window dimensions with the configured initial width/height.
+      SparkApplyWindowOptions(window, @{});
+    }
+  });
+}
+- (BOOL)windowShouldClose:(NSWindow *)window {
+  NSString *behavior = SparkLifecycleConfiguration()[@"mainWindow"][@"closeBehavior"];
+  if ([behavior isEqual:@"hide"]) { [window orderOut:nil]; return NO; }
+  if ([behavior isEqual:@"request"]) { SparkEmit(@{ @"type": @"closeRequested", @"windowId": @"main" }); return NO; }
+  return YES;
 }
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender { return SparkShouldQuit(); }
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender { return NO; }
 - (void)applicationDidBecomeActive:(NSNotification *)note { SparkEmit(@{ @"type": @"activate" }); }
 - (void)applicationDidResignActive:(NSNotification *)note { SparkEmit(@{ @"type": @"deactivate" }); }
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)visible {
-  if (!visible) for (NSWindow *window in NSApp.windows) if ([window.identifier isEqual:@"spark.main"]) [window makeKeyAndOrderFront:nil];
-  SparkEmit(@{ @"type": @"reopen" }); return YES;
+  NSDictionary *policy = SparkLifecycleConfiguration()[@"mainWindow"] ?: @{};
+  BOOL manual = [policy[@"reopenBehavior"] isEqual:@"manual"];
+  BOOL hidden = [policy[@"hidden"] boolValue] || [[NSBundle.mainBundle objectForInfoDictionaryKey:@"SparkMenuBarOnly"] boolValue];
+  BOOL hadVisibleMainWindow = self.window.isVisible;
+  if (!manual) {
+    BOOL visibleOnly = hidden || [policy[@"reopenBehavior"] isEqual:@"visibleWindows"];
+    NSWindow *target = visibleOnly ? nil : self.window;
+    if (visibleOnly) {
+      if (self.sparkLastFocusedWindow.isVisible) target = self.sparkLastFocusedWindow;
+      if (!target) for (NSWindow *candidate in NSApp.orderedWindows)
+        if ((!hidden || candidate != self.window) && candidate.isVisible && !candidate.sheet && ![candidate isKindOfClass:NSPanel.class]) { target = candidate; break; }
+    }
+    if (target.isMiniaturized) [target deminiaturize:nil];
+    [target makeKeyAndOrderFront:nil];
+  }
+  SparkEmit(@{ @"type": @"reopen", @"hasVisibleWindows": @(visible), @"mainWindowWasVisible": @(hadVisibleMainWindow) });
+  // We have handled the default action; AppKit must not unhide a hidden host.
+  return NO;
 }
 - (void)application:(NSApplication *)sender openURLs:(NSArray<NSURL *> *)urls { SparkOpenURLs(urls); }
 - (void)application:(NSApplication *)sender openFiles:(NSArray<NSString *> *)files {

package/vendor/node_modules/@legendapp/spark-desktop-host/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@legendapp/spark-desktop-host",
-  "version": "0.0.1-next.2",
+  "version": "0.0.1-next.4",
   "license": "MIT",
   "files": [
     "AppDelegate.mm",
     "windows"
   ],
   "dependencies": {
-    "@legendapp/spark-desktop-app": "0.0.1-next.2"
+    "@legendapp/spark-desktop-app": "0.0.1-next.4"
   },
   "private": true
 }