Skip to content

Commit 56d1ad5

Browse files
committed
Keep other options on screen
1 parent 6415f05 commit 56d1ad5

File tree

3 files changed

+48
-35
lines changed

3 files changed

+48
-35
lines changed

src/Hypercontextual/BankingDemo.elm

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -242,51 +242,50 @@ viewContactMethod selectedIds method =
242242
viewSelectedAccounts : Set String -> Html Msg
243243
viewSelectedAccounts selectedIds =
244244
let
245-
selectedAccounts =
246-
accounts
247-
|> List.filter (\a -> Set.member a.id selectedIds)
248-
249-
viewSelectedAccount account =
245+
viewAccountWithSelection account =
250246
let
251247
accountContent =
252248
div []
253249
[ div [ class "balance" ] [ text account.balance ]
254250
, div [ class "account-type subdued" ] [ text account.accountType ]
255251
]
252+
253+
isSelected =
254+
Set.member account.id selectedIds
256255
in
257256
Tile.tile account.name accountContent
258-
|> Tile.select
257+
|> Tile.when isSelected Tile.select
259258
|> Tile.disabled
260259
|> Tile.view
261260
in
262261
ChatDemo.viewEntry
263262
[ div [ class "options" ]
264-
(List.map viewSelectedAccount selectedAccounts)
263+
(List.map viewAccountWithSelection accounts)
265264
]
266265

267266

268267
viewSelectedMethods : Set String -> Html Msg
269268
viewSelectedMethods selectedIds =
270269
let
271-
selectedMethods =
272-
contactMethods
273-
|> List.filter (\m -> Set.member m.id selectedIds)
274-
275-
viewSelectedMethod method =
270+
viewMethodWithSelection method =
276271
let
277272
methodContent =
278273
div []
279274
[ div [ class "value" ] [ text method.value ]
280275
]
276+
277+
isSelected =
278+
Set.member method.id selectedIds
281279
in
282280
Tile.tile method.methodType methodContent
283-
|> Tile.select
281+
|> Tile.when method.isDefault (Tile.withBadge "Default")
282+
|> Tile.when isSelected Tile.select
284283
|> Tile.disabled
285284
|> Tile.view
286285
in
287286
ChatDemo.viewEntry
288287
[ div [ class "options" ]
289-
(List.map viewSelectedMethod selectedMethods)
288+
(List.map viewMethodWithSelection contactMethods)
290289
]
291290

292291

src/Hypercontextual/OrderDemo.elm

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -256,19 +256,27 @@ viewAddress selectedAddressId addr =
256256

257257

258258
viewSelectedAddress : Address -> Html Msg
259-
viewSelectedAddress addr =
259+
viewSelectedAddress selectedAddr =
260260
let
261-
addressContent =
262-
div []
263-
[ div [ class "phone" ] [ text addr.phone ]
264-
, div [ class "address subdued" ] [ text addr.address ]
265-
]
261+
viewAddressWithSelection addr =
262+
let
263+
addressContent =
264+
div []
265+
[ div [ class "phone" ] [ text addr.phone ]
266+
, div [ class "address subdued" ] [ text addr.address ]
267+
]
268+
269+
isSelected =
270+
addr.id == selectedAddr.id
271+
in
272+
Tile.tile addr.name addressContent
273+
|> Tile.when addr.isDefault (Tile.withBadge "Default")
274+
|> Tile.when isSelected Tile.select
275+
|> Tile.disabled
276+
|> Tile.view
266277
in
267278
ChatDemo.viewEntry
268-
[ Tile.tile addr.name addressContent
269-
|> Tile.select
270-
|> Tile.disabled
271-
|> Tile.view
279+
[ div [ class "options" ] (List.map viewAddressWithSelection addresses)
272280
]
273281

274282

@@ -319,19 +327,25 @@ viewAddressUpdated address =
319327

320328

321329
viewSelectedOrder : Order -> Html Msg
322-
viewSelectedOrder order =
330+
viewSelectedOrder selectedOrder =
323331
let
324-
itemsContent =
325-
div [ class "items" ]
326-
(List.map viewItem order.items)
332+
viewOrderWithSelection order =
333+
let
334+
itemsContent =
335+
div [ class "items" ]
336+
(List.map viewItem order.items)
337+
338+
isSelected =
339+
order.id == selectedOrder.id
340+
in
341+
Tile.tile order.id itemsContent
342+
|> Tile.withBadge order.status
343+
|> Tile.when isSelected Tile.select
344+
|> Tile.disabled
345+
|> Tile.view
327346
in
328347
ChatDemo.viewEntry
329-
[ Tile.tile order.id itemsContent
330-
|> Tile.withBadge order.status
331-
|> Tile.select
332-
|> Tile.disabled
333-
|> Tile.view
334-
]
348+
[ div [ class "options" ] (List.map viewOrderWithSelection orders) ]
335349

336350

337351
view : Model -> Html Msg

src/_layouts/hypercontextual.webc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183

184184
position: relative;
185185
width: 28rem;
186-
height: 32rem;
186+
height: 36rem;
187187
display: flex;
188188
flex-shrink: 0;
189189
flex-direction: column;

0 commit comments

Comments
 (0)