ayo/lion
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(field): move FocusMixin out of InteractionStateMixin

Browse source
This commit is contained in:
Thomas Allmer 2019-07-13 01:37:29 +02:00
parent 89112f6c78
commit b398f407de
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/field/src/InteractionStateMixin.js
View file

@ -2,7 +2,6 @@ import { dedupeMixin } from '@lion/core';
import { CssClassMixin } from '@lion/core/src/CssClassMixin.js';
import { ObserverMixin } from '@lion/core/src/ObserverMixin.js';
import { Unparseable } from '@lion/validate';
import { FocusMixin } from './FocusMixin.js';
/**
* `InteractionStateMixin` adds meta information about touched and dirty states, that can
@ -16,7 +15,7 @@ import { FocusMixin } from './FocusMixin.js';
export const InteractionStateMixin = dedupeMixin(
superclass =>
// eslint-disable-next-line no-unused-vars, no-shadow
class InteractionStateMixin extends CssClassMixin(FocusMixin(ObserverMixin(superclass))) {
class InteractionStateMixin extends CssClassMixin(ObserverMixin(superclass)) {
static get properties() {
return {
...super.properties,

9
packages/field/src/LionField.js
View file

@ -8,6 +8,7 @@ import { ValidateMixin } from '@lion/validate';
import { FormControlMixin } from './FormControlMixin.js';
import { InteractionStateMixin } from './InteractionStateMixin.js'; // applies FocusMixin
import { FormatMixin } from './FormatMixin.js';
import { FocusMixin } from './FocusMixin.js';
/**
* LionField: wraps components input, textarea and select and potentially others
@ -29,9 +30,11 @@ import { FormatMixin } from './FormatMixin.js';
// eslint-disable-next-line max-len, no-unused-vars
export class LionField extends FormControlMixin(
InteractionStateMixin(
FormatMixin(
ValidateMixin(
CssClassMixin(ElementMixin(DelegateMixin(SlotMixin(ObserverMixin(LionLitElement))))),
FocusMixin(
FormatMixin(
ValidateMixin(
CssClassMixin(ElementMixin(DelegateMixin(SlotMixin(ObserverMixin(LionLitElement))))),
),
),
),
),