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
5 changes: 5 additions & 0 deletions .changeset/silly-impalas-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cube-dev/ui-kit": patch
---

[CC-1616](https://cubedevinc.atlassian.net/browse/CC-1635) Recalculate position of a drodown on filter change
35 changes: 34 additions & 1 deletion src/components/pickers/ComboBox/ComboBox.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { DollarCircleOutlined } from '@ant-design/icons';
import { Meta, Story } from '@storybook/react';
import { userEvent, within } from '@storybook/testing-library';

import { SELECTED_KEY_ARG } from '../../../stories/FormFieldArgs';
import { baseProps } from '../../../stories/lists/baseProps';
Expand All @@ -10,7 +11,7 @@ export default {
title: 'Pickers/ComboBox',
component: ComboBox,
subcomponents: { Item: ComboBox.Item },
args: { id: 'name', width: '200px' },
args: { id: 'name', width: '200px', label: 'Choose your favourite color' },
parameters: { controls: { exclude: baseProps } },
argTypes: { ...SELECTED_KEY_ARG },
} as Meta<CubeComboBoxProps<any>>;
Expand Down Expand Up @@ -62,3 +63,35 @@ export const Wide: Story<CubeComboBoxProps<any>> = (args) => (
);

Wide.args = { width: '600px', defaultSelectedKey: 'red' };

export const With1LongOption: Story<CubeComboBoxProps<any>> = (args) => (
<ComboBox {...args}>
<ComboBox.Item key="red">Red</ComboBox.Item>
<ComboBox.Item key="orange">Orange</ComboBox.Item>
<ComboBox.Item key="yellow">Yellow</ComboBox.Item>
<ComboBox.Item key="green">
green lorem ipsum dolor sit amet, consectetur adipiscing elit
</ComboBox.Item>
<ComboBox.Item key="blue">Blue</ComboBox.Item>
<ComboBox.Item key="purple">Purple</ComboBox.Item>
<ComboBox.Item key="violet">Violet</ComboBox.Item>
</ComboBox>
);
With1LongOption.parameters = { layout: 'centered' };
With1LongOption.play = async ({ canvasElement }) => {
const { getByRole } = within(canvasElement);

const openButton = getByRole('button');

await userEvent.click(openButton);
};

export const With1LongOptionFiltered = With1LongOption.bind({});
With1LongOptionFiltered.parameters = { layout: 'centered' };
With1LongOptionFiltered.play = async ({ canvasElement }) => {
const { getByRole } = within(canvasElement);

const combobox = getByRole('combobox');

await userEvent.type(combobox, 'Red');
};
35 changes: 23 additions & 12 deletions src/components/pickers/ComboBox/ComboBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ import {
tasty,
} from '../../../tasty';
import { useFocus } from '../../../utils/react/interactions';
import { mergeProps, modAttrs, useCombinedRefs } from '../../../utils/react';
import {
mergeProps,
modAttrs,
useCombinedRefs,
useLayoutEffect,
} from '../../../utils/react';
import { FieldWrapper } from '../../forms/FieldWrapper';
import { CubeSelectBaseProps, ListBoxPopup } from '../Select/Select';
import {
Expand Down Expand Up @@ -186,6 +191,17 @@ function ComboBox<T extends object>(props: CubeComboBoxProps<T>, ref) {
popoverRef = useCombinedRefs(popoverRef);
listBoxRef = useCombinedRefs(listBoxRef);

let { overlayProps, placement, updatePosition } = useOverlayPosition({
targetRef: triggerRef,
overlayRef: popoverRef,
scrollRef: listBoxRef,
placement: `${direction} end`,
shouldFlip: shouldFlip,
isOpen: state.isOpen,
onClose: state.close,
offset: overlayOffset,
});

let {
labelProps,
inputProps,
Expand All @@ -203,17 +219,6 @@ function ComboBox<T extends object>(props: CubeComboBoxProps<T>, ref) {
state,
);

let { overlayProps, placement } = useOverlayPosition({
targetRef: triggerRef,
overlayRef: popoverRef,
scrollRef: listBoxRef,
placement: `${direction} end`,
shouldFlip: shouldFlip,
isOpen: state.isOpen,
onClose: state.close,
offset: overlayOffset,
});

let { isFocused, focusProps } = useFocus({ isDisabled });
let { hoverProps, isHovered } = useHover({ isDisabled });

Expand All @@ -230,6 +235,12 @@ function ComboBox<T extends object>(props: CubeComboBoxProps<T>, ref) {
true,
);

useLayoutEffect(() => {
if (state.isOpen) {
updatePosition();
}
}, [updatePosition, state.isOpen, state.collection.size]);

let isInvalid = validationState === 'invalid';

let validationIcon = isInvalid ? (
Expand Down