Skip to content

Commit b398f40

Browse files
committed
fix(field): move FocusMixin out of InteractionStateMixin
1 parent 89112f6 commit b398f40

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

packages/field/src/InteractionStateMixin.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { dedupeMixin } from '@lion/core';
22
import { CssClassMixin } from '@lion/core/src/CssClassMixin.js';
33
import { ObserverMixin } from '@lion/core/src/ObserverMixin.js';
44
import { Unparseable } from '@lion/validate';
5-
import { FocusMixin } from './FocusMixin.js';
65

76
/**
87
* `InteractionStateMixin` adds meta information about touched and dirty states, that can
@@ -16,7 +15,7 @@ import { FocusMixin } from './FocusMixin.js';
1615
export const InteractionStateMixin = dedupeMixin(
1716
superclass =>
1817
// eslint-disable-next-line no-unused-vars, no-shadow
19-
class InteractionStateMixin extends CssClassMixin(FocusMixin(ObserverMixin(superclass))) {
18+
class InteractionStateMixin extends CssClassMixin(ObserverMixin(superclass)) {
2019
static get properties() {
2120
return {
2221
...super.properties,

packages/field/src/LionField.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { ValidateMixin } from '@lion/validate';
88
import { FormControlMixin } from './FormControlMixin.js';
99
import { InteractionStateMixin } from './InteractionStateMixin.js'; // applies FocusMixin
1010
import { FormatMixin } from './FormatMixin.js';
11+
import { FocusMixin } from './FocusMixin.js';
1112

1213
/**
1314
* LionField: wraps components input, textarea and select and potentially others
@@ -29,9 +30,11 @@ import { FormatMixin } from './FormatMixin.js';
2930
// eslint-disable-next-line max-len, no-unused-vars
3031
export class LionField extends FormControlMixin(
3132
InteractionStateMixin(
32-
FormatMixin(
33-
ValidateMixin(
34-
CssClassMixin(ElementMixin(DelegateMixin(SlotMixin(ObserverMixin(LionLitElement))))),
33+
FocusMixin(
34+
FormatMixin(
35+
ValidateMixin(
36+
CssClassMixin(ElementMixin(DelegateMixin(SlotMixin(ObserverMixin(LionLitElement))))),
37+
),
3538
),
3639
),
3740
),

0 commit comments

Comments
 (0)