@forge/manifest 3.2.0 → 3.3.0-next.2

package/out/schema/manifest.d.ts

@@ -3045,7 +3045,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3060,7 +3060,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3132,7 +3132,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3146,7 +3146,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3188,7 +3188,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3202,7 +3202,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3226,7 +3226,7 @@ export interface Modules {
       name?: I18NProperty59;
       location?: string;
       cacheable?: boolean;
-      conditions?: (SingleCondition4 | CompositeCondition6)[];
+      conditions?: (CompositeCondition6 | SingleCondition4)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -3244,7 +3244,7 @@ export interface Modules {
       name?: I18NProperty59;
       location?: string;
       cacheable?: boolean;
-      conditions?: (SingleCondition4 | CompositeCondition6)[];
+      conditions?: (CompositeCondition6 | SingleCondition4)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -3257,7 +3257,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3272,7 +3272,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3322,7 +3322,7 @@ export interface Modules {
       name?: I18NProperty63;
       weight?: number;
       location?: string;
-      conditions?: (CompositeCondition7 | SingleCondition5)[];
+      conditions?: (SingleCondition5 | CompositeCondition7)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3334,7 +3334,7 @@ export interface Modules {
       name?: I18NProperty63;
       weight?: number;
       location?: string;
-      conditions?: (CompositeCondition7 | SingleCondition5)[];
+      conditions?: (SingleCondition5 | CompositeCondition7)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3530,7 +3530,7 @@ export interface Modules {
       icon?: Icon18;
       name?: I18NProperty91;
       cacheable?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3546,7 +3546,7 @@ export interface Modules {
       icon?: Icon18;
       name?: I18NProperty91;
       cacheable?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3765,7 +3765,7 @@ export interface I18NProperty1 {
  *
  */
 export interface CompositeCondition {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -6473,14 +6473,14 @@ export interface Icon10 {
  *
  */
 export interface WebItemTarget1 {
-  options?: InlineDialogOptions1 | DialogModuleOptions1 | DialogOptions2;
+  options?: DialogModuleOptions1 | InlineDialogOptions1 | DialogOptions2;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
 /**
  *
  *
- * Options for an inline dialog target
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
  *
  *  <h3>Example</h3>
  *
@@ -6490,11 +6490,9 @@ export interface WebItemTarget1 {
  *
  *     {
  *       "target": {
- *         "type": "inlinedialog",
+ *         "type": "dialogmodule",
  *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
+ *           "key": "dialog-module-key"
  *         }
  *       }
  *     }
@@ -6502,22 +6500,14 @@ export interface WebItemTarget1 {
  *
  *
  */
-export interface InlineDialogOptions1 {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
+export interface DialogModuleOptions1 {
+  key: string;
   [k: string]: unknown;
 }
 /**
  *
  *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ * Options for an inline dialog target
  *
  *  <h3>Example</h3>
  *
@@ -6527,9 +6517,11 @@ export interface InlineDialogOptions1 {
  *
  *     {
  *       "target": {
- *         "type": "dialogmodule",
+ *         "type": "inlinedialog",
  *         "options": {
- *           "key": "dialog-module-key"
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
  *         }
  *       }
  *     }
@@ -6537,8 +6529,16 @@ export interface InlineDialogOptions1 {
  *
  *
  */
-export interface DialogModuleOptions1 {
-  key: string;
+export interface InlineDialogOptions1 {
+  offsetX?: string;
+  offsetY?: string;
+  width?: string;
+  onTop?: boolean;
+  showDelay?: number;
+  closeOthers?: boolean;
+  persistent?: boolean;
+  onHover?: boolean;
+  isRelativeToMouse?: boolean;
   [k: string]: unknown;
 }
 /**
@@ -6663,37 +6663,6 @@ export interface I18NProperty59 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition4 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -6731,10 +6700,41 @@ export interface SingleCondition4 {
  *
  */
 export interface CompositeCondition6 {
-  conditions?: (ManifestSchema | SingleCondition)[];
+  conditions?: (SingleCondition | ManifestSchema)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition4 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -7089,6 +7089,37 @@ export interface I18NProperty63 {
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition5 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -7126,41 +7157,10 @@ export interface I18NProperty63 {
  *
  */
 export interface CompositeCondition7 {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition5 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -8580,7 +8580,7 @@ export interface I18NProperty74 {
  *
  */
 export interface MacroPropertyPanel {
-  controls?: (TextControl | ToggleGroup | ButtonControl | ControlGroup)[];
+  controls?: (ControlGroup | TextControl | ToggleGroup | ButtonControl1)[];
   cacheable?: boolean;
   url: string;
   [k: string]: unknown;
@@ -8588,35 +8588,7 @@ export interface MacroPropertyPanel {
 /**
  *
  *
- * Defines a text field which may appear in control extension points such as the property panel
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     {
- *       "type": "button",
- *       "label": {
- *         "value": "My Custom Control 0"
- *       },
- *       "key": "my-custom-control-0"
- *     }
- *
- *
- *
- */
-export interface TextControl {
-  macroParameter: string;
-  type: 'text' | 'TEXT';
-  key: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a ToggleGroup which may appear in control extension points such as the property panel
+ * Defines a ControlGroup which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -8626,24 +8598,21 @@ export interface TextControl {
  *
  *     [
  *       {
- *         "type": "togglegroup",
- *         "macroParameter": "toggleGroupMacroParameter",
+ *         "type": "group",
  *         "controls": [
  *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 0",
+ *             "type": "button",
  *             "label": {
  *               "value": "My Custom Control 0"
  *             },
- *             "key": "my-custom-toggle-button-0"
+ *             "key": "my-custom-control-0"
  *           },
  *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 1",
+ *             "type": "button",
  *             "label": {
  *               "value": "My Custom Control 1"
  *             },
- *             "key": "my-custom-toggle-button-1"
+ *             "key": "my-custom-control-1"
  *           }
  *         ]
  *       }
@@ -8652,16 +8621,15 @@ export interface TextControl {
  *
  *
  */
-export interface ToggleGroup {
-  controls: ToggleButtonControl[];
-  macroParameter: string;
-  type: 'togglegroup' | 'TOGGLEGROUP';
+export interface ControlGroup {
+  controls: ButtonControl[];
+  type: 'group' | 'GROUP';
   [k: string]: unknown;
 }
 /**
  *
  *
- * Defines a toggle button which appears inside a ToggleGroup
+ * Defines a button which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -8670,21 +8638,19 @@ export interface ToggleGroup {
  *
  *
  *     {
- *       "type": "togglebutton",
- *       "macroParameterValue": "macroParameterValue 0",
+ *       "type": "button",
  *       "label": {
  *         "value": "My Custom Control 0"
  *       },
- *       "key": "my-custom-toggle-button-0"
+ *       "key": "my-custom-control-0"
  *     }
  *
  *
  *
  */
-export interface ToggleButtonControl {
-  macroParameterValue: string;
+export interface ButtonControl {
   label: I18NProperty75;
-  type: 'togglebutton' | 'TOGGLEBUTTON';
+  type: 'button' | 'BUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -8715,7 +8681,7 @@ export interface I18NProperty75 {
 /**
  *
  *
- * Defines a button which may appear in control extension points such as the property panel
+ * Defines a text field which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -8734,40 +8700,16 @@ export interface I18NProperty75 {
  *
  *
  */
-export interface ButtonControl {
-  label: I18NProperty76;
-  type: 'button' | 'BUTTON';
+export interface TextControl {
+  macroParameter: string;
+  type: 'text' | 'TEXT';
   key: string;
   [k: string]: unknown;
 }
 /**
  *
  *
- * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
- *  and value in multiple places if you like, but identical keys must have identical values.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "value": "My text"
- *     }
- *
- *
- *
- */
-export interface I18NProperty76 {
-  value: string;
-  i18n?: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a ControlGroup which may appear in control extension points such as the property panel
+ * Defines a ToggleGroup which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -8777,21 +8719,24 @@ export interface I18NProperty76 {
  *
  *     [
  *       {
- *         "type": "group",
+ *         "type": "togglegroup",
+ *         "macroParameter": "toggleGroupMacroParameter",
  *         "controls": [
  *           {
- *             "type": "button",
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 0",
  *             "label": {
  *               "value": "My Custom Control 0"
  *             },
- *             "key": "my-custom-control-0"
+ *             "key": "my-custom-toggle-button-0"
  *           },
  *           {
- *             "type": "button",
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 1",
  *             "label": {
  *               "value": "My Custom Control 1"
  *             },
- *             "key": "my-custom-control-1"
+ *             "key": "my-custom-toggle-button-1"
  *           }
  *         ]
  *       }
@@ -8800,9 +8745,64 @@ export interface I18NProperty76 {
  *
  *
  */
-export interface ControlGroup {
-  controls: ButtonControl1[];
-  type: 'group' | 'GROUP';
+export interface ToggleGroup {
+  controls: ToggleButtonControl[];
+  macroParameter: string;
+  type: 'togglegroup' | 'TOGGLEGROUP';
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a toggle button which appears inside a ToggleGroup
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "type": "togglebutton",
+ *       "macroParameterValue": "macroParameterValue 0",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-toggle-button-0"
+ *     }
+ *
+ *
+ *
+ */
+export interface ToggleButtonControl {
+  macroParameterValue: string;
+  label: I18NProperty76;
+  type: 'togglebutton' | 'TOGGLEBUTTON';
+  key: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
+ *  and value in multiple places if you like, but identical keys must have identical values.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "value": "My text"
+ *     }
+ *
+ *
+ *
+ */
+export interface I18NProperty76 {
+  value: string;
+  i18n?: string;
   [k: string]: unknown;
 }
 /**
@@ -29779,7 +29779,180 @@ export interface Icon17 {
  *
  *
  */
-export interface I18NProperty83 {
+export interface I18NProperty83 {
+  value: string;
+  i18n?: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defining a Macro Property panel allows you to add a hidden iframe to your macro's
+ *  property panel. The iframe is loaded as soon as the property panel is opened.
+ *
+ *  In order to persist custom data using your property panel, use the Javascript
+ *  <a href="../../jsapi/confluence/">Confluence API</a>.
+ *  For example:
+ *
+ *     AP.require(["confluence"], function (confluence) {
+ *         var macroParams = {
+ *             myParameter: value
+ *         };
+ *         confluence.saveMacro(macroParams);
+ *     });
+ *
+ *  In order to retrieve the custom data again when the property panel is opened, use `confluence.getMacroData` (see
+ *  <a href="../../jsapi/confluence/">Confluence API</a>):
+ *
+ *     AP.require("confluence", function (confluence) {
+ *         var macroData = confluence.getMacroData(function(macroParams) {
+ *             doSomethingWith(macroParams.myParameter);
+ *         });
+ *     });
+ *
+ *  Dialogs may also be created. Use `dialog.create` (see
+ *  <a href="../../jsapi/dialog/">Dialog API</a>):
+ *
+ *     AP.require('dialog', function(dialog) {
+ *         dialog.create({
+ *             key: 'my-module-key',
+ *             width: '500px',
+ *             height: '200px',
+ *             chrome: true
+ *         }).on("close", callbackFunc);
+ *     });
+ *
+ *
+ */
+export interface MacroPropertyPanel1 {
+  controls?: (TextControl1 | ToggleGroup1 | ControlGroup1 | ButtonControl3)[];
+  cacheable?: boolean;
+  url: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a text field which may appear in control extension points such as the property panel
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "type": "button",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-control-0"
+ *     }
+ *
+ *
+ *
+ */
+export interface TextControl1 {
+  macroParameter: string;
+  type: 'text' | 'TEXT';
+  key: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a ToggleGroup which may appear in control extension points such as the property panel
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     [
+ *       {
+ *         "type": "togglegroup",
+ *         "macroParameter": "toggleGroupMacroParameter",
+ *         "controls": [
+ *           {
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 0",
+ *             "label": {
+ *               "value": "My Custom Control 0"
+ *             },
+ *             "key": "my-custom-toggle-button-0"
+ *           },
+ *           {
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 1",
+ *             "label": {
+ *               "value": "My Custom Control 1"
+ *             },
+ *             "key": "my-custom-toggle-button-1"
+ *           }
+ *         ]
+ *       }
+ *     ]
+ *
+ *
+ *
+ */
+export interface ToggleGroup1 {
+  controls: ToggleButtonControl1[];
+  macroParameter: string;
+  type: 'togglegroup' | 'TOGGLEGROUP';
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a toggle button which appears inside a ToggleGroup
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "type": "togglebutton",
+ *       "macroParameterValue": "macroParameterValue 0",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-toggle-button-0"
+ *     }
+ *
+ *
+ *
+ */
+export interface ToggleButtonControl1 {
+  macroParameterValue: string;
+  label: I18NProperty84;
+  type: 'togglebutton' | 'TOGGLEBUTTON';
+  key: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
+ *  and value in multiple places if you like, but identical keys must have identical values.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "value": "My text"
+ *     }
+ *
+ *
+ *
+ */
+export interface I18NProperty84 {
   value: string;
   i18n?: string;
   [k: string]: unknown;
@@ -29787,53 +29960,7 @@ export interface I18NProperty83 {
 /**
  *
  *
- * Defining a Macro Property panel allows you to add a hidden iframe to your macro's
- *  property panel. The iframe is loaded as soon as the property panel is opened.
- *
- *  In order to persist custom data using your property panel, use the Javascript
- *  <a href="../../jsapi/confluence/">Confluence API</a>.
- *  For example:
- *
- *     AP.require(["confluence"], function (confluence) {
- *         var macroParams = {
- *             myParameter: value
- *         };
- *         confluence.saveMacro(macroParams);
- *     });
- *
- *  In order to retrieve the custom data again when the property panel is opened, use `confluence.getMacroData` (see
- *  <a href="../../jsapi/confluence/">Confluence API</a>):
- *
- *     AP.require("confluence", function (confluence) {
- *         var macroData = confluence.getMacroData(function(macroParams) {
- *             doSomethingWith(macroParams.myParameter);
- *         });
- *     });
- *
- *  Dialogs may also be created. Use `dialog.create` (see
- *  <a href="../../jsapi/dialog/">Dialog API</a>):
- *
- *     AP.require('dialog', function(dialog) {
- *         dialog.create({
- *             key: 'my-module-key',
- *             width: '500px',
- *             height: '200px',
- *             chrome: true
- *         }).on("close", callbackFunc);
- *     });
- *
- *
- */
-export interface MacroPropertyPanel1 {
-  controls?: (ToggleGroup1 | TextControl1 | ButtonControl2 | ControlGroup1)[];
-  cacheable?: boolean;
-  url: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a ToggleGroup which may appear in control extension points such as the property panel
+ * Defines a ControlGroup which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -29843,24 +29970,21 @@ export interface MacroPropertyPanel1 {
  *
  *     [
  *       {
- *         "type": "togglegroup",
- *         "macroParameter": "toggleGroupMacroParameter",
+ *         "type": "group",
  *         "controls": [
  *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 0",
+ *             "type": "button",
  *             "label": {
  *               "value": "My Custom Control 0"
  *             },
- *             "key": "my-custom-toggle-button-0"
+ *             "key": "my-custom-control-0"
  *           },
  *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 1",
+ *             "type": "button",
  *             "label": {
  *               "value": "My Custom Control 1"
  *             },
- *             "key": "my-custom-toggle-button-1"
+ *             "key": "my-custom-control-1"
  *           }
  *         ]
  *       }
@@ -29869,92 +29993,9 @@ export interface MacroPropertyPanel1 {
  *
  *
  */
-export interface ToggleGroup1 {
-  controls: ToggleButtonControl1[];
-  macroParameter: string;
-  type: 'togglegroup' | 'TOGGLEGROUP';
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a toggle button which appears inside a ToggleGroup
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     {
- *       "type": "togglebutton",
- *       "macroParameterValue": "macroParameterValue 0",
- *       "label": {
- *         "value": "My Custom Control 0"
- *       },
- *       "key": "my-custom-toggle-button-0"
- *     }
- *
- *
- *
- */
-export interface ToggleButtonControl1 {
-  macroParameterValue: string;
-  label: I18NProperty84;
-  type: 'togglebutton' | 'TOGGLEBUTTON';
-  key: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
- *  and value in multiple places if you like, but identical keys must have identical values.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "value": "My text"
- *     }
- *
- *
- *
- */
-export interface I18NProperty84 {
-  value: string;
-  i18n?: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a text field which may appear in control extension points such as the property panel
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     {
- *       "type": "button",
- *       "label": {
- *         "value": "My Custom Control 0"
- *       },
- *       "key": "my-custom-control-0"
- *     }
- *
- *
- *
- */
-export interface TextControl1 {
-  macroParameter: string;
-  type: 'text' | 'TEXT';
-  key: string;
+export interface ControlGroup1 {
+  controls: ButtonControl2[];
+  type: 'group' | 'GROUP';
   [k: string]: unknown;
 }
 /**
@@ -30009,47 +30050,6 @@ export interface I18NProperty85 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Defines a ControlGroup which may appear in control extension points such as the property panel
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     [
- *       {
- *         "type": "group",
- *         "controls": [
- *           {
- *             "type": "button",
- *             "label": {
- *               "value": "My Custom Control 0"
- *             },
- *             "key": "my-custom-control-0"
- *           },
- *           {
- *             "type": "button",
- *             "label": {
- *               "value": "My Custom Control 1"
- *             },
- *             "key": "my-custom-control-1"
- *           }
- *         ]
- *       }
- *     ]
- *
- *
- *
- */
-export interface ControlGroup1 {
-  controls: ButtonControl3[];
-  type: 'group' | 'GROUP';
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -50951,10 +50951,47 @@ export interface I18NProperty91 {
  *
  */
 export interface WebItemTarget2 {
-  options?: DialogOptions4 | DialogModuleOptions2 | InlineDialogOptions2;
+  options?: InlineDialogOptions2 | DialogOptions4 | DialogModuleOptions2;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Options for an inline dialog target
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "inlinedialog",
+ *         "options": {
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface InlineDialogOptions2 {
+  offsetX?: string;
+  offsetY?: string;
+  width?: string;
+  onTop?: boolean;
+  showDelay?: number;
+  closeOthers?: boolean;
+  persistent?: boolean;
+  onHover?: boolean;
+  isRelativeToMouse?: boolean;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -51080,43 +51117,6 @@ export interface DialogModuleOptions2 {
   key: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Options for an inline dialog target
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "inlinedialog",
- *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface InlineDialogOptions2 {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
-  [k: string]: unknown;
-}
 /**
  *
  *