Skip to content

fix(iOS, Tabs): remove invalidate call in RNSTabsBottomAccessoryComponentView.didMoveToWindow #4155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sgaczol wants to merge 3 commits into
base: main
Choose a base branch
from
+10 −2
Open

fix(iOS, Tabs): remove invalidate call in RNSTabsBottomAccessoryComponentView.didMoveToWindow #4155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e82ba35
invalidate call removal in didMoveToWindow
sgaczol Jun 11, 2026
57e62c5
unregisterForAccessoryFrameChanges if self.window == nil
sgaczol Jun 11, 2026
90f9724
didMoveToWindow modified in RNSTabsBottomAccessoryContentComponentView
sgaczol Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ - (void)didMoveToWindow
if (self.window != nil) {
[_helper registerForAccessoryFrameChanges];
} else {

@kligarski kligarski Jun 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about similar if in RNSTabsBottomAccessoryContentComponentView - we have (self.window != nil ? self : nil) threre. Maybe we should early return there if window is nil?

@kligarski kligarski Jun 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

- (void)didMoveToWindow
{
  if (self.window == nil) {
    return;
  }
  
  if ([self.superview isKindOfClass:[RNSTabsBottomAccessoryComponentView class]]) {
    RNSTabsBottomAccessoryComponentView *accessoryView =
        static_cast<RNSTabsBottomAccessoryComponentView *>(self.superview);
    _accessoryView = accessoryView;
    [_accessoryView.helper setContentView:self forEnvironment:_environment];
  } else {
    [_accessoryView.helper setContentView:nil forEnvironment:_environment];
    _accessoryView = nil;
  }
}

@sgaczol sgaczol Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done: 90f9724

[self invalidate];
[_helper unregisterForAccessoryFrameChanges];
}
}

Expand Down
6 changes: 5 additions & 1 deletion ios/tabs/bottom-accessory/RNSTabsBottomAccessoryContentComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,15 @@ - (instancetype)initWithFrame:(CGRect)frame

- (void)didMoveToWindow
{
if (self.window == nil) {
return;
}

if ([self.superview isKindOfClass:[RNSTabsBottomAccessoryComponentView class]]) {
RNSTabsBottomAccessoryComponentView *accessoryView =
static_cast<RNSTabsBottomAccessoryComponentView *>(self.superview);
_accessoryView = accessoryView;
[_accessoryView.helper setContentView:(self.window != nil ? self : nil) forEnvironment:_environment];
[_accessoryView.helper setContentView:self forEnvironment:_environment];
} else {
[_accessoryView.helper setContentView:nil forEnvironment:_environment];
_accessoryView = nil;
Expand Down
4 changes: 4 additions & 0 deletions ios/tabs/bottom-accessory/RNSTabsBottomAccessoryHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ API_AVAILABLE(ios(26.0))
* `RNSTabBarController`.
*/
- (void)registerForAccessoryFrameChanges;
/**
* Removes the KVO registration set up by `registerForAccessoryFrameChanges`.
*/
- (void)unregisterForAccessoryFrameChanges;
/**
* Invalidates observers, display link (if it is used); resets internal properties.
*/
Expand Down
Loading