feat(core): add property ly-text

A-l-y-l-e · Dec 9, 2018 · 430fccb · 430fccb
1 parent 210b3b4
commit 430fccb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/src/lib/src/theme/paper.ts b/src/lib/src/theme/paper.ts
@@ -1,6 +1,9 @@
-import { Directive, OnChanges, ElementRef, NgZone, OnDestroy } from '@angular/core';
+import { Directive, OnChanges, ElementRef, NgZone, OnDestroy, Input, OnInit } from '@angular/core';
 import { LyTheme2 } from './theme2.service';
 import { mixinStyleUpdater, mixinBg, mixinRaised, mixinOutlined, mixinElevation, mixinShadowColor, mixinDisableRipple, mixinColor } from '../common/index';
+import { toBoolean } from '../minimal/is-boolean';
+
+const DEFAULT_BG = 'paper';
 
 export class LyPaperBase {
   constructor(
@@ -19,7 +22,7 @@ mixinBg(
             mixinDisableRipple(LyPaperBase))))))));
 
 @Directive({
-  selector: `ly-paper, [ly-paper]`,
+  selector: `ly-paper, [ly-paper], [ly-text]`,
   inputs: [
     'bg',
     'flat',
@@ -31,7 +34,16 @@ mixinBg(
     'disableRipple'
   ]
 })
-export class LyPaper extends LyPaperMixinBase implements OnChanges, OnDestroy {
+export class LyPaper extends LyPaperMixinBase implements OnChanges, OnInit, OnDestroy {
+  _hasText: boolean;
+
+  @Input('ly-text')
+  set hasText(val: any) {
+    this._hasText = toBoolean(val);
+  }
+  get hasText() {
+    return this._hasText;
+  }
 
   constructor(
     theme: LyTheme2,
@@ -48,6 +60,12 @@ export class LyPaper extends LyPaperMixinBase implements OnChanges, OnDestroy {
     this.updateStyle(this._el);
   }
 
+  ngOnInit() {
+    if (!this.bg && !this.hasText) {
+      this.bg = DEFAULT_BG;
+    }
+  }
+
   ngOnDestroy() {
     this._removeRippleEvents();
   }

diff --git a/src/lib/themes/minima/dark.ts b/src/lib/themes/minima/dark.ts
@@ -29,6 +29,10 @@ export class MinimaDark extends MinimaBase implements ThemeConfig {
     tertiary: '#212121',
     base: '#0E0E0E'
   };
+  paper = {
+    default: '#2b2b2b',
+    shadow
+  };
   text = {
     default: '#fff',
     primary: '#fff',

diff --git a/src/lib/themes/minima/light.ts b/src/lib/themes/minima/light.ts
@@ -29,6 +29,10 @@ export class MinimaLight extends MinimaBase implements ThemeConfig {
     tertiary: '#efefef',
     base: '#E0E0E0'
   };
+  paper = {
+    default: '#fff',
+    shadow
+  };
   text = {
     default: 'rgba(0, 0, 0, 0.87)',
     primary: 'rgba(0, 0, 0, 0.87)',