From db937bf3bfbec7e0e56631ed32a52f8c7d4b2adc Mon Sep 17 00:00:00 2001 From: Mike Perrotti Date: Mon, 21 Oct 2019 13:17:11 -0400 Subject: [PATCH] fix(dropdownable): does not set position if dropdownable is not open --- .../__snapshots__/DropdownMenu.test.tsx.snap | 24 +++++++++---------- .../dropdownable/components/Dropdownable.tsx | 3 +++ .../tests/__snapshots__/Tooltip.test.tsx.snap | 8 +++---- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/packages/dropdownMenu/tests/__snapshots__/DropdownMenu.test.tsx.snap b/packages/dropdownMenu/tests/__snapshots__/DropdownMenu.test.tsx.snap index 220267205..9f62f5c6b 100644 --- a/packages/dropdownMenu/tests/__snapshots__/DropdownMenu.test.tsx.snap +++ b/packages/dropdownMenu/tests/__snapshots__/DropdownMenu.test.tsx.snap @@ -306,7 +306,7 @@ exports[`Dropdown renders a closed dropdown 1`] = ` aria-labelledby="downshift-0-label" class="emotion-4" data-cy="popover" - direction="bottom-right" + direction="bottom-left" id="downshift-0-menu" role="listbox" > @@ -368,7 +368,7 @@ exports[`Dropdown renders a closed dropdown 1`] = ` aria-labelledby="downshift-0-label" class="emotion-5" data-cy="popover" - direction="bottom-right" + direction="bottom-left" id="downshift-0-menu" role="listbox" > @@ -430,7 +430,7 @@ exports[`Dropdown renders a closed dropdown 1`] = ` > @@ -992,7 +992,7 @@ exports[`Dropdown renders a dropdown with a max height 1`] = ` aria-labelledby="downshift-2-label" class="emotion-4" data-cy="popover" - direction="bottom-right" + direction="bottom-left" id="downshift-2-menu" role="listbox" style="max-height: 50px;" @@ -1055,7 +1055,7 @@ exports[`Dropdown renders a dropdown with a max height 1`] = ` aria-labelledby="downshift-2-label" class="emotion-5" data-cy="popover" - direction="bottom-right" + direction="bottom-left" id="downshift-2-menu" role="listbox" style="max-height: 50px;" @@ -1118,7 +1118,7 @@ exports[`Dropdown renders a dropdown with a max height 1`] = ` > @@ -2175,7 +2175,7 @@ exports[`Dropdown renders an open dropdown with multiple sections 1`] = ` aria-labelledby="downshift-0-label" class="emotion-9" data-cy="popover" - direction="bottom-right" + direction="bottom-left" id="downshift-0-menu" role="listbox" > @@ -2289,7 +2289,7 @@ exports[`Dropdown renders an open dropdown with multiple sections 1`] = ` aria-labelledby="downshift-2-label" class="emotion-9" data-cy="popover" - direction="bottom-right" + direction="bottom-left" id="downshift-2-menu" role="listbox" style="max-height: 50px;" diff --git a/packages/dropdownable/components/Dropdownable.tsx b/packages/dropdownable/components/Dropdownable.tsx index ecbc582b1..aa62e26d2 100644 --- a/packages/dropdownable/components/Dropdownable.tsx +++ b/packages/dropdownable/components/Dropdownable.tsx @@ -142,6 +142,9 @@ class Dropdownable extends React.Component { } setPositionFromCurrentProps() { + if (!this.props.open) { + return; + } this.setPosition(this.props); } diff --git a/packages/tooltip/tests/__snapshots__/Tooltip.test.tsx.snap b/packages/tooltip/tests/__snapshots__/Tooltip.test.tsx.snap index 2c441c8b1..89d336b75 100644 --- a/packages/tooltip/tests/__snapshots__/Tooltip.test.tsx.snap +++ b/packages/tooltip/tests/__snapshots__/Tooltip.test.tsx.snap @@ -161,7 +161,7 @@ exports[`Tooltip renders 1`] = ` open={false} > @@ -282,7 +282,8 @@ exports[`Tooltip renders open tooltip 1`] = `