Merge branch 'next' of https://github.com/wfp/ui into next

* 'next' of https://github.com/wfp/ui: minor additions to text input and list components
wfp · Sep 6, 2020 · 88e2e6a · 88e2e6a
2 parents 11f12d1 + b9b3757
commit 88e2e6a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 50 deletions.
diff --git a/src/components/List/List.stories.js b/src/components/List/List.stories.js
@@ -69,3 +69,15 @@ ListColumns.story = {
     },
   },
 };
+
+export const ListDetails = (args) => (
+  <List kind="bullets">
+    <ListItem kind="checkmark">hello</ListItem>
+    <ListItem kind="cross">hello</ListItem>
+    <ListItem>hello</ListItem>
+  </List>
+);
+
+// ListDetails.story = {
+
+// }
diff --git a/src/components/List/ListItem.js b/src/components/List/ListItem.js
@@ -75,14 +75,11 @@ ListItem.propTypes = {
    * Specify a custom className
    */
   className: PropTypes.string,
-  /**
-   * Specify if colons should be used
-   */
-  colon: PropTypes.bool,
+
   /**
    * Specify a kind.
    */
-  kind: PropTypes.oneOf(['simple', 'simple-inline', 'details', 'bullet']),
+  kind: PropTypes.oneOf(['checkmark', 'cross']),
   /**
    * Specify if the List should be small
    */

diff --git a/src/components/TextInput/TextInput-story.js b/src/components/TextInput/TextInput-story.js
diff --git a/src/components/TextInput/TextInput.stories.js b/src/components/TextInput/TextInput.stories.js
@@ -40,3 +40,20 @@ withError.args = {
   labelText: 'The labelText',
   invalid: { message: 'Please enter your first name' },
 };
+
+export const withDisabled = (args) => <TextInput {...args} />;
+
+withDisabled.story = {
+  parameters: {
+    docs: {
+      storyDescription: description,
+    },
+  },
+};
+
+withDisabled.args = {
+  name: 'inputname',
+  helperText: 'Optional helperText',
+  labelText: 'Disabled labelText',
+  disabled: true,
+};