From d1dcc14116fa408731d545d45d01669a06563b46 Mon Sep 17 00:00:00 2001
From: Alin Voinea <contact@avoinea.com>
Date: Fri, 25 Sep 2020 14:36:03 +0300
Subject: [PATCH] Change imports from volto core

---
 src/components/manage/Blocks/Group/Edit.jsx | 18 ++++++++++++++----
 src/components/manage/Blocks/Group/View.jsx |  2 +-
 src/index.js                                |  4 ++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/manage/Blocks/Group/Edit.jsx b/src/components/manage/Blocks/Group/Edit.jsx
index a418bc5..7890eeb 100644
--- a/src/components/manage/Blocks/Group/Edit.jsx
+++ b/src/components/manage/Blocks/Group/Edit.jsx
@@ -1,12 +1,20 @@
 import React from 'react';
 import { useState } from 'react';
 import { isEmpty } from 'lodash';
-import { BlocksForm } from '@eeacms/volto-blocks-form/components';
-import { emptyBlocksForm } from '@eeacms/volto-blocks-form/helpers';
+import { BlocksForm } from '@plone/volto/components';
+import { emptyBlocksForm } from '@plone/volto/helpers';
 import './editor.less';
 
 const Edit = (props) => {
-  const { block, data, onChangeBlock, pathname, selected, manage } = props;
+  const {
+    block,
+    data,
+    onChangeBlock,
+    onSelectBlock,
+    pathname,
+    selected,
+    manage,
+  } = props;
 
   const properties = isEmpty(data?.data?.blocks)
     ? emptyBlocksForm()
@@ -23,7 +31,9 @@ const Edit = (props) => {
         allowedBlocks={data.allowedBlocks}
         title={data.placeholder}
         description={data?.instructions?.data}
-        onSelectBlock={(id) => setSelectedBlock(id)}
+        onSelectBlock={(id) => {
+          setSelectedBlock(id);
+        }}
         onChangeFormData={(newFormData) => {
           onChangeBlock(block, {
             ...data,
diff --git a/src/components/manage/Blocks/Group/View.jsx b/src/components/manage/Blocks/Group/View.jsx
index c95d10d..cd22761 100644
--- a/src/components/manage/Blocks/Group/View.jsx
+++ b/src/components/manage/Blocks/Group/View.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { RenderBlocks } from '@eeacms/volto-blocks-form/components';
+import { RenderBlocks } from '@plone/volto/components';
 
 const View = (props) => {
   const { data } = props;
diff --git a/src/index.js b/src/index.js
index a816d94..8d7eae6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,8 +37,8 @@ const applyConfig = (config) => {
     schema: schema,
     restricted: false,
     mostUsed: false,
-    blockHasOwnFocusManagement: true,
-    sidebarTab: 1,
+    blockHasOwnFocusManagement: false,
+    sidebarTab: 0,
     security: {
       addPermission: [],
       view: [],