Skip to content
This repository has been archived by the owner on Dec 30, 2022. It is now read-only.

[prop-types] Allow object as type for root.Root (Fixes #1446) #1461

Merged
merged 14 commits into from
Aug 7, 2018
Merged

[prop-types] Allow object as type for root.Root (Fixes #1446) #1461

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1d3d6c2
Update PropType to allow <View/> from react-native
JonnyBurger Jul 27, 2018
237b919
Update prop types to allow <View/> from react-native (#2)
JonnyBurger Jul 27, 2018
9c2c872
Allow <View/> #3
JonnyBurger Jul 27, 2018
f47296f
Allow <View/> #4
JonnyBurger Jul 27, 2018
adf1048
Fix prettier #1
JonnyBurger Jul 27, 2018
276dca5
Fix prettier #2
JonnyBurger Jul 27, 2018
26d36c6
Fix prettier #3
JonnyBurger Jul 27, 2018
0c8cd30
Fix prettier #4
JonnyBurger Jul 27, 2018
b8436dd
CI fix #1
JonnyBurger Jul 27, 2018
1ef8fd2
CI fix #2
JonnyBurger Jul 27, 2018
8848f54
Ci fix #3
JonnyBurger Jul 27, 2018
7a0110a
Ci fix #4
JonnyBurger Jul 27, 2018
6020f01
Merge branch 'master' into master
samouss Aug 6, 2018
ebca14c
Merge branch 'master' into master
samouss Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/react-instantsearch-core/src/components/Index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ Index.propTypes = {
indexName: PropTypes.string.isRequired,
children: PropTypes.node,
root: PropTypes.shape({
Root: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
Root: PropTypes.oneOfType([
PropTypes.string,
PropTypes.func,
PropTypes.object,
]),
props: PropTypes.object,
}).isRequired,
};
Expand Down
6 changes: 5 additions & 1 deletion packages/react-instantsearch-core/src/components/InstantSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,11 @@ InstantSearch.propTypes = {
children: PropTypes.node,

root: PropTypes.shape({
Root: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
Root: PropTypes.oneOfType([
PropTypes.string,
PropTypes.func,
PropTypes.object,
]),
props: PropTypes.object,
}).isRequired,

Expand Down
6 changes: 5 additions & 1 deletion packages/react-instantsearch-core/src/core/createIndex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ const createIndex = defaultRoot => {
CreateIndex.propTypes = {
indexName: PropTypes.string.isRequired,
root: PropTypes.shape({
Root: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
Root: PropTypes.oneOfType([
PropTypes.string,
PropTypes.func,
PropTypes.object,
]).isRequired,
props: PropTypes.object,
}),
children: PropTypes.node,
Expand Down
7 changes: 5 additions & 2 deletions packages/react-instantsearch-core/src/core/createInstantSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ export default function createInstantSearch(defaultAlgoliaClient, root) {
onSearchParameters: PropTypes.func,
resultsState: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
root: PropTypes.shape({
Root: PropTypes.oneOfType([PropTypes.string, PropTypes.func])
.isRequired,
Root: PropTypes.oneOfType([
PropTypes.string,
PropTypes.func,
PropTypes.object,
]).isRequired,
props: PropTypes.object,
}),
};
Expand Down