Skip to content

Commit 7b37f4b

Browse files
committed
reafactor: if => IF!, early return
1 parent fda53e7 commit 7b37f4b

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

crate/src/page/partial/header.rs

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,19 @@ fn header_visibility(
1717
let scrolling_up = scroll_history.front() >= scroll_history.back();
1818

1919
if menu_is_visible || at_the_top_or_higher || scrolling_up {
20-
Visible
21-
} else {
22-
Hidden
23-
}
20+
return Visible
21+
}
22+
Hidden
2423
}
2524

2625
#[allow(clippy::too_many_lines)]
2726
pub fn view(model: &Model) -> Vec<Node<Msg>> {
2827
let show_header =
2928
header_visibility(model.menu_visibility, &model.scroll_history)
3029
== Visible;
31-
vec![
30+
nodes![
3231
// Header background and line container
33-
if show_header {
32+
IF!(show_header =>
3433
div![
3534
C![
3635
C.fixed,
@@ -78,11 +77,9 @@ pub fn view(model: &Model) -> Vec<Node<Msg>> {
7877
],]
7978
],
8079
]
81-
} else {
82-
empty![]
83-
},
80+
),
8481
// Photo 1
85-
if model.page == Page::About {
82+
IF!(model.page == Page::About =>
8683
div![
8784
C![
8885
C.absolute,
@@ -111,11 +108,9 @@ pub fn view(model: &Model) -> Vec<Node<Msg>> {
111108
}
112109
],
113110
]
114-
} else {
115-
empty![]
116-
},
111+
),
117112
// Menu
118-
if model.menu_visibility == Visible {
113+
IF!(model.menu_visibility == Visible =>
119114
div![
120115
C![
121116
C.fixed,
@@ -270,11 +265,9 @@ pub fn view(model: &Model) -> Vec<Node<Msg>> {
270265
],
271266
]
272267
]
273-
} else {
274-
empty![]
275-
},
268+
),
276269
// Header
277-
if show_header {
270+
IF!(show_header =>
278271
header![
279272
C![
280273
C.fixed,
@@ -510,8 +503,6 @@ pub fn view(model: &Model) -> Vec<Node<Msg>> {
510503
],]
511504
],
512505
]
513-
} else {
514-
empty![]
515-
},
506+
),
516507
]
517508
}

0 commit comments

Comments
 (0)