Skip to content

Commit 6d1fa4f

Browse files
committed
Merge branch 'master' of github.com:nativescript-community/ui-material-components
2 parents 77e0b84 + 5a2707e commit 6d1fa4f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

packages/core-tabs/platforms/android/java/com/nativescript/material/core/TabsBar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void setViewPager(ViewPager2 viewPager) {
178178
public void setItems(TabItemSpec[] items) {
179179
mTabStrip.removeAllViews();
180180
mTabItems = items;
181-
if (mViewPager != null) {
181+
if (mViewPager != null && mViewPager.getAdapter() != null) {
182182
populateTabStrip();
183183
}
184184

src/tabs/index.ios.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class UIPageViewControllerImpl extends UIPageViewController {
207207
let scrollView: UIScrollView = null;
208208

209209
for (let i = 0; i < subViews.count; i++) {
210-
const view: UIView = subViews[i];
210+
const view: UIView = subViews.objectAtIndex(i);
211211
if (view instanceof UIScrollView && !(view instanceof MDCTabBarView)) {
212212
scrollView = view;
213213
}

0 commit comments

Comments
 (0)