From ab153981c93a0155098ba8612f4e74fe7f2cdb01 Mon Sep 17 00:00:00 2001
From: Felix Linker <linkerfelix@gmail.com>
Date: Sat, 2 Jan 2021 10:59:58 +0100
Subject: [PATCH] Rework Modifictaions(Menu)

---
 src/app/components/Modification.jsx      | 74 +++++++++++-------------
 src/app/components/ModificationsMenu.jsx | 44 ++++++++++----
 2 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/src/app/components/Modification.jsx b/src/app/components/Modification.jsx
index 8dafdfe0..17938d0f 100644
--- a/src/app/components/Modification.jsx
+++ b/src/app/components/Modification.jsx
@@ -46,7 +46,7 @@ export default class Modification extends TranslatedComponent {
    * @return {React.Component} modification
    */
   render() {
-    const { translate, formats } = this.context.language;
+    const { formats } = this.context.language;
     const { highlight, m, property } = this.props;
     const { beneficial, unit, value, inputValue } = this.state;
 
@@ -58,44 +58,40 @@ export default class Modification extends TranslatedComponent {
     }
 
     return (
-      <div onBlur={this._updateFinished.bind(this)} key={property}
-        className="cb modification-container"
-      >
-        <span className="cb">{translate(property)}</span>
-        <span className="header-adjuster"></span>
-        <table style={{ width: '100%' }}>
-          <tbody>
-            <tr>
-              <td className="input-container">
-                <span>
-                  <NumberEditor value={inputValue || value} stepModifier={1}
-                    decimals={2} step={0.01} style={{ textAlign: 'right' }}
-                    className={cn('cb', { 'greyed-out': !highlight })}
-                    onKeyDown={(event) => {
-                      if (event.key == 'Enter') {
-                        this._updateFinished();
-                        event.stopPropagation();
-                      }
-                    }}
-                    onValueChange={(inputValue) => {
-                      if (inputValue.length <= 15) {
-                        this.setState({ inputValue });
-                      }
-                    }} />
-                  <span className="unit-container">{unit}</span>
-                </span>
-              </td>
-              <td style={{ textAlign: 'center' }}
-                className={cn({
-                  secondary: beneficial,
-                  warning: beneficial === false,
-                })}
-              // TODO: support absolute modifiers
-              >{formats.pct(m.getModifier(property))}</td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
+        <tr>
+          <td>
+            <span>
+              <input type="checkbox" checked={true} onClick={() => {}}/>
+            </span>
+          </td>
+          <td className="input-container">
+            <span>
+              <NumberEditor value={inputValue || value} stepModifier={1}
+                decimals={2} step={0.01} style={{ textAlign: 'right', width: '100%' }}
+                className={cn('cb', { 'greyed-out': !highlight })}
+                onKeyDown={(event) => {
+                  if (event.key == 'Enter') {
+                    this._updateFinished();
+                    event.stopPropagation();
+                  }
+                }}
+                onValueChange={(inputValue) => {
+                  if (inputValue.length <= 15) {
+                    this.setState({ inputValue });
+                  }
+                }} />
+            </span>
+          </td>
+          <td style={{ textAlign: 'left' }}>
+              <span className="unit-container">{unit}</span>
+          </td>
+          <td style={{ textAlign: 'center' }}
+            className={cn({
+              secondary: beneficial,
+              warning: beneficial === false,
+            })}
+          >{formats.pct(m.getModifier(property))}</td>
+        </tr>
     );
   }
 }
diff --git a/src/app/components/ModificationsMenu.jsx b/src/app/components/ModificationsMenu.jsx
index 0a28f2f5..31ea22d0 100644
--- a/src/app/components/ModificationsMenu.jsx
+++ b/src/app/components/ModificationsMenu.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import * as _ from 'lodash';
+import { chain, keys } from 'lodash';
 import TranslatedComponent from './TranslatedComponent';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 import cn from 'classnames';
@@ -161,21 +161,39 @@ export default class ModificationsMenu extends TranslatedComponent {
 
   /**
    * Render the modifications
-   * @param  {Object} props   React Component properties
    * @return {Array}          Array of React Components
    */
-  _renderModifications(props) {
-    const { m } = props;
+  _renderModifications() {
+    const { m } = this.props;
+    const { translate } = this.context.language;
 
     const blueprintFeatures = getBlueprintInfo(m.getBlueprint()).features[
       m.getBlueprintGrade()
     ];
-    const blueprintModifications = Object.keys(blueprintFeatures)
-      .map((feature) => this._mkModification(feature, true))
-      .filter(Boolean);
-    const moduleModifications = Object.keys(getModuleInfo(m.getItem()).props)
+    const blueprintModifications = chain(keys(blueprintFeatures))
+      .map((feature) => [
+        <tr>
+          <th colSpan="4">
+            <span className="cb">{translate(feature)}</span>
+          </th>
+        </tr>,
+        this._mkModification(feature, true),
+      ])
+      .filter(([_, mod]) => Boolean(mod))
+      .flatMap()
+      .value();
+    const moduleModifications = chain(keys(getModuleInfo(m.getItem()).props))
       .filter((prop) => !blueprintFeatures[prop])
-      .map((prop) => this._mkModification(prop, false));
+      .map((prop) => [
+        <tr>
+          <th colSpan="4">
+            <span className="cb">{translate(prop)}</span>
+          </th>
+        </tr>,
+        this._mkModification(prop, false),
+      ])
+      .flatMap()
+      .value();
 
     return blueprintModifications.concat(moduleModifications);
   }
@@ -362,7 +380,13 @@ export default class ModificationsMenu extends TranslatedComponent {
           <span
             onMouseOver={termtip.bind(null, 'HELP_MODIFICATIONS_MENU')}
             onMouseOut={tooltip.bind(null, null)}
-          >{this._renderModifications(this.props)}</span>
+          >
+            <table style={{ width: '100%' }}>
+              <tbody>
+                {this._renderModifications()}
+              </tbody>
+            </table>
+          </span>
         );
     }