Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Angular 9 #111

Merged
merged 28 commits into from
Mar 28, 2020
Merged

Support Angular 9 #111

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6ecfa0d
ivy
Enlcxx Feb 8, 2020
12f9b92
update typescript@~3.6.4
Enlcxx Feb 9, 2020
925d818
update typescript@~3.6.4
Enlcxx Feb 9, 2020
854fc1a
update Angular
Enlcxx Feb 9, 2020
9c02546
update dependencies
Enlcxx Mar 21, 2020
ae0b55f
Merge branch 'master' into ivy
Enlcxx Mar 21, 2020
6d06d75
update
Enlcxx Mar 21, 2020
4868a23
update dependencies
Enlcxx Mar 21, 2020
4eb673a
update dependencies
Enlcxx Mar 21, 2020
df80421
fix some bugs
Enlcxx Mar 21, 2020
5cc7288
update dependencies
Enlcxx Mar 22, 2020
e26d4e0
update dependencies
Enlcxx Mar 22, 2020
658e720
fix some bugs
Enlcxx Mar 22, 2020
925c4fb
update
Enlcxx Mar 23, 2020
7719c36
update
Enlcxx Mar 23, 2020
2c71627
fix some bugs
Enlcxx Mar 25, 2020
92c1b27
fix dependencies
Enlcxx Mar 25, 2020
9de3a89
­
Enlcxx Mar 25, 2020
2219707
remove unused code
Enlcxx Mar 25, 2020
150a3c7
­
Enlcxx Mar 25, 2020
d9cd700
fix some bugs
Enlcxx Mar 25, 2020
db543dd
­
Enlcxx Mar 26, 2020
b2e38d7
­
Enlcxx Mar 26, 2020
b6810e8
­
Enlcxx Mar 26, 2020
4756b26
update
Enlcxx Mar 27, 2020
8d338ff
­
Enlcxx Mar 27, 2020
4500f60
fix some bugs
Enlcxx Mar 28, 2020
558c3ea
­
Enlcxx Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
­
  • Loading branch information
@Enlcxx
Enlcxx committed Mar 28, 2020
commit 558c3eae70c93d19449af9c770eabc5b7380698c
7 changes: 3 additions & 4 deletions src/lib/field/field.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ import {
ThemeRef,
LY_COMMON_STYLES,
keyframesUniqueId,
WithStyles
WithStyles,
Style
} from '@alyle/ui';
import { LyLabel } from './label';
import { LyPlaceholder } from './placeholder';
Expand All @@ -50,8 +51,6 @@ import { Subject } from 'rxjs';
import { NgControl, NgForm, FormGroupDirective } from '@angular/forms';
import { LyError } from './error';
import { LyFieldControlBase } from './field-control-base';
import { Style } from '../src/minimal';
import { AUIThemeVariables } from '@app/app.module';

export interface LyFieldTheme {
/** Styles for Field Component */
Expand Down Expand Up @@ -465,7 +464,7 @@ export class LyField implements WithStyles, OnInit, AfterContentInit, AfterViewI

/** The field appearance style. */
@Style<string | null>(
val => (theme: AUIThemeVariables, ref) => {
val => (theme: LyFieldVariables, ref) => {
const classes = ref.selectorsOf(STYLES);
if (theme.field && theme.field.appearance) {
const appearance = theme.field.appearance[val];
Expand Down