Guard before removing

m-bert · m-bert · commit 886be0a23663 · 2026-04-09T07:59:31.000+02:00
diff --git a/packages/react-native-gesture-handler/apple/RNGestureHandlerButtonComponentView.mm b/packages/react-native-gesture-handler/apple/RNGestureHandlerButtonComponentView.mm
@@ -72,9 +72,12 @@ - (void)mountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childCom
   [_buttonView mountChildComponentView:childComponentView index:index];
 }
 
-- (void)unmountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+- (void)unmountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView
+                            index:(NSInteger)__unused index
 {
-  [childComponentView removeFromSuperview];
+  if (childComponentView.superview == _buttonView) {
+    [childComponentView removeFromSuperview];
+  }
 }
 
 - (LayoutMetrics)buildWrapperMetrics:(const LayoutMetrics &)metrics

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,12 @@ - (void)mountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childCom`
`72`	`72`	`[_buttonView mountChildComponentView:childComponentView index:index];`
`73`	`73`	`}`
`74`	`74`
`75`		`-- (void)unmountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index`
	`75`	`+- (void)unmountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView`
	`76`	`+ index:(NSInteger)__unused index`
`76`	`77`	`{`
`77`		`- [childComponentView removeFromSuperview];`
	`78`	`+ if (childComponentView.superview == _buttonView) {`
	`79`	`+ [childComponentView removeFromSuperview];`
	`80`	`+ }`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`- (LayoutMetrics)buildWrapperMetrics:(const LayoutMetrics &)metrics`