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] Make the dimension flyout panel stay close on outside click #83059

Merged
merged 9 commits into from
Nov 16, 2020
Merged

[Lens] Make the dimension flyout panel stay close on outside click #83059

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf5ac0f
:bug: Update the active dimension on close with last value in the state
dej611 Nov 10, 2020
59ecc9c
:bug: Rework the fix at the operation level
dej611 Nov 11, 2020
2dae5e8
:bug: Fixed the dnd warning issue
dej611 Nov 11, 2020
c4cc2bf
:recycle: Refactor to reuse shared function
dej611 Nov 12, 2020
42b0bc5
Merge branch 'master' into fix/82455
kibanamachine Nov 12, 2020
33e776a
:recycle: Revert flyout cose logic
dej611 Nov 16, 2020
95fc727
Merge branch 'fix/82455' of github.com:dej611/kibana into fix/82455
dej611 Nov 16, 2020
afa67bc
Merge branch 'master' into fix/82455
kibanamachine Nov 16, 2020
c79adaf
Merge remote-tracking branch 'upstream/master' into fix/82455
dej611 Nov 16, 2020
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
7 changes: 5 additions & 2 deletions ...lugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@ export function DimensionContainer({
const [focusTrapIsEnabled, setFocusTrapIsEnabled] = useState(false);

const closeFlyout = () => {
handleClose();
setFocusTrapIsEnabled(false);
// some internal popovers are pretty slow to unmount, so give it some time
setTimeout(() => {
handleClose();
setFocusTrapIsEnabled(false);
}, 150); // <= 150 has been chosen from empirical testing
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm really concerned about this approach. As you said it will add a delay as well as not even work in all cases depending on the timing of things.

I think I wasn't really clear in my original review, I think it's fine to use the updater function setState approach to make sure the flyout stays closed if the additional setStates triggered on closing the popover are really necessary, but I was under the impression the state update happening in this scenario doesn't even make sense and we can just avoid it all together.

So, in summary

  • Let's please not introduce constant waiting times in the UI if avoidable
  • See if it's possible to not update the state on unmount like this
  • If we have to, use the updater function to make sure the flyout stays closed, but limit the cases where this is happening

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll move the issue upstream and have EUI fix it at component level.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created issue elastic/eui#4265 on EUI repo and will remove the code here.

};

useEffect(() => {
Expand Down
20 changes: 12 additions & 8 deletions ...ins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,13 @@ export const FilterPopover = ({
const [isPopoverOpen, setIsPopoverOpen] = useState(false);
const inputRef = React.useRef<HTMLInputElement>();

const setPopoverOpen = (isOpen: boolean) => {
setIsPopoverOpen(isOpen);
setIsOpenByCreation(isOpen);
const closePopover = () => {
if (isOpenByCreation) {
setIsOpenByCreation(false);
}
if (isPopoverOpen) {
setIsPopoverOpen(false);
}
};

const setFilterLabel = (label: string) => setFilter({ ...filter, label });
Expand All @@ -57,14 +61,14 @@ export const FilterPopover = ({
panelClassName="lnsIndexPatternDimensionEditor__filtersEditor"
isOpen={isOpenByCreation || isPopoverOpen}
ownFocus
closePopover={() => {
setPopoverOpen(false);
}}
closePopover={() => closePopover()}
button={
<Button
onClick={() => {
if (isOpenByCreation) {
setIsOpenByCreation(false);
}
setIsPopoverOpen((open) => !open);
setIsOpenByCreation(false);
}}
/>
}
Expand All @@ -84,7 +88,7 @@ export const FilterPopover = ({
onChange={setFilterLabel}
placeholder={getPlaceholder(filter.input.query)}
inputRef={inputRef}
onSubmit={() => setPopoverOpen(false)}
onSubmit={() => closePopover()}
dataTestSubj="indexPattern-filters-label"
/>
</EuiPopover>
Expand Down
21 changes: 15 additions & 6 deletions ...ins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,12 @@ export const RangePopover = ({
});

const onSubmit = () => {
setIsPopoverOpen(false);
setIsOpenByCreation(false);
saveRangeAndReset(tempRange, true);
if (isOpenByCreation) {
setIsOpenByCreation(false);
}
if (isPopoverOpen) {
setIsPopoverOpen(false);
}
};

return (
Expand All @@ -100,8 +103,10 @@ export const RangePopover = ({
button={
<Button
onClick={() => {
if (isOpenByCreation) {
setIsOpenByCreation(false);
}
setIsPopoverOpen((isOpen) => !isOpen);
setIsOpenByCreation(false);
}}
/>
}
Expand Down Expand Up @@ -209,7 +214,7 @@ export const AdvancedRangeEditor = ({
const lastIndex = localRanges.length - 1;

// Update locally all the time, but bounce the parents prop function
// to aviod too many requests
// to avoid too many requests
useDebounce(
() => {
setRanges(localRanges.map(({ id, ...rest }) => ({ ...rest })));
Expand Down Expand Up @@ -249,7 +254,11 @@ export const AdvancedRangeEditor = ({
<>
<DragDropBuckets
onDragEnd={setLocalRanges}
onDragStart={() => setIsOpenByCreation(false)}
onDragStart={() => {
if (isOpenByCreation) {
setIsOpenByCreation(false);
}
}}
droppableId="RANGES_DROPPABLE_AREA"
items={localRanges}
>
Expand Down