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

[Lens] fix suggestion panel styling #135622

Closed
wants to merge 1 commit into from
+27 −18
Closed

[Lens] fix suggestion panel styling #135622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,9 +723,8 @@ describe('editor_frame', () => {
ExpressionRenderer: expressionRendererMock,
};
instance = (await mountWithProvider(<EditorFrame {...props} />)).instance;

act(() => {
instance.find('[data-test-subj="lnsSuggestion"]').at(2).simulate('click');
instance.find('[data-test-subj="lnsSuggestion"]').at(1).simulate('click');
});

expect(mockVisualization.getConfiguration).toHaveBeenCalledTimes(2);
Expand Down
17 changes: 11 additions & 6 deletions x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
.lnsSuggestionPanel__button {
position: relative; // Let the expression progress indicator position itself against the button
flex: 0 0 auto;
width: $lnsSuggestionWidth !important; // sass-lint:disable-line no-important
width: $lnsSuggestionWidth !important; // sass-lint:disable-line no-important
height: $lnsSuggestionHeight;
margin-right: $euiSizeS;
margin-left: $euiSizeXS / 2;
Expand All @@ -40,9 +40,14 @@
}
}

.lnsSuggestionPanel__button-isSelected {
background-color: $euiColorLightestShade !important; // sass-lint:disable-line no-important
border-color: $euiColorMediumShade !important; // sass-lint:disable-line no-important
.lnsSuggestionPanel__card {
width: 100%;
height: 100%;
}

.lnsSuggestionPanel__card-isSelected {
background-color: $euiColorLightestShade !important; // sass-lint:disable-line no-important
border-color: $euiColorMediumShade !important; // sass-lint:disable-line no-important

&:not(:focus) {
box-shadow: none !important; // sass-lint:disable-line no-important
Expand Down Expand Up @@ -93,10 +98,10 @@

.lnsSuggestionPanel__applyChangesPrompt {
height: $lnsSuggestionHeight;
background-color: $euiColorLightestShade !important;
background-color: $euiColorLightestShade !important;

display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
}
19 changes: 12 additions & 7 deletions x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,21 @@ const SuggestionPreview = ({
}) => {
return (
<EuiToolTip content={preview.title}>
<div data-test-subj={`lnsSuggestion-${camelCase(preview.title)}`}>
<button
className={classNames('lnsSuggestionPanel__button', {
'lnsSuggestionPanel__button-isSelected': selected,
})}
onClick={onSelect}
data-test-subj="lnsSuggestion"
>
<EuiPanel
className={classNames('lnsSuggestionPanel__card', {
'lnsSuggestionPanel__card-isSelected': selected,
})}
data-test-subj={`lnsSuggestion-${camelCase(preview.title)}`}
hasBorder={true}
hasShadow={false}
className={classNames('lnsSuggestionPanel__button', {
'lnsSuggestionPanel__button-isSelected': selected,
})}
paddingSize="none"
data-test-subj="lnsSuggestion"
onClick={onSelect}
aria-current={!!selected}
aria-label={preview.title}
>
Expand All @@ -173,7 +178,7 @@ const SuggestionPreview = ({
<span className="lnsSuggestionPanel__buttonLabel">{preview.title}</span>
)}
</EuiPanel>
</div>
</button>
</EuiToolTip>
);
};
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/accessibility/apps/lens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
field: 'bytes',
});

await testSubjects.click('lnsSuggestion-barChart > lnsSuggestion');
await testSubjects.click('lnsSuggestion-barChart');
await a11y.testAppSnapshot();
});

Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/lens/group1/smokescreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

await PageObjects.lens.save('twolayerchart');
await testSubjects.click('lnsSuggestion-asDonut > lnsSuggestion');
await testSubjects.click('lnsSuggestion-asDonut');

expect(await PageObjects.lens.getLayerCount()).to.eql(1);
expect(await PageObjects.lens.getDimensionTriggerText('lnsPie_sliceByDimensionPanel')).to.eql(
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/maps/group4/lens/choropleth_chart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
// add filter to force data fetch to set activeData
await filterBar.addFilter('bytes', 'is between', '200', '10000');

await testSubjects.click('lnsSuggestion-worldCountriesByCountOfRecords > lnsSuggestion');
await testSubjects.click('lnsSuggestion-worldCountriesByCountOfRecords');

await PageObjects.maps.openLegend();
await PageObjects.maps.waitForLayersToLoad();
Expand Down