minor fixes and checks

eea · Nov 9, 2020 · e4a5c66 · e4a5c66
1 parent b6d8f1d
commit e4a5c66
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/components/manage/Blocks/Group/Edit.jsx b/src/components/manage/Blocks/Group/Edit.jsx
@@ -25,6 +25,8 @@ const Edit = (props) => {
       properties.blocks_layout.items[0] !== selectedBlock
     ) {
       setSelectedBlock(properties.blocks_layout.items[0]);
+      console.log('block', block)
+      console.log('data', data)
       onChangeBlock(block, {
         ...data,
         data: properties,
@@ -43,19 +45,22 @@ const Edit = (props) => {
   let charCount = 0;
 
   const showCharCounter = () => {
-    Object.keys(props.data.data.blocks).forEach(blockId => {
-      charCount = charCount + props.data.data.blocks[blockId]?.plaintext?.length || 0
-    })
+    if(props.data?.data?.blocks) {
+      Object.keys(props.data?.data?.blocks).forEach(blockId => {
+        charCount = charCount + props.data.data.blocks[blockId]?.plaintext?.length || 0
+      })
+    }
   }
   showCharCounter()
+
   const colors = { ok: '#CCC', warning: 'darkorange', danger: 'crimson' };
   const counterStyle = {
     color: charCount < Math.ceil(props.data.maxChars/1.05) ? 
       colors.ok : 
       charCount < props.data.maxChars ? 
       colors.warning : 
       colors.danger,
-      'text-align': 'end'
+      'textAlign': 'end'
   };
   const counterComponent = 
     (props.data.maxChars ?
@@ -64,12 +69,12 @@ const Edit = (props) => {
           props.data.maxChars ?
             props.data.maxChars - charCount < 0 ?
             (<>
-              <Icon name={dissatisfiedSVG} size="24px" />
               {`${charCount - props.data.maxChars} characters over the limit`}
+              <Icon name={dissatisfiedSVG} size="24px" />
             </>) :
             (<>
-              <Icon name={delightedSVG} size="24px" />
               {`${props.data.maxChars - charCount } characters remaining out of ${props.data.maxChars}`}
+              <Icon name={delightedSVG} size="24px" />
             </>) :
             charCount
         }