Merge pull request #2227 from jebarjonet/fix-addon-knobs-object-propt…

…ypes Fix addon Knobs: add array in Object PropTypes
storybookjs · Nov 4, 2017 · 27d4f41 · 27d4f41
2 parents c2a965e + 4613dcb
commit 27d4f41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/addons/knobs/README.md b/addons/knobs/README.md
@@ -161,7 +161,7 @@ const value = color(label, defaultValue);
 
 ### object
 
-Allows you to get a JSON object from the user.
+Allows you to get a JSON object or array from the user.
 
 ```js
 import { object } from '@storybook/addon-knobs';
@@ -178,7 +178,7 @@ const value = object(label, defaultValue);
 
 ### array
 
-Allows you to get an array from the user.
+Allows you to get an array of strings from the user.
 
 ```js
 import { array } from '@storybook/addon-knobs';

diff --git a/addons/knobs/src/components/types/Object.js b/addons/knobs/src/components/types/Object.js
@@ -88,7 +88,7 @@ ObjectType.defaultProps = {
 ObjectType.propTypes = {
   knob: PropTypes.shape({
     name: PropTypes.string,
-    value: PropTypes.object,
+    value: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
   }),
   onChange: PropTypes.func,
 };