From 617d19ce503ca3f0aab6ebbe516e400dc40ec384 Mon Sep 17 00:00:00 2001 From: Tiberiu Ichim Date: Sat, 18 Sep 2021 18:01:45 +0300 Subject: [PATCH 01/12] Don't allow clicking the link in the editor --- src/editor/plugins/SimpleLink/render.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/editor/plugins/SimpleLink/render.jsx b/src/editor/plugins/SimpleLink/render.jsx index b932e033..6b2c38bb 100644 --- a/src/editor/plugins/SimpleLink/render.jsx +++ b/src/editor/plugins/SimpleLink/render.jsx @@ -19,7 +19,12 @@ export const LinkElement = (props) => { return mode === 'view' ? ( {children} ) : ( - + e.preventDefault()} + > {Array.isArray(children) ? children.map((child, i) => { if (child?.props?.decorations) { From 305bf53ed9937e05d9ac8b1a90656addd07ebf80 Mon Sep 17 00:00:00 2001 From: Tiberiu Ichim Date: Sat, 18 Sep 2021 18:02:05 +0300 Subject: [PATCH 02/12] Add comment on code purpose --- src/blocks/Table/Cell.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/blocks/Table/Cell.jsx b/src/blocks/Table/Cell.jsx index 66c3ce58..67791af3 100644 --- a/src/blocks/Table/Cell.jsx +++ b/src/blocks/Table/Cell.jsx @@ -42,6 +42,7 @@ class Cell extends Component { ) { this.props.onSelectCell(this.props.row, this.props.cell); + // Wait for Slate to initialize before asking it to focus if (this.state.editor) { setTimeout( () => !this.isUnmounted && ReactEditor.focus(this.state.editor), From 58286dce0ab76b89bb4ce309cc255e27111de569 Mon Sep 17 00:00:00 2001 From: Tiberiu Ichim Date: Sat, 18 Sep 2021 18:02:41 +0300 Subject: [PATCH 03/12] Fix misspelled variable --- src/blocks/Table/TableBlockEdit.jsx | 9 +++++++-- src/editor/plugins/SimpleLink/index.js | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/blocks/Table/TableBlockEdit.jsx b/src/blocks/Table/TableBlockEdit.jsx index 294c5307..ff03384c 100644 --- a/src/blocks/Table/TableBlockEdit.jsx +++ b/src/blocks/Table/TableBlockEdit.jsx @@ -531,8 +531,9 @@ class Edit extends Component { } componentDidUpdate(prevProps) { - if (prevProps.select && !this.props.selected) + if (prevProps.selected && !this.props.selected) { this.setState({ selected: null }); + } } /** @@ -648,6 +649,8 @@ class Edit extends Component { key={cell.key} as={cell.type === 'header' ? 'th' : 'td'} className={ + this.props.selected && + this.state.selected && rowIndex === this.state.selected.row && cellIndex === this.state.selected.cell && this.props.selected @@ -661,6 +664,8 @@ class Edit extends Component { cell={cellIndex} onSelectCell={this.onSelectCell} selected={ + this.props.selected && + this.state.selected && rowIndex === this.state.selected.row && cellIndex === this.state.selected.cell } @@ -678,7 +683,7 @@ class Edit extends Component { )} - {this.props.selected && this.state.isClient && ( + {this.props.selected && this.state.selected && this.state.isClient && (
event.preventDefault()}> diff --git a/src/editor/plugins/SimpleLink/index.js b/src/editor/plugins/SimpleLink/index.js index ccc9c774..64e32d36 100644 --- a/src/editor/plugins/SimpleLink/index.js +++ b/src/editor/plugins/SimpleLink/index.js @@ -3,6 +3,7 @@ import { defineMessages } from 'react-intl'; // , defineMessages import { ReactEditor, useSlate } from 'slate-react'; import { useSelector, useDispatch } from 'react-redux'; import AddLinkForm from '@plone/volto/components/manage/AnchorPlugin/components/LinkButton/AddLinkForm'; +import { isEqual } from 'lodash'; import { _insertElement, _unwrapElement, @@ -56,6 +57,7 @@ const SimpleLinkEditor = (props) => { getActiveElement, unwrapElement, insertElement, + isActiveElement, } = props; const showEditor = useSelector((state) => { return state['slate_plugins']?.[pluginId]?.show_sidebar_editor; @@ -65,7 +67,19 @@ const SimpleLinkEditor = (props) => { const dispatch = useDispatch(); const active = getActiveElement(editor); - const [node] = active || []; + const isElement = isActiveElement(editor); + + const [elementNode] = active || []; + const [savedActiveElement, setSavedActiveElement] = React.useState(null); + + React.useEffect(() => { + if (isElement && !isEqual(elementNode, savedActiveElement)) { + setSavedActiveElement(elementNode); + // setFormData(elementNode.data || {}); + } else if (!isElement) { + setSavedActiveElement(null); + } + }, [elementNode, isElement, savedActiveElement]); if (showEditor && !savedPosition.current) { savedPosition.current = getPositionStyle(); @@ -76,7 +90,7 @@ const SimpleLinkEditor = (props) => { { if (!active) { From ad3aa4c451aea923f916b6542f38e6710e43e418 Mon Sep 17 00:00:00 2001 From: Tiberiu Ichim Date: Sat, 18 Sep 2021 18:04:26 +0300 Subject: [PATCH 04/12] Revert SimpleLink/index.js --- src/editor/plugins/SimpleLink/index.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/editor/plugins/SimpleLink/index.js b/src/editor/plugins/SimpleLink/index.js index 64e32d36..ccc9c774 100644 --- a/src/editor/plugins/SimpleLink/index.js +++ b/src/editor/plugins/SimpleLink/index.js @@ -3,7 +3,6 @@ import { defineMessages } from 'react-intl'; // , defineMessages import { ReactEditor, useSlate } from 'slate-react'; import { useSelector, useDispatch } from 'react-redux'; import AddLinkForm from '@plone/volto/components/manage/AnchorPlugin/components/LinkButton/AddLinkForm'; -import { isEqual } from 'lodash'; import { _insertElement, _unwrapElement, @@ -57,7 +56,6 @@ const SimpleLinkEditor = (props) => { getActiveElement, unwrapElement, insertElement, - isActiveElement, } = props; const showEditor = useSelector((state) => { return state['slate_plugins']?.[pluginId]?.show_sidebar_editor; @@ -67,19 +65,7 @@ const SimpleLinkEditor = (props) => { const dispatch = useDispatch(); const active = getActiveElement(editor); - const isElement = isActiveElement(editor); - - const [elementNode] = active || []; - const [savedActiveElement, setSavedActiveElement] = React.useState(null); - - React.useEffect(() => { - if (isElement && !isEqual(elementNode, savedActiveElement)) { - setSavedActiveElement(elementNode); - // setFormData(elementNode.data || {}); - } else if (!isElement) { - setSavedActiveElement(null); - } - }, [elementNode, isElement, savedActiveElement]); + const [node] = active || []; if (showEditor && !savedPosition.current) { savedPosition.current = getPositionStyle(); @@ -90,7 +76,7 @@ const SimpleLinkEditor = (props) => { { if (!active) { From f99f8fc8e9c14eafa3a723eb62ec7f7bee2fb9c7 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Sun, 19 Sep 2021 10:04:13 +0000 Subject: [PATCH 05/12] Automated release 3.1.1 --- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01378b5d..34241166 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [3.1.1](https://github.com/eea/volto-slate/compare/3.1.0...3.1.1) + +- Fix table interaction [`#153`](https://github.com/eea/volto-slate/pull/153) +- Revert SimpleLink/index.js [`ad3aa4c`](https://github.com/eea/volto-slate/commit/ad3aa4c451aea923f916b6542f38e6710e43e418) +- Fix misspelled variable [`58286dc`](https://github.com/eea/volto-slate/commit/58286dce0ab76b89bb4ce309cc255e27111de569) +- Add comment on code purpose [`305bf53`](https://github.com/eea/volto-slate/commit/305bf53ed9937e05d9ac8b1a90656addd07ebf80) +- Don't allow clicking the link in the editor [`617d19c`](https://github.com/eea/volto-slate/commit/617d19ce503ca3f0aab6ebbe516e400dc40ec384) + #### [3.1.0](https://github.com/eea/volto-slate/compare/3.1.0-alpha.1...3.1.0) +> 14 September 2021 + +- Release 3.1.0 - html widget fixes (#149) [`#152`](https://github.com/eea/volto-slate/pull/152) +- Upgrade to 3.x.x README update [`#151`](https://github.com/eea/volto-slate/pull/151) +- Release 3.0.0 [`#150`](https://github.com/eea/volto-slate/pull/150) - [JENKINS] - Skip integration tests to be able to release 3.1.0 [`ec6bd8e`](https://github.com/eea/volto-slate/commit/ec6bd8e2b8bc1a0694941d5a1b354ad8a790fd94) - Revert "Disable some cypress tests in order to be able to release" [`52ffee2`](https://github.com/eea/volto-slate/commit/52ffee2ba4fa586d3349be0e74ee687de5b2d069) diff --git a/package.json b/package.json index 88b21f39..45f42a25 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "volto-slate", - "version": "3.1.0", + "version": "3.1.1", "description": "Slate.js integration with Volto", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", From 8f602850b97782573bfae92747fb57b837f0d1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20de=20Alba?= Date: Mon, 20 Sep 2021 18:07:12 +0200 Subject: [PATCH 06/12] EN/DE translations (#155) --- locales/de/LC_MESSAGES/volto.po | 145 ++++++++++++++++++++++++++++++++ locales/en/LC_MESSAGES/volto.po | 145 ++++++++++++++++++++++++++++++++ locales/volto.pot | 35 ++++---- 3 files changed, 310 insertions(+), 15 deletions(-) create mode 100644 locales/de/LC_MESSAGES/volto.po create mode 100644 locales/en/LC_MESSAGES/volto.po diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po new file mode 100644 index 00000000..a610b305 --- /dev/null +++ b/locales/de/LC_MESSAGES/volto.po @@ -0,0 +1,145 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language: \n" +"Language-Team: \n" +"Content-Type: \n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#: editor/plugins/SimpleLink/index +msgid "Add link" +msgstr "Link hinzufügen" + +#: editor/plugins/StyleMenu/StyleMenu +msgid "All Styles Applied" +msgstr "Alle Formatierungen angewendet" + +#: widgets/BlocksBrowser/BlocksBrowserNav +msgid "Back" +msgstr "Zurück" + +#: widgets/BlocksBrowser/BlocksBrowserNav +msgid "Browse" +msgstr "Durchsuchen" + +#: blocks/Table/TableBlockEdit +msgid "Cell" +msgstr "Zelle" + +#: widgets/BlocksBrowser/BlocksBrowserBody +msgid "Choose Target" +msgstr "Ziel auswählen" + +#: widgets/BlocksBrowser/BlocksBrowserWidget +msgid "Delete" +msgstr "Löschen" + +#: blocks/Table/TableBlockEdit +msgid "Delete col" +msgstr "Spalte löschen" + +#: blocks/Table/TableBlockEdit +msgid "Delete row" +msgstr "Zeile löschen" + +#: blocks/Table/TableBlockEdit +msgid "Divide each row into separate cells" +msgstr "Jede Zeile in einzelne Zellen teilen" + +#: widgets/BlocksBrowser/BlocksBrowserWidget +msgid "Edit" +msgstr "Bearbeiten" + +#: components/ElementEditor/messages +msgid "Edit element" +msgstr "Element bearbeiten" + +#: editor/plugins/Link/index +#: editor/plugins/SimpleLink/index +msgid "Edit link" +msgstr "Link bearbeiten" + +#: blocks/Table/TableBlockEdit +msgid "Fixed width table cells" +msgstr "Zellen mit fester Breite" + +#: editor/plugins/StyleMenu/StyleMenu +msgid "Font Style" +msgstr "Schriftart" + +#: blocks/Table/TableBlockEdit +msgid "Insert col after" +msgstr "Spalte dahinter einfügen" + +#: blocks/Table/TableBlockEdit +msgid "Insert col before" +msgstr "Spalte davor einfügen" + +#: blocks/Table/TableBlockEdit +msgid "Insert row after" +msgstr "Zeile dahinter einfügen" + +#: blocks/Table/TableBlockEdit +msgid "Insert row before" +msgstr "Zeile davor einfügen" + +#: blocks/Table/TableBlockEdit +msgid "Make the table compact" +msgstr "Tabelle komprimieren" + +#: editor/plugins/StyleMenu/StyleMenu +msgid "No Style" +msgstr "Keine Formatierung" + +#: widgets/BlocksBrowser/BlocksBrowserWidget +msgid "No items selected" +msgstr "Keine Elemente ausgewählt" + +#: widgets/BlocksBrowser/BlocksBrowserWidget +msgid "Open object browser" +msgstr "Objektsucher öffnen" + +#: editor/plugins/StyleMenu/StyleMenu +msgid "Paragraph Style" +msgstr "Abschnittsformatierung" + +#: blocks/Table/TableBlockEdit +msgid "Reduce complexity" +msgstr "Komplexität vereinfachen" + +#: components/ElementEditor/messages +msgid "Remove element" +msgstr "Element entfernen" + +#: editor/plugins/Link/index +msgid "Remove link" +msgstr "Link entferenen" + +#: widgets/BlocksBrowser/BlocksBrowserNav +msgid "Select" +msgstr "Auswählen" + +#: blocks/Table/TableBlockEdit +msgid "Stripe alternate rows with color" +msgstr "Zeilen im Wechsel einfärben" + +#: blocks/Table/TableBlockEdit +msgid "Table" +msgstr "Tabelle" + +#: blocks/Table/TableBlockEdit +msgid "Table color inverted" +msgstr "Tabellenfarbe invertiert" + +#: blocks/Text/TextBlockEdit +msgid "Type text…" +msgstr "Text eingeben" + +#: components/themes/View/DefaultSlateView +msgid "Unknown Block" +msgstr "Unbekannter Block" diff --git a/locales/en/LC_MESSAGES/volto.po b/locales/en/LC_MESSAGES/volto.po new file mode 100644 index 00000000..6aa1cf5d --- /dev/null +++ b/locales/en/LC_MESSAGES/volto.po @@ -0,0 +1,145 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language: \n" +"Language-Team: \n" +"Content-Type: \n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#: editor/plugins/SimpleLink/index +msgid "Add link" +msgstr "" + +#: editor/plugins/StyleMenu/StyleMenu +msgid "All Styles Applied" +msgstr "" + +#: widgets/BlocksBrowser/BlocksBrowserNav +msgid "Back" +msgstr "" + +#: widgets/BlocksBrowser/BlocksBrowserNav +msgid "Browse" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Cell" +msgstr "" + +#: widgets/BlocksBrowser/BlocksBrowserBody +msgid "Choose Target" +msgstr "" + +#: widgets/BlocksBrowser/BlocksBrowserWidget +msgid "Delete" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Delete col" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Delete row" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Divide each row into separate cells" +msgstr "" + +#: widgets/BlocksBrowser/BlocksBrowserWidget +msgid "Edit" +msgstr "" + +#: components/ElementEditor/messages +msgid "Edit element" +msgstr "" + +#: editor/plugins/Link/index +#: editor/plugins/SimpleLink/index +msgid "Edit link" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Fixed width table cells" +msgstr "" + +#: editor/plugins/StyleMenu/StyleMenu +msgid "Font Style" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Insert col after" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Insert col before" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Insert row after" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Insert row before" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Make the table compact" +msgstr "" + +#: editor/plugins/StyleMenu/StyleMenu +msgid "No Style" +msgstr "" + +#: widgets/BlocksBrowser/BlocksBrowserWidget +msgid "No items selected" +msgstr "" + +#: widgets/BlocksBrowser/BlocksBrowserWidget +msgid "Open object browser" +msgstr "" + +#: editor/plugins/StyleMenu/StyleMenu +msgid "Paragraph Style" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Reduce complexity" +msgstr "" + +#: components/ElementEditor/messages +msgid "Remove element" +msgstr "" + +#: editor/plugins/Link/index +msgid "Remove link" +msgstr "" + +#: widgets/BlocksBrowser/BlocksBrowserNav +msgid "Select" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Stripe alternate rows with color" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Table" +msgstr "" + +#: blocks/Table/TableBlockEdit +msgid "Table color inverted" +msgstr "" + +#: blocks/Text/TextBlockEdit +msgid "Type text…" +msgstr "" + +#: components/themes/View/DefaultSlateView +msgid "Unknown Block" +msgstr "" diff --git a/locales/volto.pot b/locales/volto.pot index c526e5ff..a6cdb066 100644 --- a/locales/volto.pot +++ b/locales/volto.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plone\n" -"POT-Creation-Date: 2021-07-12T13:13:36.922Z\n" +"POT-Creation-Date: 2021-09-20T15:08:13.917Z\n" "Last-Translator: Plone i18n \n" "Language-Team: Plone i18n \n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "" msgid "Browse" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Cell msgid "Cell" msgstr "" @@ -48,17 +48,17 @@ msgstr "" msgid "Delete" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Delete col msgid "Delete col" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Delete row msgid "Delete row" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Divide each row into separate cells msgid "Divide each row into separate cells" msgstr "" @@ -79,7 +79,7 @@ msgstr "" msgid "Edit link" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Fixed width table cells msgid "Fixed width table cells" msgstr "" @@ -89,27 +89,27 @@ msgstr "" msgid "Font Style" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Insert col after msgid "Insert col after" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Insert col before msgid "Insert col before" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Insert row after msgid "Insert row after" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Insert row before msgid "Insert row before" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Make the table compact msgid "Make the table compact" msgstr "" @@ -134,7 +134,7 @@ msgstr "" msgid "Paragraph Style" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Reduce complexity msgid "Reduce complexity" msgstr "" @@ -154,17 +154,17 @@ msgstr "" msgid "Select" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Stripe alternate rows with color msgid "Stripe alternate rows with color" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Table msgid "Table" msgstr "" -#: blocks/Table/Edit +#: blocks/Table/TableBlockEdit # defaultMessage: Table color inverted msgid "Table color inverted" msgstr "" @@ -173,3 +173,8 @@ msgstr "" # defaultMessage: Type text… msgid "Type text…" msgstr "" + +#: components/themes/View/DefaultSlateView +# defaultMessage: Unknown Block {block} +msgid "Unknown Block" +msgstr "" From 909152b3febd566c3650d10201c8cce81f814dfe Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Mon, 20 Sep 2021 16:15:35 +0000 Subject: [PATCH 07/12] Automated release 3.1.1 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34241166..b91c9fd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### [3.1.1](https://github.com/eea/volto-slate/compare/3.1.0...3.1.1) +- EN/DE translations [`#155`](https://github.com/eea/volto-slate/pull/155) - Fix table interaction [`#153`](https://github.com/eea/volto-slate/pull/153) - Revert SimpleLink/index.js [`ad3aa4c`](https://github.com/eea/volto-slate/commit/ad3aa4c451aea923f916b6542f38e6710e43e418) - Fix misspelled variable [`58286dc`](https://github.com/eea/volto-slate/commit/58286dce0ab76b89bb4ce309cc255e27111de569) From 0dfd748adbcc1ec77cb7d643077ddee7c7641678 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 20 Sep 2021 19:21:03 +0300 Subject: [PATCH 08/12] Add className on Table block in order to be able to theme it --- src/blocks/Table/TableBlockView.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/blocks/Table/TableBlockView.jsx b/src/blocks/Table/TableBlockView.jsx index 70b3875e..8d344a8a 100644 --- a/src/blocks/Table/TableBlockView.jsx +++ b/src/blocks/Table/TableBlockView.jsx @@ -30,6 +30,7 @@ const View = ({ data }) => { celled={data.table.celled} inverted={data.table.inverted} striped={data.table.striped} + className="slate-table-block" > {map(data.table.rows, (row) => ( From 3409388f6980742a218db0b29cba651af1318fad Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Mon, 20 Sep 2021 16:21:22 +0000 Subject: [PATCH 09/12] Automated release 3.1.1 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b91c9fd0..d1c31012 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - EN/DE translations [`#155`](https://github.com/eea/volto-slate/pull/155) - Fix table interaction [`#153`](https://github.com/eea/volto-slate/pull/153) +- Add className on Table block in order to be able to theme it [`0dfd748`](https://github.com/eea/volto-slate/commit/0dfd748adbcc1ec77cb7d643077ddee7c7641678) - Revert SimpleLink/index.js [`ad3aa4c`](https://github.com/eea/volto-slate/commit/ad3aa4c451aea923f916b6542f38e6710e43e418) - Fix misspelled variable [`58286dc`](https://github.com/eea/volto-slate/commit/58286dce0ab76b89bb4ce309cc255e27111de569) - Add comment on code purpose [`305bf53`](https://github.com/eea/volto-slate/commit/305bf53ed9937e05d9ac8b1a90656addd07ebf80) From 9fa9140b2333352ab03198c4ea0ef2a6653169c4 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 20 Sep 2021 19:51:45 +0300 Subject: [PATCH 10/12] Add table className also on edit --- src/blocks/Table/TableBlockEdit.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/blocks/Table/TableBlockEdit.jsx b/src/blocks/Table/TableBlockEdit.jsx index ff03384c..3b2c1e03 100644 --- a/src/blocks/Table/TableBlockEdit.jsx +++ b/src/blocks/Table/TableBlockEdit.jsx @@ -640,6 +640,7 @@ class Edit extends Component { celled={this.props.data.table.celled} inverted={this.props.data.table.inverted} striped={this.props.data.table.striped} + className="slate-table-block" > {map(this.props.data.table.rows, (row, rowIndex) => ( From 4fed2037a74bc10d2d962b2b8821811eb72801e1 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 20 Sep 2021 21:04:19 +0300 Subject: [PATCH 11/12] Update tests snapshots --- src/blocks/Table/__snapshots__/TableBlockEdit.test.js.snap | 2 +- src/blocks/Table/__snapshots__/TableBlockView.test.js.snap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blocks/Table/__snapshots__/TableBlockEdit.test.js.snap b/src/blocks/Table/__snapshots__/TableBlockEdit.test.js.snap index a360b4bc..7fac60e7 100644 --- a/src/blocks/Table/__snapshots__/TableBlockEdit.test.js.snap +++ b/src/blocks/Table/__snapshots__/TableBlockEdit.test.js.snap @@ -5,7 +5,7 @@ exports[`renders an edit table block component 1`] = ` className="block table" > Date: Mon, 20 Sep 2021 18:08:15 +0000 Subject: [PATCH 12/12] Automated release 3.1.1 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1c31012..33021157 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - EN/DE translations [`#155`](https://github.com/eea/volto-slate/pull/155) - Fix table interaction [`#153`](https://github.com/eea/volto-slate/pull/153) +- Update tests snapshots [`4fed203`](https://github.com/eea/volto-slate/commit/4fed2037a74bc10d2d962b2b8821811eb72801e1) +- Add table className also on edit [`9fa9140`](https://github.com/eea/volto-slate/commit/9fa9140b2333352ab03198c4ea0ef2a6653169c4) - Add className on Table block in order to be able to theme it [`0dfd748`](https://github.com/eea/volto-slate/commit/0dfd748adbcc1ec77cb7d643077ddee7c7641678) - Revert SimpleLink/index.js [`ad3aa4c`](https://github.com/eea/volto-slate/commit/ad3aa4c451aea923f916b6542f38e6710e43e418) - Fix misspelled variable [`58286dc`](https://github.com/eea/volto-slate/commit/58286dce0ab76b89bb4ce309cc255e27111de569)