Skip to content

Commit

Permalink
refactor: use ElementMixin instead of DirMixin (#3035)
Browse files Browse the repository at this point in the history
  • Loading branch information
web-padawan authored Nov 15, 2021
1 parent 1ac4815 commit 494155a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions packages/radio-group/src/vaadin-radio-group.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Copyright (c) 2021 Vaadin Ltd.
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
*/
import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js';
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js';
import { KeyboardMixin } from '@vaadin/component-base/src/keyboard-mixin.js';
import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
Expand Down Expand Up @@ -70,7 +70,7 @@ export interface RadioGroupEventMap extends HTMLElementEventMap, RadioGroupCusto
* @fires {CustomEvent} value-changed - Fired when the `value` property changes.
*/
declare class RadioGroup extends FieldMixin(
FocusMixin(DisabledMixin(KeyboardMixin(DirMixin(ThemableMixin(HTMLElement)))))
FocusMixin(DisabledMixin(KeyboardMixin(ElementMixin(ThemableMixin(HTMLElement)))))
) {
/**
* The value of the radio group.
Expand Down
10 changes: 6 additions & 4 deletions packages/radio-group/src/vaadin-radio-group.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/
import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js';
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js';
import { KeyboardMixin } from '@vaadin/component-base/src/keyboard-mixin.js';
import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
Expand Down Expand Up @@ -56,13 +56,15 @@ import { RadioButton } from './vaadin-radio-button.js';
*
* @extends HTMLElement
* @mixes ThemableMixin
* @mixes DirMixin
* @mixes KeyboardMixin
* @mixes DisabledMixin
* @mixes ElementMixin
* @mixes FocusMixin
* @mixes FieldMixin
* @mixes KeyboardMixin
*/
class RadioGroup extends FieldMixin(FocusMixin(DisabledMixin(KeyboardMixin(DirMixin(ThemableMixin(PolymerElement)))))) {
class RadioGroup extends FieldMixin(
FocusMixin(DisabledMixin(KeyboardMixin(ElementMixin(ThemableMixin(PolymerElement)))))
) {
static get is() {
return 'vaadin-radio-group';
}
Expand Down

0 comments on commit 494155a

Please sign in to comment.