@nativescript-community/ui-material-bottom-navigation 6.2.14 → 6.2.17

package/index.ios.d.ts

@@ -1,5 +1,6 @@
 import { TabContentItem } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-content-item';
 import { TabNavigationBase } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-navigation-base';
+import { TabsPosition } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-navigation/index-common';
 import { TabStrip } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-strip';
 import { TabStripItem } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-strip-item';
 import { Color, CoreTypes, Font, Property } from '@nativescript/core';
@@ -14,16 +15,17 @@ declare class UITabBarControllerImpl extends UITabBarController {
 }
 export declare const iosCustomPositioningProperty: Property<BottomNavigation, boolean>;
 export declare class BottomNavigation extends TabNavigationBase {
+    tabsPosition: TabsPosition;
     viewController: UITabBarControllerImpl;
     items: TabContentItem[];
-    _ios: UITabBarControllerImpl;
-    private _delegate;
-    private _moreNavigationControllerDelegate;
-    private _iconsCache;
-    private _selectedItemColor;
-    private _unSelectedItemColor;
+    private mDelegate;
+    private mMoreNavigationControllerDelegate;
+    private mIconsCache;
+    private mSelectedItemColor;
+    private mUnSelectedItemColor;
     iosCustomPositioning: boolean;
     constructor();
+    createNativeView(): UIView;
     initNativeView(): void;
     disposeNativeView(): void;
     onLoaded(): void;

package/index.ios.js

@@ -1,8 +1,9 @@
 import { TabContentItem } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-content-item';
 import { TabNavigationBase, getIconSpecSize, itemsProperty, selectedIndexProperty, tabStripProperty } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-navigation-base';
+import { TabsPosition } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-navigation/index-common';
 import { TabStrip } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-strip';
 import { TabStripItem } from '@nativescript-community/ui-material-core/tab-navigation-base/tab-strip-item';
-import { CSSType, Color, Device, Font, Frame, IOSHelper, ImageSource, Property, Utils, View, booleanConverter } from '@nativescript/core';
+import { CSSType, Color, CoreTypes, Device, Font, Frame, IOSHelper, ImageSource, Property, Utils, View, booleanConverter } from '@nativescript/core';
 import { getTransformedText } from '@nativescript/core/ui/text-base';
 import { iOSNativeHelper } from '@nativescript/core/utils';
 export { TabContentItem, TabStrip, TabStripItem };
@@ -152,7 +153,7 @@ var UINavigationControllerDelegateImpl = /** @class */ (function (_super) {
         if (owner) {
             // If viewController is one of our tab item controllers, then "< More" will be visible shortly.
             // Otherwise viewController is the UIMoreListController which shows the list of all tabs beyond the 4th tab.
-            var backToMoreWillBeVisible = owner._ios.viewControllers.containsObject(viewController);
+            var backToMoreWillBeVisible = owner.viewController.viewControllers.containsObject(viewController);
             owner._handleTwoNavigationBars(backToMoreWillBeVisible);
         }
     };
@@ -237,21 +238,24 @@ export const iosCustomPositioningProperty = new Property({
 let BottomNavigation = class BottomNavigation extends TabNavigationBase {
     constructor() {
         super();
-        this._iconsCache = {};
-        this.viewController = this._ios = UITabBarControllerImpl.initWithOwner(new WeakRef(this));
-        this.nativeViewProtected = this._ios.view;
+        this.tabsPosition = TabsPosition.Bottom;
+        this.mIconsCache = {};
+        this.viewController = UITabBarControllerImpl.initWithOwner(new WeakRef(this));
+    }
+    createNativeView() {
+        return this.viewController.view;
     }
     initNativeView() {
         super.initNativeView();
-        this._delegate = UITabBarControllerDelegateImpl.initWithOwner(new WeakRef(this));
-        this._moreNavigationControllerDelegate = UINavigationControllerDelegateImpl.initWithOwner(new WeakRef(this));
+        this.mDelegate = UITabBarControllerDelegateImpl.initWithOwner(new WeakRef(this));
+        this.mMoreNavigationControllerDelegate = UINavigationControllerDelegateImpl.initWithOwner(new WeakRef(this));
         if (!this.tabStrip) {
             this.viewController.tabBar.hidden = true;
         }
     }
     disposeNativeView() {
-        this._delegate = null;
-        this._moreNavigationControllerDelegate = null;
+        this.mDelegate = null;
+        this.mMoreNavigationControllerDelegate = null;
         super.disposeNativeView();
     }
     onLoaded() {
@@ -262,19 +266,19 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
         if (selectedView instanceof Frame) {
             selectedView._pushInFrameStackRecursive();
         }
-        this._ios.delegate = this._delegate;
+        this.viewController.delegate = this.mDelegate;
         this.onSelectedIndexChanged(selectedIndex, selectedIndex);
     }
     onUnloaded() {
-        this._ios.delegate = null;
-        this._ios.moreNavigationController.delegate = null;
+        this.viewController.delegate = null;
+        this.viewController.moreNavigationController.delegate = null;
         super.onUnloaded();
         this.items.forEach((item, i) => {
             item.unloadView(item.content);
         });
     }
     get ios() {
-        return this._ios;
+        return this.viewController;
     }
     layoutNativeView(left, top, right, bottom) {
         if (this.iosCustomPositioning) {
@@ -319,10 +323,10 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
         super.onSelectedIndexChanged(oldIndex, newIndex);
     }
     getTabBarBackgroundColor() {
-        return this._ios.tabBar.barTintColor;
+        return this.viewController.tabBar.barTintColor;
     }
     setTabBarBackgroundColor(value) {
-        this._ios.tabBar.barTintColor = value instanceof Color ? value.ios : value;
+        this.viewController.tabBar.barTintColor = value instanceof Color ? value.ios : value;
         this.updateAllItemsColors();
     }
     setTabBarItemTitle(tabStripItem, value) {
@@ -338,16 +342,16 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
         this.setViewAttributes(tabStripItem.nativeView, tabStripItem.label);
     }
     setItemColors() {
-        if (this._selectedItemColor) {
-            this.viewController.tabBar.selectedImageTintColor = this._selectedItemColor.ios;
+        if (this.mSelectedItemColor) {
+            this.viewController.tabBar.selectedImageTintColor = this.mSelectedItemColor.ios;
         }
-        if (this._unSelectedItemColor) {
-            this.viewController.tabBar.unselectedItemTintColor = this._unSelectedItemColor.ios;
+        if (this.mUnSelectedItemColor) {
+            this.viewController.tabBar.unselectedItemTintColor = this.mUnSelectedItemColor.ios;
         }
     }
     setIconColor(tabStripItem, forceReload = false) {
-        if (forceReload || (!this._unSelectedItemColor && !this._selectedItemColor)) {
-            const tabStripColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor;
+        if (forceReload || (!this.mUnSelectedItemColor && !this.mSelectedItemColor)) {
+            const tabStripColor = this.selectedIndex === tabStripItem._index ? this.mSelectedItemColor : this.mUnSelectedItemColor;
             const image = this.getIcon(tabStripItem, tabStripColor);
             tabStripItem.nativeView.image = image;
             tabStripItem.nativeView.selectedImage = image;
@@ -366,23 +370,23 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
         tabStripItem.nativeView.title = getTransformedText(tabStripItem.label.text, value);
     }
     getTabBarHighlightColor() {
-        return this._ios.tabBar.tintColor;
+        return this.viewController.tabBar.tintColor;
     }
     setTabBarHighlightColor(value) {
-        this._ios.tabBar.tintColor = value instanceof Color ? value.ios : value;
+        this.viewController.tabBar.tintColor = value instanceof Color ? value.ios : value;
     }
     getTabBarSelectedItemColor() {
-        return this._selectedItemColor;
+        return this.mSelectedItemColor;
     }
     setTabBarSelectedItemColor(value) {
-        this._selectedItemColor = value;
+        this.mSelectedItemColor = value;
         this.updateAllItemsColors();
     }
     getTabBarUnSelectedItemColor() {
-        return this._unSelectedItemColor;
+        return this.mUnSelectedItemColor;
     }
     setTabBarUnSelectedItemColor(value) {
-        this._unSelectedItemColor = value;
+        this.mUnSelectedItemColor = value;
         this.updateAllItemsColors();
     }
     onMeasure(widthMeasureSpec, heightMeasureSpec) {
@@ -395,8 +399,8 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
         this.setMeasuredDimension(widthAndState, heightAndState);
     }
     _onViewControllerShown(viewController) {
-        if (this._ios.viewControllers && this._ios.viewControllers.containsObject(viewController)) {
-            this.selectedIndex = this._ios.viewControllers.indexOfObject(viewController);
+        if (this.viewController.viewControllers && this.viewController.viewControllers.containsObject(viewController)) {
+            this.selectedIndex = this.viewController.viewControllers.indexOfObject(viewController);
         }
         else {
         }
@@ -447,13 +451,13 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
     setViewControllers(items) {
         const length = items ? items.length : 0;
         if (length === 0) {
-            this._ios.viewControllers = null;
+            this.viewController.viewControllers = null;
             return;
         }
         items = items.slice(0, maxTabsCount);
         const controllers = NSMutableArray.alloc().initWithCapacity(length);
         if (this.tabStrip) {
-            this.tabStrip.setNativeView(this._ios.tabBar);
+            this.tabStrip.setNativeView(this.viewController.tabBar);
         }
         items.forEach((item, i) => {
             const controller = this.getViewController(item);
@@ -469,21 +473,21 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
             controllers.addObject(controller);
         });
         this.setItemImages();
-        this._ios.viewControllers = controllers;
-        this._ios.customizableViewControllers = null;
-        this._ios.moreNavigationController.delegate = this._moreNavigationControllerDelegate;
+        this.viewController.viewControllers = controllers;
+        this.viewController.customizableViewControllers = null;
+        this.viewController.moreNavigationController.delegate = this.mMoreNavigationControllerDelegate;
     }
     setItemImages() {
-        if (this._selectedItemColor || this._unSelectedItemColor) {
+        if (this.mSelectedItemColor || this.mUnSelectedItemColor) {
             if (this.tabStrip && this.tabStrip.items) {
                 this.tabStrip.items.forEach((item) => {
-                    if (this._unSelectedItemColor && item.nativeView) {
-                        item.nativeView.image = this.getIcon(item, this._unSelectedItemColor);
-                        item.nativeView.tintColor = this._unSelectedItemColor;
+                    if (this.mUnSelectedItemColor && item.nativeView) {
+                        item.nativeView.image = this.getIcon(item, this.mUnSelectedItemColor);
+                        item.nativeView.tintColor = this.mUnSelectedItemColor;
                     }
-                    if (this._selectedItemColor && item.nativeView) {
-                        item.nativeView.selectedImage = this.getIcon(item, this._selectedItemColor);
-                        item.nativeView.tintColor = this._selectedItemColor;
+                    if (this.mSelectedItemColor && item.nativeView) {
+                        item.nativeView.selectedImage = this.getIcon(item, this.mSelectedItemColor);
+                        item.nativeView.tintColor = this.mSelectedItemColor;
                     }
                 });
             }
@@ -537,7 +541,7 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
         }
         const iconTag = [iconSource, font.fontStyle, font.fontWeight, font.fontSize, font.fontFamily, color].join(';');
         let isFontIcon = false;
-        let image = this._iconsCache[iconTag];
+        let image = this.mIconsCache[iconTag];
         if (!image) {
             let is;
             if (Utils.isFontIconURI(iconSource)) {
@@ -558,7 +562,7 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
                     renderingMode = this.getIconRenderingMode();
                 }
                 const originalRenderedImage = image.imageWithRenderingMode(renderingMode);
-                this._iconsCache[iconTag] = originalRenderedImage;
+                this.mIconsCache[iconTag] = originalRenderedImage;
                 image = originalRenderedImage;
             }
             else {
@@ -583,8 +587,8 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
     }
     [selectedIndexProperty.setNative](value) {
         if (value > -1) {
-            this._ios._willSelectViewController = this._ios.viewControllers[value];
-            this._ios.selectedIndex = value;
+            this.viewController._willSelectViewController = this.viewController.viewControllers[value];
+            this.viewController.selectedIndex = value;
         }
     }
     [itemsProperty.getDefault]() {
@@ -616,15 +620,15 @@ let BottomNavigation = class BottomNavigation extends TabNavigationBase {
         const tabItemTextColor = view.style.color;
         const textColor = tabItemTextColor instanceof Color ? tabItemTextColor.ios : null;
         const attributes = { [NSFontAttributeName]: font };
-        if (!this._selectedItemColor && !this._unSelectedItemColor) {
+        if (!this.mSelectedItemColor && !this.mUnSelectedItemColor) {
             if (textColor) {
                 attributes[UITextAttributeTextColor] = textColor;
                 attributes[NSForegroundColorAttributeName] = textColor;
             }
         }
         else {
-            this.viewController.tabBar.unselectedItemTintColor = this._unSelectedItemColor && this._unSelectedItemColor.ios;
-            this.viewController.tabBar.selectedImageTintColor = this._selectedItemColor && this._selectedItemColor.ios;
+            this.viewController.tabBar.unselectedItemTintColor = this.mUnSelectedItemColor && this.mUnSelectedItemColor.ios;
+            this.viewController.tabBar.selectedImageTintColor = this.mSelectedItemColor && this.mSelectedItemColor.ios;
         }
         item.setTitleTextAttributesForState(attributes, 4);
         item.setTitleTextAttributesForState(attributes, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-material-bottom-navigation",
-    "version": "6.2.14",
+    "version": "6.2.17",
     "description": "Material Design Bottom Navigation bars allow movement between primary destinations in an app. Tapping on a bottom navigation icon takes you directly to the associated view or refreshes the currently active view.",
     "main": "bottomnavigation",
     "sideEffects": false,
@@ -12,9 +12,10 @@
         }
     },
     "scripts": {
-        "tsc": "../../node_modules/.bin/cpy ../../src/bottom-navigation/index.d.ts ./ && ../../node_modules/.bin/tsc --skipLibCheck -d",
-        "tsc-win": "..\\..\\node_modules\\.bin\\cpy ..\\..\\src\\bottom-navigation\\index.d.ts .\\ && ..\\..\\node_modules\\.bin\\tsc --skipLibCheck -d",
+        "tsc": "../../node_modules/.bin/cpy ../../src/bottom-navigation/index.d.ts ./ && ../../node_modules/.bin/tsc -d",
+        "tsc-win": "..\\..\\node_modules\\.bin\\cpy ..\\..\\src\\bottom-navigation\\index.d.ts .\\ && ..\\..\\node_modules\\.bin\\tsc -d",
         "build": "npm run tsc",
+        "build.watch": "npm run tsc -- -w",
         "build.win": "npm run tsc-win",
         "build.all": "npm run build && npm run build.angular",
         "build.all.win": "npm run build.win && npm run build.angular.win",
@@ -50,7 +51,7 @@
     },
     "readmeFilename": "README.md",
     "dependencies": {
-        "@nativescript-community/ui-material-core": "^6.2.14"
+        "@nativescript-community/ui-material-core": "^6.2.17"
     },
-    "gitHead": "750b56e352d255473933621e1466b3bd891f930d"
+    "gitHead": "c3cf2af896fcd0db9d89094415175b99a38ac129"
 }

package/pnpm-lock.yaml

@@ -0,0 +1,90 @@
+dependencies:
+  '@nativescript-community/ui-material-core': 5.2.1
+lockfileVersion: 5.2
+packages:
+  /@nativescript-community/ui-material-core/5.2.1:
+    dependencies:
+      '@nativescript/hook': 2.0.0
+    dev: false
+    requiresBuild: true
+    resolution:
+      integrity: sha512-Nu0ujgzvpH4sN7Rebk3YsEcnbTR2uWXL+xy95gXflR42qa1YUVgMTXZJJm3sEcCEMKeneMODc8lpIrLOAf6mCg==
+  /@nativescript/hook/2.0.0:
+    dependencies:
+      glob: 7.1.6
+      mkdirp: 1.0.4
+    dev: false
+    resolution:
+      integrity: sha512-v3Hj3Zpd69sQJfFpDNXonV0EjO1a2OL4l48wlo1Ycsqk4r7RY822d/irFTjt0LllRG0OcdEGgfG6wKb0YgPyHw==
+  /balanced-match/1.0.0:
+    dev: false
+    resolution:
+      integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  /brace-expansion/1.1.11:
+    dependencies:
+      balanced-match: 1.0.0
+      concat-map: 0.0.1
+    dev: false
+    resolution:
+      integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  /concat-map/0.0.1:
+    dev: false
+    resolution:
+      integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  /fs.realpath/1.0.0:
+    dev: false
+    resolution:
+      integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  /glob/7.1.6:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.0.4
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+    dev: false
+    resolution:
+      integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  /inflight/1.0.6:
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+    dev: false
+    resolution:
+      integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  /inherits/2.0.4:
+    dev: false
+    resolution:
+      integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+  /minimatch/3.0.4:
+    dependencies:
+      brace-expansion: 1.1.11
+    dev: false
+    resolution:
+      integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  /mkdirp/1.0.4:
+    dev: false
+    engines:
+      node: '>=10'
+    hasBin: true
+    resolution:
+      integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+  /once/1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+    resolution:
+      integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  /path-is-absolute/1.0.1:
+    dev: false
+    engines:
+      node: '>=0.10.0'
+    resolution:
+      integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  /wrappy/1.0.2:
+    dev: false
+    resolution:
+      integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+specifiers:
+  '@nativescript-community/ui-material-core': ^5.2.1

package/react/index.js

@@ -1,4 +1,4 @@
-import { registerElement } from 'react-nativescript';
+import { NSVElement, registerElement } from 'react-nativescript';
 import { warn } from 'react-nativescript/dist/shared/Logger';
 import { BottomNavigation, TabContentItem, TabStrip } from '../';
 let installed = false;