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] Prevent jumping control drag handle between view modes #184533

Merged
merged 9 commits into from
Jun 13, 2024
Merged

[Controls] Prevent jumping control drag handle between view modes #184533

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
457e2ef
Prevent jumping control drag handle
cqliu1 Apr 4, 2024
814d510
Use empty EuiIcon size s
cqliu1 May 31, 2024
d2019e7
Fix css lint error
cqliu1 May 31, 2024
6aa0e5b
Merge branch 'main' of https://github.com/elastic/kibana into fix/jum…
cqliu1 May 31, 2024
35497fb
Merge branch 'main' into fix/jumping-control-handle
cqliu1 Jun 5, 2024
44a4bb7
Merge branch 'main' into fix/jumping-control-handle
cqliu1 Jun 12, 2024
c1ccdc4
Merge branch 'main' into fix/jumping-control-handle
cqliu1 Jun 12, 2024
4d9631c
Merge branch 'main' into fix/jumping-control-handle
cqliu1 Jun 13, 2024
faa794c
Merge branch 'main' into fix/jumping-control-handle
cqliu1 Jun 13, 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
6 changes: 4 additions & 2 deletions src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const SortableControlInner = forwardRef<
const width = panels[embeddableId].width;
const title = panels[embeddableId].explicitInput.title;

const dragHandle = (
const dragHandle = isEditable ? (
<button
ref={dragHandleRef}
{...dragHandleProps}
Expand All @@ -84,6 +84,8 @@ const SortableControlInner = forwardRef<
>
<EuiIcon type="grabHorizontal" />
</button>
) : (
<EuiIcon type="empty" size="s" />
);

return (
Expand All @@ -108,7 +110,7 @@ const SortableControlInner = forwardRef<
enableActions={draggingIndex === -1}
embeddableId={embeddableId}
embeddableType={embeddableType}
customPrepend={isEditable ? dragHandle : undefined}
customPrepend={dragHandle}
/>
</EuiFlexItem>
);
Expand Down
6 changes: 2 additions & 4 deletions src/plugins/controls/public/control_group/control_group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,8 @@ $controlMinWidth: $euiSize * 14;
max-width: 40%;
}

&-isEditable {
.controlFrame__formControlLayoutLabel {
padding-left: 0;
}
.controlFrame__formControlLayoutLabel {
padding-left: 0;
}

.controlFrame__formControlLayout {
Expand Down