Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion examples/popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ class Demo extends React.Component<any, any> {
});
}

onScrollChange = (value) => {
console.log('onScrollChange', value);
}

onDismiss = () => {
console.log('onDismiss');
this.setState({
Expand Down Expand Up @@ -63,10 +67,11 @@ class Demo extends React.Component<any, any> {
render() {
const cascader = (
<Cascader
rootNativeProps={{'data-xx': 'yy'}}
rootNativeProps={{ 'data-xx': 'yy' }}
onChange={this.onPickerChange}
data={globalData}
cols={COLS}
onScrollChange={this.onScrollChange}
/>
);
return (<div style={{ padding: 10 }}>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rmc-cascader",
"version": "4.3.5",
"version": "5.0.0",
"description": "m-cascader ui component for react",
"keywords": [
"react",
Expand Down Expand Up @@ -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"
}
}
5 changes: 3 additions & 2 deletions src/Cascader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Cascader extends React.Component<ICascaderProps, any> {
}

getCols() {
const { data, cols, pickerPrefixCls, disabled, pickerItemStyle, indicatorStyle } = 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];
Expand All @@ -83,8 +83,8 @@ class Cascader extends React.Component<ICascaderProps, any> {
prefixCls={pickerPrefixCls}
style={{ flex: 1 }}
disabled={disabled}
itemStyle={pickerItemStyle}
indicatorStyle={indicatorStyle}
pickerItemStyle={pickerItemStyle}
>
{children.map(item =>
<Picker.Item value={item.value} key={item.value}>{item.label}</Picker.Item>)
Expand All @@ -110,6 +110,7 @@ class Cascader extends React.Component<ICascaderProps, any> {
selectedValue={this.state.value}
rootNativeProps={rootNativeProps}
onValueChange={this.onValueChange}
onScrollChange={props.onScrollChange}
>
{cols}
</MultiPicker>
Expand Down
4 changes: 3 additions & 1 deletion src/CascaderTypes.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type CascaderOneValue = string|number;
export type CascaderOneValue = string | number;
export type CascaderValue = CascaderOneValue[];

export interface ICascaderDataItem {
Expand All @@ -24,4 +24,6 @@ export interface ICascaderProps {
pickerPrefixCls?: string;
/** web only */
className?: string;
/** web only */
onScrollChange?: (value: CascaderValue) => void;
}