Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Change formatting buttons behavior #9715

Merged
merged 3 commits into from
Dec 7, 2022
Merged

Change formatting buttons behavior #9715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e737e63
Change formatting buttons behavior
florianduros Dec 6, 2022
3af9c9d
Add tests
florianduros Dec 7, 2022
e2a71ae
Merge branch 'develop' into fix/hover-state-formatting-buttons
florianduros Dec 7, 2022
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
2 changes: 2 additions & 0 deletions res/css/views/rooms/wysiwyg_composer/components/_FormattingButtons.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ limitations under the License.
height: var(--size);
border-radius: 5px;
}
}

.mx_FormattingButtons_Button_hover {
&:hover {
&::after {
background: rgba($secondary-content, 0.1);
Expand Down
5 changes: 4 additions & 1 deletion src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ function Button({ label, keyCombo, onClick, isActive, className }: ButtonProps)
onClick={onClick}
title={label}
className={
classNames('mx_FormattingButtons_Button', className, { 'mx_FormattingButtons_active': isActive })}
classNames('mx_FormattingButtons_Button', className, {
'mx_FormattingButtons_active': isActive,
'mx_FormattingButtons_Button_hover': !isActive,
})}
tooltip={keyCombo && <Tooltip label={label} keyCombo={keyCombo} />}
alignment={Alignment.Top}
/>;
Expand Down
16 changes: 16 additions & 0 deletions test/components/views/rooms/wysiwyg_composer/components/FormattingButtons-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,20 @@ describe('FormattingButtons', () => {
// Then
expect(await screen.findByText('Bold')).toBeTruthy();
});

it('Should not have hover style when active', async () => {
// When
const user = userEvent.setup();
render(<FormattingButtons composer={wysiwyg} actionStates={actionStates} />);
await user.hover(screen.getByLabelText('Bold'));

// Then
expect(screen.getByLabelText('Bold')).not.toHaveClass('mx_FormattingButtons_Button_hover');

// When
await user.hover(screen.getByLabelText('Underline'));

// Then
expect(screen.getByLabelText('Underline')).toHaveClass('mx_FormattingButtons_Button_hover');
});
});