@nativescript-community/ui-material-tabs 7.0.34 → 7.0.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/index.ios.js +30 -20
  2. package/index.ios.js.map +1 -1
  3. package/package.json +4 -4
  4. package/platforms/android/native-api-usage.json +6 -6
package/index.ios.js CHANGED
@@ -134,29 +134,39 @@ var UIPageViewControllerImpl = /** @class */ (function (_super) {
134
134
  var scrollViewTop = 0;
135
135
  var scrollViewHeight = this.view.bounds.size.height + conditionalSafeAreaBottom;
136
136
  if (owner.tabStrip && this.tabBar) {
137
- var viewWidth = this.view.bounds.size.width;
138
- var viewHeight = this.view.bounds.size.height;
139
- var tabBarHeight = this.tabBar.frame.size.height;
140
- var tabBarTop = safeAreaInsetsTop;
141
- scrollViewTop = tabBarHeight;
142
- scrollViewHeight = this.view.bounds.size.height - tabBarHeight + conditionalSafeAreaBottom;
143
- var tabsPosition = owner.tabsPosition;
144
- if (tabsPosition === TabsPosition.Bottom) {
145
- tabBarTop = viewHeight - tabBarHeight - safeAreaInsetsBottom;
146
- scrollViewTop = this.view.frame.origin.y;
147
- scrollViewHeight = viewHeight - tabBarHeight;
137
+ if (owner.tabStrip.visibility === 'visible') {
138
+ this.tabBar.hidden = false;
148
139
  }
149
- var parent = owner.parent;
150
- // Handle Angular scenario where Tabs is in a ProxyViewContainer
151
- // It is possible to wrap components in ProxyViewContainers indefinitely
152
- while (parent && !parent.nativeViewProtected) {
153
- parent = parent.parent;
140
+ else {
141
+ this.tabBar.hidden = true;
154
142
  }
155
- if (parent && majorVersion > 10) {
156
- // TODO: Figure out a better way to handle ViewController nesting/Safe Area nesting
157
- tabBarTop = Math.max(tabBarTop, parent.nativeView.safeAreaInsets.top);
143
+ // failsafe with !this.tabBar.hidden just in some really odd case where hidden is false and collapse is true
144
+ // which should never happen
145
+ if (!owner.tabStrip.isCollapsed || !this.tabBar.hidden) {
146
+ var viewWidth = this.view.bounds.size.width;
147
+ var viewHeight = this.view.bounds.size.height;
148
+ var tabBarHeight = this.tabBar.frame.size.height;
149
+ var tabBarTop = safeAreaInsetsTop;
150
+ scrollViewTop = tabBarHeight;
151
+ scrollViewHeight = this.view.bounds.size.height - tabBarHeight + conditionalSafeAreaBottom;
152
+ var tabsPosition = owner.tabsPosition;
153
+ if (tabsPosition === TabsPosition.Bottom) {
154
+ tabBarTop = viewHeight - tabBarHeight - safeAreaInsetsBottom;
155
+ scrollViewTop = this.view.frame.origin.y;
156
+ scrollViewHeight = viewHeight - tabBarHeight;
157
+ }
158
+ var parent = owner.parent;
159
+ // Handle Angular scenario where Tabs is in a ProxyViewContainer
160
+ // It is possible to wrap components in ProxyViewContainers indefinitely
161
+ while (parent && !parent.nativeViewProtected) {
162
+ parent = parent.parent;
163
+ }
164
+ if (parent && majorVersion > 10) {
165
+ // TODO: Figure out a better way to handle ViewController nesting/Safe Area nesting
166
+ tabBarTop = Math.max(tabBarTop, parent.nativeView.safeAreaInsets.top);
167
+ }
168
+ this.tabBar.frame = CGRectMake(0, tabBarTop, viewWidth, tabBarHeight);
158
169
  }
159
- this.tabBar.frame = CGRectMake(0, tabBarTop, viewWidth, tabBarHeight);
160
170
  }
161
171
  else {
162
172
  this.tabBar.hidden = true;
package/index.ios.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.ios.js","sourceRoot":"../src/","sources":["index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,gEAAgE,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,2EAA2E,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,wEAAwE,CAAC;AAC/J,OAAO,EAAE,QAAQ,EAAE,MAAM,yDAAyD,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AAElD,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoP5C,MAAM,OAAO,IAAK,SAAQ,aAAuC;IACnD,oBAAoB;QAC1B,OAAO,wBAAwB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACrE,CAAC;CACJ"}
1
+ {"version":3,"file":"index.ios.js","sourceRoot":"../src/","sources":["index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,gEAAgE,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,2EAA2E,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,wEAAwE,CAAC;AAC/J,OAAO,EAAE,QAAQ,EAAE,MAAM,yDAAyD,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AAElD,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6P5C,MAAM,OAAO,IAAK,SAAQ,aAAuC;IACnD,oBAAoB;QAC1B,OAAO,wBAAwB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACrE,CAAC;CACJ"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nativescript-community/ui-material-tabs",
3
- "version": "7.0.34",
3
+ "version": "7.0.35",
4
4
  "description": "Material Design Tabs organize content across different screens, data sets, and other interactions.",
5
5
  "main": "./index",
6
6
  "sideEffects": false,
@@ -46,8 +46,8 @@
46
46
  },
47
47
  "readmeFilename": "README.md",
48
48
  "dependencies": {
49
- "@nativescript-community/ui-material-core": "^7.0.34",
50
- "@nativescript-community/ui-material-core-tabs": "^7.0.34"
49
+ "@nativescript-community/ui-material-core": "^7.0.35",
50
+ "@nativescript-community/ui-material-core-tabs": "^7.0.35"
51
51
  },
52
- "gitHead": "e0ccc861d2f6da556d045b069ebc6c8f32a6872a"
52
+ "gitHead": "3db7ec919564d8bf59c0d01e2f2e462fcd8a3134"
53
53
  }
package/platforms/android/native-api-usage.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "uses": [
3
- "android.os:Bundle*",
4
- "android.graphics:Bitmap*",
5
- "android.view.View:OnAttachStateChangeListener*",
6
- "com.nativescript.material.core:TabViewPager*",
7
- "com.nativescript.material.core:TabsBar*",
8
- "com.nativescript.material.core:TabItemSpec*"
3
+ "android.os:Bundle",
4
+ "android.graphics:Bitmap",
5
+ "android.view:View.OnAttachStateChangeListener",
6
+ "com.nativescript.material.core:TabViewPager",
7
+ "com.nativescript.material.core:TabsBar",
8
+ "com.nativescript.material.core:TabItemSpec"
9
9
  ]
10
10
  }