diff --git a/src/components/Explore/Explore.js b/src/components/Explore/Explore.js
index 5442d07ca..d65cdeaea 100644
--- a/src/components/Explore/Explore.js
+++ b/src/components/Explore/Explore.js
@@ -184,21 +184,23 @@ const Explore = ( {
/>
)}
- {showExploreBottomSheet && (
-
- {Object.keys( exploreViewText ).map( view => (
-
- )}
+ setShowExploreBottomSheet( false )}
+ headerText={t( "EXPLORE" )}
+ hidden={!showExploreBottomSheet}
+ >
+ {Object.keys( exploreViewText ).map( view => (
+
>
);
};
diff --git a/src/components/SharedComponents/Sheets/BottomSheet.js b/src/components/SharedComponents/Sheets/BottomSheet.js
index 76dc6382d..44176281c 100644
--- a/src/components/SharedComponents/Sheets/BottomSheet.js
+++ b/src/components/SharedComponents/Sheets/BottomSheet.js
@@ -59,6 +59,12 @@ const StandardBottomSheet = ( {
// eslint-disable-next-line
const noHandle = ( ) => <>>;
+ const handleBackdropPress = useCallback( position => {
+ if ( handleClose && position === -1 ) {
+ handleClose( );
+ }
+ }, [handleClose] );
+
const handleClosePress = useCallback( ( ) => {
if ( handleClose ) {
handleClose( );
@@ -100,7 +106,7 @@ const StandardBottomSheet = ( {
style={viewStyles.shadow}
handleComponent={noHandle}
backdropComponent={renderBackdrop}
- onChange={onChange}
+ onChange={onChange || handleBackdropPress}
>
diff --git a/src/components/SharedComponents/Sheets/RadioButtonSheet.js b/src/components/SharedComponents/Sheets/RadioButtonSheet.js
index fed8f56c9..b26297e17 100644
--- a/src/components/SharedComponents/Sheets/RadioButtonSheet.js
+++ b/src/components/SharedComponents/Sheets/RadioButtonSheet.js
@@ -43,11 +43,6 @@ const RadioButtonSheet = ( {
{
- if ( position === -1 ) {
- handleClose( );
- }
- }}
>
{Object.keys( radioValues ).map( radioRow => radioButtonRow( radioRow ) )}
diff --git a/src/components/SharedComponents/Sheets/TextInputSheet.js b/src/components/SharedComponents/Sheets/TextInputSheet.js
index 762fd5263..c9baf2489 100644
--- a/src/components/SharedComponents/Sheets/TextInputSheet.js
+++ b/src/components/SharedComponents/Sheets/TextInputSheet.js
@@ -53,11 +53,6 @@ const TextInputSheet = ( {
{
- if ( position === -1 ) {
- handleClose();
- }
- }}
>
{
- if ( position === -1 ) {
- handleClose( );
- }
- }}
>
diff --git a/src/components/SharedComponents/Sheets/WarningSheet.js b/src/components/SharedComponents/Sheets/WarningSheet.js
index c035467a8..b33cce61b 100644
--- a/src/components/SharedComponents/Sheets/WarningSheet.js
+++ b/src/components/SharedComponents/Sheets/WarningSheet.js
@@ -37,11 +37,6 @@ const WarningSheet = ( {
headerText={headerText}
hidden={hidden}
insideModal={insideModal}
- onChange={position => {
- if ( position === -1 ) {
- handleClose( );
- }
- }}
>
{text && {text}}