Merge branch 'master' of github.com:ant-design/ant-design

components/collapse/index.tsx

@@ -1,8 +1,33 @@
 import RcCollapse from 'rc-collapse';
 import React from 'react';
 
-export default class Collapse extends React.Component {
-  static Panel = RcCollapse.Panel;
+export interface CollapseProps {
+  activeKey?:Array<string> | string,
+  /** 初始化选中面板的key */
+  defaultActiveKey?:Array<string>,
+  /** accordion 为 true 的时候，一次只可以打开一个面板 */
+  accordion?:boolean,
+  /** 切换面板的回调*/
+  onChange?:(key:string) => void,
+
+  style?:React.CSSProperties
+}
+
+interface CollapsePanelProps {
+  /** 对应 activeKey */
+  key:string,
+  /** 面板头内容*/
+  header:React.ReactNode,
+
+  style?:React.CSSProperties
+}
+
+declare class CollapsePanel extends React.Component<CollapsePanelProps, {}> {
+
+}
+
+export default class Collapse extends React.Component<CollapseProps, any> {
+  static Panel: typeof CollapsePanel = RcCollapse.Panel;
 
   static defaultProps = {
     prefixCls: 'ant-collapse',

components/index.tsx

@@ -1,2 +1,5 @@
 import Affix from './affix';
 export { Affix };
+
+import Collapse from './collapse';
+export { Collapse };