diff --git a/package.json b/package.json index 8aa7879bf..0c06affda 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "rc-animate": "~1.1.0", "rc-calendar": "~3.14.0", "rc-checkbox": "~1.1.1", - "rc-collapse": "~1.2.3", + "rc-collapse": "~1.3.0", "rc-dialog": "~5.0.1", "rc-dropdown": "~1.3.3", "rc-form-validation": "~2.4.7", diff --git a/style/components/collapse.less b/style/components/collapse.less index c329ed6c3..50d527de3 100644 --- a/style/components/collapse.less +++ b/style/components/collapse.less @@ -31,7 +31,7 @@ color: #666; display: inline-block; margin-right: 8px; - content:"\e60f"; + content: "\e60f"; #arrow > .close(); vertical-align: middle; transition: transform 0.24s ease; @@ -43,8 +43,6 @@ &-content { height: 0; - transition-duration: .24s; - transition-timing-function: @ease-out-circ; overflow: hidden; color: @text-color; padding: 0 16px; @@ -56,6 +54,12 @@ } } + &-collapsing { + transition-duration: .3s; + transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + transition-property: height; + } + &-item:last-child { > .@{collapse-prefix-cls}-content { border-radius: 0 0 3px 3px; @@ -63,6 +67,7 @@ } &-content-active { + height: auto; } & > &-item-active {