Merge branch 'master' into jl-issue62-link

accordproject · Jun 24, 2019 · e7349a0 · e7349a0
2 parents 2e2a6a0 + d7cd186
commit e7349a0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/cicero-ui",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "cicero-ui React component",
   "main": "dist/index.js",
   "scripts": {
@@ -96,4 +96,4 @@
       "<rootDir>/src/**/?(*.)(spec|test).{js,jsx,mjs}"
     ]
   }
-}
+}
diff --git a/src/ContractEditor/index.js b/src/ContractEditor/index.js
@@ -14,8 +14,8 @@
 
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { SlateAsInputEditor } from '@accordproject/markdown-editor';
-import List from '@accordproject/markdown-editor/dist/plugins/list';
+import { SlateAsInputEditor, List } from '@accordproject/markdown-editor';
+
 import ClausePlugin from '../plugins/ClausePlugin';
 
 /**

diff --git a/src/plugins/ClausePlugin.js b/src/plugins/ClausePlugin.js
@@ -208,14 +208,14 @@ function ClausePlugin(customLoadTemplate, customParseClause) {
     const { node, children } = props;
 
     const nodeAttributes = node.data.get('attributes');
-    const { src, clauseId } = nodeAttributes;
+    const { src, clauseid } = nodeAttributes;
 
     if (src) {
       console.log(`handing over responsibility of loading: ${src}`);
       loadTemplateCallback(src.toString());
     }
 
-    return (<ClauseComponent templateUri={src} clauseId={clauseId} {...props}>{children}</ClauseComponent>);
+    return (<ClauseComponent templateUri={src} clauseId={clauseid} {...props}>{children}</ClauseComponent>);
   }
 
   /**