Closes #3081

lib/ios/RNNCommandsHandler.m

@@ -20,7 +20,7 @@
 	_controllerFactory = controllerFactory;
 	_navigationStackManager = [[RNNNavigationStackManager alloc] initWithStore:_store];
 	_modalManager = [[RNNModalManager alloc] initWithStore:_store];
-	_overlayManager = [[RNNOverlayManager alloc] init];
+	_overlayManager = [[RNNOverlayManager alloc] initWithStore:_store];
 	return self;
 }
 

lib/ios/RNNOverlayManager.h

@@ -4,6 +4,8 @@
 
 @interface RNNOverlayManager : NSObject
 
+- (instancetype)initWithStore:(RNNStore*)store;
+
 - (void)showOverlay:(UIViewController*)viewController completion:(RNNTransitionCompletionBlock)completion;
 - (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
 

lib/ios/RNNOverlayManager.m

@@ -2,11 +2,13 @@
 
 @implementation RNNOverlayManager {
 	NSMutableDictionary* _overlayDict;
+	RNNStore* _store;
 }
 
-- (instancetype)init {
+- (instancetype)initWithStore:(RNNStore *)store {
 	self = [super init];
 	_overlayDict = [[NSMutableDictionary alloc] init];
+	_store = store;
 	return self;
 }
 
@@ -33,6 +35,7 @@
 - (void)removeCachedOverlay:(RNNRootViewController*)viewController {
 	[viewController.view removeFromSuperview];
 	[_overlayDict removeObjectForKey:viewController.componentId];
+	[_store removeComponent:viewController.componentId];
 }
 
 @end