Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

web: Improve customization through render props #684

Merged
merged 14 commits into from
Dec 12, 2018
Merged

web: Improve customization through render props #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
eeb9ea4
Update submodules
bietkul Dec 2, 2018
4a12110
Update modules
bietkul Dec 4, 2018
1332ae8
Merge branch 'next' of github.com:appbaseio/reactivesearch into feat/…
bietkul Dec 4, 2018
7a6d566
web: Rename onData & onAllData in result components
bietkul Dec 4, 2018
73a8e4a
web: Added onData prop in results components
bietkul Dec 4, 2018
ab9c830
web: Rename renderSuggestions & add onSuggestions
divyanshu013 Sep 19, 2018
728880c
web: Rename renderListItem to renderItem in list components
bietkul Dec 5, 2018
7007ead
Merge Resolved
bietkul Dec 11, 2018
cdc0d29
web: Added error handling in search components
bietkul Dec 11, 2018
02e7e3d
web: Added error handling in result components
bietkul Dec 11, 2018
2ac6501
web: Added error handling in list components
bietkul Dec 12, 2018
afd6349
web: Refactor render error
bietkul Dec 12, 2018
7aa5d1c
web: Added error handling in base components
bietkul Dec 12, 2018
db1a764
Merge Resolved
bietkul Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/maps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"emotion-theming": "^9.0.0",
"prop-types": "^15.6.0",
"react-emotion": "^9.0.0",
"react-google-maps": "^9.4.5"
"react-google-maps": "^9.4.5",
"rheostat": "^3.0.1"
metagrover marked this conversation as resolved.
Show resolved Hide resolved
},
"peerDependencies": {
"@appbaseio/reactivesearch": ">=2.8.2",
Expand Down
1 change: 0 additions & 1 deletion packages/native/example/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { Text, Header, Body, Title } from 'native-base';
import {
ReactiveBase,
DataSearch,
TextField,
SingleDropdownList,
MultiDropdownList,
SingleDropdownRange,
Expand Down
2 changes: 1 addition & 1 deletion packages/playground
Open in desktop
Submodule playground updated 26 files
+68 −27 stories/index.js
+1 −1 stories/reactivesearch/CategorySearch.stories.js
+1 −1 stories/reactivesearch/Dark.stories.js
+1 −1 stories/reactivesearch/DarkCard.stories.js
+1 −1 stories/reactivesearch/DataController.stories.js
+1 −1 stories/reactivesearch/DataSearch.stories.js
+1 −1 stories/reactivesearch/DynamicRangeSlider.stories.js
+1 −1 stories/reactivesearch/MultiDropdownList.stories.js
+1 −1 stories/reactivesearch/MultiDropdownRange.stories.js
+1 −1 stories/reactivesearch/MultiLevelMenu.stories.js
+1 −1 stories/reactivesearch/MultiList.stories.js
+1 −1 stories/reactivesearch/MultiRange.stories.js
+1 −1 stories/reactivesearch/NestedList.stories.js
+1 −1 stories/reactivesearch/NestedMultiList.stories.js
+1 −1 stories/reactivesearch/NumberBox.stories.js
+1 −1 stories/reactivesearch/RangeInput.stories.js
+1 −1 stories/reactivesearch/RangeSlider.stories.js
+1 −1 stories/reactivesearch/ReactiveComponent.stories.js
+1 −1 stories/reactivesearch/ReactiveList.stories.js
+1 −1 stories/reactivesearch/ResultCard.stories.js
+1 −1 stories/reactivesearch/ResultList.stories.js
+1 −1 stories/reactivesearch/SingleDropdownList.stories.js
+1 −1 stories/reactivesearch/SingleDropdownRange.stories.js
+1 −1 stories/reactivesearch/SingleList.stories.js
+1 −1 stories/reactivesearch/SingleRange.stories.js
+1 −1 stories/reactivesearch/TextField.stories.js
2 changes: 1 addition & 1 deletion packages/reactivecore
Open in desktop
Submodule reactivecore updated 4 files
+11 −0 src/actions/query.js
+1 −0 src/constants/index.js
+11 −0 src/reducers/errorReducer.js
+2 −0 src/reducers/index.js
2 changes: 1 addition & 1 deletion packages/web/examples/CategorySearch/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Main extends Component {
dataField="original_title"
from={0}
size={3}
onData={this.booksList}
renderData={this.booksList}
className="result-list-container"
pagination
react={{
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/CustomSelectedFilters/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Main extends Component {
dataField="original_title"
from={0}
size={3}
onData={this.booksList}
renderData={this.booksList}
className="result-list-container"
pagination
react={{
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/DataController/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.booksReactiveList}
renderData={this.booksReactiveList}
react={{
and: ['BookSensor'],
}}
Expand Down
4 changes: 2 additions & 2 deletions packages/web/examples/DataSearch/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Main extends Component {
componentId="SearchResult"
dataField="original_title"
size={10}
onData={this.onData}
renderData={this.renderData}
className="result-list-container"
pagination
react={{
Expand All @@ -42,7 +42,7 @@ class Main extends Component {
);
}

onData(data) {
renderData(data) {
return {
title: (
<div
Expand Down
4 changes: 2 additions & 2 deletions packages/web/examples/DatePicker/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Main extends Component {
dataField="name"
from={0}
size={40}
onData={this.onData}
renderData={this.renderData}
showPagination
react={{
and: ['DateSensor'],
Expand Down Expand Up @@ -59,7 +59,7 @@ class Main extends Component {
return query;
}

onData(res) {
renderData(res) {
return {
image: res.image,
title: res.name,
Expand Down
4 changes: 2 additions & 2 deletions packages/web/examples/DateRange/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Main extends Component {
return query;
}

onData(res) {
renderData(res) {
return {
image: res.image,
title: res.name,
Expand Down Expand Up @@ -71,7 +71,7 @@ class Main extends Component {
dataField="name"
from={0}
size={40}
onData={this.onData}
renderData={this.renderData}
showPagination
react={{
and: ['DateSensor'],
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/DynamicRangeSlider/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class Main extends Component {
from={0}
size={3}
className="result-list-container"
onData={this.booksList}
renderData={this.booksList}
pagination
react={{
and: 'BookSensor',
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/MultiDataList/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.meetupList}
renderData={this.meetupList}
innerClass={{
image: 'meetup-list-image',
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/MultiDropdownList/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.booksReactiveList}
renderData={this.booksReactiveList}
react={{
and: ['BookSensor'],
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/MultiDropdownRange/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Main extends Component {
dataField="original_title.raw"
from={0}
size={10}
onData={this.booksCard}
renderData={this.booksCard}
react={{
and: 'BookSensor',
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/MultiList/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.booksReactiveList}
renderData={this.booksReactiveList}
react={{
and: ['BookSensor'],
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/MultiRange/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Main extends Component {
dataField="original_title.raw"
from={0}
size={10}
onData={this.booksCard}
renderData={this.booksCard}
react={{
and: 'BookSensor',
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/NumberBox/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Main extends Component {
dataField="original_title"
from={0}
size={3}
onData={this.booksList}
renderData={this.booksList}
className="result-list-container"
pagination
react={{
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/RangeInput/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Main extends Component {
from={0}
size={3}
className="result-list-container"
onData={this.booksList}
renderData={this.booksList}
pagination
react={{
and: 'BookSensor',
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/RangeSlider/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Main extends Component {
from={0}
size={3}
className="result-list-container"
onData={this.booksList}
renderData={this.booksList}
pagination
react={{
and: 'BookSensor',
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/RatingsFilter/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Main extends Component {
title="Results"
from={0}
size={20}
onData={this.onData}
renderData={this.onData}
react={{
and: 'RatingsSensor',
}}
Expand Down
4 changes: 2 additions & 2 deletions packages/web/examples/ReactiveComponent/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class Main extends Component {
title="ReactiveList"
from={0}
size={20}
onData={this.onData}
renderData={this.renderData}
pagination
react={{
and: 'CarSensor',
Expand All @@ -60,7 +60,7 @@ class Main extends Component {
);
}

onData(data) {
renderData(data) {
return (
<div key={data._id}>
<h2>{data.name}</h2>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/ReactiveList/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Main extends Component {
dataField="original_title.raw"
className="result-list-container"
size={5}
onData={this.booksReactiveList}
renderData={this.booksReactiveList}
pagination
URLParams
react={{
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/ResultCard/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Main extends Component {
componentId="SearchResult"
dataField="original_title.raw"
size={10}
onData={this.booksCard}
renderData={this.booksCard}
pagination
URLParams
react={{
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/ResultList/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Main extends Component {
componentId="SearchResult"
dataField="original_title"
size={3}
onData={this.booksList}
renderData={this.booksList}
className="result-list-container"
pagination
URLParams
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/SelectedFilters/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Main extends Component {
dataField="original_title"
from={0}
size={3}
onData={this.booksList}
renderData={this.booksList}
className="result-list-container"
pagination
react={{
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/SingleDataList/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.meetupList}
renderData={this.meetupList}
innerClass={{
image: 'meetup-list-image',
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/SingleDropdownList/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.booksReactiveList}
renderData={this.booksReactiveList}
react={{
and: ['BookSensor'],
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/SingleDropdownRange/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Main extends Component {
dataField="original_title.raw"
from={0}
size={10}
onData={this.booksCard}
renderData={this.booksCard}
react={{
and: 'BookSensor',
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/SingleList/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.booksReactiveList}
renderData={this.booksReactiveList}
react={{
and: ['BookSensor'],
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/SingleRange/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Main extends Component {
dataField="original_title.raw"
from={0}
size={10}
onData={this.booksCard}
renderData={this.booksCard}
react={{
and: 'BookSensor',
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/TagCloud/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.meetupList}
renderData={this.meetupList}
innerClass={{
image: 'meetup-list-image',
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/TextField/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Main extends Component {
dataField="original_title"
from={0}
size={3}
onData={this.booksList}
renderData={this.booksList}
className="result-list-container"
pagination
react={{
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/ToggleButton/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Main extends Component {
className="result-list-container"
from={0}
size={5}
onData={this.meetupList}
renderData={this.meetupList}
innerClass={{
image: 'meetup-list-image',
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/ssr-with-react-dom/client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const reactiveListProps = {
dataField: 'original_title.raw',
from: 0,
size: 10,
onData: data => <BookCard key={data._id} data={data} />,
renderData: data => <BookCard key={data._id} data={data} />,
react: {
and: ['BookSensor'],
},
Expand Down
21 changes: 13 additions & 8 deletions packages/web/examples/ssr-with-react-dom/server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const reactiveListProps = {
dataField: 'original_title.raw',
from: 0,
size: 10,
onData: data => <BookCard key={data._id} data={data} />,
renderData: data => <BookCard key={data._id} data={data} />,
react: {
and: ['BookSensor'],
},
Expand Down Expand Up @@ -100,12 +100,16 @@ async function handleRender(req, res) {
// ReactiveSearch uses emotion and this will inline the styles
// so you can get the correct styles for ReactiveSearch's components
// on the first load
const html = renderStylesToString(renderToString(<App
store={store}
settings={settings}
singleRangeProps={singleRangeProps}
reactiveListProps={reactiveListProps}
/>));
const html = renderStylesToString(
renderToString(
<App
store={store}
settings={settings}
singleRangeProps={singleRangeProps}
reactiveListProps={reactiveListProps}
/>,
),
);

// Send the rendered page back to the client
res.send(renderFullPage(html, store));
Expand All @@ -119,6 +123,7 @@ app.listen(port, (error) => {
} else {
// eslint-disable-next-line
console.info(
`==> 🌎 Listening on port ${port}. Open up http://localhost:${port}/ in your browser.`);
`==> 🌎 Listening on port ${port}. Open up http://localhost:${port}/ in your browser.`,
);
}
});
2 changes: 1 addition & 1 deletion packages/web/examples/ssr/pages/categorysearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const reactiveListProps = {
className: 'result-list-container',
from: 0,
size: 5,
onData: data => <BookCard key={data._id} data={data} />,
renderData: data => <BookCard key={data._id} data={data} />,
react: {
and: ['BookSensor'],
},
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/ssr/pages/datasearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const reactiveListProps = {
className: 'result-list-container',
from: 0,
size: 5,
onData: data => <BookCard key={data._id} data={data} />,
renderData: data => <BookCard key={data._id} data={data} />,
react: {
and: ['BookSensor'],
},
Expand Down
2 changes: 1 addition & 1 deletion packages/web/examples/ssr/pages/dynamicrangeslider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const reactiveListProps = {
dataField: 'original_title.raw',
from: 0,
size: 10,
onData: data => <BookCard key={data._id} data={data} />,
renderData: data => <BookCard key={data._id} data={data} />,
react: {
and: ['BookSensor'],
},
Expand Down