diff --git a/.gitignore b/.gitignore index 8fce639..a4475a5 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,11 @@ android/app/libs # screenshots whenever they are needed. # For more information about the recommended setup visit: # https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md - +# fastlane/report.xml fastlane/Preview.html fastlane/screenshots + +# eslint-cache +# +.eslintcache diff --git a/ActionSheet/README.md b/ActionSheet/README.md index d1a38fb..19b6f7c 100644 --- a/ActionSheet/README.md +++ b/ActionSheet/README.md @@ -4,8 +4,7 @@ ## Demo -![ActionSheet](http://wx4.sinaimg.cn/mw690/4c8b519dly1feq4asyl44g20hs0wsguv.gif) - + ## Example diff --git a/ActionSheet/index.js b/ActionSheet/index.js index 1e7c5a3..f98e882 100644 --- a/ActionSheet/index.js +++ b/ActionSheet/index.js @@ -31,7 +31,8 @@ class ActionSheet extends Component { if (isAndroid) { if (index === 0) { btnStyle.push(styles.btnFirst); - } else if (index === this.props.btnList.length - 1) { + } + if (index === this.props.btnList.length - 1) { btnStyle.push(styles.btnLast); } } diff --git a/AddAndSubtract/README.md b/AddAndSubtract/README.md index bd787bb..be21106 100644 --- a/AddAndSubtract/README.md +++ b/AddAndSubtract/README.md @@ -6,7 +6,7 @@ ## Demo -![AddAndSubtract](http://wx3.sinaimg.cn/mw690/4c8b519dly1fcaq7v2pnvg20ho0wgh0z.gif) + ## Example @@ -56,9 +56,19 @@ AddAndSubtract.propTypes = { // 自定义样式 style: View.propTypes.style, // 加法按钮样式 - adderStyle: View.propTypes.style, + adderBtnStyle: View.propTypes.style, + // 加法元素样式 + adderStyle: View.propTypes.style, + // 加法元素触摸时底色 + adderUnderlayColor: TouchableHighlight.propTypes.underlayColor, + // 减法按钮容器样式 + subtracterWrapperStyle: View.propTypes.style, // 减法按钮样式 - subtracterStyle: View.propTypes.style, + subtracterBtnStyle: View.propTypes.style, + // 减法元素样式 + subtracterStyle: View.propTypes.style, + // 减法元素触摸时底色 + subtracterUnderlayColor: TouchableHighlight.propTypes.underlayColor, // 自定义字体样式 textStyle: Text.propTypes.style, // 加法按钮 @@ -78,8 +88,13 @@ AddAndSubtract.defaultProps = { easing: t => t, btnWidth: 30, style: null, + adderBtnStyle: null, adderStyle: null, + adderUnderlayColor: '#bbb', + subtracterWrapperStyle: null, + subtracterBtnStyle: null, subtracterStyle: null, + subtracterUnderlayColor: '#bbb', textStyle: null, adder: +, subtracter: -, diff --git a/AddAndSubtract/index.js b/AddAndSubtract/index.js index 2df764e..a7c1fc6 100644 --- a/AddAndSubtract/index.js +++ b/AddAndSubtract/index.js @@ -94,7 +94,7 @@ class AddAndSubtract extends Component { }, this.props.subtracterWrapperStyle]} > +, subtracter: -, diff --git a/Alert/README.md b/Alert/README.md index 6694116..a64c342 100644 --- a/Alert/README.md +++ b/Alert/README.md @@ -4,7 +4,7 @@ ## Demo -![Alert](http://wx4.sinaimg.cn/mw690/4c8b519dly1fduijhj36dg20hs0ws48p.gif) + ## Props diff --git a/Badge/README.md b/Badge/README.md index 683fd3d..fcf5d92 100644 --- a/Badge/README.md +++ b/Badge/README.md @@ -12,7 +12,8 @@ ## Demo -![](demo.png) + + ## Example diff --git a/Badge/demo.png b/Badge/demo.png deleted file mode 100644 index 4b92c60..0000000 Binary files a/Badge/demo.png and /dev/null differ diff --git a/CHANGELOG.md b/CHANGELOG.md index bf5c711..1a06c37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,21 @@ n2：💛 影响之前版本使用方式的更新（需要用户适配） n3：💚 不影响之前版本使用方式的更新（不需要用户适配） ``` +## 0.17.3 + +### AddAndSubtract + +- 💚 新增属性 `adderUnderlayColor`：加法元素触摸时底色 +- 💚 新增属性 `subtracterUnderlayColor`：减法元素触摸时底色 + +### ActionSheet + +- 💚 修复安卓下只显示一行菜单时下边框无圆角的 bug + ## 0.17.2 ### Sheet - + - 💚 修复隐藏之后快速展示时不显示内容的 bug ### SmsCaptchaInput diff --git a/CardView/README.md b/CardView/README.md index 6dd76a0..8318725 100644 --- a/CardView/README.md +++ b/CardView/README.md @@ -12,7 +12,7 @@ CardView 会为卡片添加 `isActiveRnxUiCardView` 属性，激活卡片值为 ## Demo -![CardView](http://wx3.sinaimg.cn/mw690/4c8b519dly1fdgvohgt53g20hs0wsaip.gif) + ## Example diff --git a/Confirm/README.md b/Confirm/README.md index e526541..7b79dcb 100644 --- a/Confirm/README.md +++ b/Confirm/README.md @@ -4,7 +4,7 @@ ## Demo -![Confirm](http://wx3.sinaimg.cn/mw690/4c8b519dly1fdulcvgrcvg20hs0ws7h6.gif) + ## Props diff --git a/Dialog/README.md b/Dialog/README.md index bf02176..459a14f 100644 --- a/Dialog/README.md +++ b/Dialog/README.md @@ -4,7 +4,8 @@ ## Demo -![Dialog](http://wx3.sinaimg.cn/mw690/4c8b519dly1fdulkkgmsog20hs0wsn81.gif) + + ## Example diff --git a/Drop/README.md b/Drop/README.md index ec3db49..6b4d610 100644 --- a/Drop/README.md +++ b/Drop/README.md @@ -6,7 +6,7 @@ ## Demo -![Drop](http://wx1.sinaimg.cn/mw690/4c8b519dly1fbp9qg0mlog20ho0wghdw.gif) + ## Dropper diff --git a/DynamicText/README.md b/DynamicText/README.md index 9e10e17..e4380f1 100644 --- a/DynamicText/README.md +++ b/DynamicText/README.md @@ -10,7 +10,7 @@ DynamicText 有 `maxWidth` 属性可以配置支持的最大的文本长度， ## Demo -![DynamicText](http://wx4.sinaimg.cn/mw690/4c8b519dly1fdrlqh8ujsg20hs0ws4qq.gif) + ## Example diff --git a/HeaderedSheet/README.md b/HeaderedSheet/README.md index d036713..3a224a8 100644 --- a/HeaderedSheet/README.md +++ b/HeaderedSheet/README.md @@ -4,7 +4,7 @@ ## Demo -![navBar demo](demo.gif) + ## Props diff --git a/HeaderedSheet/demo.gif b/HeaderedSheet/demo.gif deleted file mode 100644 index d6a11c6..0000000 Binary files a/HeaderedSheet/demo.gif and /dev/null differ diff --git a/ImgPicker/README.md b/ImgPicker/README.md index dae3cf9..bceae9a 100644 --- a/ImgPicker/README.md +++ b/ImgPicker/README.md @@ -2,6 +2,10 @@ **图片选择组件** +## Demo + + + ## Example ```js diff --git a/ImgRollView/README.md b/ImgRollView/README.md index a3174b6..86b2512 100644 --- a/ImgRollView/README.md +++ b/ImgRollView/README.md @@ -6,6 +6,10 @@ CameraRoll 提供了访问本地相册的功能。在iOS上使用这个模块之前，你需要先链接 RCTCameraRoll 库，具体做法请参考[链接原生库文档](https://reactnative.cn/docs/0.42/linking-libraries-ios.html)。另外，从 iOS10 开始，访问相册需要用户授权。你需要在 `Info.plist` 中添加一条名为 `NSCameraUsageDescription` 的键，然后在其值中填写向用户请求权限的具体描述。编辑完成后这个键在 Xcode 中实际会显示为 `Privacy - Camera Usage Description`。 +## Demo + + + ## Example ```js diff --git a/NavBar/README.md b/NavBar/README.md index a5b4701..9b773ad 100755 --- a/NavBar/README.md +++ b/NavBar/README.md @@ -4,7 +4,7 @@ ## Demo -![navBar demo](demo.png) + ## Props diff --git a/NavBar/demo.png b/NavBar/demo.png deleted file mode 100644 index c13f695..0000000 Binary files a/NavBar/demo.png and /dev/null differ diff --git a/NumericKeyboard/README.md b/NumericKeyboard/README.md index 7e39576..6b2f669 100644 --- a/NumericKeyboard/README.md +++ b/NumericKeyboard/README.md @@ -6,7 +6,7 @@ ## Demo -![NumericKeyboard](http://wx2.sinaimg.cn/mw690/4c8b519dly1fbztgpbw6gg20ho0wgx6p.gif) + ## Example diff --git a/Overlay/README.md b/Overlay/README.md index b9e8319..af91607 100644 --- a/Overlay/README.md +++ b/Overlay/README.md @@ -14,7 +14,7 @@ ## Demo -![Overlay](http://wx2.sinaimg.cn/mw690/4c8b519dly1fdlfglw0mfg20hs0wsn3p.gif) + ## Props diff --git a/package.json b/package.json index e091035..9a31178 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start", - "lint": "eslint . *.js", + "lint": "eslint . *.js --cache", "test": "jest" }, "license": "MIT",