diff --git a/ts/components/CompositionInput.md b/ts/components/CompositionInput.md
deleted file mode 100644
index 705ee852c8..0000000000
--- a/ts/components/CompositionInput.md
+++ /dev/null
@@ -1,12 +0,0 @@
-#### Default
-
-```jsx
-<util.ConversationContext theme={util.theme}>
-  <div style={{ minHeight: '500px', paddingTop: '450px' }}>
-    <CompositionInput
-      i18n={util.i18n}
-      onSubmit={s => console.log('onSubmit', s)}
-    />
-  </div>
-</util.ConversationContext>
-```
diff --git a/ts/components/CompositionInput.stories.tsx b/ts/components/CompositionInput.stories.tsx
new file mode 100644
index 0000000000..f54f062ec6
--- /dev/null
+++ b/ts/components/CompositionInput.stories.tsx
@@ -0,0 +1,104 @@
+import * as React from 'react';
+
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+
+import { CompositionInput, Props } from './CompositionInput';
+
+// tslint:disable-next-line
+import 'draft-js/dist/Draft.css';
+
+// @ts-ignore
+import { setup as setupI18n } from '../../js/modules/i18n';
+
+// @ts-ignore
+import enMessages from '../../_locales/en/messages.json';
+import { boolean, select } from '@storybook/addon-knobs';
+
+const i18n = setupI18n('en', enMessages);
+
+const story = storiesOf('Components/CompositionInput', module);
+
+const createProps = (overrideProps: Partial<Props> = {}): Props => ({
+  i18n,
+  disabled: boolean('disabled', overrideProps.disabled || false),
+  onSubmit: action('onSubmit'),
+  onEditorSizeChange: action('onEditorSizeChange'),
+  onEditorStateChange: action('onEditorStateChange'),
+  onTextTooLong: action('onTextTooLong'),
+  startingText: overrideProps.startingText || undefined,
+  clearQuotedMessage: action('clearQuotedMessage'),
+  getQuotedMessage: action('getQuotedMessage'),
+  onPickEmoji: action('onPickEmoji'),
+  large: boolean('large', overrideProps.large || false),
+  skinTone: select(
+    'skinTone',
+    {
+      skinTone0: 0,
+      skinTone1: 1,
+      skinTone2: 2,
+      skinTone3: 3,
+      skinTone4: 4,
+      skinTone5: 5,
+    },
+    overrideProps.skinTone || undefined
+  ),
+});
+
+story.add('Default', () => {
+  const props = createProps();
+
+  return <CompositionInput {...props} />;
+});
+
+story.add('Large', () => {
+  const props = createProps({
+    large: true,
+  });
+
+  return <CompositionInput {...props} />;
+});
+
+story.add('Disabled', () => {
+  const props = createProps({
+    disabled: true,
+  });
+
+  return <CompositionInput {...props} />;
+});
+
+story.add('Starting Text', () => {
+  const props = createProps({
+    startingText: "here's some starting text",
+  });
+
+  return <CompositionInput {...props} />;
+});
+
+story.add('Multiline Text', () => {
+  const props = createProps({
+    startingText: `here's some starting text
+and more on another line
+and yet another line
+and yet another line
+and yet another line
+and yet another line
+and yet another line
+and yet another line
+and we're done`,
+  });
+
+  return <CompositionInput {...props} />;
+});
+
+story.add('Emojis', () => {
+  const props = createProps({
+    startingText: `⁣😐😐😐😐😐😐😐
+😐😐😐😐😐😐😐
+😐😐😐😂⁣😐😐😐
+😐😐😐😐😐😐😐
+😐😐😐😐😐😐😐`,
+  });
+
+  return <CompositionInput {...props} />;
+});