Skip to content

fix(Popup): prevent closing popup when finishing select text outside #19201

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

Merged
chpalac merged 8 commits into from
Aug 3, 2021
Merged

fix(Popup): prevent closing popup when finishing select text outside #19201

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ceb18db
fix(Popup): prevent closing popup on finishing select text outside
chpalac Jul 30, 2021
6155da0
Merge branch 'master' of https://github.com/microsoft/fluentui into f…
Aug 1, 2021
c9bf253
fix: tests
chpalac Aug 1, 2021
e25e330
Merge branch 'fix/popup-click-outside' of github.com:chassunc/fluentu…
chpalac Aug 1, 2021
27a8d93
fix: test
chpalac Aug 2, 2021
8fe2cec
fix popup
chpalac Aug 2, 2021
75620f8
update test
chpalac Aug 2, 2021
83a7995
fix test
chpalac Aug 3, 2021
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
4 changes: 4 additions & 0 deletions packages/fluentui/e2e/cypress/support/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ Cypress.Commands.add('clickOn', selector => {
cy.get(selector).realClick();
});

Cypress.Commands.add('mouseDownOn', selector => {
cy.get(selector).trigger('mousedown');
});

Cypress.Commands.add('focusOn', selector => {
cy.get(selector).focus();
});
Expand Down
1 change: 1 addition & 0 deletions packages/fluentui/e2e/cypress/support/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ declare namespace Cypress {
nothingIsFocused(): Chainable<Element>;
simulatePageMove(): Chainable<Element>;
clickOn(selector: string): Chainable<Element>;
mouseDownOn(selector: string): Chainable<Element>;
focusOn(selector: string): Chainable<Element>;
hover(selector: string): Chainable<Element>;
resizeViewport(width: number): Chainable<Element>;
Expand Down
2 changes: 1 addition & 1 deletion packages/fluentui/e2e/tests/popupWithoutTrigger.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('Popup without `trigger`', () => {
cy.clickOn(button);
cy.visible(popupContent);

cy.clickOn('body');
cy.mouseDownOn('body');
cy.notExist(popupContent);
});

Expand Down
7 changes: 6 additions & 1 deletion packages/fluentui/react-northstar/src/components/Popup/Popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,12 @@ export const Popup: React.FC<PopupProps> &

{context.target && (
<>
<EventListener listener={handleDocumentClick(getRefs)} target={context.target} type="click" capture />
<EventListener
listener={handleDocumentClick(getRefs)}
target={context.target}
Comment thread
chpalac marked this conversation as resolved.
Outdated
type="mousedown"

@ling1726 ling1726 Jul 30, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

it's an interesting solution, you might have to modify tests since, generally tests will only trigger the specific event.

Perhaps this should also be brought up in open hours as an FYI.

capture
/>
<EventListener
listener={handleDocumentClick(getRefs)}
target={context.target}
Expand Down