fix(components): remove hardcoded id - I233

Signed-off-by: irmerk <[email protected]>
accordproject · Feb 26, 2020 · b9f316f · b9f316f
1 parent d0bbcb2
commit b9f316f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/ClauseComponent.js b/src/components/ClauseComponent.js
@@ -62,6 +62,7 @@ function ClauseComponent(props) {
     const findConditionals = node => ({
       ...(((node.type === 'conditional') && (node.data.get('whenFalse') === '')) ? {
         [node.key]: {
+          id: node.data.get('id'),
           whenTrue: node.data.get('whenTrue'),
           whenFalse: node.data.get('whenFalse'),
           position: findPosition(node.key),
@@ -89,7 +90,7 @@ function ClauseComponent(props) {
         object: 'inline',
         type: 'conditional',
         data: {
-          id: 'forceMajeure',
+          id: selectedConditional.id,
           whenTrue: selectedConditional.whenTrue,
           whenFalse: selectedConditional.whenFalse
         },

diff --git a/src/components/Conditional.js b/src/components/Conditional.js
@@ -15,6 +15,7 @@ const Conditional = (props) => {
   const { attributes, children, node } = props;
   const [hovering, setHovering] = useState(false);
   const conditional = {
+    id: node.data.get('id'),
     whenTrue: node.data.get('whenTrue'),
     whenFalse: node.data.get('whenFalse'),
     isFalse: node.text === node.data.get('whenFalse'),
@@ -25,7 +26,7 @@ const Conditional = (props) => {
       object: 'inline',
       type: 'conditional',
       data: {
-        id: 'forceMajeure',
+        id: conditional.id,
         whenTrue: conditional.whenTrue,
         whenFalse: conditional.whenFalse
       },
@@ -45,7 +46,7 @@ const Conditional = (props) => {
   };
 
   const conditionalProps = {
-    id: node.data.get('id'),
+    id: conditional.id,
     className: 'conditional',
     onMouseEnter: () => setHovering(true),
     onMouseLeave: () => setHovering(false),