Merge eb30067 into c1c956b

react-component · Aug 8, 2019 · 54d08f6 · 54d08f6
2 parents c1c956b + eb30067
commit 54d08f6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Collapse.jsx b/src/Collapse.jsx
@@ -141,11 +141,19 @@ Collapse.propTypes = {
   prefixCls: PropTypes.string,
   activeKey: PropTypes.oneOfType([
     PropTypes.string,
-    PropTypes.arrayOf(PropTypes.string),
+    PropTypes.number,
+    PropTypes.arrayOf(PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ])),
   ]),
   defaultActiveKey: PropTypes.oneOfType([
     PropTypes.string,
-    PropTypes.arrayOf(PropTypes.string),
+    PropTypes.number,
+    PropTypes.arrayOf(PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ])),
   ]),
   openAnimation: PropTypes.object,
   onChange: PropTypes.func,