fixed base classes passing to trigger

Author: otissv

__tests__/trigger-unit-test.js

@@ -6,12 +6,55 @@ import renderElement from './helpers/renderElement';
 
 
 test('trigger Component', nested => {
-  nested.test('Renders trigger component:',
+  nested.test('Trigger type: button',
     assert => {
-      
+      const trigger = renderElement(<Trigger kitid="but" type='button'>Button trigger</Trigger>).dom();
+
+      const actualText = trigger.html();
+      const expectedText = '<button type="button" class="uk-button  uk-width-1-1" data-kitid="but">Button trigger </button>';
+      assert.equals(actualText, expectedText,
+        'Correctly renders trigger element as button');
+
+      assert.end();
+    });
+
+
+  nested.test('Trigger type: link',
+    assert => {
+      const trigger = renderElement(<Trigger kitid="link" type='link'>Link trigger</Trigger>).dom();
+
+      const actualText = trigger.html();
+      const expectedText = '<a class="uk-button  uk-width-1-1" data-kitid="link" href="#" role="button">Link trigger </a>';
+      assert.equals(actualText, expectedText,
+        'Correctly renders trigger element as link');
+
+      assert.end();
+    });
+
+
+  nested.test('Trigger type: span',
+    assert => {
+      const trigger = renderElement(<Trigger kitid="span" type='span'>Span trigger</Trigger>).dom();
+
+      const actualText = trigger.html();
+      const expectedText = '<span data-kitid="span">Span trigger </span>';
+      assert.equals(actualText, expectedText,
+        'Correctly renders trigger element as span');
 
       assert.end();
     });
 
 
+    nested.test('Trigger type: div',
+      assert => {
+        const trigger = renderElement(<Trigger kitid="div" type='div'>Span trigger</Trigger>).dom();
+
+        const actualText = trigger.html();
+        const expectedText = '<div data-kitid="div">Span trigger </div>';
+        assert.equals(actualText, expectedText,
+          'Correctly renders trigger element as div');
+
+        assert.end();
+      });
+
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-uikit-trigger",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "React uikit trigger component.",
   "keywords": [
     "javascript",
@@ -54,6 +54,7 @@
     "watch": "~0.16.0"
   },
   "dependencies": {
+    "babel-cli": "~6.1.8",
     "react": "~0.14.3",
     "react-uikit-base": "~0.2.2",
     "react-uikit-button": "~0.2.0",

src/trigger.jsx

@@ -10,11 +10,18 @@ const Trigger = (props) => {
   const icon = ufunc.maybeIf(<i className={`uk-icon-${props.icon}`}/>)(props.icon);
 
   const cleanProps = uikit.helpers.cleanProps(['icon'])(props);
+  const cleanPropType = uikit.helpers.cleanProps(['type'])(props);
+
+  const cssClassNames = uikit.helpers.cleanClasses([
+    props.classes,
+    props.className
+  ]);
 
   const type = {
     button: <Button
       {...props}
       {...cleanProps}
+      className={cssClassNames}
       block
       kitid={props.kitid}
       body={props.body}
@@ -25,6 +32,8 @@ const Trigger = (props) => {
     link: <Button
       {...props}
       {...cleanProps}
+      {...cleanPropType}
+      className={cssClassNames}
       block
       kitid={props.kitid}
       type='link'
@@ -36,8 +45,9 @@ const Trigger = (props) => {
     span : <span
       {...props}
       {...cleanProps}
+      {...cleanPropType}
       {...uikit.helpers.events}
-      col='1-1'
+      className={cssClassNames}
       data-kitid={props.kitid}
     >
       {props.body}
@@ -47,7 +57,8 @@ const Trigger = (props) => {
     div: <div
       {...props}
       {...cleanProps}
-      col='1-1'
+      {...cleanPropType}
+      className={cssClassNames}
       {...uikit.helpers.events}
       data-kitid={props.kitid}
     >
@@ -56,7 +67,6 @@ const Trigger = (props) => {
     </div>
   };
 
-
   return ufunc.either(type[props.type], type['button'])(props.type);
 };