diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index 0cfc1da..29de893 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -6,7 +6,7 @@
"@accordproject/concerto-core": "1.2.2-20210927172800",
"@accordproject/cicero-core": "0.22.0",
"@accordproject/markdown-slate": "0.13.0",
- "@accordproject/markdown-transform": "0.13.0",
+ "@accordproject/markdown-transform": "0.16.0",
"@accordproject/ui-components": "0.98.0",
"@accordproject/ui-concerto": "0.98.0",
"@accordproject/ui-contract-editor": "0.98.0",
diff --git a/packages/storybook/src/stories/1-MarkdownEditor.stories.js b/packages/storybook/src/stories/1-MarkdownEditor.stories.js
index f3b962f..49c8da6 100644
--- a/packages/storybook/src/stories/1-MarkdownEditor.stories.js
+++ b/packages/storybook/src/stories/1-MarkdownEditor.stories.js
@@ -66,6 +66,14 @@ And this is an HTML inline.
##### H5
###### H6
+## Tables:
+
+| Column1 | Column 2 |
+| ----------- | ----------- |
+| \`\`\`code block\`\`\` |  |
+| Paragraph | **Bold content** |
+| [link](http://clause.io) | *Italics* |
+
Fin.
`;
diff --git a/packages/ui-markdown-editor/package.json b/packages/ui-markdown-editor/package.json
index 003d680..0bad6a4 100644
--- a/packages/ui-markdown-editor/package.json
+++ b/packages/ui-markdown-editor/package.json
@@ -7,7 +7,7 @@
"@accordproject/markdown-html": "0.13.0",
"@accordproject/markdown-pdf": "^0.15.2",
"@accordproject/markdown-slate": "0.13.0",
- "@accordproject/markdown-transform": "^0.15.2",
+ "@accordproject/markdown-transform": "^0.16.0",
"@babel/runtime": "^7.10.3",
"image-extensions": "^1.1.0",
"is-hotkey": "^0.1.6",
diff --git a/packages/ui-markdown-editor/src/components/index.js b/packages/ui-markdown-editor/src/components/index.js
index cf39430..dc3f177 100644
--- a/packages/ui-markdown-editor/src/components/index.js
+++ b/packages/ui-markdown-editor/src/components/index.js
@@ -7,7 +7,8 @@ import { HorizontalRule } from './Span';
import {
PARAGRAPH, LINK, IMAGE, H1, H2, H3, H4, H5, H6, HR,
CODE_BLOCK, HTML_BLOCK, BLOCK_QUOTE, UL_LIST, OL_LIST, LIST_ITEM,
- HTML_INLINE, SOFTBREAK, LINEBREAK, HEADINGS, TABLE, TABLE_ROW, TABLE_CELL
+ HTML_INLINE, SOFTBREAK, LINEBREAK, HEADINGS, TABLE, TABLE_ROW, TABLE_CELL,
+ TABLE_BODY, TABLE_HEAD, HEADER_CELL
} from '../utilities/schema';
import {
H1_STYLING,
@@ -61,8 +62,11 @@ const Element = (props) => {
[HTML_INLINE]: () => (
{data.content}{children}
),
- [TABLE] : () => (),
- [TABLE_ROW] : () => ({children}
),
+ [TABLE] : () => (),
+ [TABLE_BODY] : () => ({children}),
+ [TABLE_HEAD] : () => ({children}),
+ [TABLE_ROW] : () => ({children}
),
+ [HEADER_CELL] : () => ({children} | ),
[TABLE_CELL] : () => ({children} | ),
default: () => {
console.log(`Didn't know how to render ${JSON.stringify(element, null, 2)}`);
diff --git a/packages/ui-markdown-editor/src/plugins/withHtml.js b/packages/ui-markdown-editor/src/plugins/withHtml.js
index 800ef71..7edb6c3 100644
--- a/packages/ui-markdown-editor/src/plugins/withHtml.js
+++ b/packages/ui-markdown-editor/src/plugins/withHtml.js
@@ -29,7 +29,10 @@ export const withHtml = (editor) => {
: slateTransformer
.fromCiceroMark(ciceroMarkTransformer.fromMarkdown(PLAIN_DOM));
- Transforms.insertFragment(editor, SLATE_DOM.document.children);
+ SLATE_DOM.document.children[0].type === 'table'
+ ? Transforms.insertNodes(editor, SLATE_DOM.document.children)
+ : Transforms.insertFragment(editor, SLATE_DOM.document.children);
+
} catch (err) {
console.error(err);
}
diff --git a/packages/ui-markdown-editor/src/plugins/withTables.js b/packages/ui-markdown-editor/src/plugins/withTables.js
index 0dfa12d..fa01152 100644
--- a/packages/ui-markdown-editor/src/plugins/withTables.js
+++ b/packages/ui-markdown-editor/src/plugins/withTables.js
@@ -39,14 +39,14 @@ export const withTables = (editor) => {
match: (n) =>
!Editor.isEditor(n) &&
Element.isElement(n) &&
- n.type === "table-cell",
+ n.type === "table_cell",
});
const prevNodePath = Editor.before(editor, selection);
const [tableNode] = Editor.nodes(editor, {
at: prevNodePath,
match: (n) =>
- !Editor.isEditor(n) && Element.isElement && n.type === "table-cell",
+ !Editor.isEditor(n) && Element.isElement && n.type === "table_cell",
});
if (cell) {
@@ -71,14 +71,14 @@ export const withTables = (editor) => {
match: (n) =>
!Editor.isEditor(n) &&
Element.isElement(n) &&
- n.type === "table-cell",
+ n.type === "table_cell",
});
const prevNodePath = Editor.after(editor, selection);
const [tableNode] = Editor.nodes(editor, {
at: prevNodePath,
match: (n) =>
- !Editor.isEditor(n) && Element.isElement && n.type === "table-cell",
+ !Editor.isEditor(n) && Element.isElement && n.type === "table_cell",
});
if (cell) {
@@ -124,51 +124,116 @@ export const withTables = (editor) => {
* @param {Path} path the path of the table
*/
export const handleCells = (tableNode, path, action, editor) => {
- let existingText = Array.from(tableNode.children, (rows) =>
- Array.from(rows.children, (arr) => arr.children[0].text)
- );
+
+ const headerExists = tableNode.children[0].type == 'table_head' ? true : false;
+
+ let existingText = headerExists
+ ? Array.from(tableNode.children[1].children, (rows) =>
+ Array.from(rows.children, (arr) => arr.children)
+ )
+ : Array.from(tableNode.children[0].children, (rows) =>
+ Array.from(rows.children, (arr) => arr.children)
+ );
+
+ let headerText = headerExists
+ ? Array.from(tableNode.children[0].children, (rows) =>
+ Array.from(rows.children, (arr) => arr.children)
+ )
+ : [];
+
+ // determining the number of columns in the existing table
const columns = existingText[0].length;
+
if (action === "row") {
- existingText.push(Array(columns).fill(""));
+
+ //creating a table cell slate object to be pushed in the new row
+ const newCell = [{
+ object: 'text', text: ' '
+ }];
+ existingText.push(Array(columns).fill(newCell));
+
} else if (action === "col") {
+
+ //creating a table cell slate object to be pushed at the end of each row
+ const newCell = [{
+ object: 'text', text: ' '
+ }];
+
existingText = Array.from(existingText, (item) => {
- item.push("");
+ item.push(newCell);
return item;
});
+
+ headerText = headerExists ? Array.from(headerText, (item) => {
+ item.push(newCell);
+ return item;
+ }) : [];
} else if (action === "drow") {
existingText.pop();
} else {
existingText = Array.from(existingText, (item) => {
- item.pop("");
+ item.pop();
return item;
});
+ headerText = headerExists ? Array.from(headerText, (item) => {
+ item.pop();
+ return item;
+ }) : [];
}
- const newTable = createTableNode(existingText);
+ const newTable = createTableNode(existingText, headerText, headerExists);
Transforms.insertNodes(editor, newTable, {
at: path,
});
};
-const createTableCell = (text) => {
+const createTableCell = (value) => {
return {
- type: "table-cell",
- children: [{ text }],
+ type: 'table_cell',
+ children: value,
};
};
-const createRow = (cellText) => {
- const newRow = Array.from(cellText, (value) => createTableCell(value));
+const createHeaderCell = (value) => {
return {
- type: "table-row",
+ type: 'header_cell',
+ children: value,
+ };
+};
+
+const createRow = (cellText, segment = "body") => {
+ let newRow =
+ segment == "header"
+ ? Array.from(cellText, (value) => createHeaderCell(value))
+ : Array.from(cellText, (value) => createTableCell(value));
+ return {
+ type: "table_row",
children: newRow,
};
};
-const createTableNode = (cellText) => {
+const createBody = (cellText) => {
const tableChildren = Array.from(cellText, (value) => createRow(value));
- let tableNode = { type: "table", children: tableChildren };
+ return {
+ type: "table_body",
+ children: tableChildren,
+ };
+}
+
+const createHead = (headerText) => {
+ const tableChildren = Array.from(headerText, (value) => createRow(value, "header"));
+ return {
+ type: "table_head",
+ children: tableChildren,
+ };
+}
+
+const createTableNode = (cellText, headerText, headerExists) => {
+ const headChildren = headerExists ? createHead(headerText) : [];
+ const bodyChildren = createBody(cellText);
+ const tableChildren = headerExists ? [(headChildren, bodyChildren)] : [bodyChildren];
+ let tableNode = { type: 'table', children: tableChildren };
return tableNode;
-};
+};
/**
* Inserts a table into the editor
@@ -188,12 +253,15 @@ export const insertTable = (editor, rows, columns) => {
if (!rows || !columns) {
return;
}
+ const headerText = Array.from({ length: 1 }, () =>
+ Array.from({ length: columns }, () => "")
+ );
const cellText = Array.from({ length: rows }, () =>
Array.from({ length: columns }, () => "")
);
- const newTable = createTableNode(cellText);
+ const newTable = createTableNode(cellText, headerText);
- Transforms.insertNodes(editor, newTable, {
+ Transforms.insertFragment(editor, newTable, {
mode: "highest",
});
Transforms.insertNodes(
diff --git a/packages/ui-markdown-editor/src/utilities/schema.js b/packages/ui-markdown-editor/src/utilities/schema.js
index 3dfa773..9a92279 100644
--- a/packages/ui-markdown-editor/src/utilities/schema.js
+++ b/packages/ui-markdown-editor/src/utilities/schema.js
@@ -31,8 +31,11 @@ export const HTML_INLINE = 'html_inline';
export const HEADINGBREAK = 'headingbreak';
export const TABLE = "table";
-export const TABLE_ROW = "table-row";
-export const TABLE_CELL = "table-cell";
+export const TABLE_HEAD = 'table_head';
+export const TABLE_BODY = 'table_body';
+export const HEADER_CELL = 'header_cell';
+export const TABLE_ROW = 'table_row';
+export const TABLE_CELL = 'table_cell';
const INLINES = {
[LINEBREAK]: true,