Skip to content

[#598] refreshable의 로딩 인디케이터와 LoadingView가 같이 뜨는 현상을 해결한다 #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opficdev merged 3 commits into from
Jun 17, 2026
Merged

[#598] refreshable의 로딩 인디케이터와 LoadingView가 같이 뜨는 현상을 해결한다 #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f95fa8
refactor: refreshable fetch 흐름 분리
opficdev Jun 17, 2026
c8d808b
fix: refreshable 로딩 인디케이터 분리
opficdev Jun 17, 2026
959b853
fix: refresh 알림 관찰 재구독
opficdev Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions Application/DevLogPresentation/Sources/Home/List/TodoListFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,11 @@ private extension TodoListFeature {
func fetchEffect(
query: TodoQuery,
cursor: TodoCursor?,
resetsPagination: Bool = true
resetsPagination: Bool = true,
showsIndicator: Bool = true
) -> Effect<Action> {
.concatenate(
.send(.loading(.begin(target: .default, mode: .delayed))),
showsIndicator ? .send(.loading(.begin(target: .default, mode: .delayed))) : .none,
.run { [fetchTodosUseCase] send in
do {
let page = try await fetchTodosUseCase.execute(query, cursor: cursor)
Expand All @@ -216,12 +217,16 @@ private extension TodoListFeature {
nextCursor: page.nextCursor
)))
await send(.store(.setHasMore(page.items.count == query.pageSize && page.nextCursor != nil)))
await send(.loading(.end(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.end(target: .default, mode: .delayed)))
}
} catch is CancellationError {
return
} catch {
await send(.store(.setAlert(true)))
await send(.loading(.end(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.end(target: .default, mode: .delayed)))
}
}
}
)
Expand Down Expand Up @@ -277,7 +282,9 @@ private extension TodoListFeature {
state: inout State
) -> Effect<Action> {
switch action {
case .refresh, .onAppear:
case .refresh:
return fetchEffect(query: state.query, cursor: nil, showsIndicator: false)
case .onAppear:
return fetchEffect(query: state.query, cursor: nil)
case .swipeTodo(let todo):
return swipeTodoEffect(todo, state: &state)
Expand Down
2 changes: 1 addition & 1 deletion Application/DevLogPresentation/Sources/Home/List/TodoListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ struct TodoListView: View {
}
.offset(y: headerOffset)
}
.refreshable { store.send(.view(.refresh)) }
.refreshable { await store.send(.view(.refresh)).finish() }
.scrollDisabled(visibleTodos.isEmpty || store.state.isLoading)

if store.state.isLoading {
Expand Down
20 changes: 15 additions & 5 deletions Application/DevLogPresentation/Sources/Profile/ProfileFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,11 @@ struct ProfileFeature {
if !settings.isEmpty {
state.selectedActivityKinds = settings
}
let showsIndicator = if case .fetchData = action { true } else { false }
if let selectedQuarterStart = state.selectedQuarterStart {
return .merge(
fetchUserDataEffect(),
fetchActivityQuarterEffect(selectedQuarterStart)
fetchActivityQuarterEffect(selectedQuarterStart, showsIndicator: showsIndicator)
)
}
return fetchUserDataEffect()
Expand Down Expand Up @@ -220,9 +221,14 @@ private extension ProfileFeature {
}
}

func fetchActivityQuarterEffect(_ quarterStart: Date) -> Effect<Action> {
func fetchActivityQuarterEffect(
_ quarterStart: Date,
showsIndicator: Bool = true
) -> Effect<Action> {
.run { [fetchTodosUseCase] send in
await send(.loading(.begin(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.begin(target: .default, mode: .delayed)))
}
do {
let data = try await ProfileHeatmapBuilder.fetchQuarterActivityData(
from: quarterStart,
Expand All @@ -237,9 +243,13 @@ private extension ProfileFeature {
)
)
)
await send(.loading(.end(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.end(target: .default, mode: .delayed)))
}
} catch {
await send(.loading(.end(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.end(target: .default, mode: .delayed)))
}
await send(.setAlert(true))
}
}
Expand Down
61 changes: 43 additions & 18 deletions Application/DevLogPresentation/Sources/PushNotification/PushNotificationListFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ struct PushNotificationListFeature {
case loading(LoadingFeature.Action)

enum ViewAction: Equatable {
case refresh
case fetchNotifications
case loadNextPage
case deleteNotification(PushNotificationItem)
Expand All @@ -83,7 +84,6 @@ struct PushNotificationListFeature {
case syncNotifications([PushNotificationItem], nextCursor: PushNotificationCursor?, hasMore: Bool)
case setNotificationHidden(String, Bool)
case setNotificationRead(String, Bool)
case observeNotifications(PushNotificationQuery, Int)
}
}

Expand Down Expand Up @@ -151,6 +151,14 @@ private extension PushNotificationListFeature {
state: inout State
) -> Effect<Action> {
switch action {
case .refresh:
state.nextCursor = nil
return fetchNotificationsEffect(
query: state.query,
cursor: nil,
existingCount: 0,
showsIndicator: false
)
case .fetchNotifications:
state.nextCursor = nil
return fetchNotificationsEffect(query: state.query, cursor: nil, existingCount: 0)
Expand Down Expand Up @@ -252,8 +260,6 @@ private extension PushNotificationListFeature {
if let index = state.notifications.firstIndex(where: { $0.id == notificationId }) {
state.notifications[index].isRead = isRead
}
case .observeNotifications(let query, let limit):
return observeNotificationsEffect(query: query, limit: limit)
}

return .none
Expand All @@ -269,11 +275,36 @@ private extension PushNotificationListFeature {
func fetchNotificationsEffect(
query: PushNotificationQuery,
cursor: PushNotificationCursor?,
existingCount: Int
existingCount: Int,
showsIndicator: Bool = true
) -> Effect<Action> {
let limit = max(query.pageSize, existingCount)
let fetchEffect: Effect<Action> = .run { [fetchPushNotificationsUseCase] send in
await send(.loading(.begin(target: .default, mode: .delayed)))
let fetchEffect = fetchNotificationsPageEffect(query: query, cursor: cursor, showsIndicator: showsIndicator)
let observeEffect = observeNotificationsEffect(
query: query,
limit: max(limit, existingCount + query.pageSize)
)

if cursor == nil {
return .concatenate(
.cancel(id: CancelID.observeNotifications),
fetchEffect,
observeEffect
)
}

return fetchEffect
}

func fetchNotificationsPageEffect(
query: PushNotificationQuery,
cursor: PushNotificationCursor?,
showsIndicator: Bool = true
) -> Effect<Action> {
.run { [fetchPushNotificationsUseCase] send in
if showsIndicator {
await send(.loading(.begin(target: .default, mode: .delayed)))
}
do {
let page = try await fetchPushNotificationsUseCase.execute(query, cursor: cursor)
if cursor == nil {
Expand All @@ -286,23 +317,17 @@ private extension PushNotificationListFeature {
))
)
await send(.store(.setHasMore(page.items.count == query.pageSize && page.nextCursor != nil)))
await send(.store(.observeNotifications(query, max(limit, existingCount + page.items.count))))
await send(.loading(.end(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.end(target: .default, mode: .delayed)))
}
} catch {
await send(.loading(.end(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.end(target: .default, mode: .delayed)))
}
await send(.store(.setAlert))
}
}
.cancellable(id: CancelID.fetchNotifications, cancelInFlight: true)

if cursor == nil {
return .concatenate(
.cancel(id: CancelID.observeNotifications),
fetchEffect
)
}

return fetchEffect
}

func observeNotificationsEffect(
Expand Down
2 changes: 1 addition & 1 deletion Application/DevLogPresentation/Sources/PushNotification/PushNotificationListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct PushNotificationListView: View {
headerOffset = max(0, -offset)
}
.safeAreaInset(edge: .top) { safeAreaHeader }
.refreshable { store.send(.view(.fetchNotifications)) }
.refreshable { await store.send(.view(.refresh)).finish() }
.navigationTitle(String(localized: "nav_push_notifications"))
.listStyle(.plain)
}
Expand Down
18 changes: 13 additions & 5 deletions Application/DevLogPresentation/Sources/Today/TodayFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ struct TodayFeature {
return updateDisplayOptionsEffect(state.displayOptions)
case .binding:
break
case .refresh, .fetchData:
case .refresh:
return fetchTodosEffect(showsIndicator: false)
case .fetchData:
return fetchTodosEffect()
case .setSectionScope(let scope):
if state.selectedSectionScope == scope, scope != .all {
Expand Down Expand Up @@ -255,9 +257,11 @@ private enum UpdateTodayDisplayOptionsUseCaseKey: DependencyKey {
}

private extension TodayFeature {
func fetchTodosEffect() -> Effect<Action> {
func fetchTodosEffect(showsIndicator: Bool = true) -> Effect<Action> {
.run { [fetchTodosUseCase] send in
await send(.loading(.begin(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.begin(target: .default, mode: .delayed)))
}
do {
async let todosWithDueDatePage = fetchTodosUseCase.execute(
TodoQuery(
Expand All @@ -284,9 +288,13 @@ private extension TodayFeature {
let todosWithDueDate = try await todosWithDueDatePage.items.compactMap(TodayTodoItem.init(from:))
let todosWithoutDueDate = try await todosWithoutDueDatePage.items.compactMap(TodayTodoItem.init(from:))
await send(.store(.setTodos(todosWithDueDate + todosWithoutDueDate)))
await send(.loading(.end(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.end(target: .default, mode: .delayed)))
}
} catch {
await send(.loading(.end(target: .default, mode: .delayed)))
if showsIndicator {
await send(.loading(.end(target: .default, mode: .delayed)))
}
await send(.store(.setAlert))
}
}
Expand Down
2 changes: 1 addition & 1 deletion Application/DevLogPresentation/Sources/Today/TodayView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct TodayView: View {
.navigationTitle(String(localized: "nav_today"))
.toolbar { toolbarContent }
.background(NavigationBarConfigurator())
.refreshable { store.send(.refresh) }
.refreshable { await store.send(.refresh).finish() }
.alert($store.scope(state: \.alert, action: \.alert))
.overlay {
if store.isLoading {
Expand Down
Loading