@apexnative/navigation 1.0.0-alpha.0 → 1.0.0-alpha.10

package/ios/TopBar/ANNTopBarPresenter.mm

@@ -2,17 +2,21 @@
 #import "ANNBackButtonPresenter.h"
 #import "ANNBarAppearance.h"
 #import "ANNComponentPresenter.h"
+#import "ANNComponentViewController.h"
 #import "ANNExternalViewController.h"
 #import "ANNLargeTitlePresenter.h"
 #import "ANNMainList.h"
 #import "ANNScreenBars.h"
 #import "ANNScrollEdgeEffects.h"
 #import "ANNSearchPresenter.h"
+#import "ANNSlotScreenView.h"
 #import "ANNStackController.h"
+#import "ANNTabsDesign.h"
 #import "ANNTitleComponentView.h"
 #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.
@@ -32,11 +36,27 @@ typedef NS_ENUM(NSInteger, ANNBarPhase) {
     ANNBarPhaseDidAppear,
 };
 
-static BOOL ANNIsIOS26(void) {
-    if (@available(iOS 26.0, *)) {
-        return YES;
+// The glass design of iOS 26, not its compatibility mode: the large title in the list, the title's capsule, the
+// system subtitle and the pin of the title's color are its own (`ANNTabsDesign`).
+static BOOL ANNIsGlass(void) {
+    return ANNTabsDesign.isGlass;
+}
+
+// The same look: the item's appearance is the one set last, or one equal to it.
+static BOOL ANNSameAppearance(UINavigationBarAppearance *a, UINavigationBarAppearance *b) {
+    return a == b || [a isEqual:b];
+}
+
+// The traits a look's colors and fonts resolve with: the style, the contrast, the elevation (the 1×1 background is
+// drawn with them) and the text size.
+static NSArray *ANNLookTraitsOf(UITraitCollection *traits) {
+    if (!traits) {
+        return @[];
     }
-    return NO;
+    return @[
+        @(traits.userInterfaceStyle), @(traits.accessibilityContrast), @(traits.userInterfaceLevel),
+        traits.preferredContentSizeCategory ?: @""
+    ];
 }
 
 static BOOL ANNHasComponentName(ANNComponentOptions *component) {
@@ -59,6 +79,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
 
@@ -84,6 +128,10 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
     NSUInteger _pinToken;
     // A pop's band under the title keeps the bar's look as it is (the screen leaves for one without a band of its own).
     BOOL _bandKeepsLook;
+    // What the last look was filled from, and the two appearances the item held right after it.
+    NSArray *_lookInputs;
+    UINavigationBarAppearance *_lookStandard;
+    UINavigationBarAppearance *_lookEdge;
 }
 
 - (instancetype)initWithScreen:(UIViewController *)screen {
@@ -151,13 +199,13 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
     BOOL collapses = [ANNLargeTitlePresenter collapsesIntoList:options];
     BOOL inlineInRow = [self inlineInRow:options];
     BOOL ownEdge = [options.topBar.scrollEdgeAppearance.active withDefault:NO];
-    context.transparentEdge = ANNIsIOS26() && collapses && !inlineInRow && !ownEdge;
+    context.transparentEdge = ANNIsGlass() && collapses && !inlineInRow && !ownEdge;
     // While a pop draws the band behind the title in the title's own place, the bar's edge stays clear: UIKit grows
     // the bar's background with an interactive pop, over the screen's top where the title is.
     if ([_largeTitle drawsTitleBand] && !_bandKeepsLook && !ownEdge) {
         context.transparentEdge = YES;
     }
-    context.largeTitleNeedsBackground = ANNIsIOS26() && canShow && !collapses && !inlineInRow;
+    context.largeTitleNeedsBackground = ANNIsGlass() && canShow && !collapses && !inlineInRow;
     return context;
 }
 
@@ -341,26 +389,64 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
 
 #pragma mark - The look
 
+// Several callers ask for the look along one appearance (the screen's, a merge, the band and the pin of iOS 26): it
+// is filled only when what the fill reads changed or the item holds another look, and set only when it differs from
+// the item's. A look set again makes UIKit lay the bar out anew, and on iOS 26 copy it into the stack's bar.
 - (void)applyLook:(ANNNavigationOptions *)options {
     UIViewController *screen = _screen;
     UINavigationItem *item = screen.navigationItem;
+    UITraitCollection *traits =
+        screen.viewIfLoaded.window.traitCollection ?: screen.traitCollection;
+    ANNBarAppearanceContext context = [self appearanceContextOf:options];
+    UITraitCollection *pinned = ANNIsGlass() ? _pinnedTraits : nil;
+    NSArray *inputs = [self lookInputsOf:options context:context traits:traits pinned:pinned];
+    if (_lookInputs && ANNOptionValuesSame(_lookInputs, inputs) &&
+        ANNSameAppearance(item.standardAppearance, _lookStandard) &&
+        ANNSameAppearance(item.scrollEdgeAppearance, _lookEdge)) {
+        return;
+    }
     // The screen's own looks, filled whole and set again (the item copies them).
     UINavigationBarAppearance *standard =
         [item.standardAppearance copy] ?: [UINavigationBarAppearance new];
     UINavigationBarAppearance *edge =
         [item.scrollEdgeAppearance copy] ?: [UINavigationBarAppearance new];
-    UITraitCollection *traits =
-        screen.viewIfLoaded.window.traitCollection ?: screen.traitCollection;
     [ANNBarAppearance fillStandard:standard
                         scrollEdge:edge
                        withOptions:options
-                           context:[self appearanceContextOf:options]
+                           context:context
                             traits:traits];
-    if (_pinnedTraits && ANNIsIOS26()) {
-        [self pinTitleColorsOf:standard edge:edge options:options traits:_pinnedTraits];
+    if (pinned) {
+        [self pinTitleColorsOf:standard edge:edge options:options traits:pinned];
+    }
+    if (!ANNSameAppearance(item.standardAppearance, standard)) {
+        item.standardAppearance = standard;
     }
-    item.standardAppearance = standard;
-    item.scrollEdgeAppearance = edge;
+    if (!ANNSameAppearance(item.scrollEdgeAppearance, edge)) {
+        item.scrollEdgeAppearance = edge;
+    }
+    _lookInputs = inputs;
+    _lookStandard = item.standardAppearance;
+    _lookEdge = item.scrollEdgeAppearance;
+}
+
+// What `fillStandard:scrollEdge:withOptions:context:traits:` and the pin read: the bar's options by value, the
+// image the back button's icon loads (a file written again at its path is another image), the context, the traits.
+- (NSArray *)lookInputsOf:(ANNNavigationOptions *)options
+                  context:(ANNBarAppearanceContext)context
+                   traits:(UITraitCollection *)traits
+                   pinned:(nullable UITraitCollection *)pinned {
+    ANNTopBarOptions *topBar = options.topBar;
+    Image *backIcon = topBar.backButton.icon;
+    ANNImageSource *source = backIcon.source;
+    BOOL loads = backIcon.hasValue && !(source && source.kind == ANNImageSourceKindSymbol);
+    id backImage = loads ? [backIcon withDefault:nil] : nil;
+    return @[
+        topBar.background, topBar.scrollEdgeAppearance, topBar.noBorder, topBar.borderColor,
+        topBar.title.font, topBar.title.color, topBar.largeTitle.font, topBar.largeTitle.color,
+        topBar.backButton, backImage ?: NSNull.null, @(context.transparentEdge),
+        @(context.largeTitleNeedsBackground), ANNLookTraitsOf(traits),
+        pinned ? ANNLookTraitsOf(pinned) : NSNull.null
+    ];
 }
 
 // The title colors resolved for `traits`: fixed colors that don't follow the glass's style.
@@ -388,7 +474,7 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
 - (void)pinTitleColorAlong:(id<UIViewControllerTransitionCoordinator>)coordinator
                     traits:(UITraitCollection *)traits {
     UIViewController *screen = _screen;
-    if (!screen || !ANNIsIOS26()) {
+    if (!screen || !ANNIsGlass()) {
         return;
     }
     NSUInteger token = ++_pinToken;
@@ -435,7 +521,7 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
     NSString *glass = [title.glass withDefault:nil];
     BOOL glassShows = NO;
     if (@available(iOS 26.0, *)) {
-        glassShows = [ANNTitleGlassView isGlass:glass];
+        glassShows = ANNIsGlass() && [ANNTitleGlassView isGlass:glass];
     }
     [self applySubtitle:options glass:glassShows];
 
@@ -471,7 +557,7 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
         }
     } else if (_titleComponent) {
         titleView = _titleComponent;
-    } else if (!ANNIsIOS26() && subtitle.length > 0 && !ANNLargeTitleCanShow(options)) {
+    } else if (!ANNIsGlass() && subtitle.length > 0 && !ANNLargeTitleCanShow(options)) {
         // Before iOS 26 a subtitle is a two-label title, without a large title that can show.
         titleView = [[ANNTitleView alloc] initWithOptions:options];
     }
@@ -495,8 +581,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
@@ -509,7 +598,8 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
         if (_native && !subtitle.text.hasValue) {
             return;
         }
-        if (text.length == 0) {
+        // The compatibility mode draws no system subtitle: a two-label title shows it, as before iOS 26.
+        if (text.length == 0 || !ANNIsGlass()) {
             item.attributedSubtitle = nil;
             item.largeAttributedSubtitle = nil;
             return;
@@ -561,7 +651,7 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
         return NO;
     }
     CGFloat height = ANNTitleRowHeight;
-    if (!ANNIsIOS26()) {
+    if (!ANNIsGlass()) {
         if (_screen.traitCollection.userInterfaceIdiom == UIUserInterfaceIdiomPad) {
             height = ANNTitleRowHeightPad;
         }
@@ -644,11 +734,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 +750,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 +768,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;
@@ -1001,8 +1090,10 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
         ANNNavigationOptions *options = [screen resolveOptionsWithDefault];
         [_largeTitle screenDidDisappear:options list:[self followedList]];
     }
-    // The lists the screen set leave with it; its color and its React background leave the main list.
-    [self releaseLists];
+    // The lists the screen set leave with it (the edge effects stay known for its next appearance); its color and its
+    // React background leave the main list.
+    [_edgeEffects screenDidDisappear];
+    [self releaseListsKeepingEdgeEffects:YES];
     _bandKeepsLook = NO;
     // A swipe back given up: the screen keeps the bar's own look for its next appearance.
     if (band && screen) {
@@ -1011,7 +1102,13 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
 }
 
 - (void)releaseLists {
-    [_edgeEffects reset];
+    [self releaseListsKeepingEdgeEffects:NO];
+}
+
+- (void)releaseListsKeepingEdgeEffects:(BOOL)keepEdgeEffects {
+    if (!keepEdgeEffects) {
+        [_edgeEffects reset];
+    }
     [_largeTitle removeListFill];
     [_largeTitle removeTitlePlaceFill];
     [_largeTitle removeTitleHost];
@@ -1056,6 +1153,10 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
       [weakSelf contentDidMount];
     }
                          forKey:ANNTopBarMountKey];
+    // The edge effect walks the screen again only after a mount. A native screen's views are the app's, never told; a
+    // screen of one tree (`appProvider`) hears the mounts only in the window, so it walks at each appearance.
+    [self edgeEffects].mountsReported =
+        !_native && ![content isKindOfClass:ANNSlotScreenView.class];
 }
 
 // The list the bar follows at the top edge under a large title that folds into it: the main list of a React screen;
@@ -1101,6 +1202,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 {
@@ -1175,7 +1297,7 @@ static NSArray<UIMenuElement *> *ANNRenameElementsOf(NSArray<UIMenuElement *> *e
         return;
     }
     ANNNavigationOptions *options = [screen resolveOptionsWithDefault];
-    BOOL eligible = ANNIsIOS26() && [self isShownTop] && screen.viewIfLoaded.window != nil &&
+    BOOL eligible = ANNIsGlass() && [self isShownTop] && screen.viewIfLoaded.window != nil &&
                     [background isShownInBar:bar] &&
                     [ANNLargeTitlePresenter collapsesIntoList:options] &&
                     ![self inlineInRow:options];

package/ios/TurboModules/ANNTurboEventEmitter.mm

@@ -1,5 +1,6 @@
 #import "ANNTurboEventEmitter.h"
 #import "ANNAssert.h"
+#import "ANNEventContract.h"
 #import "ANNEventEmitter.h"
 #import "ANNReloadCoordinator.h"
 #import <React/RCTUtils.h>
@@ -40,41 +41,9 @@ RCT_EXPORT_MODULE(ANNTurboEventEmitter)
     return self;
 }
 
-// Every event of the navigation and of the modules.
+// Every event of the navigation and of the modules, as the types of `src/interfaces/` name them.
 - (NSArray<NSString *> *)supportedEvents {
-    return @[
-        @"ANN.AppLaunched",
-        @"ANN.ArrangementChanged",
-        @"ANN.BottomAccessoryPlacementChanged",
-        @"ANN.BottomTabLongPressed",
-        @"ANN.BottomTabPressed",
-        @"ANN.BottomTabSelected",
-        @"ANN.CommandCompleted",
-        @"ANN.ComponentDidAppear",
-        @"ANN.ComponentDidDisappear",
-        @"ANN.ComponentWillAppear",
-        @"ANN.HingeChanged",
-        @"ANN.KeyCommandPressed",
-        @"ANN.ModalAttemptedToDismiss",
-        @"ANN.ModalDismissed",
-        @"ANN.NativeScreenCall",
-        @"ANN.NativeScreenReleased",
-        @"ANN.NavigationButtonPressed",
-        @"ANN.NavigationStateChanged",
-        @"ANN.PreviewCompleted",
-        @"ANN.ScreenInsetsChanged",
-        @"ANN.ScreenPopped",
-        @"ANN.ScreenRegionsChanged",
-        @"ANN.SearchBarCancelPressed",
-        @"ANN.SearchBarSubmitted",
-        @"ANN.SearchBarUpdated",
-        @"ANN.SearchSuggestionPicked",
-        @"ANN.SheetDetentChanged",
-        @"ANN.SlotDestroyed",
-        @"ANN.SplitViewColumnsStacked",
-        @"ANN.SplitViewDisplayModeChanged",
-        @"ANN.TitleRenamed",
-    ];
+    return ANNEventContractNames();
 }
 
 #pragma mark - Listeners
@@ -99,7 +68,7 @@ RCT_EXPORT_MODULE(ANNTurboEventEmitter)
 
 - (void)addListener:(NSString *)eventName {
     [super addListener:eventName];
-    if ([eventName isEqualToString:@"ANN.AppLaunched"] && !_listensToAppLaunched) {
+    if ([eventName isEqualToString:ANNEventContract.AppLaunched.event] && !_listensToAppLaunched) {
         _listensToAppLaunched = YES;
         [ANNEventEmitter eventEmitterListensToAppLaunched:self];
     }