Merge pull request #952 from AlonGvili/patch-1

Fixing #951 Radio group placeholder bug
ironmansoftware · Jul 8, 2019 · 3c6abc2 · 3c6abc2
2 parents 21e6634 + 7d53e34
commit 3c6abc2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/UniversalDashboard.Materialize/Components/ud-input-field.jsx b/src/UniversalDashboard.Materialize/Components/ud-input-field.jsx
@@ -234,12 +234,13 @@ export default class UdInputField extends React.Component {
                         name={`${this.props.inputId}${field.name}`} 
                         id={`${this.props.inputId}${field.name}${idx}`} 
                         disabled={field.disabled} 
-                        onChange={e => self.onRadioChanged(field, e)} value={option} />
-                    <span>{option}</span>
+                        onChange={e => self.onRadioChanged(field, e)} 
+                        value={option} />
+                    <span>{field.placeholder[idx] ? field.placeholder[idx] : option}</span>
                 </label>
             }.bind(this));
 
-            return [<p>{field.placeholder ? field.placeholder : field.name}</p>, options];
+            return options;
         }
 
         if (field.type == 'file' || field.type == 'binaryFile') {
@@ -259,4 +260,4 @@ export default class UdInputField extends React.Component {
         }
 
     }
-}
+}