Merge pull request #890 from metasfresh/dev-877

n instead of none in dropdowns #877
metasfresh · Jun 14, 2017 · ea141cc · ea141cc
2 parents 09e0401 + 3b13703
commit ea141cc
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/components/widget/List/RawList.js b/src/components/widget/List/RawList.js
@@ -315,9 +315,9 @@ class RawList extends Component {
         }
 
         const optionKeys = Object.keys(option);
-        const selectedKeys = Object.keys(selected);
+        const selectedKeys = selected && Object.keys(selected);
         const firstOption = option[optionKeys[0]];
-        const firstSelected = selected[selectedKeys[0]];
+        const firstSelected = selected && selected[selectedKeys[0]];
 
         // objects, and first elements are not
         if (
@@ -389,8 +389,14 @@ class RawList extends Component {
             isOpen
         } = this.state;
 
-        const value = defaultValue &&
+        let value = '';
+
+        if(typeof defaultValue === 'string') {
+            value = defaultValue;
+        } else {
+            value = defaultValue &&
                         defaultValue[Object.keys(defaultValue)[0]];
+        }
 
         return (
             <div