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

package/ios/Layouts/Stack/ANNPreviewPush.mm

@@ -1,19 +1,25 @@
 #import "ANNPreviewPush.h"
 #import "ANNAssert.h"
+#import "ANNCommandRunner.h"
+#import "ANNComponentViewController.h"
 #import "ANNErrorTexts.h"
+#import "ANNExternalViewController.h"
 #import "ANNLayoutFactory.h"
 #import "ANNParking.h"
 #import "ANNPopoverPresenter.h"
 #import "ANNPreviewInteraction.h"
 #import "ANNReloadCoordinator.h"
+#import "ANNSlotContainers.h"
+#import "ANNSlotScreenView.h"
 #import "ANNStackCommands.h"
 #import "ANNStackController.h"
 #import "ApexNavigation+Internal.h"
 #import "UIViewController+LayoutProtocol.h"
 
-// The view of a component mounts a frame or so after the command that rendered it: it is looked for this many times,
-// a frame apart.
-static const NSUInteger ANNPreviewSearchTries = 30;
+// The view of a component mounts a frame or so after the command that rendered it: it is looked for at each mount of
+// the source's content until this limit (30 frames), then the preview goes, as with a `nativeID` no view has.
+static const NSTimeInterval ANNPreviewSearchLimit = 30.0 / 60;
+// Where the source's mounts can't be heard, a frame apart.
 static const NSTimeInterval ANNPreviewSearchInterval = 1.0 / 60;
 
 // One preview from its push to its end: the tap took it, or it went.
@@ -28,9 +34,14 @@ static const NSTimeInterval ANNPreviewSearchInterval = 1.0 / 60;
 @property(nonatomic, copy) NSString *componentId;
 @property(nonatomic, copy) NSString *what;
 @property(nonatomic) NSUInteger generation;
-@property(nonatomic) NSUInteger tries;
+// The content whose mounts the search hears, while it looks.
+@property(nonatomic, weak, nullable) UIView<ANNComponentProtocol> *watched;
 @property(nonatomic) BOOL attached;
 @property(nonatomic) BOOL done;
+// The size of the preview, taken at the push.
+@property(nonatomic) CGSize size;
+// The screen rendered: at the push, or at the press for a screen of its own React root.
+@property(nonatomic) BOOL rendered;
 // The screen's unseen place in the main window, at its preview size, until UIKit takes its view for the menu.
 @property(nonatomic, strong, nullable) UIView *host;
 @property(nonatomic, strong, nullable) ANNParking *parking;
@@ -48,6 +59,15 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
     return records;
 }
 
+// A React screen with a root of its own renders at the press: a view with a preview costs no React root, no render and
+// no effects of the screen until the user presses it. A native screen (a kind of component screen) renders as it is
+// made, and a screen of the app's one tree renders in JavaScript as its slot is added: both render at the push.
+static BOOL ANNPreviewRendersAtPress(UIViewController *screen) {
+    return [screen isKindOfClass:ANNComponentViewController.class] &&
+           ![screen isKindOfClass:ANNExternalViewController.class] &&
+           ![screen.layoutInfo.name hasPrefix:ANNSlotPrefix];
+}
+
 @implementation ANNPreviewPush
 
 + (void)push:(ANNLayoutNode *)layout
@@ -68,6 +88,7 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
     ANNPreviewRecord *record = [ANNPreviewRecord new];
     record.previewId = layout.nodeId;
     record.screen = screen;
+    record.size = size;
     record.source = source;
     record.answer = answer;
     // The key applies only once the tap made the preview a screen of the stack.
@@ -78,18 +99,22 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
     record.generation = answer.generation;
     ANNPreviewRecords()[record.previewId] = record;
     @try {
-        [self parkAndRender:record size:size];
+        if (!ANNPreviewRendersAtPress(screen)) {
+            [self parkAndRender:record];
+        }
     } @catch (NSException *exception) {
         [self finish:record];
         [screen destroy];
         @throw;
     }
-    [self search:record];
+    [self startSearch:record];
 }
 
-// The screen renders as now: its view waits unseen in the main window, at the size of the preview, so that its content
+// The screen renders, once: its view waits unseen in the main window, at the size of the preview, so that its content
 // lays out; nothing waits for it.
-+ (void)parkAndRender:(ANNPreviewRecord *)record size:(CGSize)size {
++ (void)parkAndRender:(ANNPreviewRecord *)record {
+    record.rendered = YES;
+    CGSize size = record.size;
     UIWindow *window = ApexNavigation.mainWindow;
     if (window) {
         UIView *host = [[UIView alloc] initWithFrame:CGRectMake(0, 0, size.width, size.height)];
@@ -110,42 +135,103 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
 
 #pragma mark - The search
 
-// Each try asks first whether the preview still lives: a source that went makes it go, a reload stops it silently.
-+ (void)search:(ANNPreviewRecord *)record {
-    if (record.done || record.attached) {
+// The view is looked for at once; else again at each mount of the source's content, where it comes with one of them,
+// and a last time at the limit, when the preview goes. Both later steps keep the generation they were made with: after
+// a reload they do nothing.
++ (void)startSearch:(ANNPreviewRecord *)record {
+    if ([self search:record last:NO]) {
         return;
     }
+    UIViewController *source = record.source;
+    // A source that is a container (a stack) is heard through the screen it shows.
+    UIView<ANNComponentProtocol> *content =
+        source.reactView ?: source.presentedComponentViewController.reactView;
+    __weak ANNPreviewRecord *weakRecord = record;
+    NSUInteger generation = record.generation;
+    // A slot screen hears only the first mount of its slot, not those deeper in it, and a container may show no React
+    // content yet: there the view is looked for on each frame until the limit.
+    if (!content || [content isKindOfClass:ANNSlotScreenView.class]) {
+        [self searchNextFrame:record];
+    } else {
+        record.watched = content;
+        [content setContentDidMount:^{
+          ANNPreviewRecord *searching = weakRecord;
+          if (searching && generation == ANNReloadCoordinator.generation) {
+              [ANNPreviewPush search:searching last:NO];
+          }
+        }
+                             forKey:[self mountKeyOf:record]];
+    }
+    int64_t delay = (int64_t)(ANNPreviewSearchLimit * NSEC_PER_SEC);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay), dispatch_get_main_queue(), ^{
+      ANNPreviewRecord *searching = weakRecord;
+      if (searching && generation == ANNReloadCoordinator.generation) {
+          [ANNPreviewPush search:searching last:YES];
+      }
+    });
+}
+
+// One more search on the next frame, and so on until the view is found or the preview goes; after a reload, none.
++ (void)searchNextFrame:(ANNPreviewRecord *)record {
+    __weak ANNPreviewRecord *weakRecord = record;
+    NSUInteger generation = record.generation;
+    int64_t delay = (int64_t)(ANNPreviewSearchInterval * NSEC_PER_SEC);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay), dispatch_get_main_queue(), ^{
+      ANNPreviewRecord *searching = weakRecord;
+      if (searching && generation == ANNReloadCoordinator.generation &&
+          ![ANNPreviewPush search:searching last:NO]) {
+          [ANNPreviewPush searchNextFrame:searching];
+      }
+    });
+}
+
+// YES when the search is over: the view was found, or the preview went or stopped. Each search asks first whether the
+// preview still lives: a source that went makes it go, a reload stops it silently. The last one, not finding the view,
+// makes the preview go.
++ (BOOL)search:(ANNPreviewRecord *)record last:(BOOL)last {
+    if (record.done || record.attached) {
+        return YES;
+    }
     if (record.generation != ANNReloadCoordinator.generation) {
-        return;
+        return YES;
     }
     UIViewController *source = record.source;
     if (!source || source.nodeHelper.destroyed) {
         [self gone:record];
-        return;
+        return YES;
     }
     // Read only: the view is found by its `nativeID`, and its tag is its current Fabric tag.
     UIView *view = [ANNPopoverPresenter viewWithNativeID:record.nativeID in:source.viewIfLoaded];
     if (view) {
         [self attach:record toView:view source:source];
-        return;
+        return YES;
     }
-    if (++record.tries >= ANNPreviewSearchTries) {
+    if (last) {
         [self gone:record];
-        return;
+        return YES;
     }
-    __weak ANNPreviewRecord *weakRecord = record;
-    int64_t delay = (int64_t)(ANNPreviewSearchInterval * NSEC_PER_SEC);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay), dispatch_get_main_queue(), ^{
-      ANNPreviewRecord *searching = weakRecord;
-      if (searching) {
-          [ANNPreviewPush search:searching];
-      }
-    });
+    return NO;
+}
+
+// The key of the search's mount handler: one per preview, so that two previews of one source don't replace each other.
++ (NSString *)mountKeyOf:(ANNPreviewRecord *)record {
+    return [@"preview." stringByAppendingString:record.previewId];
+}
+
+// The search stops hearing the mounts: only its own handler goes.
++ (void)stopWatching:(ANNPreviewRecord *)record {
+    UIView<ANNComponentProtocol> *content = record.watched;
+    record.watched = nil;
+    [content setContentDidMount:nil forKey:[self mountKeyOf:record]];
 }
 
 + (void)attach:(ANNPreviewRecord *)record toView:(UIView *)view source:(UIViewController *)source {
     record.attached = YES;
+    [self stopWatching:record];
     __weak ANNPreviewRecord *weakRecord = record;
+    BOOL (^prepare)(void) = ^BOOL {
+      return [ANNPreviewPush renderAtPress:weakRecord];
+    };
     BOOL (^commit)(void) = ^BOOL {
       return [ANNPreviewPush commit:weakRecord];
     };
@@ -156,10 +242,35 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
                                   toView:view
                                 reactTag:view.tag
                                   source:source
+                                 prepare:prepare
                                   commit:commit
                                dismissed:dismissed];
 }
 
+#pragma mark - The press
+
+// The press starts (UIKit asks for the menu's configuration, about half a second before it shows the preview): the
+// screen renders now if it hasn't yet, so that its content is there when the preview shows. Out of the command's
+// runner, a failure rejects the push with its text and the preview goes. YES when the screen rendered. A preview of the
+// JavaScript before a reload renders nothing: its screen would start in the new one.
++ (BOOL)renderAtPress:(ANNPreviewRecord *)record {
+    if (!record || record.done || !record.answer.isCurrent) {
+        return NO;
+    }
+    if (record.rendered) {
+        return YES;
+    }
+    @try {
+        [self parkAndRender:record];
+    } @catch (NSException *exception) {
+        [self finish:record];
+        [record.screen destroy];
+        [record.answer reject:[ANNCommandRunner rejectionOf:exception what:record.what]];
+        return NO;
+    }
+    return YES;
+}
+
 #pragma mark - The tap
 
 // YES once the core took the preview: a key that leads back to an entry, or the push the queue accepted. From then on
@@ -206,7 +317,9 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
         return YES;
     }
     // The preview grows into the screen: a push without an animation, and without a wait, as the screen rendered
-    // already; its answer at the end of the transaction.
+    // already; its answer at the end of the transaction. A screen that rendered only as the menu opened (a pointer's
+    // right click, then a quick tap) may have no content yet: its push waits for it as a push does.
+    BOOL waits = ANNPreviewRendersAtPress(screen) && !screen.reactView.isReady;
     [stack setKey:key ofEntry:screen];
     [stack.queue push:screen
              answer:record.answer
@@ -214,7 +327,7 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
         componentId:record.componentId
              source:entry
            animated:NO
-              waits:NO];
+              waits:waits];
     return YES;
 }
 
@@ -231,9 +344,10 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
     [record.answer reject:[ANNErrorTexts previewGone:record.previewId]];
 }
 
-// The record is done: the screen leaves its unseen place, the table forgets it.
+// The record is done: the search stops, the screen leaves its unseen place, the table forgets it.
 + (void)finish:(ANNPreviewRecord *)record {
     record.done = YES;
+    [self stopWatching:record];
     [self unpark:record];
     if (ANNPreviewRecords()[record.previewId] == record) {
         [ANNPreviewRecords() removeObjectForKey:record.previewId];
@@ -286,6 +400,7 @@ static NSMutableDictionary<NSString *, ANNPreviewRecord *> *ANNPreviewRecords(vo
     NSMutableArray<UIViewController *> *screens = [NSMutableArray new];
     for (ANNPreviewRecord *record in ANNPreviewRecords().allValues) {
         record.done = YES;
+        [self stopWatching:record];
         [self unpark:record];
         if (!record.attached) {
             [screens addObject:record.screen];

package/ios/Layouts/Tabs/ANNBottomTabsAccessoryView.h

@@ -2,6 +2,8 @@
 #import "ANNReactView.h"
 #import <UIKit/UIKit.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  * The content of the tab bar's bottom accessory (iOS 26): the React component fills it, and the
  * component gets `bottomAccessoryPlacementChanged` when UIKit moves the accessory between the
@@ -10,8 +12,17 @@
 @interface ANNBottomTabsAccessoryView : UIView
 
 - (instancetype)initWithReactView:(ANNReactView *)reactView
-                     eventEmitter:(ANNEventEmitter *)eventEmitter;
+                     eventEmitter:(nullable ANNEventEmitter *)eventEmitter;
 
 @property(nonatomic, strong, readonly) ANNReactView *reactView;
 
+/**
+ * `handler` runs once when the view is out of a window: at once when it is already, else when it
+ * leaves it, so a replaced accessory shows to the end of whatever UIKit draws of it. nil cancels a
+ * handler not run yet.
+ */
+- (void)whenOutOfWindow:(nullable dispatch_block_t)handler;
+
 @end
+
+NS_ASSUME_NONNULL_END

package/ios/Layouts/Tabs/ANNBottomTabsAccessoryView.mm

@@ -3,6 +3,7 @@
 @implementation ANNBottomTabsAccessoryView {
     ANNEventEmitter *_eventEmitter;
     NSString *_placement;
+    dispatch_block_t _outOfWindowHandler;
 }
 
 - (instancetype)initWithReactView:(ANNReactView *)reactView
@@ -32,6 +33,28 @@
     }];
 }
 
+- (void)whenOutOfWindow:(dispatch_block_t)handler {
+    _outOfWindowHandler = nil;
+    if (!handler) {
+        return;
+    }
+    if (!self.window) {
+        handler();
+        return;
+    }
+    _outOfWindowHandler = [handler copy];
+}
+
+- (void)didMoveToWindow {
+    [super didMoveToWindow];
+    dispatch_block_t handler = _outOfWindowHandler;
+    if (self.window || !handler) {
+        return;
+    }
+    _outOfWindowHandler = nil;
+    handler();
+}
+
 // UIKit sets the environment when the accessory is shown and changes it as the tab bar minimizes
 // and expands.
 - (void)tabAccessoryEnvironmentDidChange API_AVAILABLE(ios(26.0)) {

package/ios/Layouts/Tabs/ANNBottomTabsController.mm

@@ -598,10 +598,11 @@ static void ANNStacksOfNode(UIViewController *node, NSMutableArray<ANNStackContr
     [[self tabsPresenter] tabsDidLayOut];
 }
 
-// `afterInitialTab` goes on at the tabs' first appearance at the latest.
+// `afterInitialTab` goes on at the tabs' first appearance at the latest; a dot that waited for the window shows.
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     [self scheduleChain];
+    [[self tabsPresenter] tabsDidAppear];
 }
 
 #pragma mark - Rendering and the preload window

package/ios/Layouts/Tabs/ANNBottomTabsCustomRow.mm

@@ -126,8 +126,13 @@ static const CGFloat ANNWideRowMargin = 16;
     if (self.superview != host) {
         [host addSubview:self];
     }
-    [host bringSubviewToFront:self];
-    // The system bar keeps its place and shows nothing; UIKit makes its subviews anew on a size change.
+    if (host.subviews.lastObject != self) {
+        [host bringSubviewToFront:self];
+    }
+    // The system bar keeps its place and shows nothing; UIKit makes its subviews anew on a size change. Not the bar's
+    // `alpha`: UIKit puts it back to 1 when the bar shows, on a pop with `hidesBottomBarWhenPushed`, and on iOS 27 on
+    // a rotation and a theme change, after the tabs' layout (a check here misses it); alpha 0 also drops the system's
+    // soft fade at the bottom.
     for (UIView *subview in bar.subviews) {
         if (!subview.hidden) {
             subview.hidden = YES;
@@ -193,6 +198,7 @@ static const CGFloat ANNWideRowMargin = 16;
         extra = MAX(0, CGRectGetMinY(barFrame) - CGRectGetMinY(frame));
     }
     BOOL hidden = wide ? _hiddenByOptions : (tabs.barHidden || bar.hidden);
+    // A new size lays the cells out again by itself; the same frame changes nothing.
     if (!CGRectEqualToRect(self.frame, frame)) {
         self.frame = frame;
     }
@@ -203,7 +209,6 @@ static const CGFloat ANNWideRowMargin = 16;
         _background.layer.cornerRadius = radius;
     }
     [self setExtraSafeArea:hidden ? 0 : extra];
-    [self setNeedsLayout];
 }
 
 - (void)setHiddenByOptions:(BOOL)hiddenByOptions {

package/ios/Layouts/Tabs/ANNBottomTabsPresenter.h

@@ -55,6 +55,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// The tabs laid out (and before they appear): the dots, the buttons' `testID`s, the custom row.
 - (void)tabsDidLayOut;
 
+/// The tabs appeared, in a window: a dot set while they were out of it (under a modal over the whole screen) is
+/// placed now, as no layout may follow.
+- (void)tabsDidAppear;
+
 /// The bar laid out in a window for the first time: the titles are set again, so that the bar measures them at their
 /// real place.
 - (void)barDidLayOutInWindow;