From 43cbdb5659ef5cc627e1d3f97844655fcdaa5e6b Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 2 Sep 2019 22:07:10 +0800
Subject: [PATCH] cr vc-collapse and update to 1.11.7

---
 .../__tests__/__snapshots__/demo.test.js.snap        |  6 +++---
 components/collapse/demo/custom.md                   |  2 +-
 components/vc-collapse/index.js                      |  2 +-
 components/vc-collapse/src/Collapse.jsx              | 12 ++++--------
 components/vc-collapse/src/Panel.jsx                 |  6 +++---
 components/vc-collapse/src/commonProps.js            | 12 ++++++++++--
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/components/collapse/__tests__/__snapshots__/demo.test.js.snap b/components/collapse/__tests__/__snapshots__/demo.test.js.snap
index 8449dec11..c208b3955 100644
--- a/components/collapse/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/collapse/__tests__/__snapshots__/demo.test.js.snap
@@ -87,7 +87,7 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
 <div>
   <div class="ant-collapse ant-collapse-borderless">
     <div role="tablist" class="ant-collapse-item ant-collapse-item-active" style="background: rgb(247, 247, 247); border-radius: 4px; margin-bottom: 24px; border: 0px; overflow: hidden;">
-      <div role="button" tabindex="0" aria-expanded="true" class="ant-collapse-header"><i aria-label="icon: caret-right" class="anticon anticon-caret-right ant-collapse-arrow"><svg viewBox="0 0 1024 1024" data-icon="caret-right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="" style="transform: rotate({isActive ? 90 : 0}deg);">
+      <div role="button" tabindex="0" aria-expanded="true" class="ant-collapse-header"><i aria-label="icon: caret-right" class="anticon anticon-caret-right ant-collapse-arrow"><svg viewBox="0 0 1024 1024" data-icon="caret-right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="" style="transform: rotate(90deg);">
             <path d="M715.8 493.5L335 165.1c-14.2-12.2-35-1.2-35 18.5v656.8c0 19.7 20.8 30.7 35 18.5l380.8-328.4c10.9-9.4 10.9-27.6 0-37z"></path>
           </svg></i>This is panel header 1</div>
       <div class="ant-collapse-content ant-collapse-content-active ant-motion-collapse">
@@ -97,13 +97,13 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
       </div>
     </div>
     <div role="tablist" class="ant-collapse-item" style="background: rgb(247, 247, 247); border-radius: 4px; margin-bottom: 24px; border: 0px; overflow: hidden;">
-      <div role="button" tabindex="0" class="ant-collapse-header"><i aria-label="icon: caret-right" class="anticon anticon-caret-right ant-collapse-arrow"><svg viewBox="0 0 1024 1024" data-icon="caret-right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="" style="transform: rotate({isActive ? 90 : 0}deg);">
+      <div role="button" tabindex="0" class="ant-collapse-header"><i aria-label="icon: caret-right" class="anticon anticon-caret-right ant-collapse-arrow"><svg viewBox="0 0 1024 1024" data-icon="caret-right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="">
             <path d="M715.8 493.5L335 165.1c-14.2-12.2-35-1.2-35 18.5v656.8c0 19.7 20.8 30.7 35 18.5l380.8-328.4c10.9-9.4 10.9-27.6 0-37z"></path>
           </svg></i>This is panel header 2</div>
       <!---->
     </div>
     <div role="tablist" class="ant-collapse-item" style="background: rgb(247, 247, 247); border-radius: 4px; margin-bottom: 24px; border: 0px; overflow: hidden;">
-      <div role="button" tabindex="0" class="ant-collapse-header"><i aria-label="icon: caret-right" class="anticon anticon-caret-right ant-collapse-arrow"><svg viewBox="0 0 1024 1024" data-icon="caret-right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="" style="transform: rotate({isActive ? 90 : 0}deg);">
+      <div role="button" tabindex="0" class="ant-collapse-header"><i aria-label="icon: caret-right" class="anticon anticon-caret-right ant-collapse-arrow"><svg viewBox="0 0 1024 1024" data-icon="caret-right" width="1em" height="1em" fill="currentColor" aria-hidden="true" class="">
             <path d="M715.8 493.5L335 165.1c-14.2-12.2-35-1.2-35 18.5v656.8c0 19.7 20.8 30.7 35 18.5l380.8-328.4c10.9-9.4 10.9-27.6 0-37z"></path>
           </svg></i>This is panel header 3</div>
       <!---->
diff --git a/components/collapse/demo/custom.md b/components/collapse/demo/custom.md
index fbbbb4a20..3984495c5 100644
--- a/components/collapse/demo/custom.md
+++ b/components/collapse/demo/custom.md
@@ -13,7 +13,7 @@ Customize the background, border and margin styles and icon for each panel.
   <div>
     <a-collapse defaultActiveKey="1" :bordered="false">
       <template v-slot:expandIcon="props">
-        <a-icon  type="caret-right" rotate="{isActive ? 90 : 0}" />
+        <a-icon  type="caret-right" :rotate="props.isActive ? 90 : 0" />
       </template>
       <a-collapse-panel  header="This is panel header 1" key="1" :style="customStyle">
         <p>{{text}}</p>
diff --git a/components/vc-collapse/index.js b/components/vc-collapse/index.js
index 93e681ee5..733445fb1 100644
--- a/components/vc-collapse/index.js
+++ b/components/vc-collapse/index.js
@@ -1,4 +1,4 @@
-// based on rc-collapse 1.11.1
+// based on rc-collapse 1.11.7
 import CollapsePanel from './src/Panel';
 import Collapse from './src/Collapse';
 import { collapseProps, panelProps } from './src/commonProps';
diff --git a/components/vc-collapse/src/Collapse.jsx b/components/vc-collapse/src/Collapse.jsx
index 700d51ded..0880411b3 100644
--- a/components/vc-collapse/src/Collapse.jsx
+++ b/components/vc-collapse/src/Collapse.jsx
@@ -9,7 +9,7 @@ function _toArray(activeKey) {
   if (!Array.isArray(currentActiveKey)) {
     currentActiveKey = currentActiveKey ? [currentActiveKey] : [];
   }
-  return currentActiveKey;
+  return currentActiveKey.map(key => String(key));
 }
 export default {
   name: 'Collapse',
@@ -84,15 +84,13 @@ export default {
       let panelEvents = {};
       if (!disabled && disabled !== '') {
         panelEvents = {
-          itemClick: panelKey => {
-            this.onClickItem(panelKey);
-          },
+          itemClick:  this.onClickItem,
         };
       }
 
       const props = {
+        key,
         props: {
-          key,
           panelKey: key,
           header,
           headerClass,
@@ -103,9 +101,7 @@ export default {
           accordion,
           expandIcon,
         },
-        on: {
-          ...panelEvents,
-        },
+        on: panelEvents,
       };
 
       return cloneElement(child, props);
diff --git a/components/vc-collapse/src/Panel.jsx b/components/vc-collapse/src/Panel.jsx
index b11e1d6f0..a840eaea6 100644
--- a/components/vc-collapse/src/Panel.jsx
+++ b/components/vc-collapse/src/Panel.jsx
@@ -55,9 +55,9 @@ export default {
       [`${prefixCls}-item-active`]: isActive,
       [`${prefixCls}-item-disabled`]: disabled,
     };
-    let icon = null;
+    let icon = <i class="arrow" />;
     if (showArrow && typeof expandIcon === 'function') {
-      icon = cloneElement(expandIcon(this.$props));
+      icon = expandIcon(this.$props);
     }
     return (
       <div class={itemCls} role="tablist">
@@ -69,7 +69,7 @@ export default {
           tabIndex={disabled ? -1 : 0}
           aria-expanded={isActive}
         >
-          {showArrow && (icon || <i class="arrow" />)}
+          {showArrow && icon}
           {header}
           {extra && <div class={`${prefixCls}-extra`}>{extra}</div>}
         </div>
diff --git a/components/vc-collapse/src/commonProps.js b/components/vc-collapse/src/commonProps.js
index 1517ebf41..7ef65fd7e 100644
--- a/components/vc-collapse/src/commonProps.js
+++ b/components/vc-collapse/src/commonProps.js
@@ -2,8 +2,16 @@ import PropTypes from '../../_util/vue-types';
 
 const collapseProps = () => ({
   prefixCls: PropTypes.string,
-  activeKey: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
-  defaultActiveKey: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
+  activeKey: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number,
+    PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])),
+  ]),
+  defaultActiveKey: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number,
+    PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])),
+  ]),
   accordion: PropTypes.bool,
   destroyInactivePanel: PropTypes.bool,
   bordered: PropTypes.bool,