Merge branch 'dev'

appbaseio · May 27, 2017 · 74a3a9e · 74a3a9e
2 parents a006e1d + b831f61
commit 74a3a9e
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 16 deletions.
diff --git a/app/assets/css/style.css b/app/assets/css/style.css
@@ -11,6 +11,42 @@
   font-weight: 900;
   font-style: normal; }
 
+.rbc-red .rbc.rbc-categorysearch .Select-control .Select-arrow-zone .Select-arrow {
+  color: red; }
+
+.rbc-red .rbc.rbc-categorysearch .rbc-strong {
+  color: red; }
+
+.rbc-orange .rbc.rbc-categorysearch .Select-control .Select-arrow-zone .Select-arrow {
+  color: orange; }
+
+.rbc-orange .rbc.rbc-categorysearch .rbc-strong {
+  color: orange; }
+
+.rbc-yellow .rbc.rbc-categorysearch .Select-control .Select-arrow-zone .Select-arrow {
+  color: yellow; }
+
+.rbc-yellow .rbc.rbc-categorysearch .rbc-strong {
+  color: yellow; }
+
+.rbc-green .rbc.rbc-categorysearch .Select-control .Select-arrow-zone .Select-arrow {
+  color: green; }
+
+.rbc-green .rbc.rbc-categorysearch .rbc-strong {
+  color: green; }
+
+.rbc-blue .rbc.rbc-categorysearch .Select-control .Select-arrow-zone .Select-arrow {
+  color: #1893e7; }
+
+.rbc-blue .rbc.rbc-categorysearch .rbc-strong {
+  color: #1893e7; }
+
+.rbc-dark .rbc.rbc-categorysearch .Select-control .Select-arrow-zone .Select-arrow {
+  color: #ccc; }
+
+.rbc-dark .rbc.rbc-categorysearch .rbc-strong {
+  color: #ccc; }
+
 .rbc.rbc-nestedlist-container {
   padding: 0;
   margin: 0; }
@@ -102,8 +138,7 @@
     .rbc.rbc-categorysearch .Select-input:hover, .rbc.rbc-categorysearch .Select-input:focus {
       outline: none; }
   .rbc.rbc-categorysearch .rbc-strong {
-    font-family: "Lato Bold";
-    color: #1893e7; }
+    font-family: "Lato Bold"; }
 
 .rbc.rbc-togglelist {
   padding: 0; }

diff --git a/app/assets/styles/partials/components/_categorysearch.scss b/app/assets/styles/partials/components/_categorysearch.scss
@@ -73,6 +73,5 @@
 
 	.rbc-strong {
 		font-family: $font-bold;
-		color: $primary-color;
 	}
 }
diff --git a/app/assets/styles/partials/theme/_default.scss b/app/assets/styles/partials/theme/_default.scss
@@ -6,3 +6,22 @@ $themes: (
 	rbc-blue: (color: #1893e7, background: #fff, font-color: #777, input-bg: #f5f5f5),
 	rbc-dark: (color: #ccc, background: #555, font-color: #eee, input-bg: #aaa)
 );
+
+@each $theme,
+$map in $themes {
+	.#{$theme} {
+		.rbc.rbc-categorysearch {
+			.Select-control {
+				.Select-arrow-zone {
+					.Select-arrow {
+						color: map-get($map, color);
+					}
+				}
+			}
+
+			.rbc-strong {
+				color: map-get($map, color);
+			}
+		}
+	}
+}
diff --git a/app/sensors/CategorySearch.js b/app/sensors/CategorySearch.js
@@ -376,6 +376,8 @@ export default class CategorySearch extends Component {
 					optionRenderer={this.optionRenderer}
 					onChange={this.handleSearch}
 					onBlurResetsInput={false}
+					backspaceRemoves={false}
+					deleteRemoves={false}
 					{...this.props}
 				/>
 			</div>

diff --git a/dist/css/style.min.css b/dist/css/style.min.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@appbaseio/reactivesearch",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "A React UI components library for building search experiences",
   "main": "lib/app.js",
   "scripts": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/appbaseio/reactivesearch#readme",
   "dependencies": {
-    "@appbaseio/reactivemaps": "1.0.0-alpha27",
+    "@appbaseio/reactivemaps": "1.0.0-alpha28",
     "classnames": "^2.2.5",
     "jquery": "^3.1.1",
     "lodash": "^4.15.0",

diff --git a/yarn.lock b/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@appbaseio/[email protected]alpha29":
-  version "1.0.0-alpha29"
-  resolved "https://registry.yarnpkg.com/@appbaseio/reactivebase/-/reactivebase-1.0.0-alpha29.tgz#5cbd25b0dd07e9b002418efb8f2fce3b5afe2e8f"
+"@appbaseio/[email protected]alpha36":
+  version "1.0.0-alpha36"
+  resolved "https://registry.yarnpkg.com/@appbaseio/reactivebase/-/reactivebase-1.0.0-alpha36.tgz#2b6a801e7d10780323dea092560c82053deab7e8"
   dependencies:
     appbase-js "^0.11.0"
     babel-preset-stage-0 "^6.5.0"
@@ -30,11 +30,11 @@
     grunt "~0.4.0"
     serve-static "^1.10.2"
 
-"@appbaseio/[email protected]alpha22":
-  version "1.0.0-alpha22"
-  resolved "https://registry.yarnpkg.com/@appbaseio/reactivemaps/-/reactivemaps-1.0.0-alpha22.tgz#d5958c94fd6597c92141ab6e65e0e4e95f76147d"
+"@appbaseio/[email protected]alpha27":
+  version "1.0.0-alpha27"
+  resolved "https://registry.yarnpkg.com/@appbaseio/reactivemaps/-/reactivemaps-1.0.0-alpha27.tgz#52437c6c10cbe64673d377ead9fce607a5cee099"
   dependencies:
-    "@appbaseio/reactivebase" "1.0.0-alpha29"
+    "@appbaseio/reactivebase" "1.0.0-alpha36"
     "@appbaseio/reactivemaps-manual" "1.0.0-alpha"
     appbase-js "^0.11.0"
     axios "^0.15.2"