Merge branch 'dev'

appbaseio · Sep 13, 2017 · 1f011b3 · 1f011b3
2 parents eea8632 + da68eeb
commit 1f011b3
Show file tree

Hide file tree

Showing 31 changed files with 164 additions and 150 deletions.
diff --git a/app/actuators/ReactiveMap.js b/app/actuators/ReactiveMap.js
@@ -577,17 +577,17 @@ export default class ReactiveMap extends Component {
 		const cx = classNames({
 			"rbc-title-active": this.props.title,
 			"rbc-title-inactive": !this.props.title
-		});
+		}, this.props.className);
 
 		return (
-			<div className={`rbc rbc-reactivemap col s12 col-xs-12 card thumbnail ${cx}`} style={ReactiveMapHelper.mapPropsStyles(this.props.componentStyle, "component")}>
+			<div className={`rbc rbc-reactivemap col s12 col-xs-12 card thumbnail ${cx}`} style={ReactiveMapHelper.mapPropsStyles(this.props.style, "component")}>
 				{title}
 				{showMapStyles}
 				<GoogleMapLoader
 					containerElement={
 						<div
 							className="rbc-container col s12 col-xs-12"
-							style={ReactiveMapHelper.mapPropsStyles(this.props.componentStyle, "map", this.mapDefaultHeight)}
+							style={ReactiveMapHelper.mapPropsStyles(this.props.style, "map", this.mapDefaultHeight)}
 						/>
 					}
 					googleMapElement={
@@ -651,7 +651,7 @@ ReactiveMap.propTypes = {
 	size: helper.sizeValidation,
 	from: ReactiveMapHelper.validation.fromValidation,
 	autoMapRender: React.PropTypes.bool,
-	componentStyle: React.PropTypes.object,
+	style: React.PropTypes.object,
 	autoCenter: React.PropTypes.bool,
 	showSearchAsMove: React.PropTypes.bool,
 	setSearchAsMove: React.PropTypes.bool,
@@ -676,7 +676,8 @@ ReactiveMap.propTypes = {
 	markerOnDblclick: React.PropTypes.func,
 	onMouseover: React.PropTypes.func,
 	onMouseout: React.PropTypes.func,
-	showMapStyles: React.PropTypes.bool
+	showMapStyles: React.PropTypes.bool,
+	className: React.PropTypes.string
 };
 
 ReactiveMap.defaultProps = {
@@ -695,7 +696,7 @@ ReactiveMap.defaultProps = {
 	autoMapRender: true,
 	defaultMarkerImage: "https://opensource.appbase.io/reactivemaps/dist/images/historic-pin.png",
 	streamMarkerImage: "https://opensource.appbase.io/reactivemaps/dist/images/stream-pin.png",
-	componentStyle: {},
+	style: {},
 	stream: false,
 	applyGeoQuery: false,
 	defaultZoom: 13

diff --git a/app/sensors/GeoDistanceDropdown.js b/app/sensors/GeoDistanceDropdown.js
@@ -417,10 +417,10 @@ export default class GeoDistanceDropdown extends Component {
 			"rbc-title-inactive": !this.props.title,
 			"rbc-placeholder-active": this.props.placeholder,
 			"rbc-placeholder-inactive": !this.props.placeholder
-		});
+		}, this.props.className);
 
 		return (
-			<div className={`rbc rbc-geodistancedropdown clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.componentStyle}>
+			<div className={`rbc rbc-geodistancedropdown clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.style}>
 				<div className="row">
 					{title}
 					<div className="rbc-search-container col s12 col-xs-12">
@@ -475,10 +475,11 @@ GeoDistanceDropdown.propTypes = {
 	),
 	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
-	componentStyle: React.PropTypes.object,
+	style: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,
 	showFilter: React.PropTypes.bool,
-	filterLabel: React.PropTypes.string
+	filterLabel: React.PropTypes.string,
+	className: React.PropTypes.string
 };
 
 // Default props value
@@ -487,7 +488,7 @@ GeoDistanceDropdown.defaultProps = {
 	placeholder: "Search...",
 	placeholderDropdown: "Select Distance",
 	autoLocation: true,
-	componentStyle: {},
+	style: {},
 	URLParams: false,
 	showFilter: true
 };
@@ -513,8 +514,9 @@ GeoDistanceDropdown.types = {
 	customQuery: TYPES.FUNCTION,
 	beforeValueChange: TYPES.FUNCTION,
 	onValueChange: TYPES.FUNCTION,
-	componentStyle: TYPES.OBJECT,
+	style: TYPES.OBJECT,
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
-	filterLabel: TYPES.STRING
+	filterLabel: TYPES.STRING,
+	className: TYPES.STRING
 };
diff --git a/app/sensors/GeoDistanceSlider.js b/app/sensors/GeoDistanceSlider.js
@@ -412,10 +412,10 @@ export default class GeoDistanceSlider extends Component {
 			"rbc-placeholder-inactive": !this.props.placeholder,
 			"rbc-labels-active": this.props.rangeLabels.start || this.props.rangeLabels.end,
 			"rbc-labels-inactive": !this.props.rangeLabels.start && !this.props.rangeLabels.end
-		});
+		}, this.props.className);
 
 		return (
-			<div className={`rbc rbc-geodistanceslider clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.componentStyle}>
+			<div className={`rbc rbc-geodistanceslider clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.style}>
 				<div className="row">
 					{title}
 					<div className="rbc-search-container col s12 col-xs-12">
@@ -472,10 +472,11 @@ GeoDistanceSlider.propTypes = {
 	autoLocation: React.PropTypes.bool,
 	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
-	componentStyle: React.PropTypes.object,
+	style: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,
 	showFilter: React.PropTypes.bool,
-	filterLabel: React.PropTypes.string
+	filterLabel: React.PropTypes.string,
+	className: React.PropTypes.string
 };
 
 // Default props value
@@ -492,7 +493,7 @@ GeoDistanceSlider.defaultProps = {
 		end: null
 	},
 	autoLocation: true,
-	componentStyle: {},
+	style: {},
 	URLParams: false,
 	showFilter: true
 };
@@ -517,10 +518,11 @@ GeoDistanceSlider.types = {
 	defaultSelected: TYPES.OBJECT,
 	placeholder: TYPES.STRING,
 	customQuery: TYPES.FUNCTION,
-	componentStyle: TYPES.OBJECT,
+	style: TYPES.OBJECT,
 	beforeValueChange: TYPES.FUNCTION,
 	onValueChange: TYPES.FUNCTION,
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
-	filterLabel: TYPES.STRING
+	filterLabel: TYPES.STRING,
+	className: TYPES.STRING
 };
diff --git a/app/sensors/PlacesSearch.js b/app/sensors/PlacesSearch.js
@@ -323,10 +323,10 @@ export default class PlacesSearch extends Component {
 			"rbc-title-inactive": !this.props.title,
 			"rbc-placeholder-active": this.props.placeholder,
 			"rbc-placeholder-inactive": !this.props.placeholder
-		});
+		}, this.props.className);
 
 		return (
-			<div className={`rbc rbc-placessearch clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.componentStyle}>
+			<div className={`rbc rbc-placessearch clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.style}>
 				<div className="row">
 					{title}
 					<div className="col s12 col-xs-12">
@@ -356,17 +356,18 @@ PlacesSearch.propTypes = {
 	autoLocation: React.PropTypes.bool,
 	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
-	componentStyle: React.PropTypes.object,
+	style: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,
 	showFilter: React.PropTypes.bool,
 	filterLabel: React.PropTypes.string,
-	unit: React.PropTypes.oneOf(["mi", "miles", "yd", "yards", "ft", "feet", "in", "inch", "km", "kilometers", "m", "meters", "cm", "centimeters", "mm", "millimeters", "NM", "nmi", "nauticalmiles"])
+	unit: React.PropTypes.oneOf(["mi", "miles", "yd", "yards", "ft", "feet", "in", "inch", "km", "kilometers", "m", "meters", "cm", "centimeters", "mm", "millimeters", "NM", "nmi", "nauticalmiles"]),
+	className: React.PropTypes.string
 };
 // Default props value
 PlacesSearch.defaultProps = {
 	placeholder: "Search..",
 	autoLocation: true,
-	componentStyle: {},
+	style: {},
 	URLParams: false,
 	showFilter: true,
 	unit: "mi"
@@ -386,9 +387,10 @@ PlacesSearch.types = {
 	customQuery: TYPES.FUNCTION,
 	placeholder: TYPES.STRING,
 	autoLocation: TYPES.BOOLEAN,
-	componentStyle: TYPES.OBJECT,
+	style: TYPES.OBJECT,
 	unit: TYPES.STRING,
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
-	filterLabel: TYPES.STRING
+	filterLabel: TYPES.STRING,
+	className: TYPES.STRING
 };
diff --git a/dist/CustomQuery.bundle.js b/dist/CustomQuery.bundle.js
diff --git a/dist/GeoDistanceDropdown.bundle.js b/dist/GeoDistanceDropdown.bundle.js
diff --git a/dist/GeoDistanceSlider.bundle.js b/dist/GeoDistanceSlider.bundle.js
diff --git a/dist/PlacesSearch.bundle.js b/dist/PlacesSearch.bundle.js
diff --git a/dist/direction.bundle.js b/dist/direction.bundle.js
diff --git a/dist/earthquake.bundle.js b/dist/earthquake.bundle.js
diff --git a/dist/events.bundle.js b/dist/events.bundle.js
diff --git a/dist/heatmap.bundle.js b/dist/heatmap.bundle.js
diff --git a/dist/list.bundle.js b/dist/list.bundle.js
diff --git a/dist/meetupblast.bundle.js b/dist/meetupblast.bundle.js
diff --git a/dist/nearby.bundle.js b/dist/nearby.bundle.js
diff --git a/dist/now.bundle.js b/dist/now.bundle.js
diff --git a/dist/transport.bundle.js b/dist/transport.bundle.js
diff --git a/dist/weather.bundle.js b/dist/weather.bundle.js
diff --git a/lib/actuators/ReactiveMap.js b/lib/actuators/ReactiveMap.js
@@ -671,17 +671,17 @@ var ReactiveMap = function (_Component) {
 		var cx = classNames({
 			"rbc-title-active": this.props.title,
 			"rbc-title-inactive": !this.props.title
-		});
+		}, this.props.className);
 
 		return React.createElement(
 			"div",
-			{ className: "rbc rbc-reactivemap col s12 col-xs-12 card thumbnail " + cx, style: ReactiveMapHelper.mapPropsStyles(this.props.componentStyle, "component") },
+			{ className: "rbc rbc-reactivemap col s12 col-xs-12 card thumbnail " + cx, style: ReactiveMapHelper.mapPropsStyles(this.props.style, "component") },
 			title,
 			showMapStyles,
 			React.createElement(GoogleMapLoader, {
 				containerElement: React.createElement("div", {
 					className: "rbc-container col s12 col-xs-12",
-					style: ReactiveMapHelper.mapPropsStyles(this.props.componentStyle, "map", this.mapDefaultHeight)
+					style: ReactiveMapHelper.mapPropsStyles(this.props.style, "map", this.mapDefaultHeight)
 				}),
 				googleMapElement: React.createElement(
 					GoogleMap,
@@ -776,7 +776,7 @@ ReactiveMap.propTypes = {
 	size: helper.sizeValidation,
 	from: ReactiveMapHelper.validation.fromValidation,
 	autoMapRender: React.PropTypes.bool,
-	componentStyle: React.PropTypes.object,
+	style: React.PropTypes.object,
 	autoCenter: React.PropTypes.bool,
 	showSearchAsMove: React.PropTypes.bool,
 	setSearchAsMove: React.PropTypes.bool,
@@ -798,7 +798,8 @@ ReactiveMap.propTypes = {
 	markerOnDblclick: React.PropTypes.func,
 	onMouseover: React.PropTypes.func,
 	onMouseout: React.PropTypes.func,
-	showMapStyles: React.PropTypes.bool
+	showMapStyles: React.PropTypes.bool,
+	className: React.PropTypes.string
 };
 
 ReactiveMap.defaultProps = {
@@ -817,7 +818,7 @@ ReactiveMap.defaultProps = {
 	autoMapRender: true,
 	defaultMarkerImage: "https://opensource.appbase.io/reactivemaps/dist/images/historic-pin.png",
 	streamMarkerImage: "https://opensource.appbase.io/reactivemaps/dist/images/stream-pin.png",
-	componentStyle: {},
+	style: {},
 	stream: false,
 	applyGeoQuery: false,
 	defaultZoom: 13

diff --git a/lib/sensors/GeoDistanceDropdown.js b/lib/sensors/GeoDistanceDropdown.js
@@ -451,11 +451,11 @@ var GeoDistanceDropdown = function (_Component) {
 			"rbc-title-inactive": !this.props.title,
 			"rbc-placeholder-active": this.props.placeholder,
 			"rbc-placeholder-inactive": !this.props.placeholder
-		});
+		}, this.props.className);
 
 		return React.createElement(
 			"div",
-			{ className: "rbc rbc-geodistancedropdown clearfix card thumbnail col s12 col-xs-12 " + cx, style: this.props.componentStyle },
+			{ className: "rbc rbc-geodistancedropdown clearfix card thumbnail col s12 col-xs-12 " + cx, style: this.props.style },
 			React.createElement(
 				"div",
 				{ className: "row" },
@@ -517,10 +517,11 @@ GeoDistanceDropdown.propTypes = {
 	})),
 	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
-	componentStyle: React.PropTypes.object,
+	style: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,
 	showFilter: React.PropTypes.bool,
-	filterLabel: React.PropTypes.string
+	filterLabel: React.PropTypes.string,
+	className: React.PropTypes.string
 };
 
 // Default props value
@@ -529,7 +530,7 @@ GeoDistanceDropdown.defaultProps = {
 	placeholder: "Search...",
 	placeholderDropdown: "Select Distance",
 	autoLocation: true,
-	componentStyle: {},
+	style: {},
 	URLParams: false,
 	showFilter: true
 };
@@ -555,8 +556,9 @@ GeoDistanceDropdown.types = {
 	customQuery: TYPES.FUNCTION,
 	beforeValueChange: TYPES.FUNCTION,
 	onValueChange: TYPES.FUNCTION,
-	componentStyle: TYPES.OBJECT,
+	style: TYPES.OBJECT,
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
-	filterLabel: TYPES.STRING
+	filterLabel: TYPES.STRING,
+	className: TYPES.STRING
 };
diff --git a/lib/sensors/GeoDistanceSlider.js b/lib/sensors/GeoDistanceSlider.js
@@ -438,11 +438,11 @@ var GeoDistanceSlider = function (_Component) {
 			"rbc-placeholder-inactive": !this.props.placeholder,
 			"rbc-labels-active": this.props.rangeLabels.start || this.props.rangeLabels.end,
 			"rbc-labels-inactive": !this.props.rangeLabels.start && !this.props.rangeLabels.end
-		});
+		}, this.props.className);
 
 		return React.createElement(
 			"div",
-			{ className: "rbc rbc-geodistanceslider clearfix card thumbnail col s12 col-xs-12 " + cx, style: this.props.componentStyle },
+			{ className: "rbc rbc-geodistanceslider clearfix card thumbnail col s12 col-xs-12 " + cx, style: this.props.style },
 			React.createElement(
 				"div",
 				{ className: "row" },
@@ -507,10 +507,11 @@ GeoDistanceSlider.propTypes = {
 	autoLocation: React.PropTypes.bool,
 	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
-	componentStyle: React.PropTypes.object,
+	style: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,
 	showFilter: React.PropTypes.bool,
-	filterLabel: React.PropTypes.string
+	filterLabel: React.PropTypes.string,
+	className: React.PropTypes.string
 };
 
 // Default props value
@@ -527,7 +528,7 @@ GeoDistanceSlider.defaultProps = {
 		end: null
 	},
 	autoLocation: true,
-	componentStyle: {},
+	style: {},
 	URLParams: false,
 	showFilter: true
 };
@@ -552,10 +553,11 @@ GeoDistanceSlider.types = {
 	defaultSelected: TYPES.OBJECT,
 	placeholder: TYPES.STRING,
 	customQuery: TYPES.FUNCTION,
-	componentStyle: TYPES.OBJECT,
+	style: TYPES.OBJECT,
 	beforeValueChange: TYPES.FUNCTION,
 	onValueChange: TYPES.FUNCTION,
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
-	filterLabel: TYPES.STRING
+	filterLabel: TYPES.STRING,
+	className: TYPES.STRING
 };
diff --git a/lib/sensors/PlacesSearch.js b/lib/sensors/PlacesSearch.js
@@ -364,11 +364,11 @@ var PlacesSearch = function (_Component) {
 			"rbc-title-inactive": !this.props.title,
 			"rbc-placeholder-active": this.props.placeholder,
 			"rbc-placeholder-inactive": !this.props.placeholder
-		});
+		}, this.props.className);
 
 		return React.createElement(
 			"div",
-			{ className: "rbc rbc-placessearch clearfix card thumbnail col s12 col-xs-12 " + cx, style: this.props.componentStyle },
+			{ className: "rbc rbc-placessearch clearfix card thumbnail col s12 col-xs-12 " + cx, style: this.props.style },
 			React.createElement(
 				"div",
 				{ className: "row" },
@@ -403,17 +403,18 @@ PlacesSearch.propTypes = {
 	autoLocation: React.PropTypes.bool,
 	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
-	componentStyle: React.PropTypes.object,
+	style: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,
 	showFilter: React.PropTypes.bool,
 	filterLabel: React.PropTypes.string,
-	unit: React.PropTypes.oneOf(["mi", "miles", "yd", "yards", "ft", "feet", "in", "inch", "km", "kilometers", "m", "meters", "cm", "centimeters", "mm", "millimeters", "NM", "nmi", "nauticalmiles"])
+	unit: React.PropTypes.oneOf(["mi", "miles", "yd", "yards", "ft", "feet", "in", "inch", "km", "kilometers", "m", "meters", "cm", "centimeters", "mm", "millimeters", "NM", "nmi", "nauticalmiles"]),
+	className: React.PropTypes.string
 };
 // Default props value
 PlacesSearch.defaultProps = {
 	placeholder: "Search..",
 	autoLocation: true,
-	componentStyle: {},
+	style: {},
 	URLParams: false,
 	showFilter: true,
 	unit: "mi"
@@ -433,9 +434,10 @@ PlacesSearch.types = {
 	customQuery: TYPES.FUNCTION,
 	placeholder: TYPES.STRING,
 	autoLocation: TYPES.BOOLEAN,
-	componentStyle: TYPES.OBJECT,
+	style: TYPES.OBJECT,
 	unit: TYPES.STRING,
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
-	filterLabel: TYPES.STRING
+	filterLabel: TYPES.STRING,
+	className: TYPES.STRING
 };