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

package/ios/Core/ANNEventEmitter.mm

@@ -1,5 +1,6 @@
 #import "ANNEventEmitter.h"
 #import "ANNAssert.h"
+#import "ANNEventContract.h"
 #import "ANNReloadCoordinator.h"
 #import "ANNTurboEventEmitter.h"
 #import <React/RCTUtils.h>
@@ -24,8 +25,6 @@ static NSString *ANNComponentTypeName(ANNReactComponentType componentType) {
 static BOOL ANNAppLaunchedPending;
 static NSUInteger ANNAppLaunchedBundle;
 
-static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
-
 @implementation ANNEventEmitter
 
 - (instancetype)init {
@@ -42,12 +41,11 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
 // The generation is checked where the event goes out, on the main queue: an event sent from another queue just
 // before a reload is dropped too.
 - (void)sendEvent:(NSString *)name body:(NSDictionary<NSString *, id> *)body {
-    NSString *eventName = [@"ANN." stringByAppendingString:name];
     RCTExecuteOnMainQueue(^{
       if (!self.isCurrent) {
           return;
       }
-      [ANNTurboEventEmitter.current sendIfListened:eventName body:body];
+      [ANNTurboEventEmitter.current sendIfListened:name body:body];
     });
 }
 
@@ -62,7 +60,7 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
         return;
     }
     ANNAppLaunchedPending = NO;
-    [eventEmitter sendIfListened:ANNAppLaunchedEvent body:nil];
+    [eventEmitter sendIfListened:ANNEventContract.AppLaunched.event body:nil];
 }
 
 + (void)eventEmitterListensToAppLaunched:(ANNTurboEventEmitter *)eventEmitter {
@@ -71,7 +69,7 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
         return;
     }
     ANNAppLaunchedPending = NO;
-    [eventEmitter sendIfListened:ANNAppLaunchedEvent body:nil];
+    [eventEmitter sendIfListened:ANNEventContract.AppLaunched.event body:nil];
 }
 
 // Only an `AppLaunched` of the module's own JavaScript or an older one: the module is made while its bundle runs,
@@ -87,11 +85,12 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
 - (void)sendCommandCompleted:(NSString *)commandName
                    commandId:(NSString *)commandId
               completionTime:(double)completionTime {
-    [self sendEvent:@"CommandCompleted"
+    const auto &keys = ANNEventContract.CommandCompleted;
+    [self sendEvent:keys.event
                body:@{
-                   @"commandName" : commandName,
-                   @"commandId" : commandId,
-                   @"completionTime" : @(completionTime),
+                   keys.commandName : commandName,
+                   keys.commandId : commandId,
+                   keys.completionTime : @(completionTime),
                }];
 }
 
@@ -100,7 +99,7 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
 - (void)sendComponentWillAppear:(NSString *)componentId
                   componentName:(NSString *)componentName
                   componentType:(ANNReactComponentType)componentType {
-    [self sendComponentEvent:@"ComponentWillAppear"
+    [self sendComponentEvent:ANNEventContract.ComponentWillAppear.event
                  componentId:componentId
                componentName:componentName
                componentType:componentType];
@@ -109,7 +108,7 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
 - (void)sendComponentDidAppear:(NSString *)componentId
                  componentName:(NSString *)componentName
                  componentType:(ANNReactComponentType)componentType {
-    [self sendComponentEvent:@"ComponentDidAppear"
+    [self sendComponentEvent:ANNEventContract.ComponentDidAppear.event
                  componentId:componentId
                componentName:componentName
                componentType:componentType];
@@ -118,21 +117,23 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
 - (void)sendComponentDidDisappear:(NSString *)componentId
                     componentName:(NSString *)componentName
                     componentType:(ANNReactComponentType)componentType {
-    [self sendComponentEvent:@"ComponentDidDisappear"
+    [self sendComponentEvent:ANNEventContract.ComponentDidDisappear.event
                  componentId:componentId
                componentName:componentName
                componentType:componentType];
 }
 
+// The three appearance events have the same keys.
 - (void)sendComponentEvent:(NSString *)name
                componentId:(NSString *)componentId
              componentName:(NSString *)componentName
              componentType:(ANNReactComponentType)componentType {
+    const auto &keys = ANNEventContract.ComponentDidAppear;
     [self sendEvent:name
                body:@{
-                   @"componentId" : componentId ?: @"",
-                   @"componentName" : componentName ?: @"",
-                   @"componentType" : ANNComponentTypeName(componentType),
+                   keys.componentId : componentId ?: @"",
+                   keys.componentName : componentName ?: @"",
+                   keys.componentType : ANNComponentTypeName(componentType),
                }];
 }
 
@@ -143,58 +144,76 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
 - (void)sendOnNavigationButtonPressed:(NSString *)componentId
                              buttonId:(NSString *)buttonId
                              selected:(NSNumber *)selected {
+    const auto &keys = ANNEventContract.NavigationButtonPressed;
     NSMutableDictionary *body =
-        [@{@"componentId" : componentId ?: @"", @"buttonId" : buttonId ?: @""} mutableCopy];
+        [@{keys.componentId : componentId ?: @"", keys.buttonId : buttonId ?: @""} mutableCopy];
     if (selected) {
-        body[@"selected"] = @(selected.boolValue);
+        body[keys.selected] = @(selected.boolValue);
     }
-    [self sendEvent:@"NavigationButtonPressed" body:body];
+    [self sendEvent:keys.event body:body];
 }
 
 - (void)sendScreenPopped:(NSString *)componentId {
-    [self sendEvent:@"ScreenPopped" body:@{@"componentId" : componentId ?: @""}];
+    const auto &keys = ANNEventContract.ScreenPopped;
+    [self sendEvent:keys.event body:@{keys.componentId : componentId ?: @""}];
 }
 
 - (void)sendNavigationStateChanged:(NSString *)screenId name:(NSString *)name tab:(NSNumber *)tab {
-    id screen = screenId ? @{@"id" : screenId, @"name" : name ?: @""} : (id)NSNull.null;
-    [self sendEvent:@"NavigationStateChanged"
-               body:@{@"screen" : screen, @"tab" : tab ?: (id)NSNull.null}];
+    const auto &keys = ANNEventContract.NavigationStateChanged;
+    const auto &screenKeys = ANNEventContract.NavigationStateChangedScreen;
+    id screen = screenId ? @{screenKeys.id : screenId, screenKeys.name : name ?: @""}
+                         : (id)NSNull.null;
+    [self sendEvent:keys.event body:@{keys.screen : screen, keys.tab : tab ?: (id)NSNull.null}];
 }
 
 - (void)sendScreenInsetsChanged:(NSString *)componentId
                          insets:(NSDictionary<NSString *, NSNumber *> *)insets {
+    const auto &keys = ANNEventContract.ScreenInsetsChanged;
     NSMutableDictionary *body = [insets mutableCopy] ?: [NSMutableDictionary new];
-    body[@"componentId"] = componentId;
-    [self sendEvent:@"ScreenInsetsChanged" body:body];
+    body[keys.componentId] = componentId;
+    [self sendEvent:keys.event body:body];
 }
 
 - (void)sendScreenRegionsChanged:(NSString *)componentId
                          regions:(NSDictionary<NSString *, NSArray *> *)regions {
+    const auto &keys = ANNEventContract.ScreenRegionsChanged;
     NSMutableDictionary *body = [regions mutableCopy] ?: [NSMutableDictionary new];
-    body[@"componentId"] = componentId;
-    [self sendEvent:@"ScreenRegionsChanged" body:body];
+    body[keys.componentId] = componentId;
+    [self sendEvent:keys.event body:body];
 }
 
 - (void)sendSlotDestroyed:(NSString *)componentId {
-    [self sendEvent:@"SlotDestroyed" body:@{@"componentId" : componentId ?: @""}];
+    const auto &keys = ANNEventContract.SlotDestroyed;
+    [self sendEvent:keys.event body:@{keys.componentId : componentId ?: @""}];
+}
+
+- (void)sendDeepLinkDispatched:(NSURL *)url {
+    const auto &keys = ANNEventContract.DeepLinkDispatched;
+    [self sendEvent:keys.event body:@{keys.url : url.absoluteString ?: @""}];
 }
 
 - (void)sendTitleRenamed:(NSString *)componentId text:(NSString *)text {
-    [self sendEvent:@"TitleRenamed"
-               body:@{@"componentId" : componentId ?: @"", @"text" : text ?: @""}];
+    const auto &keys = ANNEventContract.TitleRenamed;
+    [self sendEvent:keys.event
+               body:@{keys.componentId : componentId ?: @"", keys.text : text ?: @""}];
 }
 
 - (void)sendKeyCommandPressed:(NSString *)componentId keyCommandId:(NSString *)keyCommandId {
-    [self sendEvent:@"KeyCommandPressed"
-               body:@{@"componentId" : componentId ?: @"", @"keyCommandId" : keyCommandId ?: @""}];
+    const auto &keys = ANNEventContract.KeyCommandPressed;
+    [self sendEvent:keys.event
+               body:@{
+                   keys.componentId : componentId ?: @"",
+                   keys.keyCommandId : keyCommandId ?: @"",
+               }];
 }
 
 - (void)sendPreviewCompleted:(NSString *)componentId
           previewComponentId:(NSString *)previewComponentId {
-    [self sendEvent:@"PreviewCompleted"
+    const auto &keys = ANNEventContract.PreviewCompleted;
+    [self sendEvent:keys.event
                body:@{
-                   @"componentId" : componentId ?: @"",
-                   @"previewComponentId" : previewComponentId ?: @"",
+                   keys.componentId : componentId ?: @"",
+                   keys.previewComponentId : previewComponentId ?: @"",
                }];
 }
 
@@ -203,21 +222,24 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
 - (void)sendModalDismissed:(NSString *)componentId
              componentName:(NSString *)componentName
            modalsDismissed:(NSUInteger)modalsDismissed {
-    [self sendEvent:@"ModalDismissed"
+    const auto &keys = ANNEventContract.ModalDismissed;
+    [self sendEvent:keys.event
                body:@{
-                   @"componentId" : componentId ?: @"",
-                   @"componentName" : componentName ?: @"",
-                   @"modalsDismissed" : @(modalsDismissed),
+                   keys.componentId : componentId ?: @"",
+                   keys.componentName : componentName ?: @"",
+                   keys.modalsDismissed : @(modalsDismissed),
                }];
 }
 
 - (void)sendModalAttemptedToDismiss:(NSString *)componentId {
-    [self sendEvent:@"ModalAttemptedToDismiss" body:@{@"componentId" : componentId ?: @""}];
+    const auto &keys = ANNEventContract.ModalAttemptedToDismiss;
+    [self sendEvent:keys.event body:@{keys.componentId : componentId ?: @""}];
 }
 
 - (void)sendSheetDetentChanged:(NSString *)componentId detent:(id)detent {
-    [self sendEvent:@"SheetDetentChanged"
-               body:@{@"componentId" : componentId ?: @"", @"detent" : detent ?: @""}];
+    const auto &keys = ANNEventContract.SheetDetentChanged;
+    [self sendEvent:keys.event
+               body:@{keys.componentId : componentId ?: @"", keys.detent : detent ?: @""}];
 }
 
 #pragma mark - Search
@@ -227,82 +249,94 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
                      isFocused:(BOOL)isFocused
                          scope:(NSString *)scope
                         tokens:(NSArray<NSString *> *)tokens {
+    const auto &keys = ANNEventContract.SearchBarUpdated;
     NSMutableDictionary *body = [@{
-        @"componentId" : componentId ?: @"",
-        @"text" : text ?: @"",
-        @"isFocused" : @(isFocused),
+        keys.componentId : componentId ?: @"",
+        keys.text : text ?: @"",
+        keys.isFocused : @(isFocused),
     } mutableCopy];
-    body[@"scope"] = scope;
-    body[@"tokens"] = tokens;
-    [self sendEvent:@"SearchBarUpdated" body:body];
+    body[keys.scope] = scope;
+    body[keys.tokens] = tokens;
+    [self sendEvent:keys.event body:body];
 }
 
 - (void)sendOnSearchBarSubmitted:(NSString *)componentId
                             text:(NSString *)text
                            scope:(NSString *)scope
                           tokens:(NSArray<NSString *> *)tokens {
+    const auto &keys = ANNEventContract.SearchBarSubmitted;
     NSMutableDictionary *body =
-        [@{@"componentId" : componentId ?: @"", @"text" : text ?: @""} mutableCopy];
-    body[@"scope"] = scope;
-    body[@"tokens"] = tokens;
-    [self sendEvent:@"SearchBarSubmitted" body:body];
+        [@{keys.componentId : componentId ?: @"", keys.text : text ?: @""} mutableCopy];
+    body[keys.scope] = scope;
+    body[keys.tokens] = tokens;
+    [self sendEvent:keys.event body:body];
 }
 
 - (void)sendOnSearchBarCancelPressed:(NSString *)componentId {
-    [self sendEvent:@"SearchBarCancelPressed" body:@{@"componentId" : componentId ?: @""}];
+    const auto &keys = ANNEventContract.SearchBarCancelPressed;
+    [self sendEvent:keys.event body:@{keys.componentId : componentId ?: @""}];
 }
 
 - (void)sendOnSearchSuggestionPicked:(NSString *)componentId suggestionId:(NSString *)suggestionId {
-    [self sendEvent:@"SearchSuggestionPicked"
-               body:@{@"componentId" : componentId ?: @"", @"suggestionId" : suggestionId ?: @""}];
+    const auto &keys = ANNEventContract.SearchSuggestionPicked;
+    [self sendEvent:keys.event
+               body:@{
+                   keys.componentId : componentId ?: @"",
+                   keys.suggestionId : suggestionId ?: @"",
+               }];
 }
 
 #pragma mark - Split view, pair, hinge
 
 - (void)sendSplitViewColumnsStacked:(NSString *)componentId stacked:(BOOL)stacked {
-    [self sendEvent:@"SplitViewColumnsStacked"
-               body:@{@"componentId" : componentId ?: @"", @"stacked" : @(stacked)}];
+    const auto &keys = ANNEventContract.SplitViewColumnsStacked;
+    [self sendEvent:keys.event
+               body:@{keys.componentId : componentId ?: @"", keys.stacked : @(stacked)}];
 }
 
 - (void)sendSplitViewDisplayModeChanged:(NSString *)componentId
                             displayMode:(NSString *)displayMode
                        inspectorVisible:(NSNumber *)inspectorVisible {
+    const auto &keys = ANNEventContract.SplitViewDisplayModeChanged;
     NSMutableDictionary *body = [@{
-        @"componentId" : componentId ?: @"",
-        @"displayMode" : displayMode ?: @"automatic",
+        keys.componentId : componentId ?: @"",
+        keys.displayMode : displayMode ?: @"automatic",
     } mutableCopy];
-    body[@"inspectorVisible"] = inspectorVisible;
-    [self sendEvent:@"SplitViewDisplayModeChanged" body:body];
+    body[keys.inspectorVisible] = inspectorVisible;
+    [self sendEvent:keys.event body:body];
 }
 
 - (void)sendArrangementChanged:(NSString *)componentId state:(NSDictionary<NSString *, id> *)state {
+    const auto &keys = ANNEventContract.ArrangementChanged;
     NSMutableDictionary *body = [state mutableCopy] ?: [NSMutableDictionary new];
-    body[@"componentId"] = componentId;
-    [self sendEvent:@"ArrangementChanged" body:body];
+    body[keys.componentId] = componentId;
+    [self sendEvent:keys.event body:body];
 }
 
 - (void)sendHingeChanged:(NSDictionary<NSString *, id> *)value {
-    [self sendEvent:@"HingeChanged" body:value ?: @{}];
+    [self sendEvent:ANNEventContract.HingeChanged.event body:value ?: @{}];
 }
 
 #pragma mark - Native screens, tabs
 
 - (void)sendNativeScreenCall:(NSDictionary<NSString *, id> *)call {
-    [self sendEvent:@"NativeScreenCall" body:call];
+    [self sendEvent:ANNEventContract.NativeScreenCall.event body:call];
 }
 
 - (void)sendNativeScreenReleased:(NSString *)componentId {
-    [self sendEvent:@"NativeScreenReleased" body:@{@"componentId" : componentId ?: @""}];
+    const auto &keys = ANNEventContract.NativeScreenReleased;
+    [self sendEvent:keys.event body:@{keys.componentId : componentId ?: @""}];
 }
 
 - (void)sendBottomTabSelected:(NSUInteger)selectedTabIndex
            unselectedTabIndex:(NSUInteger)unselectedTabIndex
                  bottomTabsId:(NSString *)bottomTabsId {
-    [self sendEvent:@"BottomTabSelected"
+    const auto &keys = ANNEventContract.BottomTabSelected;
+    [self sendEvent:keys.event
                body:@{
-                   @"selectedTabIndex" : @(selectedTabIndex),
-                   @"unselectedTabIndex" : @(unselectedTabIndex),
-                   @"bottomTabsId" : bottomTabsId ?: @"",
+                   keys.selectedTabIndex : @(selectedTabIndex),
+                   keys.unselectedTabIndex : @(unselectedTabIndex),
+                   keys.bottomTabsId : bottomTabsId ?: @"",
                }];
 }
 
@@ -310,28 +344,31 @@ static NSString *const ANNAppLaunchedEvent = @"ANN.AppLaunched";
                 bottomTabsId:(NSString *)bottomTabsId
                     screenId:(NSString *)screenId
                  wasSelected:(BOOL)wasSelected {
+    const auto &keys = ANNEventContract.BottomTabPressed;
     NSMutableDictionary *body = [@{
-        @"tabIndex" : @(tabIndex),
-        @"bottomTabsId" : bottomTabsId ?: @"",
-        @"wasSelected" : @(wasSelected),
+        keys.tabIndex : @(tabIndex),
+        keys.bottomTabsId : bottomTabsId ?: @"",
+        keys.wasSelected : @(wasSelected),
     } mutableCopy];
-    body[@"screenId"] = screenId;
-    [self sendEvent:@"BottomTabPressed" body:body];
+    body[keys.screenId] = screenId;
+    [self sendEvent:keys.event body:body];
 }
 
 - (void)sendBottomTabLongPressed:(NSUInteger)selectedTabIndex
                     bottomTabsId:(NSString *)bottomTabsId {
-    [self sendEvent:@"BottomTabLongPressed"
+    const auto &keys = ANNEventContract.BottomTabLongPressed;
+    [self sendEvent:keys.event
                body:@{
-                   @"selectedTabIndex" : @(selectedTabIndex),
-                   @"bottomTabsId" : bottomTabsId ?: @"",
+                   keys.selectedTabIndex : @(selectedTabIndex),
+                   keys.bottomTabsId : bottomTabsId ?: @"",
                }];
 }
 
 - (void)sendBottomAccessoryPlacementChanged:(NSString *)componentId
                                   placement:(NSString *)placement {
-    [self sendEvent:@"BottomAccessoryPlacementChanged"
-               body:@{@"componentId" : componentId ?: @"", @"placement" : placement ?: @""}];
+    const auto &keys = ANNEventContract.BottomAccessoryPlacementChanged;
+    [self sendEvent:keys.event
+               body:@{keys.componentId : componentId ?: @"", keys.placement : placement ?: @""}];
 }
 
 @end

package/ios/Core/ANNHinge.mm

@@ -1,5 +1,6 @@
 #import "ANNHinge.h"
 #import "ANNAssert.h"
+#import "ANNEventContract.h"
 #import "ANNUtils.h"
 
 NSNotificationName const ANNHingeDidChangeNotification = @"ANNHingeDidChange";
@@ -34,11 +35,12 @@ static NSDictionary<NSString *, id> *ANNHingeValue(UIHinge *hinge) API_AVAILABLE
     if (!hinge) {
         return @{};
     }
+    const auto &keys = ANNEventContract.HingeChanged;
     NSString *state = ANNHingeStateName(hinge.status);
     if (hinge.status == UIHingeStatusUnknown) {
-        return @{@"state" : state};
+        return @{keys.state : state};
     }
-    return @{@"state" : state, @"angle" : @(round(hinge.angle * 1800 / M_PI) / 10)};
+    return @{keys.state : state, keys.angle : @(round(hinge.angle * 1800 / M_PI) / 10)};
 }
 #endif
 
@@ -94,13 +96,13 @@ static NSDictionary<NSString *, id> *ANNHingeValue(UIHinge *hinge) API_AVAILABLE
         if ([ANNLastHinge isEqualToDictionary:value]) {
             return;
         }
-        previousState = ANNLastHinge[@"state"];
+        previousState = ANNLastHinge[ANNEventContract.HingeChanged.state];
         ANNLastHinge = value;
     }
     if (ANNHingeUpdatesEnabled) {
         [ANNHingeEventEmitter sendHingeChanged:value];
     }
-    id state = value[@"state"];
+    id state = value[ANNEventContract.HingeChanged.state];
     if (previousState != state && ![previousState isEqual:state]) {
         [NSNotificationCenter.defaultCenter postNotificationName:ANNHingeDidChangeNotification
                                                           object:nil];

package/ios/Core/ANNSceneDelegate.mm

@@ -1,9 +1,10 @@
 #import "ANNSceneDelegate.h"
+#import "ANNDeepLinkQueue.h"
 #import "ApexNavigation.h"
-#import <React/RCTLinkingManager.h>
 
 // On the scene life cycle UIKit stops calling the app delegate's URL, user activity and foreground/background
-// methods. The scene forwards them, so AppDelegate overrides (and the deep links of ANNDeepLinkQueue) keep working.
+// methods. The scene forwards them, so AppDelegate overrides (and the deep links of ANNDeepLinkQueue) keep working; the
+// links keep their scene, through which React Native 0.88 and newer take them.
 @implementation ANNSceneDelegate
 
 - (void)scene:(UIScene *)scene
@@ -15,21 +16,21 @@
     self.window = [ApexNavigation attachToWindowScene:(UIWindowScene *)scene];
 
     for (UIOpenURLContext *context in connectionOptions.URLContexts) {
-        [self ann_openURLContext:context];
+        [self ann_openURLContext:context ofScene:scene];
     }
     for (NSUserActivity *activity in connectionOptions.userActivities) {
-        [self ann_continueUserActivity:activity];
+        [self ann_continueUserActivity:activity ofScene:scene];
     }
 }
 
 - (void)scene:(UIScene *)scene openURLContexts:(NSSet<UIOpenURLContext *> *)URLContexts {
     for (UIOpenURLContext *context in URLContexts) {
-        [self ann_openURLContext:context];
+        [self ann_openURLContext:context ofScene:scene];
     }
 }
 
 - (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity {
-    [self ann_continueUserActivity:userActivity];
+    [self ann_continueUserActivity:userActivity ofScene:scene];
 }
 
 - (void)sceneDidBecomeActive:(UIScene *)scene {
@@ -62,7 +63,7 @@
 
 #pragma mark - private
 
-- (void)ann_openURLContext:(UIOpenURLContext *)context {
+- (void)ann_openURLContext:(UIOpenURLContext *)context ofScene:(UIScene *)scene {
     UIApplication *application = UIApplication.sharedApplication;
     id<UIApplicationDelegate> appDelegate = application.delegate;
     if ([appDelegate respondsToSelector:@selector(application:openURL:options:)]) {
@@ -70,22 +71,31 @@
         options[UIApplicationOpenURLOptionsSourceApplicationKey] = context.options.sourceApplication;
         options[UIApplicationOpenURLOptionsAnnotationKey] = context.options.annotation;
         options[UIApplicationOpenURLOptionsOpenInPlaceKey] = @(context.options.openInPlace);
-        [appDelegate application:application openURL:context.URL options:options];
+        [ANNDeepLinkQueue forwardURLContext:context
+                                    ofScene:scene
+                                    through:^{
+                                      [appDelegate application:application openURL:context.URL options:options];
+                                    }];
     } else {
-        [RCTLinkingManager application:application openURL:context.URL options:@{}];
+        [ANNDeepLinkQueue openURLContext:context ofScene:scene];
     }
 }
 
-- (void)ann_continueUserActivity:(NSUserActivity *)activity {
+- (void)ann_continueUserActivity:(NSUserActivity *)activity ofScene:(UIScene *)scene {
     UIApplication *application = UIApplication.sharedApplication;
     id<UIApplicationDelegate> appDelegate = application.delegate;
     if ([appDelegate respondsToSelector:@selector(application:continueUserActivity:restorationHandler:)]) {
-        [appDelegate application:application
-             continueUserActivity:activity
-               restorationHandler:^(NSArray<id<UIUserActivityRestoring>> *restorableObjects){
-               }];
+        [ANNDeepLinkQueue forwardUserActivity:activity
+                                      ofScene:scene
+                                      through:^{
+                                        [appDelegate application:application
+                                             continueUserActivity:activity
+                                               restorationHandler:^(
+                                                   NSArray<id<UIUserActivityRestoring>> *restorableObjects){
+                                               }];
+                                      }];
     } else if ([activity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
-        [RCTLinkingManager application:application openURL:activity.webpageURL options:@{}];
+        [ANNDeepLinkQueue openUserActivity:activity ofScene:scene];
     }
 }
 

package/ios/Core/ANNSystemUI.h

@@ -36,8 +36,9 @@ typedef NS_ENUM(NSInteger, ANNSystemUIQuestion) {
 /// The owner adds the asks UIKit doesn't make — a merge, a side menu at rest, an overlay, a root replaced, the bar of a
 /// stack shown or hidden, the orientation after an appearance — and makes them once per turn of the main queue: a
 /// trigger marks groups, the marks of a turn are coalesced, and at its end UIKit is asked again for each marked group
-/// in the main window and every overlay window. It keeps no values but the last status bar of each window, which only
-/// chooses whether a change of the style animates. Never a wait. Main queue.
+/// in the main window and every overlay window. Each ask of the status bar also lays out the screens' blurs under it
+/// (`statusBar.blur`), then and on the next turn. It keeps no values but the last status bar of each window, which
+/// only chooses whether a change of the style animates. Never a wait. Main queue.
 @interface ANNSystemUI : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;

package/ios/Core/ANNSystemUI.mm

@@ -1,5 +1,6 @@
 #import "ANNSystemUI.h"
 #import "ANNAssert.h"
+#import "ANNComponentPresenter.h"
 #import "ANNComponentViewController.h"
 #import "ANNDefaultOptions.h"
 #import "ANNOverlayCoordinator.h"
@@ -280,6 +281,12 @@ static NSArray<UIViewController *> *ANNChainOf(UIWindow *window) {
             ask();
         }
     }
+    // The status bar hidden or shown moves no view where the safe area stays (a device with a notch): the blurs under
+    // it take its frame now, and once more on the next turn of the main queue, in case UIKit settles it after the ask.
+    [ANNComponentPresenter statusBarDidChange];
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [ANNComponentPresenter statusBarDidChange];
+    });
 }
 
 // A controller that is no node of the layout (React Native's `<Modal>`, an alert, the splash) animates as UIKit's

package/ios/Layouts/Arrangement/ANNArrangementViewController.mm

@@ -4,6 +4,7 @@
 
 #import "ANNArrangementState.h"
 #import "ANNComponentViewController.h"
+#import "ANNEventContract.h"
 #import "ANNExternalViewController.h"
 #import "ANNShownScreens.h"
 #import "ANNUtils.h"
@@ -130,11 +131,12 @@ static BOOL ANNKeepsState(UIViewController *screen) {
 
 static NSDictionary<NSString *, id> *ANNStateOf(NSString *placement, NSString *layout, BOOL front,
                                                 BOOL hidden) {
+    const auto &keys = ANNEventContract.ArrangementChanged;
     return @{
-        @"placement" : placement,
-        @"layout" : layout,
-        @"front" : @(front),
-        @"hidden" : @(hidden),
+        keys.placement : placement,
+        keys.layout : layout,
+        keys.front : @(front),
+        keys.hidden : @(hidden),
     };
 }
 

package/ios/Layouts/Modal/ANNModalCoordinator.mm

@@ -407,7 +407,7 @@ static void ANNCollectIds(UIViewController *node, NSMutableSet<NSString *> *ids)
         ANNNavigationOptions *resolved = [root resolveOptionsWithDefault];
         ANNModalPresentation *presentation =
             [[ANNModalPresentation alloc] initWithOptions:resolved animated:modal.animatedOverride];
-        NSString *problem = [presentation problemPresentingFrom:presenting windowRoot:windowRoot];
+        NSString *problem = [presentation fitToPresenting:presenting windowRoot:windowRoot];
         if (problem) {
             [self failShowOf:modal reason:problem];
             done();

package/ios/Layouts/Modal/ANNModalPresentation.h

@@ -20,7 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// `modalPresentationStyle`: one to one; unset is UIKit's automatic style; an unknown string full screen.
 @property(nonatomic, readonly) UIModalPresentationStyle style;
-/// `modalTransitionStyle`: `coverVertical` unless one of the others is given.
+/// `modalTransitionStyle`: `coverVertical` unless one of the others is given; `partialCurl` only where UIKit curls
+/// (`fitToPresenting:windowRoot:`).
 @property(nonatomic, readonly) UIModalTransitionStyle transitionStyle;
 /// The present is animated: `enter.enabled` is not `false`.
 @property(nonatomic, readonly) BOOL animated;
@@ -47,10 +48,12 @@ NS_ASSUME_NONNULL_BEGIN
                                     animation:(nullable ANNModalAnimationOptions *)animation
                                         under:(nullable UIViewController *)under;
 
-/// Why UIKit can't make this show from `presenting` (`partialCurl` only full screen, to and from), as the reason of the
-/// rejection; nil when it can. `windowRoot` is the main window's root.
-- (nullable NSString *)problemPresentingFrom:(UIViewController *)presenting
-                                  windowRoot:(nullable UIViewController *)windowRoot;
+/// Fits the show to `presenting`, before `prepare:…`: `partialCurl` stays only for a full-screen modal over a
+/// controller that fills the screen (`presenting` is `windowRoot`, the main window's root, or a full-screen modal);
+/// otherwise `transitionStyle` becomes `coverVertical`. Returns why UIKit can't make the show (`presenting` was shown
+/// with `partialCurl`), as the reason of the rejection; nil when it can.
+- (nullable NSString *)fitToPresenting:(UIViewController *)presenting
+                            windowRoot:(nullable UIViewController *)windowRoot;
 
 /// Before `presentViewController:`: the style and the transition, the presentation's delegate, the popover kept a
 /// popover (`adaptive: false`), the sheet, the size, the popover's source on `presentingLayout`, the hold, the