refactor(searchbar): renamed all selectors, variables, and components from search-bar to searchbar

references #419

demos/sink/pages/search-bar.ts

@@ -24,7 +24,7 @@ import {SinkPage} from '../sink-page';
     </p>
 
     <form (submit)="doSubmit($event)" [ng-form-model]="form">
-      <ion-search-bar placeholder="Search" ng-control="searchQuery"></ion-search-bar>
+      <ion-searchbar placeholder="Search" ng-control="searchQuery"></ion-searchbar>
       <div>
         Query: <b>{{form.controls.searchQuery.value}}</b>
       </div>

demos/sink/pages/table-search.ts

@@ -19,7 +19,7 @@ function randomTitle() {
   <ion-content>
     <form (submit)="doSearch($event)" [control-group]="form">
 
-      <ion-search-bar control="searchQuery"></ion-search-bar>
+      <ion-searchbar control="searchQuery"></ion-searchbar>
 
       <ion-list #list>
 

ionic/components/searchbar/modes/ios.scss

@@ -0,0 +1,120 @@
+
+// iOS Search Bar
+// --------------------------------------------------
+
+$searchbar-ios-padding:                  0 8px !default;
+$searchbar-ios-background-color:         rgba(0, 0, 0, 0.2) !default;
+$searchbar-ios-border-color:             rgba(0, 0, 0, 0.05) !default;
+$searchbar-ios-min-height:               44px !default;
+
+$searchbar-ios-input-search-icon-color:  #767676 !default;
+$searchbar-ios-input-search-icon-svg:    "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 13 13'><path fill='" + $searchbar-ios-input-search-icon-color + "' d='M5,1c2.2,0,4,1.8,4,4S7.2,9,5,9S1,7.2,1,5S2.8,1,5,1 M5,0C2.2,0,0,2.2,0,5s2.2,5,5,5s5-2.2,5-5S7.8,0,5,0 L5,0z'/><line stroke='" + $searchbar-ios-input-search-icon-color + "' stroke-miterlimit='10' x1='12.6' y1='12.6' x2='8.2' y2='8.2'/></svg>" !default;
+$searchbar-ios-input-search-icon-size:   13px !default;
+
+$searchbar-ios-input-height:             28px !default;
+$searchbar-ios-input-placeholder-color:  #9D9D9D !default;
+$searchbar-ios-input-text-color:         #000 !default;
+$searchbar-ios-input-background-color:   #FFFFFF !default;
+$searchbar-ios-input-transition:         all 400ms cubic-bezier(.25, .45, .05, 1) !default;
+$searchbar-ios-cancel-transition:        all 400ms cubic-bezier(.25, .45, .05, 1) !default;
+
+$searchbar-ios-input-close-icon-color:   #8F8E94 !default;
+$searchbar-ios-input-close-icon-svg:     "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path fill='" + $searchbar-ios-input-close-icon-color + "' d='M403.1,108.9c-81.2-81.2-212.9-81.2-294.2,0s-81.2,212.9,0,294.2c81.2,81.2,212.9,81.2,294.2,0S484.3,190.1,403.1,108.9z M352,340.2L340.2,352l-84.4-84.2l-84,83.8L160,339.8l84-83.8l-84-83.8l11.8-11.8l84,83.8l84.4-84.2l11.8,11.8L267.6,256L352,340.2z'/></svg>" !default;
+$searchbar-ios-input-close-icon-size:    18px !default;
+
+
+ion-searchbar {
+  padding: $searchbar-ios-padding;
+  background: $searchbar-ios-background-color;
+  border-bottom: 1px solid $searchbar-ios-border-color;
+  min-height: $searchbar-ios-min-height;
+}
+
+.searchbar-input {
+  height: $searchbar-ios-input-height;
+  padding: 0 28px;
+
+  font-size: 1.4rem;
+  font-weight: 400;
+
+  border-radius: 5px;
+  color: $searchbar-ios-input-text-color;
+  background-color: $searchbar-ios-input-background-color;
+
+  @include svg-background-image($searchbar-ios-input-search-icon-svg);
+  background-size: $searchbar-ios-input-search-icon-size;
+  background-repeat: no-repeat;
+  background-position: calc(50% - 40px);
+
+  &::placeholder {
+    color: $searchbar-ios-input-placeholder-color;
+  }
+
+  @include calc(padding-left, "50% - 28px");
+  transition: $searchbar-ios-input-transition;
+}
+
+.searchbar-close-icon {
+  width: 30px;
+  height: 100%;
+
+  @include svg-background-image($searchbar-ios-input-close-icon-svg);
+  background-size: $searchbar-ios-input-close-icon-size;
+  background-repeat: no-repeat;
+  background-position: center;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
+.searchbar-cancel {
+  @extend button[clear];
+  transition: $searchbar-ios-cancel-transition;
+  min-height: 30px;
+
+  padding-left: 8px;
+  padding-right: 0;
+  margin-left: 0;
+  margin-right: -100%;
+}
+
+.searchbar-input-container.left-align {
+  .searchbar-search-icon {
+    margin-left: 0;
+  }
+  .searchbar-input {
+    padding-left: 28px;
+    background-position: 8px;
+  }
+}
+
+&.hairlines ion-searchbar {
+  border-bottom-width: 0.55px;
+}
+
+ion-toolbar {
+
+  ion-searchbar {
+    background: transparent;
+    border-bottom-width: 0;
+
+    .searchbar-input {
+      background-color: #E5E5E5;
+    }
+  }
+
+}
+
+// Generate Default Search Bar Colors
+// --------------------------------------------------
+
+@each $color, $value in $colors {
+
+  ion-searchbar[#{$color}] {
+    //background-color: $value;
+
+    .searchbar-cancel {
+      color: $value;
+    }
+  }
+}

ionic/components/searchbar/modes/md.scss

@@ -0,0 +1,69 @@
+
+// Material Design Search Bar
+// --------------------------------------------------
+
+$searchbar-md-padding:                  8px !default;
+$searchbar-md-background-color:         inherit !default;
+
+$searchbar-md-input-search-icon-color:  #5B5B5B !default;
+$searchbar-md-input-search-icon-svg:    "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path fill='" + $searchbar-md-input-search-icon-color + "' d='M337.509,305.372h-17.501l-6.571-5.486c20.791-25.232,33.922-57.054,33.922-93.257C347.358,127.632,283.896,64,205.135,64C127.452,64,64,127.632,64,206.629s63.452,142.628,142.225,142.628c35.011,0,67.831-13.167,92.991-34.008l6.561,5.487v17.551L415.18,448L448,415.086L337.509,305.372z M206.225,305.372c-54.702,0-98.463-43.887-98.463-98.743c0-54.858,43.761-98.742,98.463-98.742c54.7,0,98.462,43.884,98.462,98.742C304.687,261.485,260.925,305.372,206.225,305.372z'/></svg>" !default;
+$searchbar-md-input-search-icon-size:   20px !default;
+
+$searchbar-md-input-height:             28px !default;
+$searchbar-md-input-box-shadow:         0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12) !default;
+$searchbar-md-input-placeholder-color:  #AEAEAE !default;
+$searchbar-md-input-text-color:         #141414 !default;
+$searchbar-md-input-background-color:   #FFFFFF !default;
+$searchbar-md-input-border-radius:      2px !default;
+
+$searchbar-md-input-close-icon-color:   #5B5B5B !default;
+$searchbar-md-input-close-icon-svg:     "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><polygon fill='" + $searchbar-md-input-close-icon-color + "' points='405,136.798 375.202,107 256,226.202 136.798,107 107,136.798 226.202,256 107,375.202 136.798,405 256,285.798 375.202,405 405,375.202 285.798,256'/></svg>" !default;
+$searchbar-md-input-close-icon-size:    22px !default;
+
+
+ion-searchbar {
+  padding: $searchbar-md-padding;
+  background: $searchbar-md-background-color;
+}
+
+.searchbar-input {
+  padding: 8px 55px;
+
+  height: $searchbar-md-input-height;
+  box-shadow: $searchbar-md-input-box-shadow;
+
+  font-size: 1.6rem;
+  font-weight: 400;
+
+  border-radius: $searchbar-md-input-border-radius;
+  color: $searchbar-md-input-text-color;
+  background-color: $searchbar-md-input-background-color;
+
+  @include svg-background-image($searchbar-md-input-search-icon-svg);
+  background-size: $searchbar-md-input-search-icon-size;
+  background-repeat: no-repeat;
+  background-position: 16px center;
+
+  &::placeholder {
+    color: $searchbar-md-input-placeholder-color;
+  }
+}
+
+.searchbar-close-icon {
+  width: $searchbar-md-input-close-icon-size;
+  height: 100%;
+  padding: 0;
+
+  @include svg-background-image($searchbar-md-input-close-icon-svg);
+  background-size: $searchbar-md-input-close-icon-size;
+  background-repeat: no-repeat;
+  background-position: center;
+  position: absolute;
+  right: 13px;
+  top: 0;
+
+}
+
+.searchbar-cancel {
+  display: none;
+}

ionic/components/searchbar/test/floating/main.html

@@ -0,0 +1,20 @@
+<ion-content>
+  <h5 padding-left padding-top> Search - Default </h5>
+  <ion-searchbar [(ng-model)]="defaultSearch" class="e2eDefaultFloatingSearchBar"></ion-searchbar>
+
+  <h5 padding-left> Search - Custom Placeholder </h5>
+  <ion-searchbar [(ng-model)]="customPlaceholder" placeholder="Filter Schedules" class="e2eCustomPlaceholderFloatingSearchBar"></ion-searchbar>
+
+  <h5 padding-left> Search - Default Cancel Button </h5>
+  <ion-searchbar [(ng-model)]="defaultCancel" show-cancel="true" class="e2eDefaultCancelButtonFloatingSearchBar"></ion-searchbar>
+
+  <h5 padding-left> Search - Custom Cancel Button Danger </h5>
+  <ion-searchbar [(ng-model)]="customCancel" show-cancel="true" cancel-text="Really Long Cancel" class="e2eCustomCancelButtonFloatingSearchBar" danger></ion-searchbar>
+
+  <h5 padding-left> Search - Custom Cancel Action</h5>
+  <ion-searchbar [(ng-model)]="customCancelAction" show-cancel="true" cancel-text="Done" [cancel-action]="myCancelAction" class="e2eCustomCancelActionFloatingSearchBar"></ion-searchbar>
+
+  <div *ng-if="clickedCustomAction">
+    Clicked custom action with input = {{customCancelAction}}
+  </div>
+</ion-content>

ionic/components/toolbar/toolbar.ts

@@ -60,7 +60,7 @@ export class ToolbarBase extends Ion  {
   template:
     '<div class="toolbar-inner">' +
       '<ng-content select="[menu-toggle]"></ng-content>' +
-      '<ng-content select="ion-title,ion-search-bar,ion-segment"></ng-content>' +
+      '<ng-content select="ion-title,ion-searchbar,ion-segment"></ng-content>' +
       '<ng-content select="ion-nav-items[primary]"></ng-content>' +
       '<ng-content select="ion-nav-items[secondary]"></ng-content>' +
     '</div>' +

scripts/docs/templates/api_menu_version.template.html

@@ -425,12 +425,12 @@
 
   <!-- SearchBar -->
   <li class="menu-section">
-    <a href="{{ page.versionHref }}/api/components/search-bar/SearchBar/" class="api-section">
+    <a href="{{ page.versionHref }}/api/components/searchbar/SearchBar/" class="api-section">
       SearchBar
     </a>
     <ul>
       <li>
-        <a href="{{ page.versionHref }}/api/components/search-bar/SearchBar/">
+        <a href="{{ page.versionHref }}/api/components/searchbar/SearchBar/">
           SearchBar
         </a>
       </li>