Skip to content

Commit 0df1691

Browse files
committed
chore: refactor
1 parent c4a108f commit 0df1691

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

src/tabs/index.ios.ts

+22-17
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,35 @@ class MDCTabBarViewDelegateImpl extends NSObject implements MDCTabBarViewDelegat
2323
}
2424

2525
public tabBarViewShouldSelectItem(tabBar: MDCTabBarView, item: UITabBarItem): boolean {
26-
const owner = this._owner.get();
27-
const shouldSelectItem = owner.mCanSelectItem;
28-
const selectedIndex = owner.tabBarItems.indexOf(item);
26+
const owner = this._owner?.get();
27+
if (owner) {
28+
const shouldSelectItem = owner.mCanSelectItem;
29+
const selectedIndex = owner.tabBarItems.indexOf(item);
2930

30-
if (owner.selectedIndex !== selectedIndex) {
31-
owner.beginTabTransition();
32-
}
31+
if (owner.selectedIndex !== selectedIndex) {
32+
owner.beginTabTransition();
33+
}
3334

34-
const tabStrip = owner.tabStrip;
35-
const tabStripItems = tabStrip && tabStrip.items;
35+
const tabStrip = owner.tabStrip;
36+
const tabStripItems = tabStrip && tabStrip.items;
3637

37-
if (tabStripItems && tabStripItems[selectedIndex]) {
38-
tabStripItems[selectedIndex]._emit(TabStripItem.tapEvent);
39-
tabStrip.notify({ eventName: TabStrip.itemTapEvent, object: tabStrip, index: selectedIndex });
40-
}
38+
if (tabStripItems && tabStripItems[selectedIndex]) {
39+
tabStripItems[selectedIndex]._emit(TabStripItem.tapEvent);
40+
tabStrip.notify({ eventName: TabStrip.itemTapEvent, object: tabStrip, index: selectedIndex });
41+
}
4142

42-
return shouldSelectItem;
43+
return shouldSelectItem;
44+
}
45+
return false;
4346
}
4447

4548
public tabBarViewDidSelectItem(tabBar: MDCTabBarView, selectedItem: UITabBarItem): void {
46-
const owner = this._owner.get();
47-
const tabBarItems = owner.tabBarItems;
48-
const selectedIndex = tabBarItems.indexOf(selectedItem);
49-
owner.selectedIndex = selectedIndex;
49+
const owner = this._owner?.get();
50+
if (owner) {
51+
const tabBarItems = owner.tabBarItems;
52+
const selectedIndex = tabBarItems.indexOf(selectedItem);
53+
owner.selectedIndex = selectedIndex;
54+
}
5055
}
5156
}
5257

0 commit comments

Comments
 (0)