Merge branch 'master' of github.com:GeekyAnts/NativeBase

CONTRIBUTING.md

@@ -51,7 +51,7 @@ NativeBase is an infant and growing rapidly, so we planned to stick to Git Flow.
 -	When a fresh new feature is requested, try to give as many details on your need as feasible. We prefer that you explain the need rather than explaining a technical solution for it. That might trigger a nice conversation on finding the best and broadest technical solution to a specific need.
 
 
-####c. Code Fixes and Enhancements
+#### c. Code Fixes and Enhancements
 
 -	Before submitting a pull request, we appreciate if you create an issue first to discuss the change.
 -	Fork the repo you are planning to work on.

ISSUE_TEMPLATE.txt

@@ -1,6 +1,10 @@
 Hi! Thanks for trying out NativeBase!
 Due to the overwhelming requests and issues/questions we ask you to add the following details with your issue.
 
+Please check the existing open/closed issues for a possible duplicate before creating a new issue :)
+
+Also **DO** fill out the below form to give us a better idea about your environment and help us debug it quicker. Issues without the required details will mostly be unattended to.
+
 ## react-native, react and native-base version
 ## Expected behaviour
 ## Actual behaviour

dist/src/basic/Icon/NBIcons.json

@@ -121,7 +121,7 @@
   },
   "arrow-down": {
     "android": {
-      "default": "md-arro-down",
+      "default": "md-arrow-down",
       "active": "md-arrow-down"
     },
     "ios": {

index.d.ts

@@ -1,36 +1,37 @@
 import * as React from 'react';
+import * as ReactNative from 'react-native';
 
 declare module 'native-base' {
     namespace NativeBase {
 
-        interface Text extends React.TextProperties {
+        interface Text extends ReactNative.TextProperties {
             note?: boolean
         }
 
-        interface Switch extends React.SwitchProperties { }
+        interface Switch extends ReactNative.SwitchProperties { }
 
-        interface View extends React.ViewProperties {
+        interface View extends ReactNative.ViewProperties {
             padder?: boolean,
         }
 
-        interface Picker extends React.PickerProperties {
+        interface Picker extends ReactNative.PickerProperties {
             iosHeader?: string,
             inlineLabel?: boolean,
         }
 
-        interface H1 extends React.TextProperties { }
+        interface H1 extends ReactNative.TextProperties { }
         /**
          * see Widget Text.js
          */
-        interface H2 extends React.TextProperties { }
+        interface H2 extends ReactNative.TextProperties { }
         /**
          * see Widget Text.js
          */
-        interface H3 extends React.TextProperties { }
+        interface H3 extends ReactNative.TextProperties { }
         /**
          * see Widget Text.js
          */
-        interface Badge extends React.ViewProperties { }
+        interface Badge extends ReactNative.ViewProperties { }
         /**
          * see Widget CardSwiper.js
          */
@@ -71,7 +72,7 @@ declare module 'native-base' {
              * Default: regular
              */
             rounded?: boolean,
-            style?: React.ViewStyle,
+            style?: ReactNative.ViewStyle,
             /**
              * It is advisable to use hasTabs prop with Header while using Tab
              */
@@ -94,25 +95,25 @@ declare module 'native-base' {
          * see Widget FooterTab.js
          */
         interface FooterTab {
-            style?: React.ViewStyle
+            style?: ReactNative.ViewStyle
         }
         /**
          * see Widget Footer.js
          */
         interface Footer {
-            style?: React.ViewStyle
+            style?: ReactNative.ViewStyle
         }
         /**
          * see Widget Title.js
          */
         interface Title {
-            style?: React.ViewStyle
+            style?: ReactNative.ViewStyle
         }
         /**
          * see Widget Subtitle/index.js
          */
         interface SubTitle {
-            style?: React.ViewStyle
+            style?: ReactNative.ViewStyle
         }
         /**
          * see Widget Container.js
@@ -122,7 +123,7 @@ declare module 'native-base' {
              * The theme prop can be applied to any component of NativeBase.
              */
             theme?: Object,
-            style?: React.ViewStyle
+            style?: ReactNative.ViewStyle
         }
         /**
          * see Widget Content.js
@@ -133,20 +134,20 @@ declare module 'native-base' {
              */
             theme?: Object,
             padder?: boolean,
-            style?: React.ViewStyle
+            style?: ReactNative.ViewStyle
         }
         /**
          * see Widget Button.js
          */
-        interface Button extends React.TouchableOpacityProperties {
+        interface Button extends ReactNative.TouchableOpacityProperties {
             /**
              * Defines button style
              */
-            style?: React.ViewStyle,
+            style?: ReactNative.ViewStyle,
             /**
              * Defines button text style
              */
-            textStyle?: React.TextStyle,
+            textStyle?: ReactNative.TextStyle,
             /**
              * Block level button
              */
@@ -216,7 +217,7 @@ declare module 'native-base' {
         /**
          * see Widget ListItem.js
          */
-        interface ListItem extends React.TouchableOpacityProperties {
+        interface ListItem extends ReactNative.TouchableOpacityProperties {
             header?: boolean,
             /**
              * Aligns icon to the right of ListItem.
@@ -242,15 +243,15 @@ declare module 'native-base' {
         /**
          * see Widget CardItem.js
          */
-        interface CardItem extends React.TouchableOpacityProperties {
+        interface CardItem extends ReactNative.TouchableOpacityProperties {
             header?: boolean,
             cardBody?: boolean,
             button?: boolean
         }
         /**
          * Override React ListViewProperties
          */
-        interface ReactListViewProperties extends React.ScrollViewProperties, React.Props<React.ListViewStatic> {
+        interface ReactListViewProperties extends ReactNative.ScrollViewProperties, React.Props<ReactNative.ListViewStatic> {
             /**
              * Flag indicating whether empty section headers should be rendered.
              * In the future release empty section headers will be rendered by
@@ -336,7 +337,7 @@ declare module 'native-base' {
              * A function that returns the scrollable component in which the list rows are rendered.
              * Defaults to returning a ScrollView with the given props.
              */
-            renderScrollComponent?: (props: React.ScrollViewProperties) => React.ReactElement<React.ScrollViewProperties>
+            renderScrollComponent?: (props: ReactNative.ScrollViewProperties) => React.ReactElement<ReactNative.ScrollViewProperties>
 
             /**
              * (sectionData, sectionID) => renderable
@@ -374,26 +375,26 @@ declare module 'native-base' {
              */
             stickyHeaderIndices?: number[]
 
-            ref?: React.Ref<React.ListViewStatic & React.ScrollViewStatic & React.ViewStatic>
+            ref?: React.Ref<ReactNative.ListViewStatic & ReactNative.ScrollViewStatic & ReactNative.ViewStatic>
         }
         /**
          * see Widget Card.js
          */
-        interface Card extends React.ViewProperties, ReactListViewProperties {
+        interface Card extends ReactNative.ViewProperties, ReactListViewProperties {
             dataArray?: Array<any>,
-            style?: React.Ref<React.ViewProperties | React.ListViewProperties>
-            ref?: React.Ref<React.ViewProperties | ReactListViewProperties>,
+            style?: React.Ref<ReactNative.ViewProperties | ReactNative.ListViewProperties>
+            ref?: React.Ref<ReactNative.ViewProperties | ReactListViewProperties>,
         }
         /**
          * react-native-easy-grid
          */
-        interface Grid extends React.ViewProperties { }
-        interface Row extends React.ViewProperties { size?: number }
-        interface Col extends React.ViewProperties { size?: number }
+        interface Grid extends ReactNative.ViewProperties { }
+        interface Row extends ReactNative.ViewProperties { size?: number }
+        interface Col extends ReactNative.ViewProperties { size?: number }
         /**
          * see Widget InputGroup.js
          */
-        interface InputGroup extends React.ViewProperties {
+        interface InputGroup extends ReactNative.ViewProperties {
             /**
              * Wraps the textbox with predefined border options.
              * Default: underline
@@ -422,7 +423,7 @@ declare module 'native-base' {
         /**
          * see Widget Input.js
          */
-        interface Input extends React.TextInputProperties {
+        interface Input extends ReactNative.TextInputProperties {
             label?: string,
             /**
              * Label placed to the left of the input element.
@@ -439,21 +440,21 @@ declare module 'native-base' {
         /**
          * see Widget Textarea.js
          */
-        interface Textarea extends React.TextInputProperties {
+        interface Textarea extends ReactNative.TextInputProperties {
             rowSpan: number;
         }
         /**
          * see Widget Icon.js
          */
         interface Icon {
             name: string,
-            style?: React.TextStyle,
+            style?: ReactNative.TextStyle,
             active?:boolean
         }
         /**
          * see Widget Icon.js
          */
-        interface Thumbnail extends React.ImageProperties {
+        interface Thumbnail extends ReactNative.ImageProperties {
             /**
              * Dimension of thumbnail.
              * Default: 30
@@ -473,7 +474,7 @@ declare module 'native-base' {
         /**
          * see Widget Spinner.js
          */
-        interface Spinner extends React.ActivityIndicatorProperties {
+        interface Spinner extends ReactNative.ActivityIndicatorProperties {
             inverse?: boolean
         }
         /**
@@ -500,10 +501,10 @@ declare module 'native-base' {
          * vendor react-native-drawer
          */
         interface DrawerStyles {
-            drawer?: React.ViewStyle,
-            main?: React.ViewStyle,
-            drawerOverlay?: React.ViewStyle,
-            mainOverlay?: React.ViewStyle
+            drawer?: ReactNative.ViewStyle,
+            main?: ReactNative.ViewStyle,
+            drawerOverlay?: ReactNative.ViewStyle,
+            mainOverlay?: ReactNative.ViewStyle
         }
         interface Drawer {
             acceptDoubleTap?: boolean,
@@ -514,7 +515,7 @@ declare module 'native-base' {
             open?: boolean,
             closedDrawerOffset?: number,
             content?: any,
-            deviceScreen?: React.ScaledSize,
+            deviceScreen?: ReactNative.ScaledSize,
             disabled?: boolean,
             initializeOpen?: boolean,
             negotiatePan?: boolean,
@@ -551,9 +552,9 @@ declare module 'native-base' {
 
         }
         interface TabHeading{
-            activeTabStyle?:React.ViewStyle,
-            textStyle?:React.TextStyle,
-            activeTextStyle?:React.TextStyle
+            activeTabStyle?:ReactNative.ViewStyle,
+            textStyle?:ReactNative.TextStyle,
+            activeTextStyle?:ReactNative.TextStyle
         }
 
         interface Item {
@@ -666,7 +667,7 @@ declare module 'native-base' {
      */
     export class Picker extends React.Component<NativeBase.Picker, any> { }
     namespace Picker {
-        export class Item extends React.Component<React.PickerItemProperties, any> { }
+        export class Item extends React.Component<ReactNative.PickerItemProperties, any> { }
     }
     /**
      * NativeBase.List

src/basic/Drawer/index.js

@@ -18,7 +18,7 @@ Drawer.defaultProps = {
   tapToClose: true,
   openDrawerOffset: 0.2,
   panCloseMask: 0.2,
-  closedDrawerOffset: -3,
+  closedDrawerOffset: 0,
   styles: {
     drawer: {
       shadowColor: '#000000',

src/basic/Icon/NBIcons.json

@@ -121,7 +121,7 @@
   },
   "arrow-down": {
     "android": {
-      "default": "md-arro-down",
+      "default": "md-arrow-down",
       "active": "md-arrow-down"
     },
     "ios": {