fixing the display align

get-focus · Nov 8, 2016 · b42610e · b42610e
1 parent 27419e2
commit b42610e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/behaviours/field.js b/src/behaviours/field.js
@@ -51,7 +51,7 @@ const fieldForBuilder = (props, textOnly = false, multiple = false, list = false
         if (get(definitions, `${entityPath}.${propertyName}`).validateOnBlur !== false) onInputBlur(propertyName, entityPath, rawInputValue);
         if (userDefinedOnBlur) userDefinedOnBlur();
     };
-    const fieldForLine = list ? fieldForListBuilder(entityPath, propertyName, false, false, options.listOnly)(props): {};
+    const fieldForLine = list ? fieldForListBuilder(entityPath, propertyName, false, false, options.isRaw, options.listOnly)(props): {};
     const selectForLine = list ? fieldForListBuilder(entityPath, propertyName, true)(props): {};
     const textForLine = list ? fieldForListBuilder(entityPath, propertyName, false, true)(props): {};
 
@@ -72,7 +72,7 @@ const fieldForBuilder = (props, textOnly = false, multiple = false, list = false
 }
 
 
-const fieldForListBuilder = (entityPathList, propertyNameList, multiple= false, textOnly= false, listOnly) => {
+const fieldForListBuilder = (entityPathList, propertyNameList, multiple= false, textOnly= false, isRaw, listOnly) => {
   const fieldForLineBuilder = (connectedComponentProps) => (propertyName, {FieldComponent = DefaultFieldComponent, entityPath, onBlur: userDefinedOnBlur,onChange: userDefinedOnChange,  ...options} = {}, index) => {
       const {fields, definitions, domains, onInputChange, onInputBlur, entityPathArray, editing, onInputBlurList} = connectedComponentProps;
       const {onChange: optionsOnChange, ...otherOptions} = options;
@@ -107,6 +107,7 @@ const fieldForListBuilder = (entityPathList, propertyNameList, multiple= false,
                 onChange={onChange}
                  onBlur={onBlur}
                  fields={fields}
+                 isRaw={isRaw}
                  {...connectedComponentProps}
                  {...options} />;
   }

diff --git a/src/components/field.js b/src/components/field.js
@@ -12,7 +12,9 @@ const FieldLabelValueComponent = ({editing, isRequired, label, name, valid, Valu
     <div data-focus='field' className='mdl-grid' data-mode={editing ? 'edit' : 'consult'} data-required={isRequired} data-valid={valid}>
         <div
             data-focus='field-label-container'
-            className={(isRaw && index === undefined || listOnly) ? '' : (isRaw && index != undefined) ? 'mdl-cell mdl-cell--top mdl-cell--2-col' : 'mdl-cell mdl-cell--top mdl-cell--4-col'} style={(listOnly) ? {margin: '8px', width: 'calc(10% - 16px)'} : (index != undefined || isRaw) ? {marginTop: '0px'} : {}}>
+            className={(isRaw && index === undefined && !listOnly && label != undefined) ? ''
+                : (isRaw && index != undefined || isRaw && listOnly || isRaw && label === undefined) ? 'mdl-cell mdl-cell--top mdl-cell--2-col'
+                : 'mdl-cell mdl-cell--top mdl-cell--4-col'} style={(index != undefined || isRaw) ? {marginTop: '0px'} : {}}>
             {(displayLabel || (displayLabel === false && index != undefined) || displayLabel === undefined) && <Label name={name} text={label} />}
         </div>
         <div data-focus='field-value-container' className='mdl-cell mdl-cell--top mdl-cell--8-col' style={(index != undefined || isRaw) ? {marginTop: '0px'} : {}}>
@@ -35,7 +37,6 @@ class Field extends PureComponent {
             SelectComponentDisplay = DefaultSelectDisplayComponent,
             ListComponent = DefaultListComponent } = otherProps.metadata;
 
-            console.log(listOnly);
             const renderConsult = () => list ?  <ListComponent fieldForLine={fieldForLine} values={otherProps.formattedInputValue} {...otherProps}/> : (multiple ? <SelectComponentDisplay {...otherProps} /> : <DisplayComponent  {...otherProps} />);
             const renderEdit = () => list ? <ListComponent fieldForLine={fieldForLine} values={otherProps.formattedInputValue} {...otherProps}/> : (multiple ? <SmartSelectComponent SelectComponent={SelectComponent} {...otherProps}/> : <InputComponent {...otherProps}/>);
             const ValueComponent = otherProps.editing ? renderEdit() : renderConsult();

diff --git a/src/components/list.js b/src/components/list.js
@@ -2,7 +2,7 @@ import React, {PropTypes} from 'react';
 
 
 function List({fieldForLine, selectForLine, textForLine, LineComponent, children, options, error, values, ...otherProps}) {
-    const renderLine = () => { debugger
+    const renderLine = () => {
     return (values ? values.map((element, index) => {
             // fieldFor which wrapp the index.
             const lineFieldFor = (linePropertyName, lineOptions) => fieldForLine(linePropertyName, lineOptions, index)