Skip to content

Commit 8dbfb1f

Browse files
authored
refactor!: move DelegateStateMixin to component-base (#5180)
1 parent 33f5228 commit 8dbfb1f

26 files changed

Lines changed: 57 additions & 22 deletions

‎packages/accordion/src/vaadin-accordion-panel.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* Copyright (c) 2019 - 2022 Vaadin Ltd.
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
6+
import { DelegateStateMixin } from '@vaadin/component-base/src/delegate-state-mixin.js';
67
import { DetailsMixin } from '@vaadin/details/src/vaadin-details-mixin.js';
78
import { DelegateFocusMixin } from '@vaadin/field-base/src/delegate-focus-mixin.js';
8-
import { DelegateStateMixin } from '@vaadin/field-base/src/delegate-state-mixin.js';
99
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1010

1111
/**

‎packages/accordion/src/vaadin-accordion-panel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import './vaadin-accordion-heading.js';
77
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
88
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
99
import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
10+
import { DelegateStateMixin } from '@vaadin/component-base/src/delegate-state-mixin.js';
1011
import { SlotObserveController } from '@vaadin/component-base/src/slot-observe-controller.js';
1112
import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
1213
import { DetailsMixin } from '@vaadin/details/src/vaadin-details-mixin.js';
1314
import { DelegateFocusMixin } from '@vaadin/field-base/src/delegate-focus-mixin.js';
14-
import { DelegateStateMixin } from '@vaadin/field-base/src/delegate-state-mixin.js';
1515
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1616

1717
class SummaryController extends SlotObserveController {

‎packages/combo-box/src/vaadin-combo-box.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
66
import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
7+
import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
78
import type { DisabledMixinClass } from '@vaadin/component-base/src/disabled-mixin.js';
89
import type { ElementMixinClass } from '@vaadin/component-base/src/element-mixin.js';
910
import type { FocusMixinClass } from '@vaadin/component-base/src/focus-mixin.js';
1011
import type { KeyboardMixinClass } from '@vaadin/component-base/src/keyboard-mixin.js';
1112
import type { DelegateFocusMixinClass } from '@vaadin/field-base/src/delegate-focus-mixin.js';
12-
import type { DelegateStateMixinClass } from '@vaadin/field-base/src/delegate-state-mixin.js';
1313
import type { FieldMixinClass } from '@vaadin/field-base/src/field-mixin.js';
1414
import type { InputConstraintsMixinClass } from '@vaadin/field-base/src/input-constraints-mixin.js';
1515
import type { InputControlMixinClass } from '@vaadin/field-base/src/input-control-mixin.js';

‎packages/combo-box/test/typings/combo-box.types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
2+
import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
23
import type { DisabledMixinClass } from '@vaadin/component-base/src/disabled-mixin.js';
34
import type { ElementMixinClass } from '@vaadin/component-base/src/element-mixin.js';
45
import type { FocusMixinClass } from '@vaadin/component-base/src/focus-mixin.js';
56
import type { KeyboardMixinClass } from '@vaadin/component-base/src/keyboard-mixin.js';
67
import type { DelegateFocusMixinClass } from '@vaadin/field-base/src/delegate-focus-mixin.js';
7-
import type { DelegateStateMixinClass } from '@vaadin/field-base/src/delegate-state-mixin.js';
88
import type { FieldMixinClass } from '@vaadin/field-base/src/field-mixin.js';
99
import type { InputConstraintsMixinClass } from '@vaadin/field-base/src/input-constraints-mixin.js';
1010
import type { InputControlMixinClass } from '@vaadin/field-base/src/input-control-mixin.js';
File renamed without changes.
File renamed without changes.

packages/field-base/test/delegate-state-mixin.test.js renamed to packages/component-base/test/delegate-state-mixin.test.js

File renamed without changes.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { PolymerElement } from '@polymer/polymer/polymer-element.js';
2+
import { html, LitElement } from 'lit';
3+
import { unsafeHTML } from 'lit/directives/unsafe-html.js';
4+
import { ControllerMixin } from '../src/controller-mixin.js';
5+
import { PolylitMixin } from '../src/polylit-mixin.js';
6+
7+
export const define = {
8+
polymer: (prefix, htmlString, classFactory) => {
9+
const tag = `${prefix}-polymer-element`;
10+
11+
customElements.define(
12+
tag,
13+
class extends classFactory(ControllerMixin(PolymerElement)) {
14+
static get template() {
15+
const tpl = document.createElement('template');
16+
tpl.innerHTML = htmlString;
17+
return tpl;
18+
}
19+
},
20+
);
21+
22+
return tag;
23+
},
24+
lit: (prefix, htmlString, classFactory) => {
25+
const tag = `${prefix}-lit-element`;
26+
27+
customElements.define(
28+
tag,
29+
class extends classFactory(PolylitMixin(LitElement)) {
30+
render() {
31+
return html`${unsafeHTML(htmlString)}`;
32+
}
33+
},
34+
);
35+
36+
return tag;
37+
},
38+
};

‎packages/details/src/vaadin-details.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
66
import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
7+
import { DelegateStateMixin } from '@vaadin/component-base/src/delegate-state-mixin.js';
78
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
89
import { DelegateFocusMixin } from '@vaadin/field-base/src/delegate-focus-mixin.js';
9-
import { DelegateStateMixin } from '@vaadin/field-base/src/delegate-state-mixin.js';
1010
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1111
import { DetailsMixin } from './vaadin-details-mixin.js';
1212

‎packages/details/src/vaadin-details.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import './vaadin-details-summary.js';
77
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
88
import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
9+
import { DelegateStateMixin } from '@vaadin/component-base/src/delegate-state-mixin.js';
910
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1011
import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
1112
import { SlotObserveController } from '@vaadin/component-base/src/slot-observe-controller.js';
1213
import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
1314
import { DelegateFocusMixin } from '@vaadin/field-base/src/delegate-focus-mixin.js';
14-
import { DelegateStateMixin } from '@vaadin/field-base/src/delegate-state-mixin.js';
1515
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1616
import { DetailsMixin } from './vaadin-details-mixin.js';
1717

0 commit comments

Comments
 (0)