Merge pull request #10 from postlight/fix-ordered-row-fields

fix: preserve order of row fields
postlight · Jan 14, 2020 · 9da4aa6 · 9da4aa6
2 parents a8c15af + 2cfa856
commit 9da4aa6
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/components/Row.js b/src/components/Row.js
@@ -37,16 +37,22 @@ const getRenderer = field => {
   return <div />;
 };
 
-const Row = ({ rowData, fieldsToDisplay }) => (
-  <div className="row">
-    {_.chain(rowData.fields)
-      .map(field =>
-        fieldsToDisplay.includes(field.name) ? getRenderer(field) : null
-      )
-      .filter(renderer => !!renderer)
-      .value()}
-  </div>
-);
+const Row = ({ rowData, fieldsToDisplay }) => {
+  const mapFields = name => {
+    const field = rowData.fields.find(field => field.name === name);
+    if (field) return getRenderer(field);
+
+    return field;
+  };
+  return (
+    <div className="row">
+      {_.chain(fieldsToDisplay)
+        .map(mapFields)
+        .filter(renderer => !!renderer)
+        .value()}
+    </div>
+  );
+};
 
 Row.defaultProps = {
   rowData: {},