diff --git a/src/platform/plugins/shared/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx b/src/platform/plugins/shared/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
index c24a3ec8b8c71..3ef540c9f3312 100644
--- a/src/platform/plugins/shared/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
+++ b/src/platform/plugins/shared/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
@@ -285,8 +285,6 @@ export function InternalDashboardTopNav({
...getManagedContentBadge(dashboardManagedBadge.getBadgeAriaLabel()),
onClick: () => setIsPopoverOpen(!isPopoverOpen),
onClickAriaLabel: dashboardManagedBadge.getBadgeAriaLabel(),
- iconOnClick: () => setIsPopoverOpen(!isPopoverOpen),
- iconOnClickAriaLabel: dashboardManagedBadge.getBadgeAriaLabel(),
} as TopNavMenuBadgeProps;
allBadges.push({
diff --git a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap
index 11b830308fe62..960b367fe4b6b 100644
--- a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap
+++ b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap
@@ -120,8 +120,6 @@ exports[`Table should render conflicting type 1`] = `
{conflictType}
diff --git a/x-pack/platform/plugins/private/monitoring/public/components/setup_mode/__snapshots__/tooltip.test.js.snap b/x-pack/platform/plugins/private/monitoring/public/components/setup_mode/__snapshots__/tooltip.test.js.snap
index 9e61e09c1b503..f71d386b48b4e 100644
--- a/x-pack/platform/plugins/private/monitoring/public/components/setup_mode/__snapshots__/tooltip.test.js.snap
+++ b/x-pack/platform/plugins/private/monitoring/public/components/setup_mode/__snapshots__/tooltip.test.js.snap
@@ -16,7 +16,6 @@ exports[`setupMode SetupModeTooltip allInternalCollection should render for apm
color="danger"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring"
>
Self monitoring
@@ -40,7 +39,6 @@ exports[`setupMode SetupModeTooltip allInternalCollection should render for beat
color="danger"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring"
>
Self monitoring
@@ -64,7 +62,6 @@ exports[`setupMode SetupModeTooltip allInternalCollection should render for elas
color="danger"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring"
>
Self monitoring
@@ -88,7 +85,6 @@ exports[`setupMode SetupModeTooltip allInternalCollection should render for kiba
color="danger"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring"
>
Self monitoring
@@ -112,7 +108,6 @@ exports[`setupMode SetupModeTooltip allInternalCollection should render for logs
color="danger"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring"
>
Self monitoring
@@ -136,7 +131,6 @@ exports[`setupMode SetupModeTooltip allMonitoredByMetricbeat should render for a
color="success"
href=""
iconType="flag"
- onClickAriaLabel="Metricbeat monitoring"
>
Metricbeat monitoring
@@ -160,7 +154,6 @@ exports[`setupMode SetupModeTooltip allMonitoredByMetricbeat should render for b
color="success"
href=""
iconType="flag"
- onClickAriaLabel="Metricbeat monitoring"
>
Metricbeat monitoring
@@ -184,7 +177,6 @@ exports[`setupMode SetupModeTooltip allMonitoredByMetricbeat should render for e
color="success"
href=""
iconType="flag"
- onClickAriaLabel="Metricbeat monitoring"
>
Metricbeat monitoring
@@ -208,7 +200,6 @@ exports[`setupMode SetupModeTooltip allMonitoredByMetricbeat should render for k
color="success"
href=""
iconType="flag"
- onClickAriaLabel="Metricbeat monitoring"
>
Metricbeat monitoring
@@ -232,7 +223,6 @@ exports[`setupMode SetupModeTooltip allMonitoredByMetricbeat should render for l
color="success"
href=""
iconType="flag"
- onClickAriaLabel="Metricbeat monitoring"
>
Metricbeat monitoring
@@ -256,7 +246,6 @@ exports[`setupMode SetupModeTooltip internalCollectionOn should render for apm 1
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring is on"
>
Self monitoring is on
@@ -280,7 +269,6 @@ exports[`setupMode SetupModeTooltip internalCollectionOn should render for beats
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring is on"
>
Self monitoring is on
@@ -304,7 +292,6 @@ exports[`setupMode SetupModeTooltip internalCollectionOn should render for elast
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring is on"
>
Self monitoring is on
@@ -328,7 +315,6 @@ exports[`setupMode SetupModeTooltip internalCollectionOn should render for kiban
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring is on"
>
Self monitoring is on
@@ -352,7 +338,6 @@ exports[`setupMode SetupModeTooltip internalCollectionOn should render for logst
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="Self monitoring is on"
>
Self monitoring is on
@@ -376,7 +361,6 @@ exports[`setupMode SetupModeTooltip no detectable instances should render for ap
color="hollow"
href=""
iconType="flag"
- onClickAriaLabel="No usage"
>
No usage
@@ -400,7 +384,6 @@ exports[`setupMode SetupModeTooltip no detectable instances should render for be
color="hollow"
href=""
iconType="flag"
- onClickAriaLabel="No usage"
>
No usage
@@ -424,7 +407,6 @@ exports[`setupMode SetupModeTooltip no detectable instances should render for el
color="hollow"
href=""
iconType="flag"
- onClickAriaLabel="No usage"
>
No usage
@@ -448,7 +430,6 @@ exports[`setupMode SetupModeTooltip no detectable instances should render for ki
color="hollow"
href=""
iconType="flag"
- onClickAriaLabel="No usage"
>
No usage
@@ -472,7 +453,6 @@ exports[`setupMode SetupModeTooltip no detectable instances should render for lo
color="hollow"
href=""
iconType="flag"
- onClickAriaLabel="No usage"
>
No usage
@@ -496,7 +476,6 @@ exports[`setupMode SetupModeTooltip only detectable instances should render for
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="No monitoring"
>
No monitoring
@@ -520,7 +499,6 @@ exports[`setupMode SetupModeTooltip only detectable instances should render for
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="No monitoring"
>
No monitoring
@@ -544,7 +522,6 @@ exports[`setupMode SetupModeTooltip only detectable instances should render for
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="No monitoring"
>
No monitoring
@@ -568,7 +545,6 @@ exports[`setupMode SetupModeTooltip only detectable instances should render for
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="No monitoring"
>
No monitoring
@@ -592,7 +568,6 @@ exports[`setupMode SetupModeTooltip only detectable instances should render for
color="warning"
href=""
iconType="flag"
- onClickAriaLabel="No monitoring"
>
No monitoring
diff --git a/x-pack/platform/plugins/private/monitoring/public/components/setup_mode/tooltip.js b/x-pack/platform/plugins/private/monitoring/public/components/setup_mode/tooltip.js
index 1fd9cdf6c3c70..c5b1b2f307d42 100644
--- a/x-pack/platform/plugins/private/monitoring/public/components/setup_mode/tooltip.js
+++ b/x-pack/platform/plugins/private/monitoring/public/components/setup_mode/tooltip.js
@@ -43,12 +43,7 @@ export function SetupModeTooltip({ setupModeData, badgeClickLink, productName })
defaultMessage: `We detected usage of this product. Click to start monitoring.`,
})}
>
-
+
{detectedText}
@@ -68,12 +63,7 @@ export function SetupModeTooltip({ setupModeData, badgeClickLink, productName })
},
})}
>
-
+
{noMonitoringText}
@@ -96,12 +86,7 @@ export function SetupModeTooltip({ setupModeData, badgeClickLink, productName })
},
})}
>
-
+
{internalCollection}
@@ -120,12 +105,7 @@ export function SetupModeTooltip({ setupModeData, badgeClickLink, productName })
},
})}
>
-
+
{internalAndMB}
@@ -144,12 +124,7 @@ export function SetupModeTooltip({ setupModeData, badgeClickLink, productName })
},
})}
>
-
+
{metricbeatCollection}
diff --git a/x-pack/platform/plugins/shared/aiops/public/components/log_rate_analysis/log_rate_analysis_info_popover.tsx b/x-pack/platform/plugins/shared/aiops/public/components/log_rate_analysis/log_rate_analysis_info_popover.tsx
index cb75935b6d69c..9db048b40ecc2 100644
--- a/x-pack/platform/plugins/shared/aiops/public/components/log_rate_analysis/log_rate_analysis_info_popover.tsx
+++ b/x-pack/platform/plugins/shared/aiops/public/components/log_rate_analysis/log_rate_analysis_info_popover.tsx
@@ -29,9 +29,6 @@ export const LogRateAnalysisInfoPopoverButton: FC<{
iconType="question"
iconSide="right"
color="hollow"
- // Defining both iconOnClick and onClick so the mouse cursor changes for cases.
- iconOnClick={onClick}
- iconOnClickAriaLabel='Click to open "Log rate analysis info" popover'
onClick={onClick}
onClickAriaLabel='Click to open "Log rate analysis info" popover'
data-test-subj="aiopsLogRateAnalysisInfoPopoverButton"
diff --git a/x-pack/platform/plugins/shared/content_connectors/public/components/shared/react_router_helpers/eui_components.tsx b/x-pack/platform/plugins/shared/content_connectors/public/components/shared/react_router_helpers/eui_components.tsx
index ef9f93c3b9c75..a4f30e07d6d11 100644
--- a/x-pack/platform/plugins/shared/content_connectors/public/components/shared/react_router_helpers/eui_components.tsx
+++ b/x-pack/platform/plugins/shared/content_connectors/public/components/shared/react_router_helpers/eui_components.tsx
@@ -248,8 +248,6 @@ export const EuiBadgeTo: React.FC = ({
const badgeProps: EuiBadgeProps = {
...rest,
- iconOnClick: routerProps.onClick,
- iconOnClickAriaLabel: label,
onClick: routerProps.onClick,
onClickAriaLabel: label,
};
diff --git a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agent_activity_badge.tsx b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agent_activity_badge.tsx
index cb8614006d51b..8bb4025a9db98 100644
--- a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agent_activity_badge.tsx
+++ b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agent_activity_badge.tsx
@@ -34,8 +34,6 @@ export const AgentActivityBadge: React.FunctionComponent<{
onClick={onClick}
onClickAriaLabel="Open the Agent activity flyout"
iconType="warning"
- iconOnClick={onClick}
- iconOnClickAriaLabel="Open the Agent activity flyout"
data-test-subj="agentActivityBadge"
>
(props: TagBadgeProps) => Rea
tagName: tag.name,
},
}),
- iconOnClick: () => undefined,
- iconOnClickAriaLabel: '',
}
: {};
diff --git a/x-pack/platform/plugins/shared/streams_app/public/components/stream_detail_significant_events_view/significant_events_table.tsx b/x-pack/platform/plugins/shared/streams_app/public/components/stream_detail_significant_events_view/significant_events_table.tsx
index 213003c1f368d..f96ef5c6a99ba 100644
--- a/x-pack/platform/plugins/shared/streams_app/public/components/stream_detail_significant_events_view/significant_events_table.tsx
+++ b/x-pack/platform/plugins/shared/streams_app/public/components/stream_detail_significant_events_view/significant_events_table.tsx
@@ -99,17 +99,6 @@ export function SignificantEventsTable({
setSelectedFeature(featuresByName[query.feature.name]);
}
}}
- iconOnClick={() => {
- if (query.feature?.name) {
- setSelectedFeature(featuresByName[query.feature.name]);
- }
- }}
- iconOnClickAriaLabel={i18n.translate(
- 'xpack.streams.significantEventsTable.featureDetailsFlyoutAriaLabel',
- {
- defaultMessage: 'Open feature details',
- }
- )}
data-test-subj="significant_events_table_feature_badge"
>
{query.feature?.name ?? '--'}
diff --git a/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rule_details/components/rule_status_panel.test.tsx b/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rule_details/components/rule_status_panel.test.tsx
index d61198fdbb669..6d025acfd14f7 100644
--- a/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rule_details/components/rule_status_panel.test.tsx
+++ b/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rule_details/components/rule_status_panel.test.tsx
@@ -188,9 +188,7 @@ describe('rule status panel', () => {
bulkDisableRules={bulkDisableRules}
/>
);
- const actionsElem = wrapper
- .find('[data-test-subj="statusDropdown"] .euiBadge__childButton')
- .first();
+ const actionsElem = wrapper.find('[data-test-subj="statusDropdown"] button').first();
actionsElem.simulate('click');
await act(async () => {
@@ -220,9 +218,7 @@ describe('rule status panel', () => {
requestRefresh={requestRefresh}
/>
);
- const actionsElem = wrapper
- .find('[data-test-subj="statusDropdown"] .euiBadge__childButton')
- .first();
+ const actionsElem = wrapper.find('[data-test-subj="statusDropdown"] button').first();
actionsElem.simulate('click');
await act(async () => {
@@ -254,9 +250,7 @@ describe('rule status panel', () => {
bulkEnableRules={bulkEnableRules}
/>
);
- const actionsElem = wrapper
- .find('[data-test-subj="statusDropdown"] .euiBadge__childButton')
- .first();
+ const actionsElem = wrapper.find('[data-test-subj="statusDropdown"] button').first();
actionsElem.simulate('click');
await act(async () => {
diff --git a/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx b/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx
index 6bee642a54e8b..36843bacb7bec 100644
--- a/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx
+++ b/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx
@@ -207,9 +207,7 @@ export const RuleStatusDropdown: React.FunctionComponent = ({
iconSide="right"
iconType={!isUpdating && isEditable ? 'arrowDown' : undefined}
onClick={onClickBadge}
- iconOnClick={onClickBadge}
onClickAriaLabel={OPEN_MENU_ARIA_LABEL}
- iconOnClickAriaLabel={OPEN_MENU_ARIA_LABEL}
isDisabled={isUpdating}
>
{badgeMessage}
diff --git a/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rules_list/components/rule_tag_badge.tsx b/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rules_list/components/rule_tag_badge.tsx
index a4e109b035271..153d39b2a54b6 100644
--- a/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rules_list/components/rule_tag_badge.tsx
+++ b/x-pack/platform/plugins/shared/triggers_actions_ui/public/application/sections/rules_list/components/rule_tag_badge.tsx
@@ -64,8 +64,6 @@ export const RuleTagBadge = (props: RuleTagBadgeP
tabIndex={-1}
onClick={onClick}
onClickAriaLabel="Tags"
- iconOnClick={onClick}
- iconOnClickAriaLabel="Tags"
>
{tags.length}
diff --git a/x-pack/solutions/observability/plugins/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.tsx b/x-pack/solutions/observability/plugins/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.tsx
index 2ddcf8a508f4d..bbd430eae437d 100644
--- a/x-pack/solutions/observability/plugins/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.tsx
+++ b/x-pack/solutions/observability/plugins/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.tsx
@@ -120,8 +120,6 @@ export function DurationDistributionChartWithScrubber({
iconSide="left"
onClick={onTrackedClearSelection}
onClickAriaLabel={clearSelectionAriaLabel}
- iconOnClick={onTrackedClearSelection}
- iconOnClickAriaLabel={clearSelectionAriaLabel}
data-test-sub="apmDurationDistributionChartWithScrubberTitleClearSelectionBadge"
>
{i18n.translate('xpack.apm.durationDistributionChartWithScrubber.selectionText', {
diff --git a/x-pack/solutions/observability/plugins/apm/public/components/shared/popover_badge/index.tsx b/x-pack/solutions/observability/plugins/apm/public/components/shared/popover_badge/index.tsx
index b52f77feb1cd5..42d2c236cac95 100644
--- a/x-pack/solutions/observability/plugins/apm/public/components/shared/popover_badge/index.tsx
+++ b/x-pack/solutions/observability/plugins/apm/public/components/shared/popover_badge/index.tsx
@@ -39,9 +39,7 @@ export function PopoverBadge({
button={
setIsPopoverOpen(!isPopoverOpen)}
onClick={() => setIsPopoverOpen(!isPopoverOpen)}
- iconOnClickAriaLabel={CLICK_ARIAL_LABEL}
onClickAriaLabel={CLICK_ARIAL_LABEL}
iconSide="left"
color="hollow"
diff --git a/x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/components/table/add_data_troubleshooting_popover.tsx b/x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/components/table/add_data_troubleshooting_popover.tsx
index ded4dc9970847..9a186cc1834ac 100644
--- a/x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/components/table/add_data_troubleshooting_popover.tsx
+++ b/x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/components/table/add_data_troubleshooting_popover.tsx
@@ -66,8 +66,6 @@ export const AddDataTroubleshootingPopover = () => {
iconSide="left"
onClick={onButtonClick}
onClickAriaLabel={popoverContent.title}
- iconOnClick={onButtonClick}
- iconOnClickAriaLabel={popoverContent.title}
>
{badgeContent}
diff --git a/x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx b/x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
index d8ad404bbde5f..eb0568543709a 100644
--- a/x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
+++ b/x-pack/solutions/observability/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
@@ -305,10 +305,6 @@ export const useHostsTable = () => {
setProperties({ detailsItemId: row.id === detailsItemId ? null : row.id });
}}
onClickAriaLabel={TABLE_CONTENT_LABEL.activeAlerts}
- iconOnClick={() => {
- setProperties({ detailsItemId: row.id === detailsItemId ? null : row.id });
- }}
- iconOnClickAriaLabel={TABLE_CONTENT_LABEL.activeAlerts}
>
{alertsCount}
diff --git a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx
index 44486774bfc23..2e6fa43648c7e 100644
--- a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx
+++ b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx
@@ -58,9 +58,7 @@ export function SyntheticsIndicatorOverview({ slo }: Props) {
{i18n.translate('xpack.slo.sloDetails.overview.syntheticsMonitor.name', {
defaultMessage: 'Name: {value}',
@@ -74,9 +72,7 @@ export function SyntheticsIndicatorOverview({ slo }: Props) {
{i18n.translate('xpack.slo.sloDetails.overview.syntheticsMonitor.locationName', {
defaultMessage: 'Location: {value}',
diff --git a/x-pack/solutions/search/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx b/x-pack/solutions/search/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
index 0017a7b9bec1b..79d0d28a09b0e 100644
--- a/x-pack/solutions/search/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
+++ b/x-pack/solutions/search/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
@@ -112,8 +112,6 @@ export const EuiBadgeTo: React.FC = ({
const badgeProps: EuiBadgeProps = {
...rest,
- iconOnClick: routerProps.onClick,
- iconOnClickAriaLabel: label,
onClick: routerProps.onClick,
onClickAriaLabel: label,
};
diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/prebuilt_rule_diff_badge.tsx b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/prebuilt_rule_diff_badge.tsx
index be10409fc2d50..07ebff0b1c421 100644
--- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/prebuilt_rule_diff_badge.tsx
+++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/prebuilt_rule_diff_badge.tsx
@@ -26,9 +26,7 @@ export const PrebuiltRuleDiffBadge = ({ label, dataTestSubj }: PrebuiltRuleDiffB
iconType="expand"
iconSide="right"
onClick={openCustomizationsPreviewFlyout}
- iconOnClick={openCustomizationsPreviewFlyout}
onClickAriaLabel={label}
- iconOnClickAriaLabel={label}
title="" // We surround all implementations of the badge with a tooltip on hover
>
{label}