Internal fixes

Author: ericof

packages/volto-code-block/news/+barrel.internal

@@ -0,0 +1 @@
+Remove barrel imports from @plone/volto. @ericof

packages/volto-code-block/news/+style.bugfix

@@ -0,0 +1 @@
+Code block: Wrap the Caption component inside the main block. @ericof

packages/volto-code-block/src/components/Blocks/Code/Data.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BlockDataForm } from '@plone/volto/components';
+import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import { codeSchema } from './schema';
 import { useIntl } from 'react-intl';
 

packages/volto-code-block/src/components/Blocks/Code/DefaultView.jsx

@@ -30,11 +30,11 @@ const CodeView = (props) => {
               lineNbr={lineNbr}
             />
           </div>
+          {caption_title && (
+            <Caption title={caption_title} description={caption_description} />
+          )}
         </div>
       )}
-      {caption_title && (
-        <Caption title={caption_title} description={caption_description} />
-      )}
     </>
   );
 };

packages/volto-code-block/src/components/Blocks/Code/Edit.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { withBlockExtensions } from '@plone/volto/helpers';
-import { SidebarPortal } from '@plone/volto/components';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions/withBlockExtensions';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import config from '@plone/volto/registry';
 import CodeBlockData from './Data';
 import Caption from '../../Caption/Caption.jsx';

packages/volto-code-block/src/components/Blocks/Code/View.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions/withBlockExtensions';
 import CodeView from './DefaultView';
 
 const CodeBlockView = (props) => {

packages/volto-code-block/src/components/Blocks/Gist/Data.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BlockDataForm } from '@plone/volto/components';
+import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import { gistSchema } from './schema';
 import { useIntl } from 'react-intl';
 

packages/volto-code-block/src/components/Blocks/Gist/Edit.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { withBlockExtensions } from '@plone/volto/helpers';
-import { SidebarPortal } from '@plone/volto/components';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions/withBlockExtensions';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import GistBlockData from './Data';
 import View from './DefaultView';
 

packages/volto-code-block/src/components/Blocks/Gist/View.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions/withBlockExtensions';
 import GistView from './DefaultView';
 
 const GistBlockView = (props) => {

packages/volto-code-block/src/components/Blocks/Mermaid/Edit.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions/withBlockExtensions';
 import config from '@plone/volto/registry';
 import Editor from '../../Editor/Editor.tsx';
 import { highlight } from 'prismjs/components/prism-core';