align title props

Author: frankhock

src/Toast/Toast.jsx

@@ -5,21 +5,9 @@ import classNames from 'classnames';
 
 import { Alert } from 'src/Alert';
 import FadeTransition from 'src/FadeTransition';
-import { isObject } from '../utils';
 
 import './Toast.scss';
 
-function buildAlertMessageProps(message) {
-  if (isObject(message) && !React.isValidElement(message)) {
-    return {
-      title: message.title,
-      message: message.body,
-    };
-  }
-
-  return { message };
-}
-
 export default function Toast(props) {
   const groupClassNames = classNames(
     'Toast',
@@ -35,9 +23,10 @@ export default function Toast(props) {
               action={message.action}
               autoDismiss={props.autoDismiss}
               id={message.id}
+              message={message.message}
+              title={message.title}
               type={message.type}
               onDismiss={props.onToastClosed}
-              {...buildAlertMessageProps(message.message)}
             />
           </FadeTransition>
         ))
@@ -52,14 +41,8 @@ Toast.propTypes = {
   messages: PropTypes.arrayOf(
     PropTypes.shape({
       id: PropTypes.string,
-      message: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.node,
-        PropTypes.shape({
-          body: PropTypes.string,
-          title: PropTypes.string,
-        }),
-      ]),
+      message: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+      title: PropTypes.string,
       type: PropTypes.string,
     }),
   ).isRequired,

src/Toast/Toast.test.jsx

@@ -19,32 +19,33 @@ describe('Toast', () => {
     expect(props.className).toContain('Toast--no-header');
   });
 
-  describe('when building alert message props', () => {
-    const setup = (message) => create(
+  describe('when building alert props', () => {
+    const setup = (props) => create(
       <Toast
         messages={[
-          { id: '1', type: 'success', message },
+          { id: '1', type: 'success', ...props },
         ]}
       />,
     );
 
     test('builds props from string message', () => {
-      const { root } = setup('hello');
+      const { root } = setup({ message: 'hello' });
 
       expect(root.findByType(Alert).props.message).toBe('hello');
     });
 
     test('builds props from node message', () => {
-      const { root } = setup(<div>hello</div>);
+      const { root } = setup({ message: <div>hello</div> });
 
       expect(root.findByType(Alert).props.message).toEqual(<div>hello</div>);
     });
 
-    test('builds props from object message', () => {
-      const { root } = setup({ title: 'woohoo', body: 'you did it!' });
+    describe('when title prop is passed', () => {
+      test('builds title prop', () => {
+        const { root } = setup({ title: 'woohoo', message: 'you did it!' });
 
-      expect(root.findByType(Alert).props.message).toBe('you did it!');
-      expect(root.findByType(Alert).props.title).toBe('woohoo');
+        expect(root.findByType(Alert).props.title).toBe('woohoo');
+      });
     });
   });
 });