Skip to content

Commit

Permalink
merge main to my branch (#3473)
Browse files Browse the repository at this point in the history
* fix(meter): added role meter progressbar in meter component (#3459)

Co-authored-by: Rajdeep Chandra <rajdeepc@adobe.com>

* docs: updated swatch mixed documentations (#3455)

Co-authored-by: Rajdeep Chandra <rajdeepc@adobe.com>

* fix(textfield): update focus state when [multiline][quiet] (#3452)

* fix: menu item missing aria labels (#3417)

* testing

* fix(menu): menu-item with submenu lacks aria-haspopup and aria-expanded

* fix(menu): added aria-expanded and aria-haspopup to menu-item

* fix(menu): fixed the aria-controls attribute of menu-item

* fix(menu): reviewed changes

* fix(menu): reviewed changes-2

* fix(menu): removed the comment

* fix(menu): removed white space

* fix(menu): white space removed

* chore: bump @web/test-runner from 0.16.1 to 0.17.0

Bumps [@web/test-runner](https://github.com/modernweb-dev/web/tree/HEAD/packages/test-runner) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/modernweb-dev/web/releases)
- [Changelog](https://github.com/modernweb-dev/web/blob/master/packages/test-runner/CHANGELOG.md)
- [Commits](https://github.com/modernweb-dev/web/commits/@web/test-runner@0.17.0/packages/test-runner)

---
updated-dependencies:
- dependency-name: "@web/test-runner"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: bump webpack-bundle-analyzer from 4.8.0 to 4.9.0

Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.8.0 to 4.9.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/webpack-bundle-analyzer@v4.8.0...v4.9.0)

---
updated-dependencies:
- dependency-name: webpack-bundle-analyzer
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: bump netlify-cli from 12.12.0 to 15.9.0

Bumps [netlify-cli](https://github.com/netlify/cli) from 12.12.0 to 15.9.0.
- [Release notes](https://github.com/netlify/cli/releases)
- [Changelog](https://github.com/netlify/cli/blob/main/CHANGELOG.md)
- [Commits](netlify/cli@v12.12.0...v15.9.0)

---
updated-dependencies:
- dependency-name: netlify-cli
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: bump husky from 8.0.2 to 8.0.3

Bumps [husky](https://github.com/typicode/husky) from 8.0.2 to 8.0.3.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](typicode/husky@v8.0.2...v8.0.3)

---
updated-dependencies:
- dependency-name: husky
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: bump word-wrap from 1.2.3 to 1.2.4

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: bump @types/react from 18.0.25 to 18.2.15

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.0.25 to 18.2.15.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Rajdeep Chandra <rajdeep.chandra@bsil.com>
Co-authored-by: Rajdeep Chandra <rajdeepc@adobe.com>
Co-authored-by: Piyush Vashisht <pvashish@adobe.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
5 people committed Jul 19, 2023
1 parent f8ad3da commit 18c0234
Show file tree
Hide file tree
Showing 9 changed files with 3,572 additions and 4,777 deletions.
8 changes: 7 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"packages": ["packages/*", "projects/*", "tools/*"],
"packages": [
"linters/*",
"packages/*",
"projects/*",
"tools/*",
"react/*"
],
"version": "0.34.0",
"granularPathspec": false,
"npmClient": "yarn",
Expand Down
3,252 changes: 0 additions & 3,252 deletions linters/stylelint-header/yarn.lock

This file was deleted.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"@web/dev-server-storybook": "^0.7.1",
"@web/rollup-plugin-copy": "^0.4.0",
"@web/rollup-plugin-html": "^2.0.0",
"@web/test-runner": "^0.16.1",
"@web/test-runner": "^0.17.0",
"@web/test-runner-commands": "^0.7.0",
"@web/test-runner-junit-reporter": "^0.6.0",
"@web/test-runner-playwright": "^0.10.0",
Expand Down Expand Up @@ -158,7 +158,7 @@
"lit": "^2.5.0",
"lit-analyzer": "^1.2.1",
"mocha-junit-reporter": "^2.0.2",
"netlify-cli": "^12.9.2",
"netlify-cli": "^15.9.0",
"next": "^13.4.1",
"node-fetch": "^3.1.0",
"npm-run-all": "^4.1.5",
Expand Down Expand Up @@ -386,6 +386,7 @@
}
},
"workspaces": [
"linters/*",
"packages/*",
"projects/*",
"tools/*",
Expand Down
11 changes: 10 additions & 1 deletion packages/menu/src/MenuItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,10 @@ export class MenuItem extends LikeAnchor(Focusable) {
const assignedElements = event.target.assignedElements({
flatten: true,
});
this.hasSubmenu = this.open || !!assignedElements.length;
this.hasSubmenu = this.open || !!assignedElements;
if (this.hasSubmenu) {
this.setAttribute('aria-haspopup', 'true');
}
}

private handleRemoveActive(event: Event): void {
Expand Down Expand Up @@ -415,6 +418,7 @@ export class MenuItem extends LikeAnchor(Focusable) {
}
this.open = true;
this.active = true;
this.setAttribute('aria-expanded', 'true');
const submenu = (
this.shadowRoot.querySelector(
'slot[name="submenu"]'
Expand All @@ -425,6 +429,10 @@ export class MenuItem extends LikeAnchor(Focusable) {
this.handleSubmenuPointerenter
);
submenu.addEventListener('change', this.handleSubmenuChange);
if (!submenu.id) {
submenu.setAttribute('id', `${this.id}-submenu`);
}
this.setAttribute('aria-controls', submenu.id);
const popover = document.createElement('sp-popover');
const returnSubmenu = reparentChildren([submenu], popover, {
position: 'beforeend',
Expand All @@ -446,6 +454,7 @@ export class MenuItem extends LikeAnchor(Focusable) {
root: this.menuData.focusRoot,
});
const closeSubmenu = async (): Promise<void> => {
this.setAttribute('aria-expanded', 'false');
delete this.closeOverlay;
(await closeOverlay)();
};
Expand Down
2 changes: 1 addition & 1 deletion packages/meter/src/Meter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class Meter extends SizedMixin(ObserveSlotText(SpectrumElement, '')) {

protected override firstUpdated(changes: PropertyValues): void {
super.firstUpdated(changes);
this.setAttribute('role', 'progressbar');
this.setAttribute('role', 'meter progressbar');
}

protected override updated(changes: PropertyValues): void {
Expand Down
2 changes: 1 addition & 1 deletion packages/swatch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ The `disabled` attribute/property determines prevents interaction on the `<sp-sw
The `mixed-value` attribute and `mixedValue` property outline when an `<sp-swatch>` element represents more than one color.

```html
<sp-swatch-group>
<sp-swatch-group selects="multiple">
<sp-swatch mixed-value></sp-swatch>
<sp-swatch mixed-value rounding="full"></sp-swatch>
<sp-swatch mixed-value shape="rectangle"></sp-swatch>
Expand Down
4 changes: 2 additions & 2 deletions packages/textfield/src/textfield.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ textarea {
forced-color-adjust: var(--swc-test-forced-color-adjust);
}

:host([grows]) .input {
:host([grows]:not([quiet])) .input {
position: absolute;
top: 0;
left: 0;
Expand All @@ -53,7 +53,7 @@ textarea {
overflow: hidden;
}

:host([grows]) #textfield:after {
:host([grows]:not([quiet])) #textfield:after {
grid-area: unset;
min-block-size: calc(
var(
Expand Down
2 changes: 1 addition & 1 deletion projects/css-custom-vars-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@typescript-eslint/parser": "^5.35.0",
"@web/dev-server": "^0.2.1",
"@web/dev-server-storybook": "^0.7.1",
"@web/test-runner": "^0.16.1",
"@web/test-runner": "^0.17.0",
"concurrently": "^5.3.0",
"tslib": "^2.3.1",
"typescript": "^4.7.2"
Expand Down

0 comments on commit 18c0234

Please sign in to comment.