From 73d89f46affbf137957540705c90361a633822e8 Mon Sep 17 00:00:00 2001 From: yiminghe Date: Mon, 15 Jun 2015 21:18:08 +0800 Subject: [PATCH] update motion --- components/dropdown/index.jsx | 2 +- components/dropdown/index.md | 1 - components/modal/confirm.jsx | 2 +- components/modal/index.jsx | 2 +- components/select/index.jsx | 7 +- package.json | 8 +- style/components/dropdown.less | 4 + style/components/tooltip.less | 4 + style/core/motion.less | 1856 ++------------------------------ 9 files changed, 86 insertions(+), 1800 deletions(-) diff --git a/components/dropdown/index.jsx b/components/dropdown/index.jsx index c79598d3d7..4d02998474 100644 --- a/components/dropdown/index.jsx +++ b/components/dropdown/index.jsx @@ -6,7 +6,7 @@ var Dropdown = require('rc-dropdown'); module.exports = React.createClass({ getDefaultProps: function() { return { - animation: 'slide-up', + transitionName: 'slide-up', prefixCls: 'ant-dropdown' }; }, diff --git a/components/dropdown/index.md b/components/dropdown/index.md index fe0a272d67..14f9710daf 100644 --- a/components/dropdown/index.md +++ b/components/dropdown/index.md @@ -18,7 +18,6 @@ | 成员 | 说明 | 类型 | 默认值 | |-------------|----------------|--------------------|--------------| -| animation | 动画名称 | String | slide-up | | trigger | 触发下来行为 | "click" or "hover" | hover | | overlay | 菜单节点 | React.Element | 无 | diff --git a/components/modal/confirm.jsx b/components/modal/confirm.jsx index 5a8ebbe7c0..0a03831631 100644 --- a/components/modal/confirm.jsx +++ b/components/modal/confirm.jsx @@ -8,7 +8,7 @@ module.exports = function (props) { var d; props = props || {}; props.iconClassName = props.iconClassName || 'anticon-exclamation-circle'; - props.animation = 'zoom'; + props.transitionName = 'zoom'; props.maskAnimation = 'fade'; var width = props.width || 375; diff --git a/components/modal/index.jsx b/components/modal/index.jsx index ae75313d0b..8936bc140f 100644 --- a/components/modal/index.jsx +++ b/components/modal/index.jsx @@ -46,7 +46,7 @@ var Modal = React.createClass({ , ]; - return ; + return ; } }); diff --git a/components/select/index.jsx b/components/select/index.jsx index 7c4dbbe1da..760b34bcb1 100644 --- a/components/select/index.jsx +++ b/components/select/index.jsx @@ -4,12 +4,13 @@ var React = require('react'); var Select = require('rc-select'); module.exports = React.createClass({ - getDefaultProps: function() { + getDefaultProps: function () { return { - prefixCls: 'ant-select' + prefixCls: 'ant-select', + transitionName: 'slide-up' }; }, - render: function() { + render: function () { return (