Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 16 additions & 3 deletions packages/module/src/AttachMenu/AttachMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
DropdownProps,
Dropdown,
DropdownToggleProps,
PopperOptions
PopperOptions,
MenuSearchInputProps,
SearchInputProps,
MenuSearchProps
} from '@patternfly/react-core';

export interface AttachMenuProps extends DropdownProps {
Expand All @@ -34,7 +37,13 @@
/** Aria label for search input */
searchInputAriaLabel?: string;
/** Toggle to be rendered */
toggle: DropdownToggleProps | ((toggleRef: React.RefObject<any>) => React.ReactNode);

Check warning on line 40 in packages/module/src/AttachMenu/AttachMenu.tsx

View workflow job for this annotation

GitHub Actions / call-build-lint-test-workflow / lint

Unexpected any. Specify a different type
/** Additional props passed to MenuSearch component */
menuSearchProps?: Omit<MenuSearchProps, 'ref'>;
/** Additional props passed to MenuSearchInput component */
menuSearchInputProps?: Omit<MenuSearchInputProps, 'ref'>;
/** Additional props passed to SearchInput component */
searchInputProps?: SearchInputProps;
}

export const AttachMenu: FunctionComponent<AttachMenuProps> = ({
Expand All @@ -49,6 +58,9 @@
searchInputPlaceholder,
searchInputAriaLabel = 'Filter menu items',
toggle,
menuSearchProps,
menuSearchInputProps,
searchInputProps,
...props
}: AttachMenuProps) => (
<Dropdown
Expand All @@ -61,12 +73,13 @@
onSelect={onSelect}
{...props}
>
<MenuSearch>
<MenuSearchInput>
<MenuSearch {...menuSearchProps}>
<MenuSearchInput {...menuSearchInputProps}>
<SearchInput
aria-label={searchInputAriaLabel}
onChange={(_event, value) => handleTextInputChange(value)}
placeholder={searchInputPlaceholder}
{...searchInputProps}
/>
</MenuSearchInput>
</MenuSearch>
Expand Down
59 changes: 58 additions & 1 deletion packages/module/src/MessageBar/MessageBar.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import '@testing-library/jest-dom';
import { DropdownGroup, DropdownItem, DropdownList } from '@patternfly/react-core';
import {
DropdownGroup,
DropdownItem,
DropdownList,
MenuSearchInputProps,
MenuSearchProps
} from '@patternfly/react-core';
import { BellIcon, CalendarAltIcon, ClipboardIcon, CodeIcon } from '@patternfly/react-icons';
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
Expand Down Expand Up @@ -218,6 +224,57 @@ describe('Message bar', () => {
await userEvent.click(attachButton);
expect(attachToggleClickSpy).toHaveBeenCalledTimes(1);
});
it('can pass searchInputProps to search input in AttachMenu', () => {
render(
<MessageBar
onSendMessage={jest.fn}
value="test"
attachMenuProps={{
isAttachMenuOpen: true,
setIsAttachMenuOpen: jest.fn(),
onAttachMenuToggleClick: jest.fn(),
onAttachMenuInputChange: jest.fn(),
attachMenuItems: ATTACH_MENU_ITEMS,
searchInputProps: { isDisabled: true }
}}
/>
);
expect(screen.getByRole('textbox', { name: /Filter menu items/i })).toBeDisabled();
});
it('can pass menuSearchProps to search input in AttachMenu', () => {
render(
<MessageBar
onSendMessage={jest.fn}
value="test"
attachMenuProps={{
isAttachMenuOpen: true,
setIsAttachMenuOpen: jest.fn(),
onAttachMenuToggleClick: jest.fn(),
onAttachMenuInputChange: jest.fn(),
attachMenuItems: ATTACH_MENU_ITEMS,
menuSearchProps: { 'data-testid': 'menu-search' } as MenuSearchProps
}}
/>
);
expect(screen.getByTestId('menu-search')).toBeTruthy();
});
it('can pass menuSearchInputProps to search input in AttachMenu', () => {
render(
<MessageBar
onSendMessage={jest.fn}
value="test"
attachMenuProps={{
isAttachMenuOpen: true,
setIsAttachMenuOpen: jest.fn(),
onAttachMenuToggleClick: jest.fn(),
onAttachMenuInputChange: jest.fn(),
attachMenuItems: ATTACH_MENU_ITEMS,
menuSearchInputProps: { 'data-testid': 'menu-search-input' } as MenuSearchInputProps
}}
/>
);
expect(screen.getByTestId('menu-search-input')).toBeTruthy();
});
it('can hide attach button', () => {
render(<MessageBar onSendMessage={jest.fn} hasAttachButton={false} />);
expect(screen.queryByRole('button', { name: 'Attach' })).toBeFalsy();
Expand Down
17 changes: 16 additions & 1 deletion packages/module/src/MessageBar/MessageBar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import type { ChangeEvent, FunctionComponent, KeyboardEvent as ReactKeyboardEvent, Ref } from 'react';
import { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
import { Accept, DropEvent, DropzoneOptions, FileError, FileRejection } from 'react-dropzone';
import { ButtonProps, TextArea, TextAreaProps, TooltipProps } from '@patternfly/react-core';
import {
ButtonProps,
MenuSearchInputProps,
MenuSearchProps,
SearchInputProps,
TextArea,
TextAreaProps,
TooltipProps
} from '@patternfly/react-core';

// Import Chatbot components
import SendButton from './SendButton';
Expand Down Expand Up @@ -30,6 +38,12 @@ export interface MessageBarWithAttachMenuProps {
onAttachMenuOnOpenChangeKeys?: string[];
/** Callback to change the open state of the menu. Triggered by clicking outside of the menu. */
onAttachMenuOpenChange?: (isOpen: boolean) => void;
/** Additional props passed to MenuSearch component in attach menu */
menuSearchProps?: Omit<MenuSearchProps, 'ref'>;
/** Additional props passed to MenuSearchInput component in attach menu */
menuSearchInputProps?: Omit<MenuSearchInputProps, 'ref'>;
/** Additional props passed to SearchInput component in attach menu */
searchInputProps?: SearchInputProps;
}

export interface MessageBarProps extends Omit<TextAreaProps, 'innerRef'> {
Expand Down Expand Up @@ -449,6 +463,7 @@ export const MessageBarBase: FunctionComponent<MessageBarProps> = ({
{...(attachMenuProps && { handleTextInputChange: attachMenuProps.onAttachMenuInputChange })}
popperProps={{ direction: 'up', distance: 8 }}
searchInputPlaceholder={attachMenuProps?.attachMenuInputPlaceholder}
{...attachMenuProps}
/>
);
}
Expand Down
Loading