Skip to content

Commit 9fa813c

Browse files
committed
rename FloatMenu to Popover ant-design#50
1 parent a8798f8 commit 9fa813c

File tree

14 files changed

+33
-31
lines changed

14 files changed

+33
-31
lines changed

components/index.web.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export { default as Checkbox } from './checkbox/index.web';
88
export { default as DatePicker } from './date-picker/index.web';
99
export { default as Drawer } from './drawer/index.web';
1010
export { default as Flex } from './flex/index.web';
11-
export { default as FloatMenu } from './float-menu/index.web';
11+
export { default as Popover } from './popover/index.web';
1212

1313
// export { default as Form } from './form/index.web';
1414
export { default as Grid } from './grid/index.web';

components/list-view/style/index.less

+7-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
.@{indexedList} {
66
// position: relative;
77

8-
.am-list-header {
9-
min-height: @list-title-height;
10-
font-size: inherit;
11-
color: inherit;
12-
}
8+
// .am-list-header {
9+
// }
1310

1411
&-section-header {
1512
.am-list-item {
13+
min-height: @list-title-height;
1614
background-color: #F7F7F7;
15+
.am-list-content {
16+
font-size: @font-size-base !important;
17+
color: @color-text-caption !important;
18+
}
1719
}
1820
}
1921

File renamed without changes.

components/float-menu/demo/basic.md components/popover/demo/basic.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
order: 0
3-
title: FloatMenu
3+
title: Popover
44
---
55

66

@@ -9,8 +9,8 @@ title: FloatMenu
99
this.customNavFlag = true;
1010

1111

12-
import { FloatMenu, Button, NavBar } from 'antd-mobile';
13-
const Item = FloatMenu.Item;
12+
import { Popover, Button, NavBar } from 'antd-mobile';
13+
const Item = Popover.Item;
1414

1515
const App = React.createClass({
1616
getInitialState() {
@@ -49,7 +49,7 @@ const App = React.createClass({
4949

5050
return (<div>
5151
<NavBar iconName={false}
52-
rightContent={<FloatMenu
52+
rightContent={<Popover
5353
visible={this.state.visible}
5454
overlay={overlay}
5555
popupAlign={{
@@ -59,13 +59,13 @@ const App = React.createClass({
5959
onSelect={this.onSelect}
6060
>
6161
<a href="#" style={{ color: 'white' }}>菜单</a>
62-
</FloatMenu>}
62+
</Popover>}
6363
>
64-
FloatMenu
64+
Popover
6565
</NavBar>
6666
<p>选中了 {this.state.selected}</p>
6767
<div style={{ paddingTop: 80, paddingLeft: 100 }}>
68-
<FloatMenu
68+
<Popover
6969
visible={this.state.visible1}
7070
overlay={[
7171
<Item key="0" value="0">item 0</Item>,
@@ -76,7 +76,7 @@ const App = React.createClass({
7676
onVisibleChange={v => this.setState({ visible1: v })}
7777
>
7878
<a href="#">菜单</a>
79-
</FloatMenu>
79+
</Popover>
8080
</div>
8181
</div>);
8282
},

components/float-menu/demo/basic.tsx components/popover/demo/basic.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as React from 'react';
22
import { StyleSheet, View, Text, ViewStyle } from 'react-native';
3-
import { FloatMenu } from 'antd-mobile';
3+
import { Popover } from 'antd-mobile';
44

5-
const Item = FloatMenu.Item;
5+
const Item = Popover.Item;
66

7-
export default class FloatMenuExample extends React.Component<any, any> {
7+
export default class PopoverExample extends React.Component<any, any> {
88
constructor(props) {
99
super(props);
1010
this.state = {
@@ -41,15 +41,15 @@ export default class FloatMenuExample extends React.Component<any, any> {
4141
<Text style={{ marginTop: 30, marginLeft: 100 }}>选择了:{this.state.selected}</Text>
4242
</View>
4343
<View style={styles.menuContainer}>
44-
<FloatMenu ref="mc" name="m"
44+
<Popover ref="mc" name="m"
4545
overlay={overlay}
4646
contextStyle={styles.contextStyle}
4747
overlayStyle={styles.overlayStyle}
4848
triggerStyle={styles.triggerStyle}
4949
onSelect={this.onSelect}
5050
>
5151
<Text>菜单</Text>
52-
</FloatMenu>
52+
</Popover>
5353
</View>
5454
</View>);
5555
}
@@ -77,5 +77,5 @@ const styles = StyleSheet.create({
7777
},
7878
});
7979

80-
export const title = 'FloatMenu';
81-
export const description = 'FloatMenu example';
80+
export const title = 'Popover';
81+
export const description = 'Popover example';

components/float-menu/index.md components/popover/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
category: Components
33
type: Components
44
chinese: 浮动菜单
5-
english: FloatMenu
5+
english: Popover
66
---
77

88
### 定义/Definition
@@ -15,7 +15,7 @@ english: FloatMenu
1515

1616
## API
1717

18-
### FloatMenu
18+
### Popover
1919
| 成员 | 说明 | 类型 | 默认值 |
2020
|------------|----------------|-------------|--------------|
2121
| visible(web) | 当前显隐状态 | Boolean | false |
@@ -32,7 +32,7 @@ english: FloatMenu
3232
| name(ios/android) | menu名字,用于手动触发开关menu | String | - |
3333
| openMenu/closeMenu/toggleMenu(ios/android) | 用于手动开关 menu,参数为上边 menu 的 name . 使用示例:`this.refs.mc.refs.menuContext.toggleMenu('m')` 见 demo | Function(name) | - |
3434

35-
### FloatMenu.Item
35+
### Popover.Item
3636
| 成员 | 说明 | 类型 | 默认值 |
3737
|------------|----------------|-------------|--------------|
3838
| children | 节点内容 | String/React.node | - |

components/float-menu/index.tsx components/popover/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { PropTypes } from 'react';
33
import Menu, { MenuContext, MenuOptions, MenuOption, MenuTrigger } from 'react-native-menu';
44
import tsPropsType from './PropsType';
55

6-
export default class FloatMenu extends React.Component<tsPropsType, any> {
6+
export default class Popover extends React.Component<tsPropsType, any> {
77
static propTypes = {
88
children: PropTypes.any,
99
};

components/float-menu/index.web.tsx components/popover/index.web.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function recursiveCloneChildren(children, cb = ch => ch) {
1616
});
1717
}
1818

19-
export default class FloatMenu extends React.Component<tsPropsType, any> {
19+
export default class Popover extends React.Component<tsPropsType, any> {
2020
static propTypes = {
2121
prefixCls: PropTypes.string,
2222
placement: PropTypes.string,
@@ -43,7 +43,7 @@ export default class FloatMenu extends React.Component<tsPropsType, any> {
4343
const extraProps = {
4444
onClick: () => {},
4545
};
46-
if (child && child.type && child.type.FloatMenuItem && !child.props.disabled) {
46+
if (child && child.type && child.type.PopoverItem && !child.props.disabled) {
4747
extraProps.onClick = () => {
4848
onSelect(child);
4949
};

components/float-menu/item.tsx components/popover/item.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default class Item extends React.Component<any, any> {
1616
disabled: false,
1717
};
1818

19-
static FloatMenuItem = true;
19+
static PopoverItem = true;
2020

2121
render() {
2222
let[{ children, className, prefixCls, iconName, disabled }, restProps] = splitObject(this.props,
File renamed without changes.
File renamed without changes.

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export { default as Card } from './components/card/';
66
export { default as DatePicker } from './components/date-picker/';
77
export { default as Drawer } from './components/drawer/';
88
export { default as Flex } from './components/flex/';
9-
export { default as FloatMenu } from './components/float-menu/';
9+
export { default as Popover } from './components/popover/';
1010
export { default as InputItem } from './components/input-item/';
1111
export { default as List } from './components/list/';
1212
export { default as ListView } from './components/list-view/';

rn-kitchen-sink/demoList.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ module.exports = {
5757
module: require('../components/flex/demo/basic'), // 必须
5858
},
5959
{
60-
title: 'FloatMenu', // 必须
60+
title: 'Popover', // 必须
6161
description: '浮动菜单',
6262
icon: 'https://os.alipayobjects.com/rmsportal/HhilRXHawmUwlML.png',
63-
module: require('../components/float-menu/demo/basic'), // 必须
63+
module: require('../components/popover/demo/basic'), // 必须
6464
},
6565
{
6666
title: 'InputItem', // 必须

0 commit comments

Comments
 (0)