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

Fix dropdown for multiple transaction insight snaps #21022

Merged
merged 7 commits into from
Sep 26, 2023
+36 −16
Merged

Fix dropdown for multiple transaction insight snaps #21022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
316750d
Fix dropdown for multiple transaction insight snaps
david0xd Sep 25, 2023
9a6293f
Fix unit test
david0xd Sep 25, 2023
af78ab0
Increase clickable area around the icon
david0xd Sep 25, 2023
e16532c
Refactor UI components
david0xd Sep 25, 2023
77f8a21
Remove left margin from the icon box
david0xd Sep 25, 2023
e8c9d06
Fix tab text alignment
david0xd Sep 26, 2023
5182032
Refactor unit test
david0xd Sep 26, 2023
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
47 changes: 32 additions & 15 deletions ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
import React, { useCallback, useEffect, useRef, useState } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import Box from '../../../box';
import {
AlignItems,
BLOCK_SIZES,
BlockSize,
BackgroundColor,
BorderColor,
BorderRadius,
BorderStyle,
DISPLAY,
FLEX_DIRECTION,
FLEX_WRAP,
Display,
FlexDirection,
FlexWrap,
TextVariant,
} from '../../../../../helpers/constants/design-system';
import { Icon, IconName, IconSize, Text } from '../../../../component-library';
import {
Box,
Icon,
IconName,
IconSize,
Text,
} from '../../../../component-library';

export const DropdownTab = ({
activeClassName,
Expand Down Expand Up @@ -43,6 +48,10 @@ export const DropdownTab = ({
const openDropdown = (event) => {
event.preventDefault();
setIsOpen(true);
};

const onTabClick = (event) => {
event.preventDefault();
onClick(tabIndex);
};

Expand Down Expand Up @@ -75,15 +84,15 @@ export const DropdownTab = ({
[activeClassName]: activeClassName && isActive,
})}
data-testid={dataTestId}
onClick={openDropdown}
onClick={onTabClick}
dataTestId={dataTestId}
flexDirection={FLEX_DIRECTION.ROW}
flexWrap={FLEX_WRAP.NO_WRAP}
height={BLOCK_SIZES.FULL}
flexDirection={FlexDirection.Row}
flexWrap={FlexWrap.NoWrap}
height={BlockSize.Full}
style={{ cursor: 'pointer', overflow: 'hidden' }}
title={selectedOptionName}
>
<Box alignItems={AlignItems.center} padding={2}>
<Box display={Display.Flex} alignItems={AlignItems.flexStart} padding={2}>
<Text
variant={TextVariant.inherit}
style={{
Expand All @@ -94,7 +103,15 @@ export const DropdownTab = ({
>
{selectedOptionName}
</Text>
<Icon marginLeft={2} name={IconName.ArrowDown} size={IconSize.Sm} />
<Box
display={Display.Flex}
alignItems={AlignItems.flexStart}
paddingLeft={1}
paddingRight={1}
onClick={openDropdown}
>
<Icon name={IconName.ArrowDown} size={IconSize.Sm} />
</Box>
</Box>
{isOpen && (
<Box
Expand All @@ -104,9 +121,9 @@ export const DropdownTab = ({
borderRadius={BorderRadius.SM}
paddingLeft={2}
paddingRight={2}
display={DISPLAY.FLEX}
flexDirection={FLEX_DIRECTION.COLUMN}
flexWrap={FLEX_WRAP.NO_WRAP}
display={Display.Flex}
flexDirection={FlexDirection.Column}
flexWrap={FlexWrap.NoWrap}
style={{ position: 'absolute', maxWidth: '170px' }}
ref={dropdownRef}
>
Expand Down
5 changes: 4 additions & 1 deletion ui/components/ui/tabs/snaps/dropdown-tab/dropdown-tab.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ describe('DropdownTab', () => {
it('registers selection', () => {
const { container, getByText } = render(<DropdownTab {...args} />);

fireEvent.click(container.firstChild);
// Find the clickable element (icon box) in the dropdown that contains
// ArrowDown icon by walking the nested elements
const clickableIconBox = container.firstChild.firstChild.lastChild;
fireEvent.click(clickableIconBox);

const element = getByText(args.options[1].name);

Expand Down
Loading