Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Add utilities for consistent focus rings #2067

Merged
merged 7 commits into from
Dec 29, 2022
Merged

Add utilities for consistent focus rings #2067

merged 7 commits into from
Dec 29, 2022

Conversation

dhruvkb
Copy link
Member

@dhruvkb dhruvkb commented Dec 22, 2022

Fixes

Related to the comment WordPress/openverse#479 by @panchovm

Description

This PR

  • defines new Tailwind utilies to use for focus rings
  • adds some stories that use these utilities
  • adds visual regression tests for the 'Focus' story
  • updates a few usages of each of the three utilities as an example
    • updates the VCheckbox component to match the WordPress component library
    • updates the search result image cell so that the white outline masks content instead of appearing outside
    • updates the search result audio cell so that the white outline masks content instead of appearing outside

This PR does not

  • update every component to use these utilities
  • remove other implementations of focus rings

These new utilities do not include any transitions on the shadows. This is intentional as the focus movement reacting to the Tab must be as fast as possible. If needed in some specific cases, it can be restored with the .transition-shadow utility.

Testing Instructions

  1. Check out the PR and run Storybook.
  2. See the stories under Meta/Focus.
  3. Add some rounded styles like rounded-sm, rounded and rounded-full to see how the ring behaves.
  4. Read the docs for Meta/Focus.

  1. Check out the PR and run the dev server.
  2. Use the keyboard navigation to focus on the following three components:
    i. Filters button in the new header (slim filled style)
    ii. Checkboxes in the filters sidebar (slim transparent style with a slight mod)
    iii. Image cell in the search results (bold filled style)
    iv. Audio cell in the search results (bold filled style)
    v. Audio row in the search results (slim transparent style)

Screenshots

image

With additional rounded-full style using the 'Controls' panel.

Checklist

  • My pull request has a descriptive title (not a vague title like
    Update index.md).
  • My pull request targets the default branch of the repository (main) or
    a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible
    errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@github-actions
Copy link

github-actions bot commented Dec 22, 2022

Storybook and Tailwind configuration previews: Ready

Storybook: https://wordpress.github.io/openverse-frontend/_preview/2067
Tailwind: https://wordpress.github.io/openverse-frontend/_preview/2067/tailwind

Please note that GitHub pages takes a little time to deploy newly pushed code, if the links above don't work or you see old versions, wait 5 minutes and try again.

You can check the GitHub pages deployment action list to see the current status of the deployments.

@openverse-bot openverse-bot added the 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work label Dec 22, 2022
@github-actions
Copy link

github-actions bot commented Dec 22, 2022

Size Change: -2.93 kB (0%)

Total Size: 873 kB

Filename Size Change
./.nuxt/dist/client/212.js 0 B -272 B (removed) 🏆
./.nuxt/dist/client/212.modern.js 0 B -276 B (removed) 🏆
./.nuxt/dist/client/213.js 0 B -1.85 kB (removed) 🏆
./.nuxt/dist/client/app.js 146 kB -1.32 kB (-1%)
./.nuxt/dist/client/app.modern.js 118 kB -1.48 kB (-1%)
./.nuxt/dist/client/commons/app.js 86.7 kB +10 B (0%)
./.nuxt/dist/client/components/v-all-results-grid.js 7.49 kB -15 B (0%)
./.nuxt/dist/client/components/v-all-results-grid.modern.js 5.01 kB -16 B (0%)
./.nuxt/dist/client/components/v-audio-track.js 5.2 kB -22 B (0%)
./.nuxt/dist/client/components/v-audio-track.modern.js 5.13 kB -24 B (0%)
./.nuxt/dist/client/components/v-image-cell-square.js 992 B -23 B (-2%)
./.nuxt/dist/client/components/v-image-cell-square.modern.js 996 B -24 B (-2%)
./.nuxt/dist/client/components/v-sources-table.js 16.6 kB +93 B (+1%)
./.nuxt/dist/client/components/v-sources-table.modern.js 16.6 kB +92 B (+1%)
./.nuxt/dist/client/runtime.js 2.54 kB -70 B (-3%)
./.nuxt/dist/client/runtime.modern.js 2.54 kB -70 B (-3%)
./.nuxt/dist/client/vendors/app.js 63.7 kB -32 B (0%)
./.nuxt/dist/client/199.js 273 B +273 B (new file) 🆕
./.nuxt/dist/client/199.modern.js 277 B +277 B (new file) 🆕
./.nuxt/dist/client/200.js 1.85 kB +1.85 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./.nuxt/dist/client/commons/app.modern.js 77.4 kB -3 B (0%)
./.nuxt/dist/client/components/loading-icon.js 748 B -1 B (0%)
./.nuxt/dist/client/components/loading-icon.modern.js 750 B -1 B (0%)
./.nuxt/dist/client/components/table-sort-icon.js 508 B 0 B
./.nuxt/dist/client/components/table-sort-icon.modern.js 514 B +1 B (0%)
./.nuxt/dist/client/components/v-audio-cell.js 357 B 0 B
./.nuxt/dist/client/components/v-audio-cell.modern.js 360 B +1 B (0%)
./.nuxt/dist/client/components/v-audio-details.js 2.52 kB -2 B (0%)
./.nuxt/dist/client/components/v-audio-details.modern.js 1.78 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.js 1.01 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.modern.js 1.01 kB 0 B
./.nuxt/dist/client/components/v-back-to-search-results-link.js 537 B -1 B (0%)
./.nuxt/dist/client/components/v-back-to-search-results-link.modern.js 543 B 0 B
./.nuxt/dist/client/components/v-bone.js 684 B -1 B (0%)
./.nuxt/dist/client/components/v-bone.modern.js 687 B -2 B (0%)
./.nuxt/dist/client/components/v-box-layout.js 1.2 kB +1 B (0%)
./.nuxt/dist/client/components/v-box-layout.modern.js 1.2 kB 0 B
./.nuxt/dist/client/components/v-content-link.js 1.11 kB 0 B
./.nuxt/dist/client/components/v-content-link.modern.js 1.09 kB -1 B (0%)
./.nuxt/dist/client/components/v-content-page.js 467 B +1 B (0%)
./.nuxt/dist/client/components/v-content-page.modern.js 470 B -1 B (0%)
./.nuxt/dist/client/components/v-content-report-button.js 776 B +1 B (0%)
./.nuxt/dist/client/components/v-content-report-button.modern.js 783 B +1 B (0%)
./.nuxt/dist/client/components/v-content-report-form.js 6.08 kB -2 B (0%)
./.nuxt/dist/client/components/v-content-report-form.modern.js 3.57 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.js 1.22 kB -1 B (0%)
./.nuxt/dist/client/components/v-content-report-popover.modern.js 4.22 kB -2 B (0%)
./.nuxt/dist/client/components/v-copy-button.js 3.98 kB -1 B (0%)
./.nuxt/dist/client/components/v-copy-button.modern.js 3.99 kB -4 B (0%)
./.nuxt/dist/client/components/v-copy-license.js 1 kB +1 B (0%)
./.nuxt/dist/client/components/v-copy-license.modern.js 1 kB +1 B (0%)
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/09090664.js 9.85 kB -1 B (0%)
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/09090664.modern.js 9.83 kB +2 B (0%)
./.nuxt/dist/client/components/v-dmca-notice.js 748 B 0 B
./.nuxt/dist/client/components/v-dmca-notice.modern.js 752 B -1 B (0%)
./.nuxt/dist/client/components/v-error-image.js 1.69 kB 0 B
./.nuxt/dist/client/components/v-error-image.modern.js 1.68 kB +1 B (0%)
./.nuxt/dist/client/components/v-error-section.js 372 B 0 B
./.nuxt/dist/client/components/v-error-section.modern.js 376 B 0 B
./.nuxt/dist/client/components/v-external-search-form.js 3.09 kB -1 B (0%)
./.nuxt/dist/client/components/v-external-search-form.modern.js 3.06 kB +1 B (0%)
./.nuxt/dist/client/components/v-external-source-list.js 2.55 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.modern.js 2.52 kB 0 B
./.nuxt/dist/client/components/v-full-layout.js 1.59 kB 0 B
./.nuxt/dist/client/components/v-full-layout.modern.js 1.59 kB -1 B (0%)
./.nuxt/dist/client/components/v-grid-skeleton.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-grid-skeleton.modern.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-home-gallery.js 4.79 kB -3 B (0%)
./.nuxt/dist/client/components/v-home-gallery.modern.js 4.77 kB 0 B
./.nuxt/dist/client/components/v-image-cell.js 1.43 kB +1 B (0%)
./.nuxt/dist/client/components/v-image-cell.modern.js 1.42 kB -2 B (0%)
./.nuxt/dist/client/components/v-image-details.js 2.15 kB +1 B (0%)
./.nuxt/dist/client/components/v-image-details.modern.js 1.42 kB 0 B
./.nuxt/dist/client/components/v-image-grid.js 4.88 kB -2 B (0%)
./.nuxt/dist/client/components/v-image-grid.modern.js 2.42 kB -1 B (0%)
./.nuxt/dist/client/components/v-license-tab-panel.js 522 B +1 B (0%)
./.nuxt/dist/client/components/v-license-tab-panel.modern.js 525 B +1 B (0%)
./.nuxt/dist/client/components/v-load-more.js 3.15 kB 0 B
./.nuxt/dist/client/components/v-load-more.modern.js 685 B +1 B (0%)
./.nuxt/dist/client/components/v-media-license.js 819 B 0 B
./.nuxt/dist/client/components/v-media-license.modern.js 826 B 0 B
./.nuxt/dist/client/components/v-media-reuse.js 1.62 kB -1 B (0%)
./.nuxt/dist/client/components/v-media-reuse.modern.js 1.61 kB +2 B (0%)
./.nuxt/dist/client/components/v-media-tag.js 429 B 0 B
./.nuxt/dist/client/components/v-media-tag.modern.js 434 B 0 B
./.nuxt/dist/client/components/v-no-results.js 2.75 kB 0 B
./.nuxt/dist/client/components/v-no-results.modern.js 2.72 kB -1 B (0%)
./.nuxt/dist/client/components/v-radio.js 1.51 kB +1 B (0%)
./.nuxt/dist/client/components/v-radio.modern.js 1.47 kB +1 B (0%)
./.nuxt/dist/client/components/v-related-audio.js 1.25 kB -1 B (0%)
./.nuxt/dist/client/components/v-related-audio.modern.js 1.25 kB +2 B (0%)
./.nuxt/dist/client/components/v-related-images.js 1.05 kB -2 B (0%)
./.nuxt/dist/client/components/v-related-images.modern.js 2.98 kB 0 B
./.nuxt/dist/client/components/v-report-desc-form.js 966 B 0 B
./.nuxt/dist/client/components/v-report-desc-form.modern.js 968 B 0 B
./.nuxt/dist/client/components/v-row-layout.js 1.7 kB 0 B
./.nuxt/dist/client/components/v-row-layout.modern.js 1.71 kB 0 B
./.nuxt/dist/client/components/v-scroll-button.js 813 B 0 B
./.nuxt/dist/client/components/v-scroll-button.modern.js 819 B 0 B
./.nuxt/dist/client/components/v-search-grid.js 5.43 kB -2 B (0%)
./.nuxt/dist/client/components/v-search-grid.modern.js 5.39 kB +1 B (0%)
./.nuxt/dist/client/components/v-search-results-title.js 656 B 0 B
./.nuxt/dist/client/components/v-search-results-title.modern.js 655 B -1 B (0%)
./.nuxt/dist/client/components/v-search-type-radio.js 795 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.modern.js 770 B 0 B
./.nuxt/dist/client/components/v-server-timeout.js 300 B +1 B (0%)
./.nuxt/dist/client/components/v-server-timeout.modern.js 303 B 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.js 3.37 kB 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.modern.js 896 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.js 887 B -1 B (0%)
./.nuxt/dist/client/components/v-skip-to-content-container.modern.js 893 B +3 B (0%)
./.nuxt/dist/client/components/v-snackbar.js 1.18 kB 0 B
./.nuxt/dist/client/components/v-snackbar.modern.js 1.19 kB -1 B (0%)
./.nuxt/dist/client/components/v-warning-suppressor.js 298 B 0 B
./.nuxt/dist/client/components/v-warning-suppressor.modern.js 303 B 0 B
./.nuxt/dist/client/pages/about.js 1.51 kB +2 B (0%)
./.nuxt/dist/client/pages/about.modern.js 1.51 kB 0 B
./.nuxt/dist/client/pages/audio/_id.js 7.94 kB 0 B
./.nuxt/dist/client/pages/audio/_id.modern.js 4.79 kB +3 B (0%)
./.nuxt/dist/client/pages/external-sources.js 1.52 kB -1 B (0%)
./.nuxt/dist/client/pages/external-sources.modern.js 1.53 kB +1 B (0%)
./.nuxt/dist/client/pages/feedback.js 1.31 kB +1 B (0%)
./.nuxt/dist/client/pages/feedback.modern.js 1.31 kB +1 B (0%)
./.nuxt/dist/client/pages/image/_id.js 9.26 kB -1 B (0%)
./.nuxt/dist/client/pages/image/_id.modern.js 7.33 kB -2 B (0%)
./.nuxt/dist/client/pages/index.js 7.53 kB -4 B (0%)
./.nuxt/dist/client/pages/index.modern.js 7.47 kB 0 B
./.nuxt/dist/client/pages/preferences.js 1.22 kB +1 B (0%)
./.nuxt/dist/client/pages/preferences.modern.js 1.21 kB -1 B (0%)
./.nuxt/dist/client/pages/privacy.js 980 B -1 B (0%)
./.nuxt/dist/client/pages/privacy.modern.js 984 B +1 B (0%)
./.nuxt/dist/client/pages/search-help.js 1.61 kB 0 B
./.nuxt/dist/client/pages/search-help.modern.js 1.61 kB 0 B
./.nuxt/dist/client/pages/search.js 5.05 kB -4 B (0%)
./.nuxt/dist/client/pages/search.modern.js 2.56 kB +1 B (0%)
./.nuxt/dist/client/pages/search/audio.js 6.14 kB -5 B (0%)
./.nuxt/dist/client/pages/search/audio.modern.js 3.64 kB -2 B (0%)
./.nuxt/dist/client/pages/search/image.js 659 B -1 B (0%)
./.nuxt/dist/client/pages/search/image.modern.js 2.73 kB -1 B (0%)
./.nuxt/dist/client/pages/search/index.js 541 B -1 B (0%)
./.nuxt/dist/client/pages/search/index.modern.js 548 B 0 B
./.nuxt/dist/client/pages/search/model-3d.js 242 B -1 B (0%)
./.nuxt/dist/client/pages/search/model-3d.modern.js 246 B 0 B
./.nuxt/dist/client/pages/search/search-page.types.js 266 B 0 B
./.nuxt/dist/client/pages/search/search-page.types.modern.js 270 B 0 B
./.nuxt/dist/client/pages/search/video.js 240 B 0 B
./.nuxt/dist/client/pages/search/video.modern.js 244 B 0 B
./.nuxt/dist/client/pages/sources.js 1.51 kB -2 B (0%)
./.nuxt/dist/client/pages/sources.modern.js 1.51 kB -1 B (0%)
./.nuxt/dist/client/vendors/app.modern.js 63.1 kB +4 B (0%)

compressed-size-action

@dhruvkb dhruvkb added 🟨 priority: medium Not blocking but should be addressed soon ✨ goal: improvement Improvement to an existing user-facing feature 🕹 aspect: interface Concerns end-users' experience with the software and removed 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work labels Dec 22, 2022
@dhruvkb dhruvkb marked this pull request as ready for review December 22, 2022 10:17
@dhruvkb dhruvkb requested a review from a team as a code owner December 22, 2022 10:17
@dhruvkb dhruvkb requested review from zackkrida and obulat December 22, 2022 10:17
Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

Thank you for adding this, it's really helpful!

We need to support color customization for the focus ring: for the internal header modal, the ring is yellow on a dark-charcoal background. Also, which variant should we use for the filter sidebar which has a lighter charcoal background?

@dhruvkb
Copy link
Member Author

dhruvkb commented Dec 23, 2022

Hmm, I assumed the 2x2 matrix of focus styles shared by @panchovm in the comment was exhaustive! I'll go through the mockups and see which styles are missed, starting with the two cases you shared @obulat, thanks!

@dhruvkb
Copy link
Member Author

dhruvkb commented Dec 23, 2022

The checkbox component is fascinating when it comes to focus styles. The version in the WordPress design library is very different from our implementation.

Screenshot 2022-12-23 at 12 46 30 PM

In these, the variant seems to be slim-transparent (as the border itself gets colored on focus) but with a white offset appearing INSIDE the component (which affects the inner square's size).

@fcoveram
Copy link

Thanks @obulat for mentioning the color variant. That was the only remaining point I missed. The color accents we are using are Pink, Yellow, and White.

The focus styles designed are based on the WordPress example you shared @dhruvkb. Although the inside border is 0.5px thicker, being 1.5px instead of 1px as we have. It was changed during this year as when starting the Openverse Design Library, the inside border was 1px.

They look like this in Figma

WordPress Design Library

Openverse Design Library

@dhruvkb
Copy link
Member Author

dhruvkb commented Dec 26, 2022

@panchovm two follow up questions

  • Will we be updating our design system to also use the thicker borders to match the WordPress design?

  • Our current checkbox is drastically different from the WordPress design, differing not only in border thickness but also focus outline style (see below for screenshots from current prod @ https://search.openverse.engineering). It'll be nice if you could add some mockups of the ideal checkbox for us to refer to, if not the WordPress one.

State UI
On focused Screenshot 2022-12-27 at 1 52 20 AM
Off focused Screenshot 2022-12-27 at 1 53 55 AM
On Screenshot 2022-12-27 at 1 54 05 AM
Off Screenshot 2022-12-27 at 1 54 12 AM

@fcoveram
Copy link

To your questions @dhruvkb

Will we be updating our design system to also use the thicker borders to match the WordPress design?

Yes. Openverse focus styles are fully based on the WordPress one.

The checkbox, and probably a few other UI elements that I am missing, are pulled from the WordPress Design Library directly, which is why they do not exist in Openverse DL.

It'll be nice if you could add some mockups of the ideal checkbox for us to refer to, if not the WordPress one.

To not block any code work, I can update this diagram with the new values: 1.5px thickness for the inside border, and the variant we need for the accent color.

Otherwise, I need to check all components in the Design Library and update the in progress Figma files. Design files marked as done are not updated nor reviewed since the PRs related to those mockups were merged.

What do you think?

@dhruvkb dhruvkb marked this pull request as draft December 27, 2022 10:41
Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

This will be such a great dev-ex change! I've had hard times with the focus rings on several occasions.
I think there are just two things I'd like address here: the dark background visual regression tests, and the checkbox border color.

test/storybook/visual-regression/focus.spec.ts Outdated Show resolved Hide resolved
@WordPress WordPress deleted a comment from github-actions bot Dec 28, 2022
@WordPress WordPress deleted a comment from github-actions bot Dec 28, 2022
@WordPress WordPress deleted a comment from github-actions bot Dec 28, 2022
@WordPress WordPress deleted a comment from github-actions bot Dec 28, 2022
@WordPress WordPress deleted a comment from github-actions bot Dec 28, 2022
@dhruvkb dhruvkb requested a review from obulat December 28, 2022 16:25
@dhruvkb dhruvkb marked this pull request as ready for review December 28, 2022 16:25
@dhruvkb dhruvkb requested review from fcoveram and removed request for zackkrida December 28, 2022 19:35
Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

LGTM!
Thank you for explaining the checkbox state changes.

@obulat
Copy link
Contributor

obulat commented Dec 29, 2022

Note on the Playwright tests: the pages tests can be flaky. The page is rendered correctly, but when you take the snapshot, the page content is shifted to the left side. I think the easiest quick fix for this is to set retries to 2 in the playwright.config.ts.

Copy link

@fcoveram fcoveram left a comment

Choose a reason for hiding this comment

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

Storybook

Stories are accurate 👌 they look awesome.

Dev

All components look excellent except for the Filters button.

In the resting state, I see the grey border during focus. In the active state, the slim-filled style does not mask the content, it shows pink and white borders as outside borders.

Here is a screen recording from Chrome inspector.

CleanShot.2022-12-29.at.10.13.17.mp4

@fcoveram
Copy link

Forgot to mention that, in this comment, I added an updated version of the focus styles diagram that has the color variant and the 1.5px thickness for slim

@github-actions
Copy link

Playwright Failure Test Results

It looks like some of the Playwright tests failed. You can download the Playwright trace
output for both Storybook and Nuxt Playwright tests that have failed at the bottom of this
page, under the "Artifacts" section:

https://github.com/WordPress/openverse-frontend/actions/runs/3799307570

Read more about how to use this artifact here: https://github.com/WordPress/openverse-frontend/blob/main/test/playwright/README.md#debugging

@dhruvkb
Copy link
Member Author

dhruvkb commented Dec 29, 2022

@panchovm in this PR I decided not to update the Button component because that was a huge change affecting lots of components. I'll handle that separately.

@dhruvkb dhruvkb requested a review from fcoveram December 29, 2022 16:15
@dhruvkb dhruvkb merged commit a228738 into main Dec 29, 2022
@dhruvkb dhruvkb deleted the focus_rings branch December 29, 2022 18:39
@dhruvkb
Copy link
Member Author

dhruvkb commented Dec 29, 2022

Merging to unblock working on the Buttons separately.

github-actions bot pushed a commit that referenced this pull request Dec 29, 2022
@fcoveram
Copy link

fcoveram commented Jan 2, 2023

No problem 👍 Excellent work.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🕹 aspect: interface Concerns end-users' experience with the software ✨ goal: improvement Improvement to an existing user-facing feature 🟨 priority: medium Not blocking but should be addressed soon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants