Merge branch 'master' into trista/readme

Author: mxdi9i7

.eslintrc

@@ -38,7 +38,7 @@
     "react/jsx-handler-names": 0,
     "react/jsx-fragments": 0,
     "react/no-unused-prop-types": 0,
-    "import/export": 0,
+    "import/export": 2,
     "no-extra-boolean-cast": 0
   }
 }

README.md

@@ -10,10 +10,10 @@ Lightweight Mobile UI Components built on Typescript and React in under 2kb!
 
 ## **Features**
 
-* Support Typescript
-* 60+ Reusable components
-* 100% Storybook coverage: [https://vant.bctc.io](https://vant.bctc.io)
-* Extensive documentation and demos
+- Support Typescript
+- 60+ Reusable components
+- 100% Storybook coverage: [https://vant.bctc.io](https://vant.bctc.io)
+- Extensive documentation and demos
 
 ## Install
 
@@ -72,65 +72,69 @@ const App = () => {
 
 ### Action Components
 
-* [ ] ActionSheet
-* [ ] Dialog
-* [ ] DropdownMenu
-* [ ] Loading
-* [ ] Notify
-* [ ] Overlay
-* [ ] PullRefresh
-* [ ] ShareSheet
-* [ ] SwipeCell
-* [ ] Toast
+- [ ] ActionSheet
+- [ ] Dialog
+- [ ] DropdownMenu
+- [ ] Loading
+- [ ] Notify
+- [ ] Overlay
+- [ ] PullRefresh
+- [ ] ShareSheet
+- [ ] SwipeCell
+- [ ] Toast
 
 ### Display Components
 
-* [ ] Circle
-* [ ] Collapse
-* [ ] CountDown
-* [ ] Divider
-* [ ] Empty
-* [ ] ImagePreview
-* [ ] Lazyload
-* [ ] List
-* [ ] NoticeBar
-* [ ] Panel
-* [ ] Progress
-* [ ] Skeleton
-* [ ] Steps
-* [ ] Sticky
-* [ ] Swipe
-* [x] Tag
+- [ ] Circle
+- [ ] Collapse
+- [ ] CountDown
+- [ ] Divider
+- [ ] Empty
+- [ ] ImagePreview
+- [ ] Lazyload
+- [ ] List
+- [ ] NoticeBar
+- [ ] Panel
+- [ ] Progress
+- [ ] Skeleton
+- [ ] Steps
+- [ ] Sticky
+- [ ] Swipe
+- [x] Tag
 
 ### Navigation Components
 
-* [ ] Grid
-* [ ] IndexBar
-* [x] NavBar
-* [ ] Pagination
-* [ ] Sidebar
-* [ ] Tab
-* [ ] Tabbar
-* [ ] TreeSelect
+- [ ] Grid
+- [ ] IndexBar
+- [x] NavBar
+- [ ] Pagination
+- [ ] Sidebar
+- [ ] Tab
+- [ ] Tabbar
+- [ ] TreeSelect
 
 ### Business Components
 
-* [ ] AddressEdit
-* [ ] AddressList
-* [ ] Area
-* [ ] Card
-* [ ] Contact
-* [ ] Coupon
-* [ ] GoodsAction
-* [ ] SubmitBar
-* [ ] Sku
+- [ ] AddressEdit
+- [ ] AddressList
+- [ ] Area
+- [ ] Card
+- [ ] Contact
+- [ ] Coupon
+- [ ] GoodsAction
+- [ ] SubmitBar
+- [ ] Sku
 
 ### Deprecated
 
-* [ ] SwitchCell
+- [ ] SwitchCell
 
 ## Contribution
 
+If you like what we do, please consider buy us a bubble-tea(donate)!
+
+[![DonorBox](https://d1iczxrky3cnb2.cloudfront.net/button-small-blue.png)](https://donorbox.org/vant-react-dev-team?default_interval=o&amount=5)
+
 Please make sure to read the[ Contributing Guide](.github/CONTRIBUTION.md) before making a pull request.
 
 Or, join our discussion group on Wechat by adding me!
@@ -144,4 +148,3 @@ Modern browsers and Android 4.0+, iOS 8.0+.
 ## Open Source License
 
 This is an Open Source Software operating under the [MIT](https://github.com/mxdi9i7/vant-react/blob/master/LICENSE) License.
-

changelog.md

@@ -2,25 +2,67 @@
 
 ## Intro
 
-Vant follows Semantic Versioning 0.1.1.
+Vant follows Semantic Versioning 0.2.0.
 
 **Release Schedule**
 
 - Patch version：released weekly, including features and bug fixes.
 - Minor version：released every one to two months, including backwards compatible features.
 - Major version：including breaking changes and new features.
 
+## **0**.2.2
+
+-06-24-2020
+
+**Bug Fixes**
+
+- Popup:
+  - fix custom size and hided scrollbar
+  - add padding and fit-content
+  
+## **0**.2.1
+
+-06-18-2020
+
+**Bug Fixes**
+
+- Popup:
+  - Adjusted position
+
+## **0**.2.0
+
+-06-17-2020
+
+**Feature**
+
+- Added Field components [\#26](https://github.com/mxdi9i7/vant-react/pull/26)
+- Added Search components [\#31](https://github.com/mxdi9i7/vant-react/pull/31)
+- Added Rate components [\#32](https://github.com/mxdi9i7/vant-react/pull/32)
+- Added Popup components [\#33](https://github.com/mxdi9i7/vant-react/pull/33)
+- Added Cell components [\#33](https://github.com/mxdi9i7/vant-react/pull/42)
+- Added Built-in style
+- Basic docs: Popup & Field & Rate
+- Added changelogs
+
+**Bug Fixes**
+
+- Button:
+  - Enabled icon buttons
+- Icon:
+  - Added handle icon click
+  - Adjusted icon librart sryles
+
 ## **0**.1.1
 
 -05-25-2020
 
 **Bug Fixes**
 
 - Button:
-  - enable icon buttons, need to have icon library done first
-  - accept linear gradient
+  - Enabled icon buttons, need to have icon library done first
+  - Accepted linear gradient
 - Tag:
-  - accept custom tag element
+  - Accepted custom tag element
 
 ## **0**.1.0
 
@@ -29,7 +71,7 @@ Vant follows Semantic Versioning 0.1.1.
 **Feature**
 
 - Added Button components [\#4](https://github.com/mxdi9i7/vant-react/pull/4)
-- Added Icons components [\#6](https://github.com/mxdi9i7/vant-react/pull/6/files)
+- Added Icons components [\#6](https://github.com/mxdi9i7/vant-react/pull/6)
 - Added Navbar components [\#8](https://github.com/mxdi9i7/vant-react/pull/8)
 - Added Tag components [\#9](https://github.com/mxdi9i7/vant-react/pull/9)
 - Basic docs: Navbar & Tag & Icon
@@ -38,8 +80,8 @@ Vant follows Semantic Versioning 0.1.1.
 **Bug Fixes**
 
 - Button:
-  - add hairline props
-  - accept color in rgb
+  - Added hairline props
+  - Accepted color in rgb
 - Navbar：
-  - Fix navbar font weight
-  - Add navbar prop -> border: boolean, default is true
+  - Fixed navbar font weight
+  - Added navbar prop -> border: boolean, default is true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vant-react",
-  "version": "0.1.2",
+  "version": "0.2.4",
   "description": "Lightweight Mobile UI Components built in React & Typescript, inspired by Vant: https://youzan.github.io/vant",
   "author": "mxdi9i7",
   "license": "MIT",

src/assets/icons/loaders/Circular/index.tsx

@@ -2,7 +2,7 @@ import React, { ReactElement } from 'react';
 import './index.scss';
 
 interface Props {
-  className: string;
+  className?: string;
   loadingSize?: string;
 }
 

src/assets/icons/loaders/Spinner/index.tsx

@@ -3,7 +3,7 @@ import React, { ReactElement } from 'react';
 import './index.scss';
 
 interface Props {
-  className: string;
+  className?: string;
   loadingSize?: string;
 }
 

src/components/Button/index.stories.tsx

@@ -8,7 +8,7 @@ export default {
 };
 
 export const ButtonTypes = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button type='default'>Default Button</Button>
     <Button type='primary'>Primary Button</Button>
     <Button type='info'>Info Button</Button>
@@ -18,7 +18,7 @@ export const ButtonTypes = () => (
 );
 
 export const PlainButtons = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button type='danger' plain>
       Danger Button
     </Button>
@@ -29,7 +29,7 @@ export const PlainButtons = () => (
 );
 
 export const HairlineButtons = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button type='danger' hairline>
       Danger Button
     </Button>
@@ -40,7 +40,7 @@ export const HairlineButtons = () => (
 );
 
 export const DisabledButtons = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button type='danger' disabled>
       Disabled Button
     </Button>
@@ -51,7 +51,7 @@ export const DisabledButtons = () => (
 );
 
 export const LoadingButtons = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button type='danger' loading>
       Loading Default
     </Button>
@@ -68,7 +68,7 @@ export const LoadingButtons = () => (
 );
 
 export const ButtonShapes = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button type='info' round>
       Info Button
     </Button>
@@ -79,7 +79,7 @@ export const ButtonShapes = () => (
 );
 
 export const ButtonSize = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button type='info' size='large'>
       Info Button
     </Button>
@@ -93,7 +93,7 @@ export const ButtonSize = () => (
 );
 
 export const ButtonColor = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button color='FFECB3'>Info Button</Button>
     <Button color='00796B' fontColor='#999'>
       Warning Button
@@ -105,29 +105,29 @@ export const ButtonColor = () => (
 );
 
 export const ButtonTags = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button tag='a'>A Tag</Button>
     <Button tag='button'>Button Tag</Button>
   </div>
 );
 
 export const ButtonNativeTypes = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button nativeType='button'>Button Type</Button>
     <Button nativeType='reset'>Reset Type</Button>
     <Button nativeType='submit'>Submit Type</Button>
   </div>
 );
 
 export const BlockButtons = () => (
-  <div className='container column button'>
+  <div className='storybook__container column button'>
     <Button>Non Block Button</Button>
     <Button block>Block Button</Button>
   </div>
 );
 
 export const IconButton = () => (
-  <div className='container button'>
+  <div className='storybook__container button'>
     <Button icon='star-o' type='primary' />
     <Button icon='star-o' type='info'>
       Custom Icon Button
@@ -139,7 +139,7 @@ export const IconButton = () => (
 );
 
 export const ButtonURL = () => (
-  <div className='container column button'>
+  <div className='storybook__container column button'>
     <Button tag='a' url='https://github.com/mxdi9i7/vant-react'>
       Button with URL
     </Button>
@@ -153,7 +153,7 @@ export const ButtonURL = () => (
 );
 
 export const ButtonAction = () => (
-  <div className='container column button'>
+  <div className='storybook__container column button'>
     <Button click={(e) => alert(e.target)}>Handle Click</Button>
     <Button touchstart={(e) => alert(e.target)}>Handle Touchstart</Button>
     <Button click={(e) => alert(e.target)} type='primary' disabled>