From 64a4e855072c4d47ac980d236c1f2c45743b336c Mon Sep 17 00:00:00 2001
From: mama <mael.thomas@data.gouv.fr>
Date: Fri, 13 Oct 2017 12:36:25 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9composition=20du=20composant=20Somme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/engine/mecanismViews/Somme.js | 75 ++++++++++++++--------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/source/engine/mecanismViews/Somme.js b/source/engine/mecanismViews/Somme.js
index 7e2c99830..3066e1da0 100644
--- a/source/engine/mecanismViews/Somme.js
+++ b/source/engine/mecanismViews/Somme.js
@@ -4,47 +4,46 @@ import {path} from 'ramda'
 import {Node, NodeValue} from './common'
 
 
-export default class Somme extends Component {
-	render() {
-		let {explanation, nodeValue} = this.props
-		return <Node
+export default ({explanation, nodeValue}) =>
+		<Node
 			classes="mecanism somme"
 			name="somme"
 			value={nodeValue}
-			child={
-				this.renderTable(explanation)
-			}
+			child={<Table explanation={explanation}/>}
 		/>
-	}
-	renderTable = explanation => (
-		<table>
-			<caption />
-			<tbody>
-				{explanation.map((v, i) => {
-					let rowFormula = path(["explanation", "formule", "explanation"], v),
-						isSomme = rowFormula && rowFormula.name == "somme"
 
-					return [
-						<tr key={v.name} className={isSomme ? "" : "noNest"}>
-							<td className="operator blank">{i != 0 && "+"}</td>
-							<td className="element">{makeJsx(v)}</td>
-							<td className="situationValue value">
-								<NodeValue data={v.nodeValue} />
-							</td>
-						</tr>,
-						...(isSomme
-							? [
-								<tr className="nested">
-									<td className="blank" />
-									<td className="nested">
-										{this.renderTable(rowFormula.explanation)}
-									</td>
-								</tr>
-							]
-							: [])
-					]
-				})}
-			</tbody>
-		</table>
-	)
+let Table = ({explanation}) => <table>
+	<caption />
+	<tbody>
+		{explanation.map((v, i) => <Row {...{v, i}}/>)}
+	</tbody>
+</table>
+
+
+class Row extends Component {
+	render() {
+		let {v, i} = this.props,
+			rowFormula = path(["explanation", "formule", "explanation"], v),
+			isSomme = rowFormula && rowFormula.name == "somme"
+
+		return [
+			<tr key={v.name} className={isSomme ? "" : "noNest"}>
+				<td className="operator blank">{i != 0 && "+"}</td>
+				<td className="element">{makeJsx(v)}</td>
+				<td className="situationValue value">
+					<NodeValue data={v.nodeValue} />
+				</td>
+			</tr>,
+			...(isSomme
+				? [
+					<tr className="nested">
+						<td className="blank" />
+						<td className="nested">
+							<Table explanation={rowFormula.explanation}/>
+						</td>
+					</tr>
+				]
+				: [])
+		]
+	}
 }