Some types improvements/fixes (#6412)

Co-authored-by: Steve Piercy <[email protected]>
plone · Oct 18, 2024 · aeea3ed · aeea3ed
1 parent 5660ae4
commit aeea3ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/packages/types/news/6412.bugfix b/packages/types/news/6412.bugfix
@@ -0,0 +1 @@
+Some improvements and fixes in blocks and settings types. @sneridagh
diff --git a/packages/types/src/config/Blocks.d.ts b/packages/types/src/config/Blocks.d.ts
@@ -1,6 +1,7 @@
 import type { Content } from '../content';
 import type { BlockViewProps, BlockEditProps } from '../blocks';
 import type { IntlShape } from 'react-intl';
+import { User } from '../services';
 
 export interface BlocksConfig {
  blocksConfig: BlocksConfigData;
@@ -79,6 +80,7 @@ export interface BlockConfigBase {
  block: BlockConfigBase; // TODO: This has to be extendable
  navRoot: Content;
  contentType: string;
+ user: User;
  }) => boolean)
  | boolean;
 
@@ -124,6 +126,7 @@ export interface BlockExtension {
  title: string;
  template?: React.ComponentType<any>;
  render?: React.ComponentType<any>;
+ view?: React.ComponentType<any>;
  fullobjects?: boolean;
 }
 

diff --git a/packages/types/src/config/Settings.d.ts b/packages/types/src/config/Settings.d.ts
@@ -1,5 +1,5 @@
 import { Content } from '../content';
-import { BlocksConfigData } from './Blocks';
+import { BlocksFormData } from '../blocks/index';
 
 type apiExpandersType =
  | { match: string; GET_CONTENT: string[] }
@@ -19,7 +19,7 @@ type styleClassNameExtendersType = ({
 }: {
  block: string;
  content: Content;
- data: BlocksConfigData;
+ data: BlocksFormData;
  classNames: string[];
 }) => string[];