From 5b462e28b8558d41919f241b714d94176057c464 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sat, 18 Jun 2022 12:14:58 +0200
Subject: [PATCH] Update component definition in TS. Closes #4384

---
 index.d.ts | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 80a1ca6c2..8642f2f46 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -447,34 +447,34 @@ declare namespace grapesjs {
 
     /** Style prefix */
     stylePrefix?: string;
-  
+
     /** Enable/Disable globally the possibility to sort layers */
     sortable?: boolean;
-  
+
     /** Enable/Disable globally the possibility to hide layers */
     hidable?: boolean;
-  
+
     /** Hide textnodes */
     hideTextnode?: boolean;
-  
+
     /** Indicate a query string of the element to be selected as the root of layers.
     * By default the root is the wrapper */
     root?: string;
-  
+
     /** Indicates if the wrapper is visible in layers */
     showWrapper?: boolean;
-  
+
     /** Show hovered components in canvas */
     showHover?: boolean;
-  
+
     /** Scroll to selected component in Canvas when it's selected in Layers
     * true, false or `scrollIntoView`-like options,
     * `block: 'nearest'` avoids the issue of window scrolling */
     scrollCanvas?: boolean | LayerManagerScrollCanvasConfig;
-  
+
     /** Highlight when a layer component is hovered */
     highlightHover?: boolean;
-  
+
     /**
      * WARNING: Experimental option
      * A callback triggered once the component layer is initialized.
@@ -485,7 +485,7 @@ declare namespace grapesjs {
      * };
      */
     onInit?: () => any;
-  
+
     /**
      * WARNING: Experimental option
      * A callback triggered once the component layer is rendered.
@@ -498,7 +498,7 @@ declare namespace grapesjs {
      * }
      */
     onRender?: () => any;
-  
+
     /**
      * Extend Layer view object (view/ItemView.js)
      * @example
@@ -1779,13 +1779,13 @@ declare namespace grapesjs {
   }
 
   interface AddComponentOptions {
-    isComponent?: (el: HTMLElement) => boolean | ComponentProperties;
+    isComponent?: (el: HTMLElement) => boolean | ComponentDefinition;
     model?: ComponentModelDefinition;
     view?: ComponentViewDefinition;
   }
 
   interface ComponentModelDefinition {
-    defaults?: ComponentProperties;
+    defaults?: ComponentDefinition;
     init?: (this: Component) => void;
     handlePropChange?: (this: Component) => void;
     handleAttrChange?: (this: Component) => void;
@@ -2141,6 +2141,17 @@ declare namespace grapesjs {
     // * Children components. Default: `null`
     // */
     components?: Backbone.Collection<Component>;
+  }
+
+  interface ComponentDefinition extends Omit<ComponentProperties, 'components'> {
+    /**
+     * Children components.
+     */
+    components?: string | ComponentDefinition | (string | ComponentDefinition)[];
+    [key: string]: unknown;
+  }
+
+  interface ComponentModelProperties extends ComponentProperties {
     [key: string]: any;
   }
 
@@ -2161,7 +2172,7 @@ declare namespace grapesjs {
    *
    * [Component]: component.html
    */
-  interface Component extends Backbone.Model<ComponentProperties> {
+  interface Component extends Backbone.Model<ComponentModelProperties> {
     view?: ComponentView;
 
     /**