Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Controls] Fix styles #192319

Merged
merged 9 commits into from
Sep 11, 2024
Merged

[Controls] Fix styles #192319

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
52c3375
fix controls styles
andreadelrio Sep 8, 2024
1fcd634
Merge branch 'main' into controls-es
elasticmachine Sep 8, 2024
8c81905
Merge branch 'main' into controls-es
elasticmachine Sep 10, 2024
4bae4ab
clean up
andreadelrio Sep 10, 2024
b48a4a5
remove storybook
andreadelrio Sep 10, 2024
38d5cf8
compress Apply button too
andreadelrio Sep 10, 2024
9eff7c3
remove leading zero
andreadelrio Sep 10, 2024
06f4e16
Merge branch 'main' into controls-es
elasticmachine Sep 10, 2024
51a16f2
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion src/plugins/controls/public/react_controls/control_group/components/control_panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.controlPanel--label {
@include euiTextTruncate;
padding: 0;
height: $euiButtonHeightSmall;
height: 100%;
}
}

Expand All @@ -38,3 +38,33 @@
.controlFrame__dragHandle {
line-height: 0; // Vertically center the grab handle
}

.controlFrame__formControlLayout:not(.controlFrame__formControlLayout--edit):not(.controlFrame__formControlLayout--twoLine) {
.euiFormControlLayout__prepend {
padding-inline-start: $euiSizeS !important; // to-do remove !important when new controls are merged
}
}

.controlFrame__formControlLayout.controlFrame__formControlLayout--view.timeSlider {
.euiFormControlLayout__prepend {
padding-inline-start: 0 !important; // to-do remove !important when new controls are merged
}
}

.controlFrame__formControlLayout.controlFrame__formControlLayout--twoLine.controlFrame__formControlLayout--edit {
.euiFormControlLayout__prepend {
padding-inline-end: 0 !important; // to-do remove !important when new controls are merged
}
}

.controlFrame__formControlLayout.controlFrame__formControlLayout--twoLine:not(.controlFrame__formControlLayout--edit) {
.euiFormControlLayout__prepend {
padding-inline: 0 !important; // to-do remove !important when new controls are merged
}
}

.controlFrame__formControlLayout:not(.controlFrame__formControlLayout--twoLine).controlFrame__formControlLayout--edit {
.euiFormControlLayout__prepend {
padding-inline-start: $euiSizeXS * 0.5 !important; // skinny icon, to-do remove !important when new controls are merged
}
}
11 changes: 7 additions & 4 deletions src/plugins/controls/public/react_controls/control_group/components/control_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { ControlPanelProps, DefaultControlApi } from '../../controls/types';
import { ControlError } from './control_error';

import './control_panel.scss';
import { A } from '@storybook/components';
andreadelrio marked this conversation as resolved.
Show resolved Hide resolved

const DragHandle = ({
isEditable,
Expand All @@ -56,9 +57,7 @@ const DragHandle = ({
>
<EuiIcon type="grabHorizontal" />
</button>
) : hideEmptyDragHandle ? null : (
<EuiIcon size="s" type="empty" />
);
) :null;

export const ControlPanel = <ApiType extends DefaultControlApi = DefaultControlApi>({
Component,
Expand Down Expand Up @@ -113,6 +112,7 @@ export const ControlPanel = <ApiType extends DefaultControlApi = DefaultControlA
viewModeSubject
);
const usingTwoLineLayout = labelPosition === 'twoLine';
const controlType = api ? api.type : null;

const [initialLoadComplete, setInitialLoadComplete] = useState(!dataLoading);
if (!initialLoadComplete && (dataLoading === false || (api && !api.dataLoading))) {
Expand Down Expand Up @@ -162,7 +162,10 @@ export const ControlPanel = <ApiType extends DefaultControlApi = DefaultControlA
fullWidth
isLoading={Boolean(dataLoading)}
compressed
className="controlFrame__formControlLayout"
className={classNames('controlFrame__formControlLayout', {
'controlFrame__formControlLayout--twoLine': usingTwoLineLayout,
'controlFrame__formControlLayout--edit' : isEditable}, `${controlType}`
)}
prepend={
<>
<DragHandle
Expand Down