fix(field): move FocusMixin out of InteractionStateMixin
This commit is contained in:
parent
89112f6c78
commit
b398f407de
2 changed files with 7 additions and 5 deletions
|
|
@ -2,7 +2,6 @@ import { dedupeMixin } from '@lion/core';
|
||||||
import { CssClassMixin } from '@lion/core/src/CssClassMixin.js';
|
import { CssClassMixin } from '@lion/core/src/CssClassMixin.js';
|
||||||
import { ObserverMixin } from '@lion/core/src/ObserverMixin.js';
|
import { ObserverMixin } from '@lion/core/src/ObserverMixin.js';
|
||||||
import { Unparseable } from '@lion/validate';
|
import { Unparseable } from '@lion/validate';
|
||||||
import { FocusMixin } from './FocusMixin.js';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `InteractionStateMixin` adds meta information about touched and dirty states, that can
|
* `InteractionStateMixin` adds meta information about touched and dirty states, that can
|
||||||
|
|
@ -16,7 +15,7 @@ import { FocusMixin } from './FocusMixin.js';
|
||||||
export const InteractionStateMixin = dedupeMixin(
|
export const InteractionStateMixin = dedupeMixin(
|
||||||
superclass =>
|
superclass =>
|
||||||
// eslint-disable-next-line no-unused-vars, no-shadow
|
// 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() {
|
static get properties() {
|
||||||
return {
|
return {
|
||||||
...super.properties,
|
...super.properties,
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ import { ValidateMixin } from '@lion/validate';
|
||||||
import { FormControlMixin } from './FormControlMixin.js';
|
import { FormControlMixin } from './FormControlMixin.js';
|
||||||
import { InteractionStateMixin } from './InteractionStateMixin.js'; // applies FocusMixin
|
import { InteractionStateMixin } from './InteractionStateMixin.js'; // applies FocusMixin
|
||||||
import { FormatMixin } from './FormatMixin.js';
|
import { FormatMixin } from './FormatMixin.js';
|
||||||
|
import { FocusMixin } from './FocusMixin.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* LionField: wraps components input, textarea and select and potentially others
|
* LionField: wraps components input, textarea and select and potentially others
|
||||||
|
|
@ -29,12 +30,14 @@ import { FormatMixin } from './FormatMixin.js';
|
||||||
// eslint-disable-next-line max-len, no-unused-vars
|
// eslint-disable-next-line max-len, no-unused-vars
|
||||||
export class LionField extends FormControlMixin(
|
export class LionField extends FormControlMixin(
|
||||||
InteractionStateMixin(
|
InteractionStateMixin(
|
||||||
|
FocusMixin(
|
||||||
FormatMixin(
|
FormatMixin(
|
||||||
ValidateMixin(
|
ValidateMixin(
|
||||||
CssClassMixin(ElementMixin(DelegateMixin(SlotMixin(ObserverMixin(LionLitElement))))),
|
CssClassMixin(ElementMixin(DelegateMixin(SlotMixin(ObserverMixin(LionLitElement))))),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
) {
|
) {
|
||||||
get delegations() {
|
get delegations() {
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue