From e337345a5a4da1e945b6561beb3118cce494eb05 Mon Sep 17 00:00:00 2001 From: silentcloud Date: Wed, 6 Sep 2017 16:02:22 +0800 Subject: [PATCH 1/7] use rmc-picker with m-dialog --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ad811f7..c0643bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rmc-cascader", - "version": "4.3.4", + "version": "5.0.0-alpha.0", "description": "m-cascader ui component for react", "keywords": [ "react", @@ -72,6 +72,6 @@ "dependencies": { "array-tree-filter": "1.0.x", "babel-runtime": "6.x", - "rmc-picker": "^4.0.1" + "rmc-picker": "^5.0.0-alpha.0" } } From 269c7aacfce3790cb0460a5b1e653d9363ef7c51 Mon Sep 17 00:00:00 2001 From: silentcloud Date: Mon, 18 Sep 2017 10:13:35 +0800 Subject: [PATCH 2/7] chore: update dep, bump alpha.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c0643bc..90dc2c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rmc-cascader", - "version": "5.0.0-alpha.0", + "version": "5.0.0-alpha.1", "description": "m-cascader ui component for react", "keywords": [ "react", @@ -72,6 +72,6 @@ "dependencies": { "array-tree-filter": "1.0.x", "babel-runtime": "6.x", - "rmc-picker": "^5.0.0-alpha.0" + "rmc-picker": "~5.0.0-alpha.3" } } From 7b7856b91dc7430e130b70405b08962af6fe20f3 Mon Sep 17 00:00:00 2001 From: silentcloud Date: Mon, 18 Sep 2017 10:52:52 +0800 Subject: [PATCH 3/7] fix: disabled, indicatorstyle and itemStyle --- src/Cascader.tsx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Cascader.tsx b/src/Cascader.tsx index b5c801a..ccd74b8 100644 --- a/src/Cascader.tsx +++ b/src/Cascader.tsx @@ -62,7 +62,7 @@ class Cascader extends React.Component { } getCols() { - const { data, cols, pickerPrefixCls } = this.props; + const { data, cols, pickerPrefixCls, disabled, pickerItemStyle, indicatorStyle } = this.props; const value = this.state.value; const childrenTree = arrayTreeFilter(data, (c, level) => { return c.value === value[level]; @@ -78,7 +78,14 @@ class Cascader extends React.Component { childrenTree.length = cols! - 1; childrenTree.unshift(data); return childrenTree.map((children: any[] = [], level) => ( - + {children.map(item => {item.label}) } @@ -88,12 +95,7 @@ class Cascader extends React.Component { render() { const props = this.props; - const { - prefixCls, - className, rootNativeProps, - disabled, pickerItemStyle, - indicatorStyle, style, - } = props; + const { prefixCls, className, rootNativeProps, style } = props; const cols = this.getCols(); const multiStyle = { flexDirection: 'row', @@ -104,12 +106,9 @@ class Cascader extends React.Component { {cols} From 8f9b0f2857a48f7308ab52ea77ca16632cce2df6 Mon Sep 17 00:00:00 2001 From: silentcloud Date: Mon, 18 Sep 2017 10:54:42 +0800 Subject: [PATCH 4/7] bump 5.0.0-alpha.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 90dc2c2..01eda16 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rmc-cascader", - "version": "5.0.0-alpha.1", + "version": "5.0.0-alpha.2", "description": "m-cascader ui component for react", "keywords": [ "react", From af3fe46e8dc7c8eb3f40cccedc36d142001e29a6 Mon Sep 17 00:00:00 2001 From: zhang740 Date: Thu, 21 Sep 2017 10:32:19 +0800 Subject: [PATCH 5/7] pass through the props onScrollChange. --- examples/popup.tsx | 7 ++++++- src/Cascader.tsx | 1 + src/CascaderTypes.tsx | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/popup.tsx b/examples/popup.tsx index b7f7b0a..7000a0d 100644 --- a/examples/popup.tsx +++ b/examples/popup.tsx @@ -30,6 +30,10 @@ class Demo extends React.Component { }); } + onScrollChange = (value) => { + console.log('onScrollChange', value); + } + onDismiss = () => { console.log('onDismiss'); this.setState({ @@ -63,10 +67,11 @@ class Demo extends React.Component { render() { const cascader = ( ); return (
diff --git a/src/Cascader.tsx b/src/Cascader.tsx index ccd74b8..541ed34 100644 --- a/src/Cascader.tsx +++ b/src/Cascader.tsx @@ -110,6 +110,7 @@ class Cascader extends React.Component { selectedValue={this.state.value} rootNativeProps={rootNativeProps} onValueChange={this.onValueChange} + onScrollChange={props.onScrollChange} > {cols} diff --git a/src/CascaderTypes.tsx b/src/CascaderTypes.tsx index 7cacc93..dd39fb3 100644 --- a/src/CascaderTypes.tsx +++ b/src/CascaderTypes.tsx @@ -1,4 +1,4 @@ -export type CascaderOneValue = string|number; +export type CascaderOneValue = string | number; export type CascaderValue = CascaderOneValue[]; export interface ICascaderDataItem { @@ -24,4 +24,6 @@ export interface ICascaderProps { pickerPrefixCls?: string; /** web only */ className?: string; + /** web only */ + onScrollChange?: (value: CascaderValue) => void; } From 77763100aef13e1bac93c9aac167f5542525a351 Mon Sep 17 00:00:00 2001 From: zhang740 Date: Thu, 21 Sep 2017 10:45:26 +0800 Subject: [PATCH 6/7] bump version 5.0.0-alpha.3 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 01eda16..eded1a1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rmc-cascader", - "version": "5.0.0-alpha.2", + "version": "5.0.0-alpha.3", "description": "m-cascader ui component for react", "keywords": [ "react", @@ -72,6 +72,6 @@ "dependencies": { "array-tree-filter": "1.0.x", "babel-runtime": "6.x", - "rmc-picker": "~5.0.0-alpha.3" + "rmc-picker": "~5.0.0-alpha.6" } } From 54f486b96e0e85a126f5b3b669031e363e65f0b7 Mon Sep 17 00:00:00 2001 From: silentcloud Date: Thu, 12 Oct 2017 11:30:48 +0800 Subject: [PATCH 7/7] 5.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 01eda16..b8f17e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rmc-cascader", - "version": "5.0.0-alpha.2", + "version": "5.0.0", "description": "m-cascader ui component for react", "keywords": [ "react", @@ -72,6 +72,6 @@ "dependencies": { "array-tree-filter": "1.0.x", "babel-runtime": "6.x", - "rmc-picker": "~5.0.0-alpha.3" + "rmc-picker": "~5.0.0" } }