feat(popover): change popover item background color to match wrapper

updated e2e test and added a test to open the popover references #5420
ionic-team · May 24, 2016 · b0d71da · b0d71da
1 parent 1373108
commit b0d71da
Show file tree

Hide file tree

Showing 7 changed files with 287 additions and 20 deletions.
diff --git a/src/components/popover/popover.ios.scss b/src/components/popover/popover.ios.scss
@@ -11,6 +11,7 @@ $popover-ios-border-radius:             10px !default;
 $popover-ios-text-color:                #000 !default;
 
 $popover-ios-background:                #f3f3f3 !default;
+$popover-ios-item-background:           $popover-ios-background !default;
 $popover-ios-arrow-background:          $popover-ios-background !default;
 
 
@@ -25,6 +26,10 @@ $popover-ios-arrow-background:          $popover-ios-background !default;
   background: $popover-ios-background;
 }
 
+.popover-wrapper .item {
+  background-color: $popover-ios-item-background;
+}
+
 
 // Popover Arrow
 // -----------------------------------------

diff --git a/src/components/popover/popover.md.scss b/src/components/popover/popover.md.scss
@@ -4,12 +4,14 @@
 // Material Design Popover
 // --------------------------------------------------
 
-$popover-md-min-width:                 150px !default;
+$popover-md-min-width:                 200px !default;
 $popover-md-max-width:                 270px !default;
 $popover-md-max-height:                90% !default;
 $popover-md-border-radius:             2px !default;
 $popover-md-text-color:                #000 !default;
+
 $popover-md-background:                #fafafa !default;
+$popover-md-item-background:           $popover-md-background !default;
 
 
 .popover-wrapper {
@@ -22,3 +24,7 @@ $popover-md-background:                #fafafa !default;
   color: $popover-md-text-color;
   background: $popover-md-background;
 }
+
+.popover-wrapper .item {
+  background-color: $popover-md-item-background;
+}
diff --git a/src/components/popover/popover.wp.scss b/src/components/popover/popover.wp.scss
@@ -4,12 +4,14 @@
 // Windows Popover
 // --------------------------------------------------
 
-$popover-wp-min-width:                 150px !default;
+$popover-wp-min-width:                 200px !default;
 $popover-wp-max-width:                 270px !default;
 $popover-wp-max-height:                90% !default;
 $popover-wp-border-radius:             2px !default;
 $popover-wp-text-color:                #000 !default;
-$popover-wp-background:                #fff !default;
+
+$popover-wp-background:                #e6e6e6 !default;
+$popover-wp-item-background:           $popover-wp-background !default;
 
 
 .popover-wrapper {
@@ -22,3 +24,7 @@ $popover-wp-background:                #fff !default;
   color: $popover-wp-text-color;
   background: $popover-wp-background;
 }
+
+.popover-wrapper .item {
+  background-color: $popover-wp-item-background;
+}
diff --git a/src/components/popover/test/basic/e2e.ts b/src/components/popover/test/basic/e2e.ts
@@ -0,0 +1,4 @@
+
+it('should open list popover', function() {
+  element(by.css('.e2eOpenListPopover')).click();
+});
diff --git a/src/components/popover/test/basic/index.ts b/src/components/popover/test/basic/index.ts
@@ -1,4 +1,113 @@
-import {App, Page, Popover, NavController} from '../../../../../src';
+import {ViewChild, ElementRef} from '@angular/core';
+import {App, Page, Popover, NavController, Content, NavParams} from '../../../../../src';
+
+
+@Page({
+  template: `
+    <ion-list radio-group [(ngModel)]="fontFamily" (change)="changeFontFamily()">
+      <ion-row>
+        <ion-col>
+          <button (click)="changeFontSize('smaller')" ion-item detail-none class="text-button text-smaller">A</button>
+        </ion-col>
+        <ion-col>
+          <button (click)="changeFontSize('larger')" ion-item detail-none class="text-button text-larger">A</button>
+        </ion-col>
+      </ion-row>
+      <ion-row class="row-dots">
+        <ion-col>
+          <button (click)="changeBackground('white')" category="dot" class="dot-white" [class.selected]="background == 'white'"></button>
+        </ion-col>
+        <ion-col>
+          <button (click)="changeBackground('tan')" category="dot" class="dot-tan" [class.selected]="background == 'tan'"></button>
+        </ion-col>
+        <ion-col>
+          <button (click)="changeBackground('grey')" category="dot" class="dot-grey" [class.selected]="background == 'grey'"></button>
+        </ion-col>
+        <ion-col>
+          <button (click)="changeBackground('black')" category="dot" class="dot-black" [class.selected]="background == 'black'"></button>
+        </ion-col>
+      </ion-row>
+      <ion-item class="text-athelas">
+        <ion-label>Athelas</ion-label>
+        <ion-radio value="Athelas"></ion-radio>
+      </ion-item>
+      <ion-item class="text-charter">
+        <ion-label>Charter</ion-label>
+        <ion-radio value="Charter"></ion-radio>
+      </ion-item>
+      <ion-item class="text-iowan">
+        <ion-label>Iowan</ion-label>
+        <ion-radio value="Iowan"></ion-radio>
+      </ion-item>
+      <ion-item class="text-palatino">
+        <ion-label>Palatino</ion-label>
+        <ion-radio value="Palatino"></ion-radio>
+      </ion-item>
+      <ion-item class="text-san-francisco">
+        <ion-label>San Francisco</ion-label>
+        <ion-radio value="San Francisco"></ion-radio>
+      </ion-item>
+      <ion-item class="text-seravek">
+        <ion-label>Seravek</ion-label>
+        <ion-radio value="Seravek"></ion-radio>
+      </ion-item>
+      <ion-item class="text-times-new-roman">
+        <ion-label>Times New Roman</ion-label>
+        <ion-radio value="Times New Roman"></ion-radio>
+      </ion-item>
+    </ion-list>
+  `,
+})
+class PopoverRadioPage {
+  background: string = 'white';
+  contentEle: any;
+  textEle: any;
+  fontFamily;
+
+  colors = {
+    "white": {
+      "bg": "#fff",
+      "fg": "#000"
+    },
+    "tan": {
+      "bg": "#f9f1e4",
+      "fg": "#000"
+    },
+    "grey": {
+      "bg": "#4c4b50",
+      "fg": "#fff"
+    },
+    "black": {
+      "bg": "#000",
+      "fg": "#fff"
+    },
+  };
+
+  constructor(private navParams: NavParams) {
+
+  }
+
+  ngOnInit() {
+    if (this.navParams.data) {
+      this.contentEle = this.navParams.data.contentEle;
+      this.textEle = this.navParams.data.textEle;
+    }
+  }
+
+  changeBackground(color) {
+    this.background = color;
+    this.contentEle.style.background = this.colors[color].bg;
+    this.textEle.style.color = this.colors[color].fg;
+  }
+
+  changeFontSize(direction) {
+    this.textEle.style.fontSize = direction;
+  }
+
+  changeFontFamily() {
+    if (this.fontFamily) this.textEle.style.fontFamily = this.fontFamily;
+  }
+}
 
 
 @Page({
@@ -9,11 +118,10 @@ import {App, Page, Popover, NavController} from '../../../../../src';
       <button ion-item>Documentation</button>
       <button ion-item>Showcase</button>
       <button ion-item>GitHub Repo</button>
-
     </ion-list>
   `
 })
-class PopoverPage {
+class PopoverListPage {
 
 }
 
@@ -22,17 +130,29 @@ class PopoverPage {
   templateUrl: 'main.html'
 })
 class E2EPage {
+  @ViewChild('popoverContent', {read: ElementRef}) content: ElementRef;
+  @ViewChild('popoverText', {read: ElementRef}) text: ElementRef;
+
   popover: any;
 
-  constructor(private nav: NavController) {}
+  constructor(private nav: NavController) {
 
-  createPopover() {
-    this.popover = Popover.create(PopoverPage);
   }
 
-  presentPopover(ev) {
-    this.createPopover();
-    this.nav.present(this.popover, {
+  presentListPopover(ev) {
+    let popover = Popover.create(PopoverListPage);
+    this.nav.present(popover, {
+      ev: ev
+    });
+  }
+
+  presentRadioPopover(ev) {
+    let popover = Popover.create(PopoverRadioPage, {
+      contentEle: this.content.nativeElement,
+      textEle: this.text.nativeElement
+    });
+
+    this.nav.present(popover, {
       ev: ev
     });
   }
@@ -49,3 +169,5 @@ class E2EApp {
     this.root = E2EPage;
   }
 }
+
+document.body.innerHTML += '<link href="style.css" rel="stylesheet">'
diff --git a/src/components/popover/test/basic/main.html b/src/components/popover/test/basic/main.html
@@ -1,35 +1,46 @@
 <ion-navbar *navbar primary>
   <ion-buttons left>
-    <button (click)="presentPopover($event)">
+    <button (click)="presentRadioPopover($event)">
       <ion-icon name="person"></ion-icon>
     </button>
-    <button (click)="presentPopover($event)">
+    <button (click)="presentListPopover($event)">
       <ion-icon name="search"></ion-icon>
     </button>
   </ion-buttons>
   <ion-title>Popover</ion-title>
   <ion-buttons end>
-    <button (click)="presentPopover($event)">
+    <button (click)="presentListPopover($event)">
       <ion-icon name="options"></ion-icon>
     </button>
-    <button (click)="presentPopover($event)">
+    <button (click)="presentRadioPopover($event)">
       <ion-icon name="more"></ion-icon>
     </button>
   </ion-buttons>
 </ion-navbar>
 
-<ion-content padding>
+<ion-content #popoverContent padding>
 
-  <button block (click)="presentPopover($event)">
-    Present Popover
+  <button block (click)="presentListPopover($event)" class="e2eOpenListPopover">
+    Present List Popover
   </button>
 
+  <div #popoverText class="text-to-change">
+    <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris vel ipsum in purus mollis dictum eget vitae purus. Nulla ultrices est odio, a maximus velit pretium ac. Donec vel elementum mi. Proin elementum pulvinar neque, in lacinia nibh tempus auctor. Nam sapien velit, commodo ac nibh a, maximus ullamcorper nunc. Integer luctus tortor dignissim, dictum neque at, scelerisque purus. Vivamus nec erat vel magna posuere euismod. Sed ac augue eu tellus tincidunt fermentum eget sit amet nunc. Donec sit amet mi libero. Cras nunc arcu, ultrices nec sapien eu, convallis posuere libero. Pellentesque vulputate lacus eros, at lobortis lorem egestas et. Vestibulum tempus quam in efficitur lobortis. Maecenas consectetur consequat sem pharetra aliquet. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</div>
+
+    <div>Mauris ac ligula elit. Nulla pulvinar eget leo ut aliquet. Praesent sit amet luctus quam. Nam fringilla iaculis mi, ut maximus mauris molestie feugiat. Curabitur nec scelerisque elit. Nunc eu odio facilisis, tempor enim eget, venenatis sem. Sed vitae lorem vehicula, auctor orci ultrices, finibus mauris. Donec vitae pulvinar diam. Nulla luctus congue quam, sed lacinia arcu dictum a.</div>
+
+    <div>Morbi laoreet magna elit, id dapibus massa varius consequat. Praesent rhoncus nunc quam, eu mollis velit commodo ut. Etiam euismod elit mi, non auctor velit blandit ut. Aenean vitae pulvinar mi, ac pretium tellus. Morbi eu auctor sem, sollicitudin cursus felis. Praesent vestibulum velit sed eros iaculis ornare. Praesent diam diam, pellentesque eget scelerisque sed, bibendum ut risus. Sed sed fermentum sem. Integer vel justo felis. Proin eget quam est. In sit amet ipsum sagittis, convallis ipsum fringilla, interdum ante. Etiam vel tincidunt mauris. Nunc feugiat eros nunc, et vestibulum metus mollis et. Nullam eu viverra velit, id ultrices nisl. Donec non enim elementum, laoreet sapien id, feugiat tellus.</div>
+
+    <div>Sed pellentesque ipsum eget ante hendrerit maximus. Aliquam id venenatis nulla. Nullam in nibh at enim vestibulum ullamcorper. Nam felis dolor, lobortis vel est non, condimentum malesuada nisl. In metus sapien, malesuada at nulla in, pretium aliquam turpis. Quisque elementum purus mi, sed tristique turpis ultricies in. Donec feugiat dolor non ultricies ultricies. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin ut purus et diam porta cursus vitae semper mi. Donec fringilla tellus orci. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc vitae commodo sem. Duis vehicula quam sit amet imperdiet facilisis. Pellentesque eget dignissim neque, et scelerisque libero. Maecenas molestie metus sed orci cursus, in venenatis justo dapibus.</div>
+
+    <p>Aenean rhoncus urna at interdum blandit. Donec ac massa nec libero vehicula tincidunt. Sed sit amet hendrerit risus. Aliquam vitae vestibulum ipsum, non feugiat orci. Vivamus eu rutrum elit. Nulla dapibus tortor non dignissim pretium. Nulla in luctus turpis. Etiam non mattis tortor, at aliquet ex. Nunc ut ante varius, auctor dui vel, volutpat elit. Nunc laoreet augue sit amet ultrices porta. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vestibulum pellentesque lobortis est, ut tincidunt ligula mollis sit amet. In porta risus arcu, quis pellentesque dolor mattis non. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;</p>
+  </div>
 </ion-content>
 
 <ion-toolbar position="bottom">
   <ion-title>Popover</ion-title>
   <ion-buttons start>
-    <button (click)="presentPopover($event)">
+    <button (click)="presentListPopover($event)">
       <ion-icon name="more"></ion-icon>
     </button>
   </ion-buttons>