File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -48,6 +48,7 @@ const RoutesList: React.FC<SheetProps> = ({ sheetRef }) => {
4848 const {
4949 data : routes ,
5050 isLoading : isRoutesLoading ,
51+ isError : routeError ,
5152 isRefetching : isRefreshing ,
5253 refetch : refetchRoutes ,
5354 } = useRoutes ( ) ;
@@ -60,13 +61,6 @@ const RoutesList: React.FC<SheetProps> = ({ sheetRef }) => {
6061 const { data : defaultGroup , refetch : refetchDefaultGroup } =
6162 useDefaultRouteGroup ( ) ;
6263
63- const routeError = [
64- useRoutes ( ) . isError ,
65- useAuthToken ( ) . isError ,
66- usePatternPaths ( ) . isError ,
67- useBaseData ( ) . isError ,
68- ] . some ( ( v ) => v === true ) ;
69-
7064 const handleRouteSelected = ( selectedRoute : IMapRoute ) => {
7165 setSelectedRoute ( selectedRoute ) ;
7266 setDrawnRoutes ( [ selectedRoute ] ) ;
Original file line number Diff line number Diff line change @@ -79,27 +79,17 @@ const Home = () => {
7979 sheetStack = [ "routeList" ] ;
8080
8181 setPresentSheet ( ( sheet ) => {
82- // There is a problem with dismiss on android.
83- // Seems like the reference isn't able to be detected/accessible?
84- // .close is slightly less performant but is more reliable due to sheet not being removed from the view hierarchy
85- const prevSheet = sheetRefs [ sheetStack . at ( - 1 ) ! ] ;
8682 const newSheet = sheetRefs [ sheet ] ;
87- prevSheet ?. current ?. close ( ) ;
8883 newSheet ?. current ?. present ( ) ;
8984 sheetStack . push ( sheet ) ;
9085 } ) ;
9186
9287 setDismissSheet ( ( sheet ) => {
9388 // run any defined close sheet steps
9489 callSheetCloseCallback ( sheet ) ;
95-
96- // See comments in setPresentSheet()
9790 const prevSheet = sheetRefs [ sheet ] ;
9891 prevSheet ?. current ?. close ( ) ;
9992 sheetStack . pop ( ) ;
100-
101- const newSheet = sheetRefs [ sheetStack . at ( - 1 ) ! ] ;
102- newSheet ?. current ?. present ( ) ;
10393 } ) ;
10494 } , [ ] ) ;
10595
You can’t perform that action at this time.
0 commit comments