Skip to content

Commit 6ec8c29

Browse files
sissbrueckersissbruecker
authored
refactor!: remove ControllerMixin and its usages (#9243)
1 parent d8d9965 commit 6ec8c29

File tree

54 files changed

+28
-321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+28
-321
lines changed

‎packages/checkbox-group/src/vaadin-checkbox-group-mixin.d.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import type { Constructor } from '@open-wc/dedupe-mixin';
77
import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
88
import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
9-
import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
109
import type { FieldMixinClass } from '@vaadin/field-base/src/field-mixin.js';
1110
import type { LabelMixinClass } from '@vaadin/field-base/src/label-mixin.js';
1211
import type { ValidateMixinClass } from '@vaadin/field-base/src/validate-mixin.js';
@@ -17,7 +16,6 @@ import type { ValidateMixinClass } from '@vaadin/field-base/src/validate-mixin.j
1716
export declare function CheckboxGroupMixin<T extends Constructor<HTMLElement>>(
1817
base: T,
1918
): Constructor<CheckboxGroupMixinClass> &
20-
Constructor<ControllerMixinClass> &
2119
Constructor<DisabledMixinClass> &
2220
Constructor<FieldMixinClass> &
2321
Constructor<FocusMixinClass> &

‎packages/checkbox-group/test/typings/checkbox-group.types.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import '../../vaadin-checkbox-group.js';
22
import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
33
import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
4-
import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
54
import type { ElementMixinClass } from '@vaadin/component-base/src/element-mixin.js';
65
import type { FieldMixinClass } from '@vaadin/field-base/src/field-mixin.js';
76
import type { LabelMixinClass } from '@vaadin/field-base/src/label-mixin.js';
@@ -34,7 +33,6 @@ group.addEventListener('validated', (event) => {
3433

3534
// Mixins
3635
assertType<CheckboxGroupMixinClass>(group);
37-
assertType<ControllerMixinClass>(group);
3836
assertType<DisabledMixinClass>(group);
3937
assertType<ElementMixinClass>(group);
4038
assertType<FieldMixinClass>(group);

‎packages/checkbox/src/vaadin-checkbox-mixin.d.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import type { DelegateFocusMixinClass } from '@vaadin/a11y-base/src/delegate-foc
99
import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
1010
import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
1111
import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
12-
import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
1312
import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
1413
import type { SlotStylesMixinClass } from '@vaadin/component-base/src/slot-styles-mixin.js';
1514
import type { CheckedMixinClass } from '@vaadin/field-base/src/checked-mixin.js';
@@ -26,7 +25,6 @@ export declare function CheckboxMixin<T extends Constructor<HTMLElement>>(
2625
): Constructor<ActiveMixinClass> &
2726
Constructor<CheckboxMixinClass> &
2827
Constructor<CheckedMixinClass> &
29-
Constructor<ControllerMixinClass> &
3028
Constructor<DelegateFocusMixinClass> &
3129
Constructor<DelegateStateMixinClass> &
3230
Constructor<DisabledMixinClass> &

‎packages/checkbox/test/typings/checkbox.types.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import type { DelegateFocusMixinClass } from '@vaadin/a11y-base/src/delegate-foc
44
import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
55
import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
66
import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
7-
import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
87
import type { ElementMixinClass } from '@vaadin/component-base/src/element-mixin.js';
98
import type { CheckedMixinClass } from '@vaadin/field-base/src/checked-mixin.js';
109
import type { FieldMixinClass } from '@vaadin/field-base/src/field-mixin.js';
@@ -36,7 +35,6 @@ assertType<string>(checkbox.name);
3635
assertType<string>(checkbox.value);
3736

3837
// Mixins
39-
assertType<ControllerMixinClass>(checkbox);
4038
assertType<ActiveMixinClass>(checkbox);
4139
assertType<DisabledMixinClass>(checkbox);
4240
assertType<ElementMixinClass>(checkbox);

‎packages/combo-box/src/vaadin-combo-box-mixin.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { FocusMixin } from '@vaadin/a11y-base/src/focus-mixin.js';
88
import { isElementFocused, isKeyboardActive } from '@vaadin/a11y-base/src/focus-utils.js';
99
import { KeyboardMixin } from '@vaadin/a11y-base/src/keyboard-mixin.js';
1010
import { isTouch } from '@vaadin/component-base/src/browser-utils.js';
11-
import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
1211
import { OverlayClassMixin } from '@vaadin/component-base/src/overlay-class-mixin.js';
1312
import { get } from '@vaadin/component-base/src/path-utils.js';
1413
import { InputMixin } from '@vaadin/field-base/src/input-mixin.js';
@@ -46,7 +45,6 @@ function findItemIndex(items, callback) {
4645

4746
/**
4847
* @polymerMixin
49-
* @mixes ControllerMixin
5048
* @mixes ValidateMixin
5149
* @mixes DisabledMixin
5250
* @mixes InputMixin
@@ -57,7 +55,7 @@ function findItemIndex(items, callback) {
5755
*/
5856
export const ComboBoxMixin = (subclass) =>
5957
class ComboBoxMixinClass extends OverlayClassMixin(
60-
ControllerMixin(ValidateMixin(FocusMixin(KeyboardMixin(InputMixin(DisabledMixin(subclass)))))),
58+
ValidateMixin(FocusMixin(KeyboardMixin(InputMixin(DisabledMixin(subclass))))),
6159
) {
6260
static get properties() {
6361
return {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import type { DelegateFocusMixinClass } from '@vaadin/a11y-base/src/delegate-foc
77
import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
88
import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
99
import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
10-
import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
1110
import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
1211
import type { ElementMixinClass } from '@vaadin/component-base/src/element-mixin.js';
1312
import type { OverlayClassMixinClass } from '@vaadin/component-base/src/overlay-class-mixin.js';
@@ -24,6 +23,7 @@ import type { ThemePropertyMixinClass } from '@vaadin/vaadin-themable-mixin/vaad
2423
import type { ComboBoxDataProviderMixinClass } from './vaadin-combo-box-data-provider-mixin.js';
2524
import type { ComboBoxMixinClass } from './vaadin-combo-box-mixin.js';
2625
import type { ComboBoxDefaultItem } from './vaadin-combo-box-mixin.js';
26+
2727
export {
2828
ComboBoxDataProvider,
2929
ComboBoxDataProviderCallback,
@@ -246,8 +246,7 @@ interface ComboBox<TItem = ComboBoxDefaultItem>
246246
DelegateFocusMixinClass,
247247
ThemableMixinClass,
248248
ThemePropertyMixinClass,
249-
ElementMixinClass,
250-
ControllerMixinClass {}
249+
ElementMixinClass {}
251250

252251
declare global {
253252
interface HTMLElementTagNameMap {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import type { DelegateFocusMixinClass } from '@vaadin/a11y-base/src/delegate-foc
22
import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
33
import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
44
import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
5-
import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
65
import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
76
import type { DirMixinClass } from '@vaadin/component-base/src/dir-mixin.js';
87
import type { ElementMixinClass } from '@vaadin/component-base/src/element-mixin.js';
@@ -124,7 +123,6 @@ assertType<string>(narrowedComboBox.allowedCharPattern);
124123
// ComboBox mixins
125124
assertType<ComboBoxDataProviderMixinClass<TestComboBoxItem>>(narrowedComboBox);
126125
assertType<ComboBoxMixinClass<TestComboBoxItem>>(narrowedComboBox);
127-
assertType<ControllerMixinClass>(narrowedComboBox);
128126
assertType<ElementMixinClass>(narrowedComboBox);
129127
assertType<DelegateFocusMixinClass>(narrowedComboBox);
130128
assertType<DelegateStateMixinClass>(narrowedComboBox);

‎packages/component-base/index.d.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export { ControllerMixin } from './src/controller-mixin.js';
21
export { DelegateStateMixin } from './src/delegate-state-mixin.js';
32
export { DirMixin } from './src/dir-mixin.js';
43
export { ElementMixin } from './src/element-mixin.js';

‎packages/component-base/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export { ControllerMixin } from './src/controller-mixin.js';
21
export { DelegateStateMixin } from './src/delegate-state-mixin.js';
32
export { DirMixin } from './src/dir-mixin.js';
43
export { ElementMixin } from './src/element-mixin.js';

‎packages/component-base/src/controller-mixin.d.ts‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)