d9057f7 · bridge · git.iko.soy

residents: fix broken crumb navigation

fixes: #479

commitd9057f7160302c6c2704f7c1e6161602b152a98e authorLiam Fitzgerald <liam@urizen.co> dateSat 27 Jun 2020, 14:12 (6 years ago) parent1b19a2d

2 files changed+7−3

unifiedsplit

src/lib/useRouter.js+3−2

@@ -1,5 +1,5 @@

11import { useCallback, useMemo, useState, useRef, useEffect } from 'react';

2−import { last, includes as _includes, findIndex } from 'lodash';

2+import { last, includes as _includes, findIndex, get } from 'lodash';

44const NULL_DATA = {};

@@ -89,7 +89,8 @@ export default function useRouter({

8989 routes,

9090 ]);

9191 const data = useMemo(() => {

92− return last(routes).data || NULL_DATA;

92+ return get(last(routes), 'data', {});

93+ // return last(routes).data || NULL_DATA;

9394 }, [routes]);

9495 const Route = useMemo(() => views[peek().key], [views, peek]);

9596

src/views/Residents.js+4−1

@@ -158,6 +158,7 @@ export default function Residents() {

158158 const point = need.point(pointCursor);

159159 const { getResidents, syncResidents } = usePointCache();

160160

161+ const goBack = useCallback(() => pop(), [pop]);

161162 useEffect(() => {

162163 syncResidents(point);

163164 }, [syncResidents, point]);

@@ -202,7 +203,9 @@ export default function Residents() {

202203 return (

203204 <View pop={pop} inset>

204205 <NavHeader>

205− <Crumbs routes={[{ text: name, action: pop }, { text: 'Residents' }]} />

206+ <Crumbs

207+ routes={[{ text: name, action: goBack }, { text: 'Residents' }]}

208+ />

206209 </NavHeader>

207210 <Grid>

208211 <Grid.Item full as={H4} className="mt4">