@apexnative/navigation 1.0.0-alpha.2 → 1.0.0-alpha.4

package/ios/TopBar/ANNSearchPresenter.mm

@@ -2,6 +2,7 @@
 #import "ANNEventEmitter.h"
 #import "ANNScreenInsets.h"
 #import "ANNSearchResultsViewController.h"
+#import "ANNUserChoice.h"
 
 static void *ANNSearchFieldColorContext = &ANNSearchFieldColorContext;
 
@@ -49,6 +50,47 @@ static NSString *ANNResultsKey(ANNComponentOptions *component) {
     return [NSString stringWithFormat:@"%@\n%@", component.name.get, component.componentId.get];
 }
 
+static NSString *const ANNScopeChoiceKey = @"topBar.searchBar.selectedScope";
+static NSString *const ANNTokensChoiceKey = @"topBar.searchBar.tokens";
+static NSString *const ANNSuggestionsChoiceKey = @"topBar.searchBar.suggestions";
+
+static BOOL ANNHasScope(ANNNavigationOptions *options, NSString *scopeId) {
+    for (ANNSearchScopeOptions *scope in options.topBar.searchBar.scopes) {
+        if ([[scope.identifier withDefault:nil] isEqualToString:scopeId]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+// The scope the user picked, by its id: it stays over the app's `selectedScope` where the scopes have it, as on
+// Android (`UserChoices.yieldTo`). It goes at a merge into the screen that gives another `selectedScope` than the app
+// had there (the own options', else the screen's resolution before the merge), or after which the screen's scopes
+// don't have it.
+static ANNUserChoice *ANNScopeChoice(NSString *scope) {
+    return [ANNUserChoice choiceWithValue:scope
+        apply:^(ANNNavigationOptions *options, id value) {
+          if (ANNHasScope(options, value)) {
+              options.topBar.searchBar.selectedScope = [Text withValue:value];
+          }
+        }
+        merged:^id(id value, ANNNavigationOptions *merge, ANNNavigationOptions *own,
+                   ANNNavigationOptions *before, ANNNavigationOptions *after) {
+          if (!ANNHasScope(after, value)) {
+              return nil;
+          }
+          Text *given = merge.topBar.searchBar.selectedScope;
+          if (!given.hasValue) {
+              return value;
+          }
+          Text *ownScope = own.topBar.searchBar.selectedScope;
+          Text *was = ownScope.hasValue ? ownScope : before.topBar.searchBar.selectedScope;
+          NSString *merged = [given withDefault:nil];
+          NSString *had = [was withDefault:nil];
+          return merged == had || [merged isEqualToString:had] ? value : nil;
+        }];
+}
+
 @interface ANNSearchPresenter () <UISearchResultsUpdating, UISearchBarDelegate, UISearchControllerDelegate>
 @end
 
@@ -380,9 +422,11 @@ static NSString *ANNResultsKey(ANNComponentOptions *component) {
 
 #pragma mark - Tokens
 
+// A token's key names its icon by the source the options give, never by the decoded image: a key read before and after
+// the cache lets the image go, or a file at the same path changes, stays the same, and computing it loads nothing.
 static NSString *ANNTokenKey(ANNSearchTokenOptions *token) {
     return [NSString stringWithFormat:@"%@\n%@\n%@\n%@", [token.identifier withDefault:@""], [token.text withDefault:@""],
-                                      [token.sfSymbol withDefault:@""], [token.icon withDefault:nil] ?: @""];
+                                      [token.sfSymbol withDefault:@""], token.icon.source.sourceKey ?: @""];
 }
 
 static NSArray<NSString *> *ANNTokenIds(NSArray<UISearchToken *> *tokens) {
@@ -395,6 +439,59 @@ static NSArray<NSString *> *ANNTokenIds(NSArray<UISearchToken *> *tokens) {
     return ids;
 }
 
+static NSArray<NSString *> *ANNTokenKeys(NSArray<ANNSearchTokenOptions *> *tokens) {
+    NSMutableArray<NSString *> *keys = [NSMutableArray new];
+    for (ANNSearchTokenOptions *token in tokens) {
+        [keys addObject:ANNTokenKey(token)];
+    }
+    return keys;
+}
+
+// The tokens the field has after the user deleted some (or brought them back with Undo), as copies of their options:
+// they stay over the app's `tokens` until a merge gives a list other than the app had there (the own options', else
+// the screen's resolution before the merge), as the other choices. After a merge the tokens the screen's resolution no
+// longer has (by id) leave the choice, and all of them when it has no `tokens`.
+static ANNUserChoice *ANNTokensChoice(NSArray<ANNSearchTokenOptions *> *tokens) {
+    return [ANNUserChoice choiceWithValue:tokens
+        apply:^(ANNNavigationOptions *options, id value) {
+          // Copies: two trees never share a group.
+          NSArray<ANNSearchTokenOptions *> *kept = value;
+          NSMutableArray<ANNSearchTokenOptions *> *copies =
+              [NSMutableArray arrayWithCapacity:kept.count];
+          for (ANNSearchTokenOptions *token in kept) {
+              [copies addObject:[token copy]];
+          }
+          options.topBar.searchBar.tokens = copies;
+        }
+        merged:^id(id value, ANNNavigationOptions *merge, ANNNavigationOptions *own,
+                   ANNNavigationOptions *before, ANNNavigationOptions *after) {
+          NSArray<ANNSearchTokenOptions *> *now = after.topBar.searchBar.tokens;
+          if (!now) {
+              return nil;
+          }
+          NSArray<ANNSearchTokenOptions *> *given = merge.topBar.searchBar.tokens;
+          if (given) {
+              NSArray<ANNSearchTokenOptions *> *was =
+                  own.topBar.searchBar.tokens ?: before.topBar.searchBar.tokens;
+              if (!was || ![ANNTokenKeys(given) isEqualToArray:ANNTokenKeys(was)]) {
+                  return nil;
+              }
+          }
+          NSMutableSet<NSString *> *ids = [NSMutableSet new];
+          for (ANNSearchTokenOptions *token in now) {
+              [ids addObject:[token.identifier withDefault:@""]];
+          }
+          NSArray<ANNSearchTokenOptions *> *chosen = value;
+          NSMutableArray<ANNSearchTokenOptions *> *kept = [NSMutableArray new];
+          for (ANNSearchTokenOptions *token in chosen) {
+              if ([ids containsObject:[token.identifier withDefault:@""]]) {
+                  [kept addObject:token];
+              }
+          }
+          return kept.count == chosen.count ? value : kept;
+        }];
+}
+
 // The field gets the tokens again only when the options changed: setting them resets the user's selection.
 - (void)applyTokens:(NSArray<ANNSearchTokenOptions *> *)tokens field:(UISearchTextField *)field {
     if (!tokens) {
@@ -426,7 +523,7 @@ static NSArray<NSString *> *ANNTokenIds(NSArray<UISearchToken *> *tokens) {
     field.tokens = searchTokens;
 }
 
-// The tokens the field has now, written to the screen's options when the user deleted some (or brought them back with
+// The tokens the field has now, kept in the screen's user layer when the user deleted some (or brought them back with
 // Undo), so the options apply them as they are. Their ids, or nil when the search bar has no tokens option.
 - (NSArray<NSString *> *)syncTokens:(UISearchTextField *)field {
     if (!_tokenOptions) {
@@ -444,24 +541,73 @@ static NSArray<NSString *> *ANNTokenIds(NSArray<UISearchToken *> *tokens) {
     }
     if (![_appliedTokens isEqualToArray:keys]) {
         _appliedTokens = keys;
-        [_viewController changeOwnOptions:^(ANNNavigationOptions *options) {
-          // Copies: the objects above belong to the applied tree, and two trees never share a group.
-          NSMutableArray<ANNSearchTokenOptions *> *own = [NSMutableArray arrayWithCapacity:tokens.count];
-          for (ANNSearchTokenOptions *token in tokens) {
-              [own addObject:[token copy]];
-          }
-          options.topBar.searchBar.tokens = own;
-        }];
+        // Copies: the objects above belong to the applied tree, and two trees never share a group.
+        NSMutableArray<ANNSearchTokenOptions *> *kept =
+            [NSMutableArray arrayWithCapacity:tokens.count];
+        for (ANNSearchTokenOptions *token in tokens) {
+            [kept addObject:[token copy]];
+        }
+        [_viewController setUserChoice:ANNTokensChoice(kept) forKey:ANNTokensChoiceKey];
     }
     return ids;
 }
 
 #pragma mark - Suggestions
 
+// A suggestion's key names its icon by its source, as a token's does (`ANNTokenKey`).
 static NSString *ANNSuggestionKey(ANNSearchSuggestionOptions *suggestion) {
     return [NSString stringWithFormat:@"%@\n%@\n%@\n%@\n%@", [suggestion.identifier withDefault:@""],
                                       [suggestion.title withDefault:@""], [suggestion.accessibilityLabel withDefault:@""],
-                                      [suggestion.sfSymbol withDefault:@""], [suggestion.icon withDefault:nil] ?: @""];
+                                      [suggestion.sfSymbol withDefault:@""], suggestion.icon.source.sourceKey ?: @""];
+}
+
+static NSArray<NSString *> *ANNSuggestionKeys(NSArray<ANNSearchSuggestionOptions *> *suggestions) {
+    NSMutableArray<NSString *> *keys = [NSMutableArray new];
+    for (ANNSearchSuggestionOptions *suggestion in suggestions) {
+        [keys addObject:ANNSuggestionKey(suggestion)];
+    }
+    return keys;
+}
+
+// The suggestions UIKit removed, by their keys: they stay out of the app's `suggestions` until the next merge that
+// gives `suggestions`, any list, the same one again too (a fixed list sent on every search-updated event shows each
+// time), as on Android, which shows whatever list a merge gives. After a merge without them the removed ones the
+// screen's resolution no longer has leave the choice.
+static ANNUserChoice *ANNRemovedSuggestionsChoice(NSArray<NSString *> *removed) {
+    return [ANNUserChoice choiceWithValue:removed
+        apply:^(ANNNavigationOptions *options, id value) {
+          NSArray<ANNSearchSuggestionOptions *> *suggestions = options.topBar.searchBar.suggestions;
+          if (!suggestions) {
+              return;
+          }
+          NSSet<NSString *> *gone = [NSSet setWithArray:value];
+          NSMutableArray<ANNSearchSuggestionOptions *> *kept = [NSMutableArray new];
+          for (ANNSearchSuggestionOptions *suggestion in suggestions) {
+              if (![gone containsObject:ANNSuggestionKey(suggestion)]) {
+                  [kept addObject:suggestion];
+              }
+          }
+          options.topBar.searchBar.suggestions = kept;
+        }
+        merged:^id(id value, ANNNavigationOptions *merge, ANNNavigationOptions *own,
+                   ANNNavigationOptions *before, ANNNavigationOptions *after) {
+          if (merge.topBar.searchBar.suggestions) {
+              return nil;
+          }
+          NSSet<NSString *> *now =
+              [NSSet setWithArray:ANNSuggestionKeys(after.topBar.searchBar.suggestions)];
+          NSArray<NSString *> *removed = value;
+          NSMutableArray<NSString *> *kept = [NSMutableArray new];
+          for (NSString *key in removed) {
+              if ([now containsObject:key]) {
+                  [kept addObject:key];
+              }
+          }
+          if (kept.count == 0) {
+              return nil;
+          }
+          return kept.count == removed.count ? value : kept;
+        }];
 }
 
 - (void)applySuggestions:(NSArray<ANNSearchSuggestionOptions *> *)suggestions
@@ -491,13 +637,20 @@ static NSString *ANNSuggestionKey(ANNSearchSuggestionOptions *suggestion) {
     search.searchSuggestions = items.count ? items : nil;
 }
 
-// UIKit has removed the suggestions: so do the screen's options, and the next ones from mergeOptions show.
+// UIKit has removed the suggestions: the screen's user layer keeps them out, with those it removed before, until the
+// next mergeOptions that gives suggestions, which show.
 - (void)syncSuggestions:(UISearchController *)search API_AVAILABLE(ios(16.0)) {
     if (_appliedSuggestions.count && !search.searchSuggestions.count) {
+        NSArray<NSString *> *removed = _appliedSuggestions;
         _appliedSuggestions = @[];
-        [_viewController changeOwnOptions:^(ANNNavigationOptions *options) {
-          options.topBar.searchBar.suggestions = @[];
-        }];
+        UIViewController<ANNLayoutProtocol> *viewController = _viewController;
+        ANNUserChoice *before = [viewController userChoiceForKey:ANNSuggestionsChoiceKey];
+        NSArray<NSString *> *removedBefore = before.value;
+        if (removedBefore.count) {
+            removed = [removedBefore arrayByAddingObjectsFromArray:removed];
+        }
+        [viewController setUserChoice:ANNRemovedSuggestionsChoice(removed)
+                               forKey:ANNSuggestionsChoiceKey];
     }
 }
 
@@ -606,14 +759,12 @@ static NSString *ANNSuggestionKey(ANNSearchSuggestionOptions *suggestion) {
     }
 }
 
-// The pick is written to the screen's options, so it stays when the options apply again. UIKit then updates the
+// The pick is kept in the screen's user layer, so it stays when the options apply again. UIKit then updates the
 // search results: searchBarUpdated carries the new scope.
 - (void)searchBar:(UISearchBar *)searchBar selectedScopeButtonIndexDidChange:(NSInteger)selectedScope {
     NSString *scope = [self selectedScope:searchBar];
     if (scope) {
-        [_viewController changeOwnOptions:^(ANNNavigationOptions *options) {
-          options.topBar.searchBar.selectedScope = [Text withValue:scope];
-        }];
+        [_viewController setUserChoice:ANNScopeChoice(scope) forKey:ANNScopeChoiceKey];
     }
 }
 

package/ios/TopBar/ANNTopBarPresenter.h

@@ -88,6 +88,11 @@ NS_ASSUME_NONNULL_BEGIN
 /// had no large title: a large title that doesn't fold into the list fills its place there until the screen appeared.
 - (void)shownFromLowerBarWithBottom:(CGFloat)oldBarBottom;
 
+/// iOS 26, a push starts that brings the screen in with its content drawn, before UIKit's push: its large title keeps
+/// a place in the screen for the whole transition (`screenInPush:` of `ANNLargeTitlePresenter`). Nothing for a screen
+/// that didn't wait parked for its content: its content comes in the push.
+- (void)arrivesByPushOn:(UINavigationController *)navigation;
+
 /// iOS 26, a pop or a swipe back starts that reveals the screen, after its will-appear and before UIKit lays it out
 /// for the transition: its large title keeps a place in the window for the whole transition. Returns whether the title
 /// is in that place.

package/ios/TopBar/ANNTopBarPresenter.mm

@@ -2,6 +2,7 @@
 #import "ANNBackButtonPresenter.h"
 #import "ANNBarAppearance.h"
 #import "ANNComponentPresenter.h"
+#import "ANNComponentViewController.h"
 #import "ANNExternalViewController.h"
 #import "ANNLargeTitlePresenter.h"
 #import "ANNMainList.h"
@@ -13,6 +14,7 @@
 #import "ANNTitleGlassView.h"
 #import "ANNTitleView.h"
 #import "ANNToolbarPresenter.h"
+#import "ANNUserChoice.h"
 #import "UIViewController+LayoutProtocol.h"
 
 // The key of the bar's handler on the screen's content mounts.
@@ -59,6 +61,30 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
     return kept;
 }
 
+static NSString *const ANNRenameChoiceKey = @"topBar.title.text";
+
+// The title the user gave: it stays over the app's `title.text` until a merge gives another text than the app had
+// there (the own options', else the title the screen resolved to before the merge, as the other choices); a re-render
+// that sends the old title again keeps it.
+static ANNUserChoice *ANNRenameChoice(NSString *title) {
+    return [ANNUserChoice choiceWithValue:title
+        apply:^(ANNNavigationOptions *options, id value) {
+          options.topBar.title.text = [Text withValue:value];
+        }
+        merged:^id(id value, ANNNavigationOptions *merge, ANNNavigationOptions *own,
+                   ANNNavigationOptions *before, ANNNavigationOptions *after) {
+          Text *text = merge.topBar.title.text;
+          if (!text.hasValue) {
+              return value;
+          }
+          Text *ownText = own.topBar.title.text;
+          Text *was = ownText.hasValue ? ownText : before.topBar.title.text;
+          NSString *merged = [text withDefault:nil];
+          NSString *had = [was withDefault:nil];
+          return merged == had || [merged isEqualToString:had] ? value : nil;
+        }];
+}
+
 @interface ANNTopBarPresenter () <UINavigationItemRenameDelegate>
 @end
 
@@ -495,8 +521,11 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
 // The layers of the title: the screen's own text hides a component of its stack or of the defaults; a component in the
 // screen's own options shows over its own text.
 - (BOOL)ownTextHidesComponent {
-    ANNTopBarTitleOptions *own = _screen.options.topBar.title;
-    return own.text.hasValue && !own.text.isNull && !ANNHasComponentName(own.component);
+    UIViewController *screen = _screen;
+    ANNTopBarTitleOptions *own = screen.options.topBar.title;
+    BOOL ownText = (own.text.hasValue && !own.text.isNull) ||
+                   [screen userChoiceForKey:ANNRenameChoiceKey] != nil;
+    return ownText && !ANNHasComponentName(own.component);
 }
 
 // iOS 26: the system subtitle under the title and under the large title, with only the attributes given (a color, or
@@ -644,11 +673,12 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
         __weak ANNBarButtons *buttons = _buttons;
         UIMenu *menu = [title.menu menuWithPickHandler:^(NSString *itemId) {
           [buttons menuItemPicked:itemId
-              menuOf:^ANNMenuOptions *(ANNNavigationOptions *resolved) {
-                return resolved.topBar.title.menu;
+              choiceKey:@"topBar.title.menu"
+              menuOf:^ANNMenuOptions *(ANNNavigationOptions *options) {
+                return options.topBar.title.menu;
               }
-              setMenu:^(ANNNavigationOptions *own, ANNMenuOptions *copy) {
-                own.topBar.title.menu = copy;
+              setMenu:^(ANNNavigationOptions *options, ANNMenuOptions *copy) {
+                options.topBar.title.menu = copy;
               }];
         }];
         menuTitle = menu.title;
@@ -659,8 +689,8 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
 
 #pragma mark - UINavigationItemRenameDelegate
 
-// Empty or blank: the old title back, no event; the same: nothing; new: the screen's own `title.text`, the title drawn
-// again, then `ANN.TitleRenamed`.
+// Empty or blank: the old title back, no event; the same: nothing; new: `title.text` in the screen's user layer, the
+// title drawn again, then `ANN.TitleRenamed`.
 - (void)navigationItem:(UINavigationItem *)navigationItem
     didEndRenamingWithTitle:(NSString *)title {
     UIViewController *screen = _screen;
@@ -677,9 +707,7 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
     if ([title isEqualToString:old]) {
         return;
     }
-    [screen changeOwnOptions:^(ANNNavigationOptions *own) {
-      own.topBar.title.text = [Text withValue:title];
-    }];
+    [screen setUserChoice:ANNRenameChoice(title) forKey:ANNRenameChoiceKey];
     ANNNavigationOptions *options = [screen resolveOptionsWithDefault];
     [self applyTitle:options textWins:NO];
     NSString *componentId = screen.layoutInfo.componentId;
@@ -1101,6 +1129,27 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
                             options:[screen resolveOptionsWithDefault]];
 }
 
+// The top of the safe area the screen takes on the stack is that of its place while it waited parked: UIKit lays it out
+// only inside the push.
+- (void)arrivesByPushOn:(UINavigationController *)navigation {
+    UIViewController *screen = _screen;
+    if (_native || ![screen isKindOfClass:ANNComponentViewController.class]) {
+        return;
+    }
+    ANNComponentViewController *component = (ANNComponentViewController *)screen;
+    ANNScreenPlace * (^placeWhileParked)(void) = component.placeWhileParked;
+    ANNScreenPlace *place = placeWhileParked ? placeWhileParked() : nil;
+    if (!place || !component.reactView.isReady) {
+        return;
+    }
+    ANNNavigationOptions *options = [screen resolveOptionsWithDefault];
+    [_largeTitle screenInPush:options
+                         list:[self followedList]
+                  inlineInRow:[self inlineInRow:options]
+                          top:place.safeArea.top
+                     stackTop:navigation.view.safeAreaInsets.top];
+}
+
 // A native screen's views are the app's: the core lays nothing into them. The band behind the title is filled where
 // the title is, and the look follows it, before UIKit lays the screen out for the transition.
 - (BOOL)revealedByPop {

package/ios/TurboModules/ANNTurboModule.mm

@@ -10,6 +10,7 @@
 #import "ANNEventContract.h"
 #import "ANNExternalViewController.h"
 #import "ANNHinge.h"
+#import "ANNJavaScriptCalls.h"
 #import "ANNLayoutReader.h"
 #import "ANNModalCoordinator.h"
 #import "ANNNativeScreenCalls.h"
@@ -29,6 +30,9 @@
 #import "ANNStackCommands.h"
 #import "ApexNavigation+Internal.h"
 #import "UIViewController+LayoutProtocol.h"
+#import <React/RCTCallInvokerModule.h>
+#import <React/RCTInitializing.h>
+#import <React/RCTInvalidating.h>
 
 // How many modules this process made: the first one is a cold start, the next ones come with reloads of JavaScript.
 static NSUInteger ANNTurboModuleCount;
@@ -84,6 +88,11 @@ static BOOL ANNFindsScreen(NSString *componentId, ANNCommandAnswer *answer) {
     return NO;
 }
 
+// The module's call invoker and queue go to `ANNJavaScriptCalls`, so that a step of the core can come after the calls
+// JavaScript made (a push after the options of its screen's first commit).
+@interface ANNTurboModule () <RCTCallInvokerModule, RCTInitializing, RCTInvalidating>
+@end
+
 // Every asynchronous method takes the one path of `ANNCommandRunner`: on the module's queue the layout is read and
 // checked whole, then one task on the main queue runs the command with its area's class. A question answers at once on
 // the JavaScript thread what it answers before the first data.
@@ -94,6 +103,11 @@ static BOOL ANNFindsScreen(NSString *componentId, ANNCommandAnswer *answer) {
 
 RCT_EXPORT_MODULE(ANNTurboModule)
 
+// React Native gives the module its shared queue through this (it has none of its own) and its call invoker, both
+// before `initialize`.
+@synthesize methodQueue = _methodQueue;
+@synthesize callInvoker = _callInvoker;
+
 + (BOOL)requiresMainQueueSetup {
     return NO;
 }
@@ -109,6 +123,14 @@ RCT_EXPORT_MODULE(ANNTurboModule)
     return self;
 }
 
+- (void)initialize {
+    [ANNJavaScriptCalls setCallInvoker:_callInvoker methodQueue:_methodQueue ofModule:self];
+}
+
+- (void)invalidate {
+    [ANNJavaScriptCalls moduleWent:self];
+}
+
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
     return std::make_shared<facebook::react::NativeANNTurboModuleSpecJSI>(params);
@@ -139,7 +161,7 @@ RCT_EXPORT_MODULE(ANNTurboModule)
 // navigation has a host. React Native starts its surface once the bundle ran.
 - (void)startHost {
     [ANNCommandRunner runVoid:@"startHost"
-                         what:@"startHost"
+                         what:@"start the host of the slots"
                          body:^{
                            RCTHost *host = [ApexNavigation getHost];
                            if (host) {
@@ -170,22 +192,23 @@ RCT_EXPORT_MODULE(ANNTurboModule)
                          }];
 }
 
-// `mergeOptions`: a node nobody has (not made yet, gone, a reload) takes nothing, without a log; a node of a modal that
-// goes with the old root is not shown (logged). The values that could be read merge even when one couldn't. The whole
-// apply is one Core Animation transaction, closed on any error. Then the modal or the overlay of the node takes the
-// merge once (`mergeOptions` step 5).
+// `mergeOptions`: without the navigation's window it logs `nowhereToShow` (JavaScript keeps the options for the next
+// root); a node nobody has (not made yet, gone, a reload) or a node of a modal that goes with the old root takes
+// nothing, without a log, as on Android. The values that could be read merge even when one couldn't. The whole apply
+// is one Core Animation transaction, closed on any error. Then the modal or the overlay of the node takes the merge
+// once (`mergeOptions` step 5).
 - (void)mergeOptions:(NSString *)componentId options:(NSDictionary *)options {
     NSString *what = ANNWhat(@"merge the options of the screen '%@'", componentId);
     [ANNCommandRunner runVoid:@"mergeOptions"
                          what:what
                          body:^{
-                           UIViewController *node = [ANNNodeRegistry nodeForComponentId:componentId];
-                           if (!node) {
+                           if (!ApexNavigation.mainWindow) {
+                               [ANNCommandRunner logFailure:@"mergeOptions"
+                                                       text:ANNErrorTexts.nowhereToShow];
                                return;
                            }
-                           if ([ANNModalCoordinator isWithOldRoot:node]) {
-                               NSString *text = [ANNErrorTexts screenNotShown:componentId];
-                               [ANNCommandRunner logFailure:@"mergeOptions" text:text];
+                           UIViewController *node = ANNCommandNode(componentId);
+                           if (!node) {
                                return;
                            }
                            NSString *unreadablePath = nil;
@@ -244,13 +267,13 @@ RCT_EXPORT_MODULE(ANNTurboModule)
                      }];
 }
 
-// iOS lays out no screen before its push: always null.
+// iOS lays out no screen before its push: always null (`NSNull`; nil would reach JavaScript as `undefined`).
 - (void)preparePush:(NSString *)commandId
         componentId:(NSString *)componentId
              layout:(NSDictionary *)layout
             resolve:(RCTPromiseResolveBlock)resolve
              reject:(RCTPromiseRejectBlock)reject {
-    [ANNErrorHandler resolve:resolve of:@"preparePush" value:nil];
+    [ANNErrorHandler resolve:resolve of:@"preparePush" value:NSNull.null];
 }
 
 - (void)cancelPreparedPush:(NSString *)componentId {
@@ -551,26 +574,21 @@ RCT_EXPORT_MODULE(ANNTurboModule)
                     check:nil
                      body:^(id layout, ANNCommandAnswer *answer) {
                        // The links module answers once the launch links are known, at once in the background
-                       // (`getLaunchLink`): the URL, or null.
+                       // (`getLaunchLink`): the URL, or null (`NSNull`; nil would reach JavaScript as `undefined`).
                        [ANNDeepLinkQueue takeLaunchLink:^(NSURL *url) {
-                         [answer resolve:url.absoluteString];
+                         [answer resolve:url.absoluteString ?: (id)NSNull.null];
                        }];
                      }];
 }
 
 - (void)updateNativeScreenProps:(NSString *)componentId update:(NSDictionary *)update {
     NSString *what = ANNWhat(@"updateNativeScreenProps for the screen '%@'", componentId);
-    // At once, also during a transition; a node that isn't a native screen, or no node, takes nothing.
+    // At once, also during a transition; a node that isn't a native screen, no node, or a node of a modal that goes
+    // with the old root takes nothing, without a log, as on Android.
     [ANNCommandRunner runVoid:@"updateNativeScreenProps"
                          what:what
                          body:^{
                            UIViewController *node = ANNCommandNode(componentId);
-                           // A node of a modal that goes with the old root is not shown.
-                           if (!node && [ANNNodeRegistry nodeForComponentId:componentId]) {
-                               NSString *text = [ANNErrorTexts screenNotShown:componentId];
-                               [ANNCommandRunner logFailure:@"updateNativeScreenProps" text:text];
-                               return;
-                           }
                            if ([node isKindOfClass:ANNExternalViewController.class]) {
                                [((ANNExternalViewController *)node).nativeScreenContext
                                    applyUpdate:update];