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

Jump to bottom

fix(modal): calciteModalClose should emit on close button click #7680

Merged
merged 6 commits into from Sep 6, 2023
Merged

fix(modal): calciteModalClose should emit on close button click #7680

merged 6 commits into from Sep 6, 2023

Conversation

driskull
Copy link
Member

@driskull driskull commented Sep 5, 2023 •
edited

Related Issue: #7655

Summary

  • Updates openCloseComponent helper to consider opened property for components that have it
  • Update modal to emit correctly on close click
  • Add test
  • @jcfranco for risk consideration.

@github-actions github-actions bot added the bug Bug reports for broken functionality. Issues should include a reproduction of the bug. label Sep 5, 2023
@driskull driskull marked this pull request as ready for review September 5, 2023 22:50
@driskull driskull requested a review from a team as a code owner September 5, 2023 22:50
jcfranco
jcfranco approved these changes Sep 5, 2023
View reviewed changes
Copy link
Member

@jcfranco jcfranco left a comment

Choose a reason for hiding this comment

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

Awesome!

packages/calcite-components/src/utils/openCloseComponent.ts
/**
* When true, the component is open.
*/
opened?: boolean;
Copy link
Member

Choose a reason for hiding this comment

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

@Elijbet Let's look into refactoring this to follow <propName>Prop, similar to other props, so components can specify their source-of-truth open prop. #proppropprop

packages/calcite-components/src/components/modal/modal.e2e.ts Outdated
const modalBeforeClose = page.waitForEvent("calciteModalBeforeClose");
const modalClose = page.waitForEvent("calciteModalClose");

const closeButton = await page.find("calcite-modal >>> .close");
Copy link
Member

Choose a reason for hiding this comment

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

Can this use the CSS lookup object?

@jcfranco
Copy link
Member

jcfranco commented Sep 5, 2023

@jcfranco for risk consideration

This seems low-risk to me.

jcfranco
jcfranco approved these changes Sep 6, 2023
View reviewed changes
Copy link
Member

@jcfranco jcfranco left a comment

Choose a reason for hiding this comment

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

💥💥💥

packages/calcite-components/src/components/modal/modal.e2e.ts
@@ -543,7 +568,7 @@ describe("calcite-modal accessibility checks", () => {
modal.setProperty("open", true);
await page.waitForChanges();
expect(await modal.isVisible()).toBe(true);
const closeButton = await page.find("calcite-modal >>> .close");
const closeButton = await page.find(`calcite-modal >>> .${CSS.close}`);
Copy link
Member

Choose a reason for hiding this comment

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

✨🧹✨

@driskull driskull mentioned this pull request Sep 6, 2023
Merged
@driskull driskull added low risk Issues with low risk for consideration in low risk milestones pr ready for visual snapshots Adding this label will run visual snapshot testing. labels Sep 6, 2023
@driskull driskull merged commit 796bf90 into main Sep 6, 2023
17 of 18 checks passed
@driskull driskull deleted the dris0000/modal-close-event-fix branch September 6, 2023 18:00
@github-actions github-actions bot added this to the 1.8.0 Maintenance Release milestone Sep 6, 2023
driskull added a commit that referenced this pull request Sep 6, 2023
@driskull
fix(sheet): calciteSheetClose should emit on scrim click (#7685)
6ae963e 
**Related Issue:** #7681

## Summary

- Depends on #7680
- Update sheet to emit correctly on scrim click
- Add test
- @jcfranco for risk consideration.
@calcite-admin calcite-admin mentioned this pull request Sep 6, 2023
Merged
benelan added a commit that referenced this pull request Sep 6, 2023
@benelan
Merge remote-tracking branch 'origin/main' into benelan/ccr-vite-fix
1e05ae3 
* origin/main:
  fix(list): remove unnecessary z-index (#7678)
  fix(sheet): calciteSheetClose should emit on scrim click (#7685)
  fix(modal): calciteModalClose should emit on close button click (#7680)
  fix(list-item): Do not call preventDefault on enter key within slotted actions (#7684)
  chore(locale): add extra info to default numbering system export (#7683)
  fix(input-date-picker): apply default numbering system to avoid browser inferring from locale (#7682)
  chore: release next
  fix(time-picker): focus corresponding input when nudge buttons are clicked (#7650)
  build(deps): update dependency @types/sortablejs to v1.15.2 (#7674)
  feat(flow): split up custom flow item interfaces (#7666)
jcfranco pushed a commit that referenced this pull request Sep 7, 2023
@calcite-admin @github-actions
chore: release main (#7654)
171c9d0 
🤖 I have created a release *beep* *boop*
---


<details><summary>@esri/calcite-components: 1.8.0</summary>

##
[1.8.0](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components@1.7.0...@esri/calcite-components@1.8.0)
(2023-09-06)


### Features

* **flow:** Split up custom flow item interfaces
([#7666](#7666))
([6c22e7c](6c22e7c))


### Bug Fixes

* **action-group:** Honor flex-grow on slotted actions
([#7690](#7690))
([0777234](0777234))
* **block:** Provide textual name on collapse and expansion to AT
([#7652](#7652))
([85bd71b](85bd71b))
* **input-date-picker:** Apply default numbering system to avoid browser
inferring from locale
([#7682](#7682))
([3e1ed2d](3e1ed2d))
* **input-time-zone:** Prevent items from being deselected
([#7661](#7661))
([c2dd436](c2dd436))
* **list-item:** Do not call preventDefault on enter key within slotted
actions
([#7684](#7684))
([c3261f0](c3261f0))
* **list:** Remove unnecessary z-index
([#7678](#7678))
([1f4cd97](1f4cd97))
* **modal:** CalciteModalClose should emit on close button click
([#7680](#7680))
([796bf90](796bf90))
* **sheet:** CalciteSheetClose should emit on scrim click
([#7685](#7685))
([6ae963e](6ae963e))
* **sheet:** Update shadow style in display-mode="float"
([#7664](#7664))
([851bedb](851bedb))
* **table:** Allow wrapping text in table-header and table-cell
([#7665](#7665))
([15cb2bf](15cb2bf))
* **time-picker:** Focus corresponding input when nudge buttons are
clicked
([#7650](#7650))
([9c7d846](9c7d846))
</details>

<details><summary>@esri/calcite-components-react: 1.8.0</summary>

##
[1.8.0](https://github.com/Esri/calcite-design-system/compare/@esri/calcite-components-react@1.7.0...@esri/calcite-components-react@1.8.0)
(2023-09-06)


### Bug Fixes

* Resolve vite errors due to using expressions in dynamic imports
([#7671](#7671))
([b4c1038](b4c1038))


### Dependencies

* The following workspace dependencies were updated
  * dependencies
    * @esri/calcite-components bumped from ^1.8.0-next.2 to ^1.8.0
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@Elijbet Elijbet mentioned this pull request Oct 30, 2023
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jcfranco jcfranco jcfranco approved these changes

Assignees

@driskull driskull

Labels
bug Bug reports for broken functionality. Issues should include a reproduction of the bug. low risk Issues with low risk for consideration in low risk milestones pr ready for visual snapshots Adding this label will run visual snapshot testing.
Projects
None yet
Milestone
1.8.0 Maintenance Release
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@driskull @jcfranco