Merge pull request #12 from eea/fix-for-dexterity-content-types

fix for dexterity content types
eea · Jan 26, 2021 · dca51d0 · dca51d0
2 parents e87bc1d + 9501593
commit dca51d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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).
 
+> 26 January 2020
+
+- make compatible with dexterity layout settings (https://github.com/eea/volto-columns-block/pull/12)
+
 #### [1.0.5](https://github.com/eea/volto-columns-block/compare/1.0.4...1.0.5)
 
 - Fixes #9 - Toolbar z-index [`#9`](https://github.com/eea/volto-columns-block/issues/9)

diff --git a/src/ColumnsBlock/ColumnsBlockEdit.jsx b/src/ColumnsBlock/ColumnsBlockEdit.jsx
@@ -216,7 +216,7 @@ class ColumnsBlockEdit extends React.Component {
     return (
       <div role="presentation" className="columns-block">
         {data.coldata ? 'old style columns block, safe to remove it' : ''}
-        {Object.keys(data).length === 1 ? (
+        {!data?.data ? (
           <ColumnVariations
             variants={variants}
             data={data}