@arcgis/map-components 4.32.0-next.46 → 4.32.0-next.48

package/dist/types/lumina.d.ts

@@ -57,392 +57,382 @@ import type { ArcgisValuePicker } from "../components/arcgis-value-picker";
 import type { ArcgisVersionManagement } from "../components/arcgis-version-management";
 import type { ArcgisWeather } from "../components/arcgis-weather";
 import type { ArcgisZoom } from "../components/arcgis-zoom";
-import { h } from "@arcgis/lumina";
-
-type EventHandler<E> = { bivarianceHack(event: E): void }["bivarianceHack"];
-
-type TargetedEvent<Target extends EventTarget = EventTarget, TypedEvent extends Event = Event> = Omit<
-  TypedEvent,
-  "currentTarget" | "target"
-> & {
-  readonly currentTarget: Target;
-  readonly target: Target;
-};
+import type { h, EventHandler } from "@arcgis/lumina";
 
 interface LuminaArcgisAreaMeasurement2d extends Partial<Pick<ArcgisAreaMeasurement2d, 'autoDestroyDisabled' | 'icon' | 'label' | 'position' | 'referenceElement' | 'unit' | 'unitOptions'>>, h.JSX.HTMLAttributes<HTMLArcgisAreaMeasurement2dElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisAreaMeasurement2dElement, CustomEvent<ArcgisAreaMeasurement2d["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisAreaMeasurement2dElement, CustomEvent<ArcgisAreaMeasurement2d["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisAreaMeasurement2dElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisAreaMeasurement2dElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisAreaMeasurement3d extends Partial<Pick<ArcgisAreaMeasurement3d, 'autoDestroyDisabled' | 'icon' | 'label' | 'position' | 'referenceElement' | 'unit' | 'unitOptions'>>, h.JSX.HTMLAttributes<HTMLArcgisAreaMeasurement3dElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisAreaMeasurement3dElement, CustomEvent<ArcgisAreaMeasurement3d["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisAreaMeasurement3dElement, CustomEvent<ArcgisAreaMeasurement3d["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisAreaMeasurement3dElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisAreaMeasurement3dElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisAttachments extends Partial<Pick<ArcgisAttachments, 'autoDestroyDisabled' | 'capabilities' | 'displayType' | 'graphic' | 'hideAddButton' | 'hideAddSubmitButton' | 'hideCancelAddButton' | 'hideCancelUpdateButton' | 'hideDeleteButton' | 'hideErrorMessage' | 'hideProgressBar' | 'hideUpdateButton' | 'icon' | 'label' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisAttachmentsElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisAttachmentsElement, CustomEvent<ArcgisAttachments["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisAttachmentsElement, CustomEvent<ArcgisAttachments["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisAttachmentsElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisAttachmentsElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisBasemapGallery extends Partial<Pick<ArcgisBasemapGallery, 'activeBasemap' | 'autoDestroyDisabled' | 'disabled' | 'headingLevel' | 'icon' | 'label' | 'position' | 'referenceElement' | 'source'>>, h.JSX.HTMLAttributes<HTMLArcgisBasemapGalleryElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisBasemapGalleryElement, CustomEvent<ArcgisBasemapGallery["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisBasemapGalleryElement, CustomEvent<ArcgisBasemapGallery["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisBasemapGalleryElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisBasemapGalleryElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisBasemapLayerList extends Partial<Pick<ArcgisBasemapLayerList, 'autoDestroyDisabled' | 'baseFilterText' | 'baseListItemCreatedFunction' | 'basemapTitle' | 'catalogOptions' | 'collapsed' | 'dragEnabled' | 'editingTitle' | 'filterPlaceholder' | 'headingLevel' | 'hideBaseLayers' | 'hideFlow' | 'hideHeading' | 'hideReferenceLayers' | 'hideStatusIndicators' | 'icon' | 'label' | 'minFilterItems' | 'position' | 'referenceElement' | 'referenceFilterText' | 'referenceListItemCreatedFunction' | 'selectedItems' | 'selectionMode' | 'showCloseButton' | 'showCollapseButton' | 'showEditTitleButton' | 'showErrors' | 'showFilter' | 'showTemporaryLayerIndicators' | 'visibilityAppearance'>>, h.JSX.HTMLAttributes<HTMLArcgisBasemapLayerListElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisBasemapLayerListElement, CustomEvent<ArcgisBasemapLayerList["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisBasemapLayerListElement, CustomEvent<ArcgisBasemapLayerList["arcgisReady"]["detail"]>>>;
-  onarcgisTriggerAction?: EventHandler<TargetedEvent<HTMLArcgisBasemapLayerListElement, CustomEvent<ArcgisBasemapLayerList["arcgisTriggerAction"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisBasemapLayerListElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisBasemapLayerListElement["arcgisReady"]>;
+  onarcgisTriggerAction?: EventHandler<HTMLArcgisBasemapLayerListElement["arcgisTriggerAction"]>;
 }
 
 interface LuminaArcgisBasemapToggle extends Partial<Pick<ArcgisBasemapToggle, 'autoDestroyDisabled' | 'icon' | 'label' | 'messageOverrides' | 'nextBasemap' | 'position' | 'referenceElement' | 'showTitle'>>, h.JSX.HTMLAttributes<HTMLArcgisBasemapToggleElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisBasemapToggleElement, CustomEvent<ArcgisBasemapToggle["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisBasemapToggleElement, CustomEvent<ArcgisBasemapToggle["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisBasemapToggleElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisBasemapToggleElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisBookmarks extends Partial<Pick<ArcgisBookmarks, 'autoDestroyDisabled' | 'bookmarks' | 'defaultCreateOptions' | 'defaultEditOptions' | 'disabled' | 'dragEnabled' | 'filterPlaceholder' | 'filterText' | 'hideFlow' | 'hideThumbnail' | 'hideTime' | 'icon' | 'label' | 'position' | 'referenceElement' | 'showAddBookmarkButton' | 'showCloseButton' | 'showCollapseButton' | 'showEditBookmarkButton' | 'showFilter' | 'showHeading'>>, h.JSX.HTMLAttributes<HTMLArcgisBookmarksElement> {
-  onarcgisEdit?: EventHandler<TargetedEvent<HTMLArcgisBookmarksElement, CustomEvent<ArcgisBookmarks["arcgisEdit"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisBookmarksElement, CustomEvent<ArcgisBookmarks["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisBookmarksElement, CustomEvent<ArcgisBookmarks["arcgisReady"]["detail"]>>>;
-  onarcgisSelect?: EventHandler<TargetedEvent<HTMLArcgisBookmarksElement, CustomEvent<ArcgisBookmarks["arcgisSelect"]["detail"]>>>;
+  onarcgisEdit?: EventHandler<HTMLArcgisBookmarksElement["arcgisEdit"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisBookmarksElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisBookmarksElement["arcgisReady"]>;
+  onarcgisSelect?: EventHandler<HTMLArcgisBookmarksElement["arcgisSelect"]>;
 }
 
 interface LuminaArcgisBuildingExplorer extends Partial<Pick<ArcgisBuildingExplorer, 'autoDestroyDisabled' | 'headingLevel' | 'hideDisciplines' | 'hideLevels' | 'hidePhases' | 'icon' | 'label' | 'layers' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisBuildingExplorerElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisBuildingExplorerElement, CustomEvent<ArcgisBuildingExplorer["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisBuildingExplorerElement, CustomEvent<ArcgisBuildingExplorer["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisBuildingExplorerElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisBuildingExplorerElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisCatalogLayerList extends Partial<Pick<ArcgisCatalogLayerList, 'autoDestroyDisabled' | 'catalogLayer' | 'collapsed' | 'filterPlaceholder' | 'filterText' | 'headingLevel' | 'hideFlow' | 'hideStatusIndicators' | 'icon' | 'label' | 'listItemCreatedFunction' | 'minFilterItems' | 'position' | 'referenceElement' | 'selectedItems' | 'selectionMode' | 'showCloseButton' | 'showCollapseButton' | 'showErrors' | 'showFilter' | 'showHeading' | 'showTemporaryLayerIndicators' | 'visibilityAppearance'>>, h.JSX.HTMLAttributes<HTMLArcgisCatalogLayerListElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisCatalogLayerListElement, CustomEvent<ArcgisCatalogLayerList["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisCatalogLayerListElement, CustomEvent<ArcgisCatalogLayerList["arcgisReady"]["detail"]>>>;
-  onarcgisTriggerAction?: EventHandler<TargetedEvent<HTMLArcgisCatalogLayerListElement, CustomEvent<ArcgisCatalogLayerList["arcgisTriggerAction"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisCatalogLayerListElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisCatalogLayerListElement["arcgisReady"]>;
+  onarcgisTriggerAction?: EventHandler<HTMLArcgisCatalogLayerListElement["arcgisTriggerAction"]>;
 }
 
 interface LuminaArcgisCompass extends Partial<Pick<ArcgisCompass, 'autoDestroyDisabled' | 'icon' | 'label' | 'messageOverrides' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisCompassElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisCompassElement, CustomEvent<ArcgisCompass["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisCompassElement, CustomEvent<ArcgisCompass["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisCompassElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisCompassElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisCoordinateConversion extends Partial<Pick<ArcgisCoordinateConversion, 'autoDestroyDisabled' | 'conversions' | 'formats' | 'headingLevel' | 'hideCaptureButton' | 'hideEditButton' | 'hideExpandButton' | 'hideSettingsButton' | 'icon' | 'label' | 'locationSymbol' | 'mode' | 'multipleConversionsDisabled' | 'orientation' | 'position' | 'referenceElement' | 'storageDisabled' | 'storageType'>>, h.JSX.HTMLAttributes<HTMLArcgisCoordinateConversionElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisCoordinateConversionElement, CustomEvent<ArcgisCoordinateConversion["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisCoordinateConversionElement, CustomEvent<ArcgisCoordinateConversion["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisCoordinateConversionElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisCoordinateConversionElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisDaylight extends Partial<Pick<ArcgisDaylight, 'autoDestroyDisabled' | 'currentSeason' | 'dateOrSeason' | 'dayPlaying' | 'headingLevel' | 'hideDatePicker' | 'hideHeader' | 'hidePlayButtons' | 'hideShadowsToggle' | 'hideSunLightingToggle' | 'hideTimezone' | 'icon' | 'label' | 'playSpeedMultiplier' | 'position' | 'referenceElement' | 'timeSliderSteps' | 'yearPlaying'>>, h.JSX.HTMLAttributes<HTMLArcgisDaylightElement> {
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisDaylightElement, CustomEvent<ArcgisDaylight["arcgisReady"]["detail"]>>>;
+  onarcgisReady?: EventHandler<HTMLArcgisDaylightElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisDirectionalPad extends Partial<Pick<ArcgisDirectionalPad, 'autoDestroyDisabled' | 'disabled' | 'icon' | 'label' | 'position' | 'referenceElement' | 'visualScale'>>, h.JSX.HTMLAttributes<HTMLArcgisDirectionalPadElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisDirectionalPadElement, CustomEvent<ArcgisDirectionalPad["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisDirectionalPadElement, CustomEvent<ArcgisDirectionalPad["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisDirectionalPadElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisDirectionalPadElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisDirections extends Partial<Pick<ArcgisDirections, 'apiKey' | 'autoDestroyDisabled' | 'headingLevel' | 'hideLayerDetails' | 'hideSaveAsButton' | 'hideSaveButton' | 'icon' | 'label' | 'layer' | 'maxStops' | 'position' | 'referenceElement' | 'routeLayerItemId' | 'searchProperties' | 'unit' | 'useDefaultRouteLayer'>>, h.JSX.HTMLAttributes<HTMLArcgisDirectionsElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisDirectionsElement, CustomEvent<ArcgisDirections["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisDirectionsElement, CustomEvent<ArcgisDirections["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisDirectionsElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisDirectionsElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisDirectlineMeasurement3d extends Partial<Pick<ArcgisDirectLineMeasurement3d, 'autoDestroyDisabled' | 'icon' | 'label' | 'position' | 'referenceElement' | 'unit' | 'unitOptions'>>, h.JSX.HTMLAttributes<HTMLArcgisDirectlineMeasurement3dElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisDirectlineMeasurement3dElement, CustomEvent<ArcgisDirectLineMeasurement3d["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisDirectlineMeasurement3dElement, CustomEvent<ArcgisDirectLineMeasurement3d["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisDirectlineMeasurement3dElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisDirectlineMeasurement3dElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisDistanceMeasurement2d extends Partial<Pick<ArcgisDistanceMeasurement2d, 'autoDestroyDisabled' | 'icon' | 'label' | 'position' | 'referenceElement' | 'unit' | 'unitOptions'>>, h.JSX.HTMLAttributes<HTMLArcgisDistanceMeasurement2dElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisDistanceMeasurement2dElement, CustomEvent<ArcgisDistanceMeasurement2d["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisDistanceMeasurement2dElement, CustomEvent<ArcgisDistanceMeasurement2d["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisDistanceMeasurement2dElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisDistanceMeasurement2dElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisEditor extends Partial<Pick<ArcgisEditor, 'allowedWorkflows' | 'autoDestroyDisabled' | 'headingLevel' | 'hideCreateFeaturesSection' | 'hideEditFeaturesSection' | 'hideLabelsToggle' | 'hideSnappingControlsElementsEnabledToggle' | 'hideSnappingControlsElementsFeatureEnabledToggle' | 'hideSnappingControlsElementsLayerList' | 'hideSnappingControlsElementsSelfEnabledToggle' | 'hideTooltipsToggle' | 'icon' | 'label' | 'labelOptions' | 'layerInfos' | 'position' | 'referenceElement' | 'showSnappingControlsElementsHeader' | 'snappingOptions' | 'supportingWidgetDefaults' | 'tooltipOptions'>>, h.JSX.HTMLAttributes<HTMLArcgisEditorElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisEditorElement, CustomEvent<ArcgisEditor["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisEditorElement, CustomEvent<ArcgisEditor["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisEditorElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisEditorElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisElevationProfile extends Partial<Pick<ArcgisElevationProfile, 'autoDestroyDisabled' | 'hideChart' | 'hideClearButton' | 'hideLegend' | 'hideSelectButton' | 'hideSettingsButton' | 'hideSketchButton' | 'hideUniformChartScalingToggle' | 'hideUnitSelector' | 'highlightEnabled' | 'hoveredChartPosition' | 'icon' | 'input' | 'label' | 'position' | 'profiles' | 'referenceElement' | 'uniformChartScaling' | 'unit' | 'unitOptions'>>, h.JSX.HTMLAttributes<HTMLArcgisElevationProfileElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisElevationProfileElement, CustomEvent<ArcgisElevationProfile["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisElevationProfileElement, CustomEvent<ArcgisElevationProfile["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisElevationProfileElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisElevationProfileElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisExpand extends Partial<Pick<ArcgisExpand, 'autoCollapse' | 'autoDestroyDisabled' | 'closeOnEsc' | 'collapseIcon' | 'collapseTooltip' | 'expanded' | 'expandIcon' | 'expandTooltip' | 'group' | 'icon' | 'iconNumber' | 'label' | 'mode' | 'placement' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisExpandElement> {
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisExpandElement, CustomEvent<ArcgisExpand["arcgisReady"]["detail"]>>>;
+  onarcgisReady?: EventHandler<HTMLArcgisExpandElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisFeature extends Partial<Pick<ArcgisFeature, 'autoDestroyDisabled' | 'defaultPopupTemplateEnabled' | 'graphic' | 'headingLevel' | 'hideContentAttachments' | 'hideContentExpression' | 'hideContentFields' | 'hideContentMedia' | 'hideContentText' | 'hideLastEditInfo' | 'hideTitle' | 'icon' | 'label' | 'location' | 'map' | 'position' | 'referenceElement' | 'spatialReference'>>, h.JSX.HTMLAttributes<HTMLArcgisFeatureElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisFeatureElement, CustomEvent<ArcgisFeature["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisFeatureElement, CustomEvent<ArcgisFeature["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisFeatureElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisFeatureElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisFeatureForm extends Partial<Pick<ArcgisFeatureForm, 'autoDestroyDisabled' | 'feature' | 'formTemplate' | 'groupDisplay' | 'headingLevel' | 'icon' | 'label' | 'layer' | 'position' | 'referenceElement' | 'timeZone'>>, h.JSX.HTMLAttributes<HTMLArcgisFeatureFormElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisFeatureFormElement, CustomEvent<ArcgisFeatureForm["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisFeatureFormElement, CustomEvent<ArcgisFeatureForm["arcgisReady"]["detail"]>>>;
-  onarcgisSubmit?: EventHandler<TargetedEvent<HTMLArcgisFeatureFormElement, CustomEvent<ArcgisFeatureForm["arcgisSubmit"]["detail"]>>>;
-  onarcgisValueChange?: EventHandler<TargetedEvent<HTMLArcgisFeatureFormElement, CustomEvent<ArcgisFeatureForm["arcgisValueChange"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisFeatureFormElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisFeatureFormElement["arcgisReady"]>;
+  onarcgisSubmit?: EventHandler<HTMLArcgisFeatureFormElement["arcgisSubmit"]>;
+  onarcgisValueChange?: EventHandler<HTMLArcgisFeatureFormElement["arcgisValueChange"]>;
 }
 
 interface LuminaArcgisFeatureTable extends Partial<Pick<ArcgisFeatureTable, 'actionColumnConfig' | 'attachmentsEnabled' | 'attributeTableTemplate' | 'autoDestroyDisabled' | 'autoRefreshDisabled' | 'columnReorderingDisabled' | 'description' | 'editingEnabled' | 'filterBySelectionEnabled' | 'filterGeometry' | 'hiddenFields' | 'hideColumnDescriptions' | 'hideColumnMenuItemsSortAscending' | 'hideColumnMenuItemsSortDescending' | 'hideColumnMenus' | 'hideHeader' | 'hideMenu' | 'hideMenuItemsClearSelection' | 'hideMenuItemsDeleteSelection' | 'hideMenuItemsExportSelectionToCsv' | 'hideMenuItemsRefreshData' | 'hideMenuItemsSelectedRecordsShowAllToggle' | 'hideMenuItemsSelectedRecordsShowSelectedToggle' | 'hideMenuItemsToggleColumns' | 'hideMenuItemsZoomToSelection' | 'hideProgress' | 'hideSelectionColumn' | 'hideTooltips' | 'highlightDisabled' | 'highlightIds' | 'icon' | 'initialSize' | 'label' | 'layer' | 'layerItemId' | 'layerUrl' | 'maxSize' | 'menuConfig' | 'multipleSelectionDisabled' | 'multipleSortEnabled' | 'objectIds' | 'outFields' | 'pageIndex' | 'pageSize' | 'paginationEnabled' | 'position' | 'referenceElement' | 'relatedRecordsEnabled' | 'relatedTable' | 'relatedTables' | 'returnGeometryEnabled' | 'returnMEnabled' | 'returnZEnabled' | 'rowHighlightIds' | 'showLayerDropdown' | 'tableController' | 'tableDisabled' | 'tableParent' | 'tableTemplate' | 'timeExtent' | 'timeZone'>>, h.JSX.HTMLAttributes<HTMLArcgisFeatureTableElement> {
-  onarcgisCellClick?: EventHandler<TargetedEvent<HTMLArcgisFeatureTableElement, CustomEvent<ArcgisFeatureTable["arcgisCellClick"]["detail"]>>>;
-  onarcgisCellKeydown?: EventHandler<TargetedEvent<HTMLArcgisFeatureTableElement, CustomEvent<ArcgisFeatureTable["arcgisCellKeydown"]["detail"]>>>;
-  onarcgisCellPointerout?: EventHandler<TargetedEvent<HTMLArcgisFeatureTableElement, CustomEvent<ArcgisFeatureTable["arcgisCellPointerout"]["detail"]>>>;
-  onarcgisCellPointerover?: EventHandler<TargetedEvent<HTMLArcgisFeatureTableElement, CustomEvent<ArcgisFeatureTable["arcgisCellPointerover"]["detail"]>>>;
-  onarcgisColumnReorder?: EventHandler<TargetedEvent<HTMLArcgisFeatureTableElement, CustomEvent<ArcgisFeatureTable["arcgisColumnReorder"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisFeatureTableElement, CustomEvent<ArcgisFeatureTable["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisFeatureTableElement, CustomEvent<ArcgisFeatureTable["arcgisReady"]["detail"]>>>;
-  onarcgisSelectionChange?: EventHandler<TargetedEvent<HTMLArcgisFeatureTableElement, CustomEvent<ArcgisFeatureTable["arcgisSelectionChange"]["detail"]>>>;
+  onarcgisCellClick?: EventHandler<HTMLArcgisFeatureTableElement["arcgisCellClick"]>;
+  onarcgisCellKeydown?: EventHandler<HTMLArcgisFeatureTableElement["arcgisCellKeydown"]>;
+  onarcgisCellPointerout?: EventHandler<HTMLArcgisFeatureTableElement["arcgisCellPointerout"]>;
+  onarcgisCellPointerover?: EventHandler<HTMLArcgisFeatureTableElement["arcgisCellPointerover"]>;
+  onarcgisColumnReorder?: EventHandler<HTMLArcgisFeatureTableElement["arcgisColumnReorder"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisFeatureTableElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisFeatureTableElement["arcgisReady"]>;
+  onarcgisSelectionChange?: EventHandler<HTMLArcgisFeatureTableElement["arcgisSelectionChange"]>;
 }
 
 interface LuminaArcgisFeatureTemplates extends Partial<Pick<ArcgisFeatureTemplates, 'autoDestroyDisabled' | 'enableListScroll' | 'filterFunction' | 'filterText' | 'groupBy' | 'headingLevel' | 'hideFilter' | 'icon' | 'label' | 'layers' | 'position' | 'referenceElement' | 'selectionMode'>>, h.JSX.HTMLAttributes<HTMLArcgisFeatureTemplatesElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisFeatureTemplatesElement, CustomEvent<ArcgisFeatureTemplates["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisFeatureTemplatesElement, CustomEvent<ArcgisFeatureTemplates["arcgisReady"]["detail"]>>>;
-  onarcgisSelect?: EventHandler<TargetedEvent<HTMLArcgisFeatureTemplatesElement, CustomEvent<ArcgisFeatureTemplates["arcgisSelect"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisFeatureTemplatesElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisFeatureTemplatesElement["arcgisReady"]>;
+  onarcgisSelect?: EventHandler<HTMLArcgisFeatureTemplatesElement["arcgisSelect"]>;
 }
 
 interface LuminaArcgisFeatures extends Partial<Pick<ArcgisFeatures, 'actions' | 'autoDestroyDisabled' | 'collapsed' | 'content' | 'featureNavigationTop' | 'features' | 'featuresPerPage' | 'featuresTitle' | 'featureViewModelAbilities' | 'goToOverride' | 'headerActions' | 'headingLevel' | 'hideActionBar' | 'hideCloseButton' | 'hideFeatureNavigation' | 'hideFlow' | 'hideHeading' | 'hideSpinner' | 'icon' | 'includeDefaultActions' | 'label' | 'map' | 'position' | 'promises' | 'referenceElement' | 'selectedFeatureIndex' | 'showCollapseButton' | 'spatialReference' | 'timeZone'>>, h.JSX.HTMLAttributes<HTMLArcgisFeaturesElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisFeaturesElement, CustomEvent<ArcgisFeatures["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisFeaturesElement, CustomEvent<ArcgisFeatures["arcgisReady"]["detail"]>>>;
-  onarcgisTriggerAction?: EventHandler<TargetedEvent<HTMLArcgisFeaturesElement, CustomEvent<ArcgisFeatures["arcgisTriggerAction"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisFeaturesElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisFeaturesElement["arcgisReady"]>;
+  onarcgisTriggerAction?: EventHandler<HTMLArcgisFeaturesElement["arcgisTriggerAction"]>;
 }
 
 interface LuminaArcgisFloorFilter extends Partial<Pick<ArcgisFloorFilter, 'autoDestroyDisabled' | 'facility' | 'headingLevel' | 'icon' | 'label' | 'level' | 'longNames' | 'position' | 'referenceElement' | 'site'>>, h.JSX.HTMLAttributes<HTMLArcgisFloorFilterElement> {
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisFloorFilterElement, CustomEvent<ArcgisFloorFilter["arcgisReady"]["detail"]>>>;
+  onarcgisReady?: EventHandler<HTMLArcgisFloorFilterElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisFullscreen extends Partial<Pick<ArcgisFullscreen, 'autoDestroyDisabled' | 'element' | 'icon' | 'label' | 'messageOverrides' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisFullscreenElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisFullscreenElement, CustomEvent<ArcgisFullscreen["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisFullscreenElement, CustomEvent<ArcgisFullscreen["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisFullscreenElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisFullscreenElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisHistogram extends Partial<Pick<ArcgisHistogram, 'autoDestroyDisabled' | 'average' | 'barCreatedFunction' | 'bins' | 'dataLineCreatedFunction' | 'dataLines' | 'icon' | 'label' | 'labelFormatFunction' | 'layout' | 'max' | 'min' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisHistogramElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisHistogramElement, CustomEvent<ArcgisHistogram["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisHistogramElement, CustomEvent<ArcgisHistogram["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisHistogramElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisHistogramElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisHistogramRangeSlider extends Partial<Pick<ArcgisHistogramRangeSlider, 'autoDestroyDisabled' | 'average' | 'barCreatedFunction' | 'bins' | 'dataLineCreatedFunction' | 'dataLines' | 'excludedBarColor' | 'icon' | 'includedBarColor' | 'label' | 'labelFormatFunction' | 'max' | 'min' | 'position' | 'precision' | 'rangeType' | 'referenceElement' | 'standardDeviation' | 'standardDeviationCount' | 'values'>>, h.JSX.HTMLAttributes<HTMLArcgisHistogramRangeSliderElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisHistogramRangeSliderElement, CustomEvent<ArcgisHistogramRangeSlider["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisHistogramRangeSliderElement, CustomEvent<ArcgisHistogramRangeSlider["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisHistogramRangeSliderElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisHistogramRangeSliderElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisHome extends Partial<Pick<ArcgisHome, 'autoDestroyDisabled' | 'goToOverride' | 'icon' | 'label' | 'messageOverrides' | 'position' | 'referenceElement' | 'viewpoint'>>, h.JSX.HTMLAttributes<HTMLArcgisHomeElement> {
-  onarcgisGo?: EventHandler<TargetedEvent<HTMLArcgisHomeElement, CustomEvent<ArcgisHome["arcgisGo"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisHomeElement, CustomEvent<ArcgisHome["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisHomeElement, CustomEvent<ArcgisHome["arcgisReady"]["detail"]>>>;
+  onarcgisGo?: EventHandler<HTMLArcgisHomeElement["arcgisGo"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisHomeElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisHomeElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisLayerList extends Partial<Pick<ArcgisLayerList, 'autoDestroyDisabled' | 'catalogOptions' | 'collapsed' | 'dragEnabled' | 'filterPlaceholder' | 'filterText' | 'headingLevel' | 'hideCatalogLayerList' | 'hideFlow' | 'hideStatusIndicators' | 'icon' | 'knowledgeGraphOptions' | 'label' | 'listItemCreatedFunction' | 'minDragEnabledItems' | 'minFilterItems' | 'openedLayers' | 'position' | 'referenceElement' | 'selectedItems' | 'selectionMode' | 'showCloseButton' | 'showCollapseButton' | 'showErrors' | 'showFilter' | 'showHeading' | 'showTemporaryLayerIndicators' | 'visibilityAppearance'>>, h.JSX.HTMLAttributes<HTMLArcgisLayerListElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisLayerListElement, CustomEvent<ArcgisLayerList["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisLayerListElement, CustomEvent<ArcgisLayerList["arcgisReady"]["detail"]>>>;
-  onarcgisTriggerAction?: EventHandler<TargetedEvent<HTMLArcgisLayerListElement, CustomEvent<ArcgisLayerList["arcgisTriggerAction"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisLayerListElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisLayerListElement["arcgisReady"]>;
+  onarcgisTriggerAction?: EventHandler<HTMLArcgisLayerListElement["arcgisTriggerAction"]>;
 }
 
 interface LuminaArcgisLegend extends Partial<Pick<ArcgisLegend, 'activeLayerInfos' | 'autoDestroyDisabled' | 'basemapLegendVisible' | 'headingLevel' | 'hideLayersNotInCurrentView' | 'icon' | 'label' | 'layerInfos' | 'legendStyle' | 'position' | 'referenceElement' | 'respectLayerDefinitionExpression' | 'respectLayerVisibilityDisabled'>>, h.JSX.HTMLAttributes<HTMLArcgisLegendElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisLegendElement, CustomEvent<ArcgisLegend["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisLegendElement, CustomEvent<ArcgisLegend["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisLegendElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisLegendElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisLineOfSight extends Partial<Pick<ArcgisLineOfSight, 'autoDestroyDisabled' | 'icon' | 'label' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisLineOfSightElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisLineOfSightElement, CustomEvent<ArcgisLineOfSight["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisLineOfSightElement, CustomEvent<ArcgisLineOfSight["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisLineOfSightElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisLineOfSightElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisLocate extends Partial<Pick<ArcgisLocate, 'autoDestroyDisabled' | 'geolocationOptions' | 'goToLocationDisabled' | 'goToOverride' | 'graphic' | 'icon' | 'label' | 'messageOverrides' | 'popupDisabled' | 'position' | 'referenceElement' | 'scale'>>, h.JSX.HTMLAttributes<HTMLArcgisLocateElement> {
-  onarcgisError?: EventHandler<TargetedEvent<HTMLArcgisLocateElement, CustomEvent<ArcgisLocate["arcgisError"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisLocateElement, CustomEvent<ArcgisLocate["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisLocateElement, CustomEvent<ArcgisLocate["arcgisReady"]["detail"]>>>;
-  onarcgisSuccess?: EventHandler<TargetedEvent<HTMLArcgisLocateElement, CustomEvent<ArcgisLocate["arcgisSuccess"]["detail"]>>>;
+  onarcgisError?: EventHandler<HTMLArcgisLocateElement["arcgisError"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisLocateElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisLocateElement["arcgisReady"]>;
+  onarcgisSuccess?: EventHandler<HTMLArcgisLocateElement["arcgisSuccess"]>;
 }
 
 interface LuminaArcgisMap extends Partial<Pick<ArcgisMap, 'allLayerViews' | 'autoDestroyDisabled' | 'background' | 'basemap' | 'basemapView' | 'constraints' | 'extent' | 'fatalError' | 'floors' | 'graphics' | 'ground' | 'highlightOptions' | 'highlights' | 'ipsInfo' | 'itemId' | 'layerViews' | 'map' | 'navigation' | 'padding' | 'popup' | 'popupDisabled' | 'resizeAlign' | 'rotation' | 'scale' | 'spatialReference' | 'theme' | 'timeExtent' | 'timeZone' | 'viewpoint' | 'zoom'>>, ArcgisMapSetterTypes, h.JSX.HTMLAttributes<HTMLArcgisMapElement> {
-  onarcgisViewChange?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewChange"]["detail"]>>>;
-  onarcgisViewClick?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewClick"]["detail"]>>>;
-  onarcgisViewDoubleClick?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewDoubleClick"]["detail"]>>>;
-  onarcgisViewDrag?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewDrag"]["detail"]>>>;
-  onarcgisViewHold?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewHold"]["detail"]>>>;
-  onarcgisViewImmediateClick?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewImmediateClick"]["detail"]>>>;
-  onarcgisViewImmediateDoubleClick?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewImmediateDoubleClick"]["detail"]>>>;
-  onarcgisViewKeyDown?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewKeyDown"]["detail"]>>>;
-  onarcgisViewKeyUp?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewKeyUp"]["detail"]>>>;
-  onarcgisViewLayerviewCreate?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewLayerviewCreate"]["detail"]>>>;
-  onarcgisViewLayerviewCreateError?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewLayerviewCreateError"]["detail"]>>>;
-  onarcgisViewLayerviewDestroy?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewLayerviewDestroy"]["detail"]>>>;
-  onarcgisViewMouseWheel?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewMouseWheel"]["detail"]>>>;
-  onarcgisViewPointerDown?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewPointerDown"]["detail"]>>>;
-  onarcgisViewPointerEnter?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewPointerEnter"]["detail"]>>>;
-  onarcgisViewPointerLeave?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewPointerLeave"]["detail"]>>>;
-  onarcgisViewPointerMove?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewPointerMove"]["detail"]>>>;
-  onarcgisViewPointerUp?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewPointerUp"]["detail"]>>>;
-  onarcgisViewReadyChange?: EventHandler<TargetedEvent<HTMLArcgisMapElement, CustomEvent<ArcgisMap["arcgisViewReadyChange"]["detail"]>>>;
+  onarcgisViewChange?: EventHandler<HTMLArcgisMapElement["arcgisViewChange"]>;
+  onarcgisViewClick?: EventHandler<HTMLArcgisMapElement["arcgisViewClick"]>;
+  onarcgisViewDoubleClick?: EventHandler<HTMLArcgisMapElement["arcgisViewDoubleClick"]>;
+  onarcgisViewDrag?: EventHandler<HTMLArcgisMapElement["arcgisViewDrag"]>;
+  onarcgisViewHold?: EventHandler<HTMLArcgisMapElement["arcgisViewHold"]>;
+  onarcgisViewImmediateClick?: EventHandler<HTMLArcgisMapElement["arcgisViewImmediateClick"]>;
+  onarcgisViewImmediateDoubleClick?: EventHandler<HTMLArcgisMapElement["arcgisViewImmediateDoubleClick"]>;
+  onarcgisViewKeyDown?: EventHandler<HTMLArcgisMapElement["arcgisViewKeyDown"]>;
+  onarcgisViewKeyUp?: EventHandler<HTMLArcgisMapElement["arcgisViewKeyUp"]>;
+  onarcgisViewLayerviewCreate?: EventHandler<HTMLArcgisMapElement["arcgisViewLayerviewCreate"]>;
+  onarcgisViewLayerviewCreateError?: EventHandler<HTMLArcgisMapElement["arcgisViewLayerviewCreateError"]>;
+  onarcgisViewLayerviewDestroy?: EventHandler<HTMLArcgisMapElement["arcgisViewLayerviewDestroy"]>;
+  onarcgisViewMouseWheel?: EventHandler<HTMLArcgisMapElement["arcgisViewMouseWheel"]>;
+  onarcgisViewPointerDown?: EventHandler<HTMLArcgisMapElement["arcgisViewPointerDown"]>;
+  onarcgisViewPointerEnter?: EventHandler<HTMLArcgisMapElement["arcgisViewPointerEnter"]>;
+  onarcgisViewPointerLeave?: EventHandler<HTMLArcgisMapElement["arcgisViewPointerLeave"]>;
+  onarcgisViewPointerMove?: EventHandler<HTMLArcgisMapElement["arcgisViewPointerMove"]>;
+  onarcgisViewPointerUp?: EventHandler<HTMLArcgisMapElement["arcgisViewPointerUp"]>;
+  onarcgisViewReadyChange?: EventHandler<HTMLArcgisMapElement["arcgisViewReadyChange"]>;
 }
 type ArcgisMapSetterTypes = ArcgisMap["_setterTypes"]
 
 interface LuminaArcgisMeasurement extends Partial<Pick<ArcgisMeasurement, 'activeTool' | 'areaUnit' | 'autoDestroyDisabled' | 'icon' | 'label' | 'linearUnit' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisMeasurementElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisMeasurementElement, CustomEvent<ArcgisMeasurement["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisMeasurementElement, CustomEvent<ArcgisMeasurement["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisMeasurementElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisMeasurementElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisNavigationToggle extends Partial<Pick<ArcgisNavigationToggle, 'autoDestroyDisabled' | 'icon' | 'label' | 'layout' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisNavigationToggleElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisNavigationToggleElement, CustomEvent<ArcgisNavigationToggle["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisNavigationToggleElement, CustomEvent<ArcgisNavigationToggle["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisNavigationToggleElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisNavigationToggleElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisOrientedImageryViewer extends Partial<Pick<ArcgisOrientedImageryViewer, 'autoDestroyDisabled' | 'currentCoverageVisible' | 'disabled' | 'galleryOpened' | 'icon' | 'imageEnhancementToolActive' | 'isAdditionalCoverageVisible' | 'isAdditionalPointSourcesVisible' | 'label' | 'layer' | 'mapImageConversionToolState' | 'navigationToolActive' | 'orientedImageryLayerItemId' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisOrientedImageryViewerElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisOrientedImageryViewerElement, CustomEvent<ArcgisOrientedImageryViewer["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisOrientedImageryViewerElement, CustomEvent<ArcgisOrientedImageryViewer["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisOrientedImageryViewerElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisOrientedImageryViewerElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisPlacement extends Partial<Pick<ArcgisPlacement, 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisPlacementElement> {
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisPlacementElement, CustomEvent<ArcgisPlacement["arcgisReady"]["detail"]>>>;
+  onarcgisReady?: EventHandler<HTMLArcgisPlacementElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisPrint extends Partial<Pick<ArcgisPrint, 'allowedFormats' | 'allowedLayouts' | 'autoDestroyDisabled' | 'exportedLinks' | 'extraParameters' | 'headingLevel' | 'icon' | 'includeDefaultTemplatesDisabled' | 'label' | 'portal' | 'position' | 'printServiceUrl' | 'referenceElement' | 'showPrintAreaEnabled' | 'templateCustomTextElements' | 'templateOptions'>>, h.JSX.HTMLAttributes<HTMLArcgisPrintElement> {
-  onarcgisComplete?: EventHandler<TargetedEvent<HTMLArcgisPrintElement, CustomEvent<ArcgisPrint["arcgisComplete"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisPrintElement, CustomEvent<ArcgisPrint["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisPrintElement, CustomEvent<ArcgisPrint["arcgisReady"]["detail"]>>>;
-  onarcgisSubmit?: EventHandler<TargetedEvent<HTMLArcgisPrintElement, CustomEvent<ArcgisPrint["arcgisSubmit"]["detail"]>>>;
+  onarcgisComplete?: EventHandler<HTMLArcgisPrintElement["arcgisComplete"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisPrintElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisPrintElement["arcgisReady"]>;
+  onarcgisSubmit?: EventHandler<HTMLArcgisPrintElement["arcgisSubmit"]>;
 }
 
 interface LuminaArcgisScaleBar extends Partial<Pick<ArcgisScaleBar, 'autoDestroyDisabled' | 'barStyle' | 'icon' | 'label' | 'messageOverrides' | 'position' | 'referenceElement' | 'unit'>>, h.JSX.HTMLAttributes<HTMLArcgisScaleBarElement> {
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisScaleBarElement, CustomEvent<ArcgisScaleBar["arcgisReady"]["detail"]>>>;
+  onarcgisReady?: EventHandler<HTMLArcgisScaleBarElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisScaleRangeSlider extends Partial<Pick<ArcgisScaleRangeSlider, 'autoDestroyDisabled' | 'disabled' | 'hidePreview' | 'hideScaleMenusMaxScaleMenu' | 'hideScaleMenusMinScaleMenu' | 'icon' | 'label' | 'layer' | 'maxScale' | 'maxScaleLimit' | 'minScale' | 'minScaleLimit' | 'mode' | 'position' | 'referenceElement' | 'region'>>, h.JSX.HTMLAttributes<HTMLArcgisScaleRangeSliderElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisScaleRangeSliderElement, CustomEvent<ArcgisScaleRangeSlider["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisScaleRangeSliderElement, CustomEvent<ArcgisScaleRangeSlider["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisScaleRangeSliderElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisScaleRangeSliderElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisScene extends Partial<Pick<ArcgisScene, 'allLayerViews' | 'alphaCompositingEnabled' | 'analyses' | 'autoDestroyDisabled' | 'basemap' | 'basemapView' | 'camera' | 'cameraFov' | 'cameraHeading' | 'cameraPosition' | 'cameraTilt' | 'clippingArea' | 'constraints' | 'environment' | 'extent' | 'fatalError' | 'floors' | 'graphics' | 'ground' | 'highlightOptions' | 'highlights' | 'itemId' | 'layerViews' | 'map' | 'navigation' | 'padding' | 'popup' | 'popupDisabled' | 'qualityProfile' | 'scale' | 'spatialReference' | 'theme' | 'timeExtent' | 'viewingMode' | 'viewpoint' | 'zoom'>>, ArcgisSceneSetterTypes, h.JSX.HTMLAttributes<HTMLArcgisSceneElement> {
-  onarcgisViewChange?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewChange"]["detail"]>>>;
-  onarcgisViewClick?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewClick"]["detail"]>>>;
-  onarcgisViewDoubleClick?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewDoubleClick"]["detail"]>>>;
-  onarcgisViewDrag?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewDrag"]["detail"]>>>;
-  onarcgisViewHold?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewHold"]["detail"]>>>;
-  onarcgisViewImmediateClick?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewImmediateClick"]["detail"]>>>;
-  onarcgisViewImmediateDoubleClick?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewImmediateDoubleClick"]["detail"]>>>;
-  onarcgisViewKeyDown?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewKeyDown"]["detail"]>>>;
-  onarcgisViewKeyUp?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewKeyUp"]["detail"]>>>;
-  onarcgisViewLayerviewCreate?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewLayerviewCreate"]["detail"]>>>;
-  onarcgisViewLayerviewCreateError?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewLayerviewCreateError"]["detail"]>>>;
-  onarcgisViewLayerviewDestroy?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewLayerviewDestroy"]["detail"]>>>;
-  onarcgisViewMouseWheel?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewMouseWheel"]["detail"]>>>;
-  onarcgisViewPointerDown?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewPointerDown"]["detail"]>>>;
-  onarcgisViewPointerEnter?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewPointerEnter"]["detail"]>>>;
-  onarcgisViewPointerLeave?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewPointerLeave"]["detail"]>>>;
-  onarcgisViewPointerMove?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewPointerMove"]["detail"]>>>;
-  onarcgisViewPointerUp?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewPointerUp"]["detail"]>>>;
-  onarcgisViewReadyChange?: EventHandler<TargetedEvent<HTMLArcgisSceneElement, CustomEvent<ArcgisScene["arcgisViewReadyChange"]["detail"]>>>;
+  onarcgisViewChange?: EventHandler<HTMLArcgisSceneElement["arcgisViewChange"]>;
+  onarcgisViewClick?: EventHandler<HTMLArcgisSceneElement["arcgisViewClick"]>;
+  onarcgisViewDoubleClick?: EventHandler<HTMLArcgisSceneElement["arcgisViewDoubleClick"]>;
+  onarcgisViewDrag?: EventHandler<HTMLArcgisSceneElement["arcgisViewDrag"]>;
+  onarcgisViewHold?: EventHandler<HTMLArcgisSceneElement["arcgisViewHold"]>;
+  onarcgisViewImmediateClick?: EventHandler<HTMLArcgisSceneElement["arcgisViewImmediateClick"]>;
+  onarcgisViewImmediateDoubleClick?: EventHandler<HTMLArcgisSceneElement["arcgisViewImmediateDoubleClick"]>;
+  onarcgisViewKeyDown?: EventHandler<HTMLArcgisSceneElement["arcgisViewKeyDown"]>;
+  onarcgisViewKeyUp?: EventHandler<HTMLArcgisSceneElement["arcgisViewKeyUp"]>;
+  onarcgisViewLayerviewCreate?: EventHandler<HTMLArcgisSceneElement["arcgisViewLayerviewCreate"]>;
+  onarcgisViewLayerviewCreateError?: EventHandler<HTMLArcgisSceneElement["arcgisViewLayerviewCreateError"]>;
+  onarcgisViewLayerviewDestroy?: EventHandler<HTMLArcgisSceneElement["arcgisViewLayerviewDestroy"]>;
+  onarcgisViewMouseWheel?: EventHandler<HTMLArcgisSceneElement["arcgisViewMouseWheel"]>;
+  onarcgisViewPointerDown?: EventHandler<HTMLArcgisSceneElement["arcgisViewPointerDown"]>;
+  onarcgisViewPointerEnter?: EventHandler<HTMLArcgisSceneElement["arcgisViewPointerEnter"]>;
+  onarcgisViewPointerLeave?: EventHandler<HTMLArcgisSceneElement["arcgisViewPointerLeave"]>;
+  onarcgisViewPointerMove?: EventHandler<HTMLArcgisSceneElement["arcgisViewPointerMove"]>;
+  onarcgisViewPointerUp?: EventHandler<HTMLArcgisSceneElement["arcgisViewPointerUp"]>;
+  onarcgisViewReadyChange?: EventHandler<HTMLArcgisSceneElement["arcgisViewReadyChange"]>;
 }
 type ArcgisSceneSetterTypes = ArcgisScene["_setterTypes"]
 
 interface LuminaArcgisSearch extends Partial<Pick<ArcgisSearch, 'activeMenu' | 'activeSourceIndex' | 'allPlaceholder' | 'autoDestroyDisabled' | 'autoSelectDisabled' | 'disabled' | 'icon' | 'includeDefaultSourcesDisabled' | 'label' | 'locationDisabled' | 'maxResults' | 'maxSuggestions' | 'minSuggestCharacters' | 'popupDisabled' | 'popupTemplate' | 'portal' | 'position' | 'referenceElement' | 'resultGraphicDisabled' | 'searchAllDisabled' | 'searchTerm' | 'sources' | 'suggestionsDisabled'>>, h.JSX.HTMLAttributes<HTMLArcgisSearchElement> {
-  onarcgisBlur?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisBlur"]["detail"]>>>;
-  onarcgisClear?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisClear"]["detail"]>>>;
-  onarcgisComplete?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisComplete"]["detail"]>>>;
-  onarcgisFocus?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisFocus"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisReady"]["detail"]>>>;
-  onarcgisSelectResult?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisSelectResult"]["detail"]>>>;
-  onarcgisStart?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisStart"]["detail"]>>>;
-  onarcgisSuggestComplete?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisSuggestComplete"]["detail"]>>>;
-  onarcgisSuggestStart?: EventHandler<TargetedEvent<HTMLArcgisSearchElement, CustomEvent<ArcgisSearch["arcgisSuggestStart"]["detail"]>>>;
+  onarcgisBlur?: EventHandler<HTMLArcgisSearchElement["arcgisBlur"]>;
+  onarcgisClear?: EventHandler<HTMLArcgisSearchElement["arcgisClear"]>;
+  onarcgisComplete?: EventHandler<HTMLArcgisSearchElement["arcgisComplete"]>;
+  onarcgisFocus?: EventHandler<HTMLArcgisSearchElement["arcgisFocus"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisSearchElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisSearchElement["arcgisReady"]>;
+  onarcgisSelectResult?: EventHandler<HTMLArcgisSearchElement["arcgisSelectResult"]>;
+  onarcgisStart?: EventHandler<HTMLArcgisSearchElement["arcgisStart"]>;
+  onarcgisSuggestComplete?: EventHandler<HTMLArcgisSearchElement["arcgisSuggestComplete"]>;
+  onarcgisSuggestStart?: EventHandler<HTMLArcgisSearchElement["arcgisSuggestStart"]>;
 }
 
 interface LuminaArcgisShadowCast extends Partial<Pick<ArcgisShadowCast, 'autoDestroyDisabled' | 'discreteOptions' | 'durationOptions' | 'endTimeOfDay' | 'headingLevel' | 'hideColorPicker' | 'hideDatePicker' | 'hideTimeRangeSlider' | 'hideTimezone' | 'hideTooltip' | 'hideVisualizationOptions' | 'icon' | 'label' | 'position' | 'referenceElement' | 'startTimeOfDay' | 'thresholdOptions' | 'utcOffset' | 'visualizationType'>>, h.JSX.HTMLAttributes<HTMLArcgisShadowCastElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisShadowCastElement, CustomEvent<ArcgisShadowCast["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisShadowCastElement, CustomEvent<ArcgisShadowCast["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisShadowCastElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisShadowCastElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisSketch extends Partial<Pick<ArcgisSketch, 'autoDestroyDisabled' | 'availableCreateTools' | 'creationMode' | 'defaultCreateOptions' | 'defaultGraphicsLayerDisabled' | 'defaultUpdateOptions' | 'hideCreateToolsCircle' | 'hideCreateToolsPoint' | 'hideCreateToolsPolygon' | 'hideCreateToolsPolyline' | 'hideCreateToolsRectangle' | 'hideDuplicateButton' | 'hideLabelsToggle' | 'hideSelectionToolsLassoSelection' | 'hideSelectionToolsRectangleSelection' | 'hideSettingsMenu' | 'hideSnappingControls' | 'hideSnappingControlsElementsEnabledToggle' | 'hideSnappingControlsElementsFeatureEnabledToggle' | 'hideSnappingControlsElementsLayerList' | 'hideSnappingControlsElementsSelfEnabledToggle' | 'hideTooltipsToggle' | 'hideUndoRedoMenu' | 'icon' | 'label' | 'labelOptions' | 'layer' | 'layout' | 'pointSymbol' | 'polygonSymbol' | 'polylineSymbol' | 'position' | 'referenceElement' | 'showSnappingControlsElementsHeader' | 'snappingOptions' | 'tooltipOptions'>>, h.JSX.HTMLAttributes<HTMLArcgisSketchElement> {
-  onarcgisCreate?: EventHandler<TargetedEvent<HTMLArcgisSketchElement, CustomEvent<ArcgisSketch["arcgisCreate"]["detail"]>>>;
-  onarcgisDelete?: EventHandler<TargetedEvent<HTMLArcgisSketchElement, CustomEvent<ArcgisSketch["arcgisDelete"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisSketchElement, CustomEvent<ArcgisSketch["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisSketchElement, CustomEvent<ArcgisSketch["arcgisReady"]["detail"]>>>;
-  onarcgisRedo?: EventHandler<TargetedEvent<HTMLArcgisSketchElement, CustomEvent<ArcgisSketch["arcgisRedo"]["detail"]>>>;
-  onarcgisUndo?: EventHandler<TargetedEvent<HTMLArcgisSketchElement, CustomEvent<ArcgisSketch["arcgisUndo"]["detail"]>>>;
-  onarcgisUpdate?: EventHandler<TargetedEvent<HTMLArcgisSketchElement, CustomEvent<ArcgisSketch["arcgisUpdate"]["detail"]>>>;
+  onarcgisCreate?: EventHandler<HTMLArcgisSketchElement["arcgisCreate"]>;
+  onarcgisDelete?: EventHandler<HTMLArcgisSketchElement["arcgisDelete"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisSketchElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisSketchElement["arcgisReady"]>;
+  onarcgisRedo?: EventHandler<HTMLArcgisSketchElement["arcgisRedo"]>;
+  onarcgisUndo?: EventHandler<HTMLArcgisSketchElement["arcgisUndo"]>;
+  onarcgisUpdate?: EventHandler<HTMLArcgisSketchElement["arcgisUpdate"]>;
 }
 
 interface LuminaArcgisSlice extends Partial<Pick<ArcgisSlice, 'autoDestroyDisabled' | 'excludedLayers' | 'excludeGroundSurface' | 'headingLevel' | 'icon' | 'label' | 'position' | 'referenceElement' | 'shape' | 'tiltEnabled'>>, h.JSX.HTMLAttributes<HTMLArcgisSliceElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisSliceElement, CustomEvent<ArcgisSlice["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisSliceElement, CustomEvent<ArcgisSlice["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisSliceElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisSliceElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisSlider extends Partial<Pick<ArcgisSlider, 'autoDestroyDisabled' | 'draggableSegmentsEnabled' | 'effectiveMax' | 'effectiveMin' | 'icon' | 'label' | 'labelInputsEnabled' | 'layout' | 'max' | 'min' | 'position' | 'precision' | 'rangeLabelInputsEnabled' | 'referenceElement' | 'snapOnClickEnabled' | 'steps' | 'syncedSegmentsEnabled' | 'thumbsConstrained' | 'tickConfigs' | 'trackElement' | 'values'>>, h.JSX.HTMLAttributes<HTMLArcgisSliderElement> {
-  onarcgisMaxChange?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisMaxChange"]["detail"]>>>;
-  onarcgisMaxClick?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisMaxClick"]["detail"]>>>;
-  onarcgisMinChange?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisMinChange"]["detail"]>>>;
-  onarcgisMinClick?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisMinClick"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisReady"]["detail"]>>>;
-  onarcgisSegmentClick?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisSegmentClick"]["detail"]>>>;
-  onarcgisSegmentDrag?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisSegmentDrag"]["detail"]>>>;
-  onarcgisThumbChange?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisThumbChange"]["detail"]>>>;
-  onarcgisThumbClick?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisThumbClick"]["detail"]>>>;
-  onarcgisThumbDrag?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisThumbDrag"]["detail"]>>>;
-  onarcgisTickClick?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisTickClick"]["detail"]>>>;
-  onarcgisTrackClick?: EventHandler<TargetedEvent<HTMLArcgisSliderElement, CustomEvent<ArcgisSlider["arcgisTrackClick"]["detail"]>>>;
+  onarcgisMaxChange?: EventHandler<HTMLArcgisSliderElement["arcgisMaxChange"]>;
+  onarcgisMaxClick?: EventHandler<HTMLArcgisSliderElement["arcgisMaxClick"]>;
+  onarcgisMinChange?: EventHandler<HTMLArcgisSliderElement["arcgisMinChange"]>;
+  onarcgisMinClick?: EventHandler<HTMLArcgisSliderElement["arcgisMinClick"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisSliderElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisSliderElement["arcgisReady"]>;
+  onarcgisSegmentClick?: EventHandler<HTMLArcgisSliderElement["arcgisSegmentClick"]>;
+  onarcgisSegmentDrag?: EventHandler<HTMLArcgisSliderElement["arcgisSegmentDrag"]>;
+  onarcgisThumbChange?: EventHandler<HTMLArcgisSliderElement["arcgisThumbChange"]>;
+  onarcgisThumbClick?: EventHandler<HTMLArcgisSliderElement["arcgisThumbClick"]>;
+  onarcgisThumbDrag?: EventHandler<HTMLArcgisSliderElement["arcgisThumbDrag"]>;
+  onarcgisTickClick?: EventHandler<HTMLArcgisSliderElement["arcgisTickClick"]>;
+  onarcgisTrackClick?: EventHandler<HTMLArcgisSliderElement["arcgisTrackClick"]>;
 }
 
 interface LuminaArcgisSwipe extends Partial<Pick<ArcgisSwipe, 'autoDestroyDisabled' | 'direction' | 'dragLabel' | 'icon' | 'leadingLayers' | 'swipePosition' | 'trailingLayers'>>, h.JSX.HTMLAttributes<HTMLArcgisSwipeElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisSwipeElement, CustomEvent<ArcgisSwipe["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisSwipeElement, CustomEvent<ArcgisSwipe["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisSwipeElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisSwipeElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisTableList extends Partial<Pick<ArcgisTableList, 'autoDestroyDisabled' | 'collapsed' | 'dragEnabled' | 'filterPlaceholder' | 'filterText' | 'icon' | 'label' | 'listItemCreatedFunction' | 'minDragEnabledItems' | 'minFilterItems' | 'position' | 'referenceElement' | 'selectedItems' | 'selectionMode' | 'visibleElementsCloseButton' | 'visibleElementsCollapseButton' | 'visibleElementsErrors' | 'visibleElementsFilter' | 'visibleElementsFlow' | 'visibleElementsHeading' | 'visibleElementsStatusIndicators' | 'visibleElementsTemporaryTableIndicators'>>, h.JSX.HTMLAttributes<HTMLArcgisTableListElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisTableListElement, CustomEvent<ArcgisTableList["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisTableListElement, CustomEvent<ArcgisTableList["arcgisReady"]["detail"]>>>;
-  onarcgisTriggerAction?: EventHandler<TargetedEvent<HTMLArcgisTableListElement, CustomEvent<ArcgisTableList["arcgisTriggerAction"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisTableListElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisTableListElement["arcgisReady"]>;
+  onarcgisTriggerAction?: EventHandler<HTMLArcgisTableListElement["arcgisTriggerAction"]>;
 }
 
 interface LuminaArcgisTimeSlider extends Partial<Pick<ArcgisTimeSlider, 'actions' | 'autoDestroyDisabled' | 'disabled' | 'fullTimeExtent' | 'icon' | 'label' | 'layout' | 'loop' | 'mode' | 'playRate' | 'position' | 'referenceElement' | 'stops' | 'tickConfigs' | 'timeExtent' | 'timeVisible' | 'timeZone'>>, h.JSX.HTMLAttributes<HTMLArcgisTimeSliderElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisTimeSliderElement, CustomEvent<ArcgisTimeSlider["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisTimeSliderElement, CustomEvent<ArcgisTimeSlider["arcgisReady"]["detail"]>>>;
-  onarcgisTriggerAction?: EventHandler<TargetedEvent<HTMLArcgisTimeSliderElement, CustomEvent<ArcgisTimeSlider["arcgisTriggerAction"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisTimeSliderElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisTimeSliderElement["arcgisReady"]>;
+  onarcgisTriggerAction?: EventHandler<HTMLArcgisTimeSliderElement["arcgisTriggerAction"]>;
 }
 
 interface LuminaArcgisTrack extends Partial<Pick<ArcgisTrack, 'autoDestroyDisabled' | 'error' | 'geolocationOptions' | 'goToLocationDisabled' | 'goToOverride' | 'graphic' | 'icon' | 'label' | 'messageOverrides' | 'position' | 'positionFilterFunction' | 'referenceElement' | 'scale'>>, h.JSX.HTMLAttributes<HTMLArcgisTrackElement> {
-  onarcgisComplete?: EventHandler<TargetedEvent<HTMLArcgisTrackElement, CustomEvent<ArcgisTrack["arcgisComplete"]["detail"]>>>;
-  onarcgisError?: EventHandler<TargetedEvent<HTMLArcgisTrackElement, CustomEvent<ArcgisTrack["arcgisError"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisTrackElement, CustomEvent<ArcgisTrack["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisTrackElement, CustomEvent<ArcgisTrack["arcgisReady"]["detail"]>>>;
+  onarcgisComplete?: EventHandler<HTMLArcgisTrackElement["arcgisComplete"]>;
+  onarcgisError?: EventHandler<HTMLArcgisTrackElement["arcgisError"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisTrackElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisTrackElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisUtilityNetworkAssociations extends Partial<Pick<ArcgisUtilityNetworkAssociations, 'autoRefreshAssociationsDisabled' | 'connectivityAssociationsLineSymbol' | 'includeConnectivityAssociationsDisabled' | 'includeStructuralAttachmentAssociationsDisabled' | 'maxAllowableAssociations' | 'maxAllowableAssociationsSliderMax' | 'maxAllowableAssociationsSliderMin' | 'maxAllowableAssociationsSliderStep' | 'position' | 'referenceElement' | 'showArrowsConnectivity' | 'showArrowsStructuralAttachment' | 'showAssociationsEnabled' | 'structuralAttachmentAssociationsLineSymbol' | 'utilityNetwork' | 'visibleElementsConnectivityAssociationsSettingsArrowsToggle' | 'visibleElementsConnectivityAssociationsSettingsCapSelect' | 'visibleElementsConnectivityAssociationsSettingsColorPicker' | 'visibleElementsConnectivityAssociationsSettingsStylePicker' | 'visibleElementsConnectivityAssociationsSettingsWidthInput' | 'visibleElementsMaxAllowableAssociationsSlider' | 'visibleElementsStructuralAttachmentAssociationsSettingsArrowsToggle' | 'visibleElementsStructuralAttachmentAssociationsSettingsCapSelect' | 'visibleElementsStructuralAttachmentAssociationsSettingsColorPicker' | 'visibleElementsStructuralAttachmentAssociationsSettingsStylePicker' | 'visibleElementsStructuralAttachmentAssociationsSettingsWidthInput'>>, h.JSX.HTMLAttributes<HTMLArcgisUtilityNetworkAssociationsElement> {
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisUtilityNetworkAssociationsElement, CustomEvent<ArcgisUtilityNetworkAssociations["arcgisReady"]["detail"]>>>;
+  onarcgisReady?: EventHandler<HTMLArcgisUtilityNetworkAssociationsElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisUtilityNetworkTrace extends Partial<Pick<ArcgisUtilityNetworkTrace, 'defaultGraphicColor' | 'disabled' | 'enableResultArea' | 'flags' | 'gdbVersion' | 'inputSettings' | 'position' | 'referenceElement' | 'resultAreaProperties' | 'selectedTraces' | 'selectOnCompleteDisabled' | 'showGraphicsOnCompleteDisabled' | 'showSelectionAttributesDisabled'>>, h.JSX.HTMLAttributes<HTMLArcgisUtilityNetworkTraceElement> {
-  onarcgisAddFlag?: EventHandler<TargetedEvent<HTMLArcgisUtilityNetworkTraceElement, CustomEvent<ArcgisUtilityNetworkTrace["arcgisAddFlag"]["detail"]>>>;
-  onarcgisAddFlagComplete?: EventHandler<TargetedEvent<HTMLArcgisUtilityNetworkTraceElement, CustomEvent<ArcgisUtilityNetworkTrace["arcgisAddFlagComplete"]["detail"]>>>;
-  onarcgisAddFlagError?: EventHandler<TargetedEvent<HTMLArcgisUtilityNetworkTraceElement, CustomEvent<ArcgisUtilityNetworkTrace["arcgisAddFlagError"]["detail"]>>>;
-  onarcgisAddResultArea?: EventHandler<TargetedEvent<HTMLArcgisUtilityNetworkTraceElement, CustomEvent<ArcgisUtilityNetworkTrace["arcgisAddResultArea"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisUtilityNetworkTraceElement, CustomEvent<ArcgisUtilityNetworkTrace["arcgisReady"]["detail"]>>>;
-  onarcgisRemoveResultArea?: EventHandler<TargetedEvent<HTMLArcgisUtilityNetworkTraceElement, CustomEvent<ArcgisUtilityNetworkTrace["arcgisRemoveResultArea"]["detail"]>>>;
+  onarcgisAddFlag?: EventHandler<HTMLArcgisUtilityNetworkTraceElement["arcgisAddFlag"]>;
+  onarcgisAddFlagComplete?: EventHandler<HTMLArcgisUtilityNetworkTraceElement["arcgisAddFlagComplete"]>;
+  onarcgisAddFlagError?: EventHandler<HTMLArcgisUtilityNetworkTraceElement["arcgisAddFlagError"]>;
+  onarcgisAddResultArea?: EventHandler<HTMLArcgisUtilityNetworkTraceElement["arcgisAddResultArea"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisUtilityNetworkTraceElement["arcgisReady"]>;
+  onarcgisRemoveResultArea?: EventHandler<HTMLArcgisUtilityNetworkTraceElement["arcgisRemoveResultArea"]>;
 }
 
 interface LuminaArcgisUtilityNetworkValidateTopology extends Partial<Pick<ArcgisUtilityNetworkValidateTopology, 'extentToValidate' | 'position' | 'referenceElement' | 'utilityNetwork'>>, h.JSX.HTMLAttributes<HTMLArcgisUtilityNetworkValidateTopologyElement> {
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisUtilityNetworkValidateTopologyElement, CustomEvent<ArcgisUtilityNetworkValidateTopology["arcgisReady"]["detail"]>>>;
+  onarcgisReady?: EventHandler<HTMLArcgisUtilityNetworkValidateTopologyElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisValuePicker extends Partial<Pick<ArcgisValuePicker, 'autoDestroyDisabled' | 'canNext' | 'canPlay' | 'canPrevious' | 'caption' | 'component' | 'hideNextButton' | 'hidePlayButton' | 'hidePreviousButton' | 'icon' | 'label' | 'layout' | 'loop' | 'playRate' | 'position' | 'referenceElement' | 'values'>>, h.JSX.HTMLAttributes<HTMLArcgisValuePickerElement> {
-  onarcgisAnimate?: EventHandler<TargetedEvent<HTMLArcgisValuePickerElement, CustomEvent<ArcgisValuePicker["arcgisAnimate"]["detail"]>>>;
-  onarcgisNext?: EventHandler<TargetedEvent<HTMLArcgisValuePickerElement, CustomEvent<ArcgisValuePicker["arcgisNext"]["detail"]>>>;
-  onarcgisPause?: EventHandler<TargetedEvent<HTMLArcgisValuePickerElement, CustomEvent<ArcgisValuePicker["arcgisPause"]["detail"]>>>;
-  onarcgisPlay?: EventHandler<TargetedEvent<HTMLArcgisValuePickerElement, CustomEvent<ArcgisValuePicker["arcgisPlay"]["detail"]>>>;
-  onarcgisPrevious?: EventHandler<TargetedEvent<HTMLArcgisValuePickerElement, CustomEvent<ArcgisValuePicker["arcgisPrevious"]["detail"]>>>;
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisValuePickerElement, CustomEvent<ArcgisValuePicker["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisValuePickerElement, CustomEvent<ArcgisValuePicker["arcgisReady"]["detail"]>>>;
+  onarcgisAnimate?: EventHandler<HTMLArcgisValuePickerElement["arcgisAnimate"]>;
+  onarcgisNext?: EventHandler<HTMLArcgisValuePickerElement["arcgisNext"]>;
+  onarcgisPause?: EventHandler<HTMLArcgisValuePickerElement["arcgisPause"]>;
+  onarcgisPlay?: EventHandler<HTMLArcgisValuePickerElement["arcgisPlay"]>;
+  onarcgisPrevious?: EventHandler<HTMLArcgisValuePickerElement["arcgisPrevious"]>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisValuePickerElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisValuePickerElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisVersionManagement extends Partial<Pick<ArcgisVersionManagement, 'allowEditingDisabled' | 'autoDestroyDisabled' | 'closable' | 'icon' | 'label' | 'messageOverrides' | 'mode' | 'pageSize' | 'position' | 'referenceElement' | 'versioningStates' | 'view'>>, h.JSX.HTMLAttributes<HTMLArcgisVersionManagementElement> {
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisVersionManagementElement, CustomEvent<ArcgisVersionManagement["arcgisReady"]["detail"]>>>;
-  onarcgisVersioningStateChanged?: EventHandler<TargetedEvent<HTMLArcgisVersionManagementElement, CustomEvent<ArcgisVersionManagement["arcgisVersioningStateChanged"]["detail"]>>>;
+  onarcgisReady?: EventHandler<HTMLArcgisVersionManagementElement["arcgisReady"]>;
+  onarcgisVersioningStateChanged?: EventHandler<HTMLArcgisVersionManagementElement["arcgisVersioningStateChanged"]>;
 }
 
 interface LuminaArcgisWeather extends Partial<Pick<ArcgisWeather, 'autoDestroyDisabled' | 'headingLevel' | 'hideHeader' | 'icon' | 'label' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisWeatherElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisWeatherElement, CustomEvent<ArcgisWeather["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisWeatherElement, CustomEvent<ArcgisWeather["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisWeatherElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisWeatherElement["arcgisReady"]>;
 }
 
 interface LuminaArcgisZoom extends Partial<Pick<ArcgisZoom, 'autoDestroyDisabled' | 'icon' | 'label' | 'layout' | 'messageOverrides' | 'position' | 'referenceElement'>>, h.JSX.HTMLAttributes<HTMLArcgisZoomElement> {
-  onarcgisPropertyChange?: EventHandler<TargetedEvent<HTMLArcgisZoomElement, CustomEvent<ArcgisZoom["arcgisPropertyChange"]["detail"]>>>;
-  onarcgisReady?: EventHandler<TargetedEvent<HTMLArcgisZoomElement, CustomEvent<ArcgisZoom["arcgisReady"]["detail"]>>>;
+  onarcgisPropertyChange?: EventHandler<HTMLArcgisZoomElement["arcgisPropertyChange"]>;
+  onarcgisReady?: EventHandler<HTMLArcgisZoomElement["arcgisReady"]>;
 }
 
 declare module "@arcgis/lumina" {