Merge pull request #109 from webdev-dev/master

FormField: fixed small bug on SelectionHybridCheckbox

Author: kmiyauchi

lib/FormFields/renderSelectionHybridCheckbox.js

@@ -103,17 +103,20 @@ var renderSelectionHybridCheckbox = function (_React$Component) {
         value: function parseOptionsAndSpecials(props) {
             var exclusives = [];
             var options = [];
-            props.options.forEach(function (option) {
-                var key = props.getOptKey(option);
-                var special = props.getOptSpecial(option);
-                if (special.includes('exclusive')) {
-                    exclusives.push(key);
-                }
-                options.push({
-                    key: key,
-                    value: props.getOptVal(option)
+
+            if (props.options) {
+                props.options.forEach(function (option) {
+                    var key = props.getOptKey(option);
+                    var special = props.getOptSpecial(option);
+                    if (special.includes('exclusive')) {
+                        exclusives.push(key);
+                    }
+                    options.push({
+                        key: key,
+                        value: props.getOptVal(option)
+                    });
                 });
-            });
+            }
             return { options: options, exclusives: exclusives };
         }
     }, {
@@ -131,7 +134,8 @@ var renderSelectionHybridCheckbox = function (_React$Component) {
                 globalError = _props2.globalError,
                 fieldMap = _props2.fieldMap,
                 disabled = _props2.disabled,
-                columnCount = _props2.columnCount;
+                columnCount = _props2.columnCount,
+                preview = _props2.preview;
             var options = this.state.options;
 
 
@@ -152,7 +156,7 @@ var renderSelectionHybridCheckbox = function (_React$Component) {
             return _react2.default.createElement(
                 'div',
                 {
-                    className: (0, _classnames2.default)(className, 'wfui-form-item', { 'wfui-form-item-error': globalError }, { 'wfui-form-disabled': disabled })
+                    className: (0, _classnames2.default)(className, 'wfui-form-item', { 'wfui-form-item-error': globalError }, { 'wfui-form-disabled': disabled }, { 'wfui-form-preview': preview })
                 },
                 _react2.default.createElement(
                     _index.ControlLabel,

src/FormFields/renderSelectionHybridCheckbox.jsx

@@ -62,17 +62,20 @@ class renderSelectionHybridCheckbox extends React.Component {
     parseOptionsAndSpecials(props) {
         const exclusives = [];
         let options = [];
-        props.options.forEach(option => {
-            const key = props.getOptKey(option);
-            const special = props.getOptSpecial(option);
-            if (special.includes('exclusive')) {
-                exclusives.push(key);
-            }
-            options.push({
-                key,
-                value: props.getOptVal(option),
+
+        if (props.options) {
+            props.options.forEach(option => {
+                const key = props.getOptKey(option);
+                const special = props.getOptSpecial(option);
+                if (special.includes('exclusive')) {
+                    exclusives.push(key);
+                }
+                options.push({
+                    key,
+                    value: props.getOptVal(option),
+                });
             });
-        });
+        }
         return { options, exclusives };
     }
     render() {
@@ -87,6 +90,7 @@ class renderSelectionHybridCheckbox extends React.Component {
             fieldMap,
             disabled,
             columnCount,
+            preview,
         } = this.props;
 
         const { options } = this.state;
@@ -112,6 +116,7 @@ class renderSelectionHybridCheckbox extends React.Component {
                     'wfui-form-item',
                     { 'wfui-form-item-error': globalError },
                     { 'wfui-form-disabled': disabled },
+                    { 'wfui-form-preview': preview },
                 )}
             >
                 <ControlLabel>{label}</ControlLabel>