Skip to content

Commit

Permalink
Merge branch 'main' into card-proto
Browse files Browse the repository at this point in the history
  • Loading branch information
jouni committed Dec 5, 2024
2 parents 4d3f26a + 4f7958c commit 899fa65
Show file tree
Hide file tree
Showing 237 changed files with 4,720 additions and 3,948 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "24.6.0-alpha9"
"version": "24.6.0-rc1"
}
6 changes: 3 additions & 3 deletions packages/a11y-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/a11y-base",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -32,11 +32,11 @@
"dependencies": {
"@open-wc/dedupe-mixin": "^1.3.0",
"@polymer/polymer": "^3.0.0",
"@vaadin/component-base": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-rc1",
"lit": "^3.0.0"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
}
Expand Down
16 changes: 8 additions & 8 deletions packages/accordion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/accordion",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -37,16 +37,16 @@
"dependencies": {
"@open-wc/dedupe-mixin": "^1.3.0",
"@polymer/polymer": "^3.0.0",
"@vaadin/a11y-base": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-alpha9",
"@vaadin/details": "24.6.0-alpha9",
"@vaadin/vaadin-lumo-styles": "24.6.0-alpha9",
"@vaadin/vaadin-material-styles": "24.6.0-alpha9",
"@vaadin/vaadin-themable-mixin": "24.6.0-alpha9",
"@vaadin/a11y-base": "24.6.0-rc1",
"@vaadin/component-base": "24.6.0-rc1",
"@vaadin/details": "24.6.0-rc1",
"@vaadin/vaadin-lumo-styles": "24.6.0-rc1",
"@vaadin/vaadin-material-styles": "24.6.0-rc1",
"@vaadin/vaadin-themable-mixin": "24.6.0-rc1",
"lit": "^3.0.0"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
},
Expand Down
1 change: 1 addition & 0 deletions packages/accordion/src/vaadin-accordion-heading.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class AccordionHeading extends ActiveMixin(DirMixin(ThemableMixin(PolymerElement
opened: {
type: Boolean,
reflectToAttribute: true,
value: false,
},
};
}
Expand Down
25 changes: 20 additions & 5 deletions packages/accordion/src/vaadin-accordion-panel-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ export const AccordionPanelMixin = (superClass) =>
return ['__updateAriaAttributes(focusElement, _contentElements)'];
}

static get delegateAttrs() {
return ['theme'];
}

static get delegateProps() {
return ['disabled', 'opened'];
return ['disabled', 'opened', '_theme'];
}

constructor() {
Expand Down Expand Up @@ -69,6 +65,25 @@ export const AccordionPanelMixin = (superClass) =>
this.addController(this._tooltipController);
}

/**
* Override method from `DelegateStateMixin` to set delegate `theme`
* using attribute instead of property (needed for the Lit version).
* @protected
* @override
*/
_delegateProperty(name, value) {
if (!this.stateTarget) {
return;
}

if (name === '_theme') {
this._delegateAttribute('theme', value);
return;
}

super._delegateProperty(name, value);
}

/**
* Override method inherited from `DisabledMixin`
* to not set `aria-disabled` on the host element.
Expand Down
1 change: 1 addition & 0 deletions packages/accordion/src/vaadin-lit-accordion-heading.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class AccordionHeading extends ActiveMixin(DirMixin(ThemableMixin(PolylitMixin(L
opened: {
type: Boolean,
reflectToAttribute: true,
value: false,
},
};
}
Expand Down
10 changes: 10 additions & 0 deletions packages/accordion/test/accordion-panel.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,16 @@ describe('vaadin-accordion-panel', () => {
await nextUpdate(panel);
expect(heading.hasAttribute('disabled')).to.be.false;
});

it(`should propagate theme attribute to ${type} heading`, async () => {
panel.setAttribute('theme', 'filled');
await nextUpdate(panel);
expect(heading.getAttribute('theme')).to.equal('filled');

panel.removeAttribute('theme');
await nextUpdate(panel);
expect(heading.hasAttribute('theme')).to.be.false;
});
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ snapshots["vaadin-accordion-heading host disabled"] =

snapshots["vaadin-accordion-heading shadow default"] =
`<button
aria-expanded="false"
id="button"
part="content"
>
Expand All @@ -47,6 +48,7 @@ snapshots["vaadin-accordion-heading shadow default"] =

snapshots["vaadin-accordion-heading shadow disabled"] =
`<button
aria-expanded="false"
disabled=""
id="button"
part="content"
Expand Down
16 changes: 8 additions & 8 deletions packages/app-layout/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/app-layout",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -36,16 +36,16 @@
],
"dependencies": {
"@polymer/polymer": "^3.0.0",
"@vaadin/a11y-base": "24.6.0-alpha9",
"@vaadin/button": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-alpha9",
"@vaadin/vaadin-lumo-styles": "24.6.0-alpha9",
"@vaadin/vaadin-material-styles": "24.6.0-alpha9",
"@vaadin/vaadin-themable-mixin": "24.6.0-alpha9",
"@vaadin/a11y-base": "24.6.0-rc1",
"@vaadin/button": "24.6.0-rc1",
"@vaadin/component-base": "24.6.0-rc1",
"@vaadin/vaadin-lumo-styles": "24.6.0-rc1",
"@vaadin/vaadin-material-styles": "24.6.0-rc1",
"@vaadin/vaadin-themable-mixin": "24.6.0-rc1",
"lit": "^3.0.0"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
},
Expand Down
22 changes: 11 additions & 11 deletions packages/avatar-group/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/avatar-group",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -38,19 +38,19 @@
"dependencies": {
"@open-wc/dedupe-mixin": "^1.3.0",
"@polymer/polymer": "^3.0.0",
"@vaadin/a11y-base": "24.6.0-alpha9",
"@vaadin/avatar": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-alpha9",
"@vaadin/item": "24.6.0-alpha9",
"@vaadin/list-box": "24.6.0-alpha9",
"@vaadin/overlay": "24.6.0-alpha9",
"@vaadin/vaadin-lumo-styles": "24.6.0-alpha9",
"@vaadin/vaadin-material-styles": "24.6.0-alpha9",
"@vaadin/vaadin-themable-mixin": "24.6.0-alpha9",
"@vaadin/a11y-base": "24.6.0-rc1",
"@vaadin/avatar": "24.6.0-rc1",
"@vaadin/component-base": "24.6.0-rc1",
"@vaadin/item": "24.6.0-rc1",
"@vaadin/list-box": "24.6.0-rc1",
"@vaadin/overlay": "24.6.0-rc1",
"@vaadin/vaadin-lumo-styles": "24.6.0-rc1",
"@vaadin/vaadin-material-styles": "24.6.0-rc1",
"@vaadin/vaadin-themable-mixin": "24.6.0-rc1",
"lit": "^3.0.0"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
},
Expand Down
16 changes: 0 additions & 16 deletions packages/avatar-group/src/vaadin-lit-avatar-group-overlay.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,6 @@ class AvatarGroupOverlay extends PositionMixin(OverlayMixin(DirMixin(ThemableMix
return overlayStyles;
}

static get properties() {
return {
/**
* When true, the overlay is visible and attached to body.
* This property config is overridden to set `sync: true`.
*/
opened: {
type: Boolean,
notify: true,
observer: '_openedChanged',
reflectToAttribute: true,
sync: true,
},
};
}

/** @protected */
render() {
return html`
Expand Down
16 changes: 8 additions & 8 deletions packages/avatar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/avatar",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -38,16 +38,16 @@
"dependencies": {
"@open-wc/dedupe-mixin": "^1.3.0",
"@polymer/polymer": "^3.0.0",
"@vaadin/a11y-base": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-alpha9",
"@vaadin/tooltip": "24.6.0-alpha9",
"@vaadin/vaadin-lumo-styles": "24.6.0-alpha9",
"@vaadin/vaadin-material-styles": "24.6.0-alpha9",
"@vaadin/vaadin-themable-mixin": "24.6.0-alpha9",
"@vaadin/a11y-base": "24.6.0-rc1",
"@vaadin/component-base": "24.6.0-rc1",
"@vaadin/tooltip": "24.6.0-rc1",
"@vaadin/vaadin-lumo-styles": "24.6.0-rc1",
"@vaadin/vaadin-material-styles": "24.6.0-rc1",
"@vaadin/vaadin-themable-mixin": "24.6.0-rc1",
"lit": "^3.0.0"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/board/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/board",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -39,11 +39,11 @@
],
"dependencies": {
"@polymer/polymer": "^3.0.0",
"@vaadin/a11y-base": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-alpha9"
"@vaadin/a11y-base": "24.6.0-rc1",
"@vaadin/component-base": "24.6.0-rc1"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
},
Expand Down
16 changes: 8 additions & 8 deletions packages/button/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/button",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -36,16 +36,16 @@
"dependencies": {
"@open-wc/dedupe-mixin": "^1.3.0",
"@polymer/polymer": "^3.0.0",
"@vaadin/a11y-base": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-alpha9",
"@vaadin/vaadin-lumo-styles": "24.6.0-alpha9",
"@vaadin/vaadin-material-styles": "24.6.0-alpha9",
"@vaadin/vaadin-themable-mixin": "24.6.0-alpha9",
"@vaadin/a11y-base": "24.6.0-rc1",
"@vaadin/component-base": "24.6.0-rc1",
"@vaadin/vaadin-lumo-styles": "24.6.0-rc1",
"@vaadin/vaadin-material-styles": "24.6.0-rc1",
"@vaadin/vaadin-themable-mixin": "24.6.0-rc1",
"lit": "^3.0.0"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/icon": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/icon": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/card/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/card",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -34,14 +34,14 @@
"web-component"
],
"dependencies": {
"@vaadin/component-base": "24.6.0-alpha9",
"@vaadin/vaadin-lumo-styles": "24.6.0-alpha9",
"@vaadin/vaadin-material-styles": "24.6.0-alpha9",
"@vaadin/vaadin-themable-mixin": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-rc1",
"@vaadin/vaadin-lumo-styles": "24.6.0-rc1",
"@vaadin/vaadin-material-styles": "24.6.0-rc1",
"@vaadin/vaadin-themable-mixin": "24.6.0-rc1",
"lit": "^3.0.0"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/charts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/charts",
"version": "24.6.0-alpha9",
"version": "24.6.0-rc1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -36,14 +36,14 @@
],
"dependencies": {
"@polymer/polymer": "^3.0.0",
"@vaadin/component-base": "24.6.0-alpha9",
"@vaadin/vaadin-lumo-styles": "24.6.0-alpha9",
"@vaadin/vaadin-material-styles": "24.6.0-alpha9",
"@vaadin/vaadin-themable-mixin": "24.6.0-alpha9",
"@vaadin/component-base": "24.6.0-rc1",
"@vaadin/vaadin-lumo-styles": "24.6.0-rc1",
"@vaadin/vaadin-material-styles": "24.6.0-rc1",
"@vaadin/vaadin-themable-mixin": "24.6.0-rc1",
"highcharts": "9.2.2"
},
"devDependencies": {
"@vaadin/chai-plugins": "24.6.0-alpha9",
"@vaadin/chai-plugins": "24.6.0-rc1",
"@vaadin/testing-helpers": "^1.0.0",
"sinon": "^18.0.0"
},
Expand Down
4 changes: 4 additions & 0 deletions packages/charts/src/vaadin-chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,10 @@ class Chart extends ResizeMixin(ElementMixin(ThemableMixin(PolymerElement))) {
disconnectedCallback() {
super.disconnectedCallback();

if (this.configuration) {
this._jsonConfigurationBuffer = this.configuration.userOptions;
}

queueMicrotask(() => {
if (this.isConnected) {
return;
Expand Down
Loading

0 comments on commit 899fa65

Please sign in to comment.