fix: improve typings and export additional types (#8631)

google · Oct 31, 2024 · e4eb975 · e4eb975
1 parent 089179b
commit e4eb975
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/core/blockly.ts b/core/blockly.ts
@@ -60,6 +60,7 @@ import {
   FieldDropdownConfig,
   FieldDropdownFromJsonConfig,
   FieldDropdownValidator,
+  ImageProperties,
   MenuGenerator,
   MenuGeneratorFunction,
   MenuOption,
@@ -94,7 +95,7 @@ import {
   FieldVariableFromJsonConfig,
   FieldVariableValidator,
 } from './field_variable.js';
-import {Flyout} from './flyout_base.js';
+import {Flyout, FlyoutItem} from './flyout_base.js';
 import {FlyoutButton} from './flyout_button.js';
 import {FlyoutSeparator} from './flyout_separator.js';
 import {IFlyoutInflater} from './interfaces/i_flyout_inflater.js';
@@ -156,7 +157,7 @@ import {IStyleable} from './interfaces/i_styleable.js';
 import {IToolbox} from './interfaces/i_toolbox.js';
 import {IToolboxItem} from './interfaces/i_toolbox_item.js';
 import {IVariableMap} from './interfaces/i_variable_map.js';
-import {IVariableModel} from './interfaces/i_variable_model.js';
+import {IVariableModel, IVariableState} from './interfaces/i_variable_model.js';
 import {
   IVariableBackedParameterModel,
   isVariableBackedParameterModel,
@@ -488,6 +489,7 @@ export {
   FieldDropdownConfig,
   FieldDropdownFromJsonConfig,
   FieldDropdownValidator,
+  ImageProperties,
   MenuGenerator,
   MenuGeneratorFunction,
   MenuOption,
@@ -513,7 +515,7 @@ export {
   FieldVariableFromJsonConfig,
   FieldVariableValidator,
 };
-export {Flyout};
+export {Flyout, FlyoutItem};
 export {FlyoutButton};
 export {FlyoutMetricsManager};
 export {FlyoutSeparator};
@@ -568,6 +570,7 @@ export {IToolbox};
 export {IToolboxItem};
 export {IVariableMap};
 export {IVariableModel};
+export {IVariableState};
 export {IVariableBackedParameterModel, isVariableBackedParameterModel};
 export {Marker};
 export {MarkerManager};

diff --git a/core/clipboard.ts b/core/clipboard.ts
@@ -7,7 +7,7 @@
 // Former goog.module ID: Blockly.clipboard
 
 import type {ICopyData, ICopyable} from './interfaces/i_copyable.js';
-import {BlockPaster} from './clipboard/block_paster.js';
+import {BlockPaster, BlockCopyData} from './clipboard/block_paster.js';
 import * as globalRegistry from './registry.js';
 import {WorkspaceSvg} from './workspace_svg.js';
 import * as registry from './clipboard/registry.js';
@@ -110,4 +110,4 @@ export const TEST_ONLY = {
   copyInternal,
 };
 
-export {BlockPaster, registry};
+export {BlockPaster, BlockCopyData, registry};
diff --git a/core/dropdowndiv.ts b/core/dropdowndiv.ts
@@ -160,7 +160,7 @@ export function getOwner(): Field | null {
  *
  * @returns Div to populate with content.
  */
-export function getContentDiv(): Element {
+export function getContentDiv(): HTMLDivElement {
   return content;
 }