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.

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

feat(dialog): s2 standard dialog migration #2860

Open
wants to merge 31 commits into
base: spectrum-two
Choose a base branch
from

Conversation

marissahuysentruyt
Copy link
Collaborator

@marissahuysentruyt marissahuysentruyt commented Jun 24, 2024

Description

This migrates the Standard Dialog to S2. 🎉 The default dialog story is called "Standard Dialog." New tokens were utilized to match the design specs. The template underwent significant changes (first uncovered in #2833) to accommodate missing elements such as optional header content, optional footer content, hero/cover images, and the button group. There is also a new option for the footer content, where a checkbox and text can be present, or just the text itself.

Documentation has been updated and the divider story was removed since dividers are no longer supported in dialog components in S2.

This PR pulls in certain features from main in preparation for when spectrum-two merges. That includes some import statements that are commented out and the dialog.test.js file. While the test file doesn't do anything on this branch at this time, it has been updated. Dialogs with dividers are no longer supported, so that test case has been removed.

Because the dialog was renamed to "standard dialog" and the divider component was removed, mod properties are either "new," have been renamed to reflect the "standard dialog" language, or removed:

New Mods
--mod-standard-dialog-spacing-title-to-header-content
--mod-standard-dialog-spacing-title-to-description
--mod-standard-dialog-header-content-font-size

Renamed Mods
--mod-dialog-confirm-small-width > --mod-standard-dialog-max-width-small
--mod-dialog-confirm-medium-width > --mod-standard-dialog-max-width
--mod-dialog-confirm-large-width > --mod-standard-dialog-max-width-large
--mod-dialog-confirm-border-radius > --mod-standard-dialog-border-radius
--mod-dialog-confirm-description-text-size > --mod-standard-dialog-description-font-size
--mod-dialog-confirm-description-text-line-height > --mod-standard-dialog-description-line-height
--mod-dialog-confirm-description-text-color > --mod-standard-dialog-description-text-color
--mod-dialog-confirm-description-font-weight > --mod-standard-dialog-description-font-weight
--mod-dialog-heading-font-weight > --mod-standard-dialog-heading-font-weight
--mod-dialog-confirm-title-text-line-height > --mod-standard-dialog-heading-line-height
--mod-dialog-confirm-title-text-color > --mod-standard-dialog-heading-text-color
--mod-dialog-confirm-title-text-size > --mod-standard-dialog-heading-font-size
--mod-dialog-confirm-hero-height > --mod-standard-dialog-hero-block-size
--mod-dialog-min-inline-size > --mod-standard-dialog-min-inline-size
--mod-dialog-confirm-padding-grid > --mod-standard-dialog-spacing-grid-padding
--mod-dialog-confirm-footer-padding-top > --mod-standard-dialog-spacing-description-to-footer
--mod-dialog-confirm-close-button-padding > --mod-standard-dialog-spacing-edge-to-close-button
--mod-dialog-confirm-gap-size > --mod-standard-dialog-spacing-footer-to-button-group

Removed Mods
--mod-dialog-confirm-buttongroup-padding-top
--mod-dialog-confirm-close-button-size
--mod-dialog-confirm-description-margin
--mod-dialog-confirm-description-padding
--mod-dialog-confirm-divider-block-spacing-end
--mod-dialog-confirm-divider-block-spacing-start
--mod-dialog-confirm-divider-height

New mod for button group:
--mod-buttongroup-flex-wrap

Designs

S2 Standard Dialog Tokens specs
S2 / Desktop Standard Dialog

There will be subsequent work for the fullscreen and fullscreenTakeover dialogs, (draft PR: #3347).

Jira

CSS-714

How and where has this been tested?

Please tag yourself on the tests you've marked complete to confirm the tests have been run by someone other than the author.

Validation steps

  • Standard dialog design review and approval @marissahuysentruyt CSS-803
  • Pull down the branch
  • Visit the dialog storybook
  • The standard dialog matches the S2 standard dialog specs (@rise-erpelding)
  • The dialog no longer supports the Divider component, so any JS or CSS referencing the dialog's divider has been removed from the stories and index.css files
  • Verify the .spectrum-Dialog and .spectrum-Modal utilize the updated border-radius value (corner-radius-extra-large-default 16px)
  • Verify the button group or close button is keyboard accessible and the focus rings do not get cut off in any variant
  • In your editor, verify that the class modifiers --small, --medium and --large have been removed from the JS and CSS. Any sizing modifiers should now reflect T-shirt sizing (--sizeS, size--L), without a --sizeM as that is the default dialog size.
  • Create various combinations of the dialog to verify combos are considered in the CSS:
    • mobile vs desktop
    • light vs dark mode
    • "small", "medium", "large" dialogs to test the max widths
    • dismissible vs. non-dismissible
    • hero vs non-hero
    • changing the hero image
    • change the optional header content to verify that element wraps
    • change the optional footer content to verify that element wraps
  • You may run into the error "Rendered fewer hooks than expected." when using certain controls. Refreshing the window will remove the error.
  • Verify new tokens are used:
    • standard-dialog-maximum-width-small
    • standard-dialog-maximum-width-medium
    • standard-dialog-maximum-width-large
    • standard-dialog-minimum-width
    • standard-dialog-title-font-size
    • standard-dialog-body-font-size
  • Verify updated tokens are used:
    • corner-radius-extra-large-default
    • spacing-500
    • spacing-400
    • spacing-300
    • background-layer-2-color (in the designs, this is accidentally misnamed as background-color-layer2
    • line-height-200
  • Verify the fullscreen and fullscreenTakeover stories look acceptable and not broken visually (these will be updated to match the takeover dialog design specs in feat(dialog): s2 takeover dialog migration #3347).
  • Chromatic coverage (using dialog.test.js file) will include the default, with a hero image, both as non-dismissible (the default) and dismissible (isDismissible: true). The fullscreen and fullscreenTakeover are separate test templates, and do not have additional variations/test scenarios.
  • Tray, which uses a dialog component, doesn't looks broken. It should no longer have a divider.

Regression testing

Validate:

  1. The documentation pages for at least two other components are still loading, including:
  • The pages render correctly, are accessible, and are responsive.
  1. If components have been modified, VRTs have been run on this branch:
  • VRTs have been run and looked at.
  • Any VRT changes have been accepted (by reviewer and/or PR author), or there are no changes.

Screenshots

To-do list

  • I have read the contribution guidelines.
  • I have updated relevant storybook stories and templates.
  • I have tested these changes in Windows High Contrast mode.
  • If my change impacts other components, I have tested to make sure they don't break.
  • If my change impacts documentation, I have updated the documentation accordingly.
  • ✨ This pull request is ready to merge. ✨

Copy link

changeset-bot bot commented Jun 24, 2024

🦋 Changeset detected

Latest commit: 3c34cba

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 17 packages
Name Type
@spectrum-css/buttongroup Patch
@spectrum-css/dialog Major
@spectrum-css/modal Patch
@spectrum-css/underlay Patch
@spectrum-css/popover Major
@spectrum-css/tray Major
@spectrum-css/alertdialog Patch
@spectrum-css/actionbar Major
@spectrum-css/actionmenu Major
@spectrum-css/coachmark Major
@spectrum-css/combobox Major
@spectrum-css/contextualhelp Major
@spectrum-css/datepicker Major
@spectrum-css/picker Major
@spectrum-css/pickerbutton Major
@spectrum-css/menu Major
@spectrum-css/tabs Major

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link
Contributor

github-actions bot commented Jun 24, 2024

File metrics

Summary

Total size: 4.29 MB*
Total change (Δ): ⬇ 2.81 KB (-0.06%)

Table reports on changes to a package's main file. Other changes can be found in the collapsed Details section below.

Package Size Δ
avatar 5.02 KB ⬇ 1.54 KB
buttongroup 1.42 KB ⬆ 0.03 KB
dialog 13.78 KB ⬆ 0.62 KB
modal 5.42 KB ⬆ 0.02 KB
tokens 244.00 KB ⬆ 0.17 KB

Details

avatar

File Head Base Δ
index-base.css 5.02 KB 6.56 KB ⬇ 1.54 KB (-23.54%)
index-vars.css 5.02 KB 6.56 KB ⬇ 1.54 KB (-23.54%)
index.css 5.02 KB 6.56 KB ⬇ 1.54 KB (-23.54%)
metadata.json 1.76 KB 2.46 KB ⬇ 0.71 KB (-28.29%)

buttongroup

File Head Base Δ
index-base.css 1.42 KB 1.39 KB ⬆ 0.03 KB (2.39%)
index-vars.css 1.42 KB 1.39 KB ⬆ 0.03 KB (2.39%)
index.css 1.42 KB 1.39 KB ⬆ 0.03 KB (2.39%)
metadata.json 0.57 KB 0.53 KB ⬆ 0.04 KB (6.57%)

dialog

File Head Base Δ
index-base.css 13.78 KB 13.18 KB ⬆ 0.62 KB (4.56%)
index-vars.css 13.78 KB 13.18 KB ⬆ 0.62 KB (4.56%)
index.css 13.78 KB 13.18 KB ⬆ 0.62 KB (4.56%)
metadata.json 5.85 KB 5.66 KB ⬆ 0.19 KB (3.35%)

modal

File Head Base Δ
index-base.css 5.42 KB 5.40 KB ⬆ 0.02 KB (0.29%)
index-vars.css 5.42 KB 5.40 KB ⬆ 0.02 KB (0.29%)
index.css 5.42 KB 5.40 KB ⬆ 0.02 KB (0.29%)
metadata.json 1.83 KB 1.82 KB ⬆ 0.02 KB (0.86%)

tokens

File Head Base Δ
css/dark-vars.css 42.64 KB 42.64 KB -
css/express/custom-dark-vars.css 0.59 KB 0.59 KB -
css/express/custom-darkest-vars.css 0.59 KB 0.59 KB -
css/express/custom-large-vars.css 0.50 KB 0.50 KB -
css/express/custom-light-vars.css 0.63 KB 0.63 KB -
css/express/custom-medium-vars.css 0.48 KB 0.48 KB -
css/express/custom-vars.css 0.04 KB 0.04 KB -
css/global-vars.css 65.60 KB 65.60 KB -
css/large-vars.css 34.33 KB 34.33 KB -
css/light-vars.css 42.64 KB 42.64 KB -
css/medium-vars.css 34.24 KB 34.24 KB -
css/spectrum/custom-dark-vars.css 3.40 KB 3.40 KB -
css/spectrum/custom-darkest-vars.css 3.40 KB 3.40 KB -
css/spectrum/custom-large-vars.css 4.84 KB 4.76 KB ⬆ 0.08 KB (1.70%)
css/spectrum/custom-light-vars.css 3.40 KB 3.40 KB -
css/spectrum/custom-medium-vars.css 5.06 KB 4.98 KB ⬆ 0.09 KB (1.67%)
css/spectrum/custom-vars.css 2.18 KB 2.18 KB -
index.css 244.00 KB 243.84 KB ⬆ 0.17 KB (0.07%)
* Size determined by adding together the size of the main file for all packages in the library.
* Results are not gzipped or minified.
* An ASCII character in UTF-8 is 8 bits or 1 byte.

Copy link
Contributor

github-actions bot commented Jun 24, 2024

🚀 Deployed on https://pr-2860--spectrum-css.netlify.app

@marissahuysentruyt marissahuysentruyt force-pushed the marissahuysentruyt/css-714-s2-dialog branch from 6f90f2f to 1e8b017 Compare June 24, 2024 16:18
@marissahuysentruyt marissahuysentruyt force-pushed the marissahuysentruyt/css-714-s2-dialog branch from 1e8b017 to 596d2f6 Compare June 24, 2024 18:42
@marissahuysentruyt marissahuysentruyt force-pushed the marissahuysentruyt/css-714-s2-dialog branch 3 times, most recently from abaf623 to 4f08fa7 Compare June 25, 2024 17:09
@castastrophe castastrophe added the S2 Spectrum 2 label Jun 27, 2024
@marissahuysentruyt marissahuysentruyt force-pushed the marissahuysentruyt/css-714-s2-dialog branch from 49d137e to a57836c Compare July 1, 2024 15:35
@marissahuysentruyt marissahuysentruyt marked this pull request as ready for review July 1, 2024 15:40
components/dialog/index.css Outdated Show resolved Hide resolved
components/dialog/stories/dialog.stories.js Outdated Show resolved Hide resolved
components/dialog/stories/dialog.stories.js Outdated Show resolved Hide resolved
components/dialog/index.css Outdated Show resolved Hide resolved
components/dialog/index.css Outdated Show resolved Hide resolved
components/dialog/index.css Show resolved Hide resolved
Copy link
Collaborator

@rise-erpelding rise-erpelding left a comment

Choose a reason for hiding this comment

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

Hey, this component is a beast and you did a nice job! There are so many changes for S2 and it matches the spec nicely for most typical cases! I'm going to go ahead and submit these initial thoughts so I'm not sitting on this for too long but I may come back and add more comments later!

Wrapping

I didn't dig into the minmax function that you added that you commented on, but I did note that there were some funky formatting/wrapping issues that may or may not be fixed by adjusting that grid-template-columns:
Screenshot 2024-07-03 at 10 04 29 AM

  • Adding more "Additional header content" will stretch this container and push the heading text so that it wraps and eventually gets pushed out of the dialog on the left, that's probably not expected behavior. That's probably not expected behavior. On the plus side, I can see that the heading text is wrapping nicely!
  • In the footer, adding too much footer content also does a weird thing where it doesn't wrap and pushes the action buttons out of the dialog on the right side (although the footer text does eventually wrap, which is good!), that's probably not ideal either. It might help to have some max-width values/tokens for these two content areas.

Fullscreen/Fullscreen Takeover Mode

Screenshot 2024-07-02 at 9 41 46 PM

  • I called out the close button positioning in a comment, I think. It ends up being really funky if the close button is added, is the close button allowed to be used for fullscreen mode? Also, the close button is appearing in addition to the action buttons, and I had thought this should be an either/or situation (so correct me if I'm wrong!).
  • The footer content disappears in fullscreen, is that expected?
  • I made this callout in a comment but I'm going to leave it here too so it doesn't get forgotten: do we definitely want border-radius on the dialog for the fullscreen takeover mode?
  • I cannot remove fullscreen/fullscreen takeover as an option once I select it, so I can't go back to the modal that it starts on without removing the parameter from the url. It would be nice to have this be an option so that I could go back to it after looking at fullscreen.
  • The hero image control doesn't work in Storybook if I'm on fullscreen mode. I'm not sure whether or not this is intentional, but if fullscreen dialogs are not meant to have a hero image, we should remove controls for those if possible

Tray

I captured it with two dialogs but I just looked again and didn't see the issue 🤷‍♀️ But I also just saw it when I checked main so I don't think this is something you caused with this work.
Screenshot 2024-07-03 at 11 13 52 AM

@marissahuysentruyt
Copy link
Collaborator Author

marissahuysentruyt commented Jul 5, 2024

@rise-erpelding thanks for all of this feedback!

The footer content disappears in fullscreen, is that expected?
is the close button allowed to be used for fullscreen mode
The hero image control doesn't work in Storybook if I'm on fullscreen mode.

I left a comment about all of these! They're things I've asked about, but I don't think have been decided on yet for S2. I have a Jira ticket to follow up on the 3 questions that still remain for the fullscreen layouts. (this is the hero & dismissible control removals: 0bfa1a8) for fullscreen layouts)

I cannot remove fullscreen/fullscreen takeover as an option once I select it

I agree. I ended up having to alter the template a little more and sort of rework some arguments, so I'd love for you to try to break things!! I think I got that figured out: 0bfa1a8

The hero image control doesn't work in Storybook if I'm on fullscreen mode.

That was intentional on my part. Unfortunately, it seems like you found half of the work and I didn't fix the controls 😬 They should be removed now: 94220e6

I captured it with two dialogs but I just looked again and didn't see the issue.

Was there something going on with Tray? I know it uses a dialog, but that wasn't one of the components I intentionally touched.

As for the header and footer overflow and grid placement- still working on it. 👍

EDIT:
I reworked the header and footer grid placements: d8cd82f
I also had to rework some of the template to hopefully 🤞 handle some of the edge cases that I was missing: eff80b9

I moved the Chromatic testing templates to template.js too, to match some other requests I've seen on other pull requests.

Copy link
Collaborator

@jawinn jawinn left a comment

Choose a reason for hiding this comment

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

I took an initial look over this and the comments so far, and have a couple questions/comments.

It looks like something may have changed recently with the required text wrapping?
Screenshot 2024-07-08 at 2 10 14 PM

components/dialog/index.css Outdated Show resolved Hide resolved
components/modal/index.css Outdated Show resolved Hide resolved
components/underlay/index.css Outdated Show resolved Hide resolved
components/dialog/index.css Show resolved Hide resolved
- adds is-hidden-story to replicate what is on main and remove most
stories from the sidebar
- adds some comments and TODOs giving context to the fullscreen and
fullscreenTakeover stories being hidden for now while guidance is
created.
- add typography to peerDependencies
- remove divider from peerDependencies and peerDependenciesMeta
- adds closebutton and typography to peerDependenciesMeta
- adds some opportunities for mod properties
- fixes some spacing between heading & optional header content
- fixes some spacing between footer content and button group
- updates the changeset with new mods
border-radius: var(--mod-standard-dialog-border-radius, var(--spectrum-standard-dialog-border-radius));
overflow: hidden;

.spectrum--large & {
Copy link
Collaborator

@jawinn jawinn Nov 7, 2024

Choose a reason for hiding this comment

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

Can .spectrum--large be converted by SWC? I could be wrong, but I thought that part of the reason we have custom-vars in the tokens package was because they had trouble with us using large platform scale and light/dark classes like this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for calling this out. Glad we got confirmation from Cassondra that we cannot do this and I can correct it before it goes out to SWC.

For posterity, we cannot nest platform styles like this:

because the individual web components are not aware of the context they exist inside. Namely, we can't rely on the element having a ".spectrum--large" class to look up to. We can add...the default value to the custom medium styles (custom-medium-vars) and the alt to custom large (custom-large-vars)and it should toggle accurately

Doing so ☝️ allows us to access it like a global variable.

</span>
`,
() => html`
<span class="${rootClass}-heading--noHeader"></span>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Screenshot 2024-11-07 at 2 26 28 PM
Screenshot 2024-11-07 at 2 26 08 PM

I'm seeing some extra space appearing when there is no "additional header content", as a result of the gap property and this empty element being there. When I remove the element, it seems to look fine. Do we need this empty element and this --noHeader class? I remember there were questions about the purpose of this class a few weeks back; did you find out more about it? I'm trying to find any other visual difference when it is used vs when it isn't; I'm not seeing a difference when disabling some of the margin-inline-end: 0 styles connected to this class.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I meant to combine these two commits, but I believe I've gotten rid of the --noHeader styles that weren't really doing anything.

fd8c087
836e3a7

control: { type: "text" },
if: { arg: "hasFooter", truthy: true },
},
hasCheckbox: {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm not seeing the checkbox appear for fullscreen and fullscreenTakeover layout options. Or is this something where we need Storybook to allow multiple conditional controls in order to only show it for the default layout?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

For right now, the checkbox and/or footer text is not supported in the fullscreen or fullscreenTakeover stories. Rise and I did decide we'd need multiple conditionals to only show it. Maybe we can talk more about this during our dev sync?

#2860 (comment)

#2860 (comment)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Also- I may have moved that work to the other dialog branch. I'd have to check on it though.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@jawinn I refactored the controls a bit. This should also have the comment for the multiple conditionals we talked about last week.

27d5fba

@@ -46,39 +116,186 @@ export default {
},
control: "boolean",
},
heroImageUrl: {
Copy link
Collaborator

Choose a reason for hiding this comment

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

It'd be nice if I could view the hero image from the controls, without having to upload an image. Are we missing the hasHeroImage control? I see it referenced once in the Docs story.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Let me know if this is close to what you were thinking! 9d8f881

.changeset/metal-fireants-switch.md Outdated Show resolved Hide resolved
min-inline-size: var(--mod-standard-dialog-min-inline-size, var(--spectrum-standard-dialog-min-inline-size));
max-inline-size: 100%;
max-block-size: inherit;
background-color: var(--spectrum-standard-dialog-background-color);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Previously the background color was being set on Modal that wraps the Dialog, so now that we're setting the background color here on the Dialog, there is some antialiasing bleed through happening on the corners since both now have background colors on top of each other:
Screenshot 2024-11-07 at 3 22 52 PM
If you set --mod-modal-background-color: hotpink; you can see the issue better:
Screenshot 2024-11-07 at 3 31 34 PM
It's kind of a CSS rendering quirk, even though these things have the same border-radius; I encountered something similar when working on color slider.

I'm not sure why Modal has the background (or why Modal is separate from Dialog to begin with), but it seems like we'll need to work toward making its background transparent? That would affect alert dialog and tray too, so I'm not sure about the best course. A stop-gap here might be to use --mod-modal-background-color: transparent; in this dialog template, but we can't really build it into Dialog's CSS since Modal is the parent. This could be something to talk about at team meeting.

Also, do we need a mod for this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I have the mod for the background here: c98edd3

I was able to recreate the issue with the background color, so I had to edit modal a bit to accept customStyles. Let me know what you think: 3c34cba

Copy link
Collaborator

@jawinn jawinn left a comment

Choose a reason for hiding this comment

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

One other thing I saw on the Docs page that looks a little off is this in the fullscreen and fullscreen takeover stories:
Screenshot 2024-11-07 at 10 45 38 AM

set --spectrum-standard-dialog-spacing-edge-to-content tokens for
desktop and mobile
- adds a hasHeroImage control
- refactors template to check for hasHeroImage
- sets a default image for heroImageUrl
- also adds a comment about multiple conditionals for argTypes
- calls for --spectrum-standard-dialog-spacing-edge-to-content
- removes .spectrum--large nesting
- fixes dismissible grid spacing between additional header content and
close button
because modal was originally setting the background color of dialogs,
there was some 'antialiasing bleed through' behind the dialog. By adding
customStyles to Modal, we can set --mod-modal-background-color to
transparent and get rid of the hairline color (especially noticeable
behind a hero image in a dialog)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-review S2 Spectrum 2 skip_vrt Add to a PR to skip running VRT (but still pass the action)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants