Skip to content

Commit 6f26725

Browse files
[9.3] [Security Solution] fix wrong alignment of buttons in Timeline (#268314) (#268562)
# Backport This will backport the following commits from `main` to `9.3`: - [[Security Solution] fix wrong alignment of buttons in Timeline (#268314)](#268314) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Philippe Oberti","email":"philippe.oberti@elastic.co"},"sourceCommit":{"committedDate":"2026-05-09T01:00:53Z","message":"[Security Solution] fix wrong alignment of buttons in Timeline (#268314)","sha":"15e710dcb8c2ca4028f75536431354b963789068","branchLabelMapping":{"^v9.5.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Threat Hunting","backport:version","v9.5.0","v9.3.5","v9.4.1"],"title":"[Security Solution] fix wrong alignment of buttons in Timeline","number":268314,"url":"https://github.com/elastic/kibana/pull/268314","mergeCommit":{"message":"[Security Solution] fix wrong alignment of buttons in Timeline (#268314)","sha":"15e710dcb8c2ca4028f75536431354b963789068"}},"sourceBranch":"main","suggestedTargetBranches":["9.3","9.4"],"targetPullRequestStates":[{"branch":"main","label":"v9.5.0","branchLabelMappingKey":"^v9.5.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/268314","number":268314,"mergeCommit":{"message":"[Security Solution] fix wrong alignment of buttons in Timeline (#268314)","sha":"15e710dcb8c2ca4028f75536431354b963789068"}},{"branch":"9.3","label":"v9.3.5","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.4","label":"v9.4.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Philippe Oberti <philippe.oberti@elastic.co>
1 parent f72e510 commit 6f26725

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/toolbar_additional_controls.tsx

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
import { EuiToolTip, EuiButtonIcon } from '@elastic/eui';
8-
import React, { useMemo, useCallback, useRef } from 'react';
7+
8+
import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
9+
import React, { useCallback, useMemo, useRef } from 'react';
910

1011
import { isActiveTimeline } from '../../../../../helpers';
1112
import { TimelineId } from '../../../../../../common/types/timeline';
@@ -69,10 +70,18 @@ export const ToolbarAdditionalControlsComponent: React.FC<Props> = ({ timelineId
6970

7071
return (
7172
<>
72-
<RowRendererSwitch timelineId={timelineId} />
73-
<StatefulRowRenderersBrowser timelineId={timelineId} />
74-
<LastUpdatedContainer updatedAt={updatedAt} />
75-
<span className="rightPosition">
73+
<EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
74+
<EuiFlexItem grow={false}>
75+
<RowRendererSwitch timelineId={timelineId} />
76+
</EuiFlexItem>
77+
<EuiFlexItem grow={false}>
78+
<StatefulRowRenderersBrowser timelineId={timelineId} />
79+
</EuiFlexItem>
80+
<EuiFlexItem grow={false}>
81+
<LastUpdatedContainer updatedAt={updatedAt} />
82+
</EuiFlexItem>
83+
</EuiFlexGroup>
84+
<span style={{ position: 'absolute', right: 0 }}>
7685
<EuiToolTip
7786
ref={toolTipRef}
7887
content={fullScreen ? i18n.EXIT_FULL_SCREEN : i18n.FULL_SCREEN}
@@ -81,7 +90,7 @@ export const ToolbarAdditionalControlsComponent: React.FC<Props> = ({ timelineId
8190
<EuiButtonIcon
8291
aria-label={fullScreen ? i18n.EXIT_FULL_SCREEN : i18n.FULL_SCREEN}
8392
className={`${fullScreen ? EXIT_FULL_SCREEN_CLASS_NAME : ''}`}
84-
color={fullScreen ? 'text' : 'primary'}
93+
color="text"
8594
data-test-subj={
8695
// a full screen button gets created for timeline and for the host page
8796
// this sets the data-test-subj for each case so that tests can differentiate between them

x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,6 @@ export const StyledTimelineUnifiedDataTable = styled.div.attrs(({ className = ''
196196
width: fit-content;
197197
}
198198
199-
.udtTimeline .rightPosition {
200-
position: absolute;
201-
right: 5px;
202-
203-
button {
204-
${({ theme }) => `color: ${theme.eui.euiColorDarkShade};`}
205-
}
206-
}
207-
208199
.udtTimeline .euiDataGrid__rightControls {
209200
padding-right: 30px;
210201
}

0 commit comments

Comments
 (0)