[fix] #120 페이지네이션 액션 애니메이션 제거

YAPP-Github · Sep 15, 2024 · 636e6dd · 636e6dd
1 parent c771ccc
commit 636e6dd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/Projects/Feature/FeatureSetting/Sources/Search/PokitSearchFeature.swift b/Projects/Feature/FeatureSetting/Sources/Search/PokitSearchFeature.swift
@@ -73,10 +73,7 @@ public struct PokitSearchFeature {
             guard let startDate = domain.condition.startDate else {
                 return nil
             }
-            let formatter = DateFormatter()
-            formatter.dateFormat = "yyyy-MM-dd"
-
-            return formatter.string(from: startDate)
+            return DateFormat.searchCondition.formatter.string(from: startDate)
         }
         var hasNext: Bool {
             get { domain.contentList.hasNext }
@@ -335,7 +332,7 @@ private extension PokitSearchFeature {
             state.shareSheetItem = nil
             return .none
         case .로딩_isPresented:
-            return .send(.async(.컨텐츠_검색_결과_페이징_조회), animation: .pokitDissolve)
+            return .send(.async(.컨텐츠_검색_결과_페이징_조회))
         }
     }
 
@@ -350,9 +347,6 @@ private extension PokitSearchFeature {
             state.domain.contentList.data = []
             return .none
         case .updateDateFilter(startDate: let startDate, endDate: let endDate):
-            let formatter = DateFormatter()
-            formatter.dateFormat = "yy.MM.dd"
-
             state.domain.condition.startDate = startDate
             state.domain.condition.endDate = endDate
 
@@ -362,11 +356,13 @@ private extension PokitSearchFeature {
                 return .none
             }
 
+            let startDateString = DateFormat.dateFilter.formatter.string(from: startDate)
             if startDate == endDate {
                 /// - 날짜 필터를 하루만 선택했을 경우
-                state.dateFilterText = "\(formatter.string(from: startDate))"
+                state.dateFilterText = startDateString
             } else {
-                state.dateFilterText = "\(formatter.string(from: startDate))~\(formatter.string(from: endDate))"
+                let endDateString = DateFormat.dateFilter.formatter.string(from: endDate)
+                state.dateFilterText = "\(startDateString)~\(endDateString)"
             }
 
             return .none
@@ -525,7 +521,7 @@ private extension PokitSearchFeature {
                         endDate: endDateString
                     )
                 ).toDomain()
-                await send(.inner(.컨텐츠_검색_결과_페이징_갱신(contentList)), animation: .pokitDissolve)
+                await send(.inner(.컨텐츠_검색_결과_페이징_갱신(contentList)))
             }
         }
     }

diff --git a/Projects/Feature/FeatureSetting/Sources/Search/PokitSearchView.swift b/Projects/Feature/FeatureSetting/Sources/Search/PokitSearchView.swift
@@ -15,7 +15,7 @@ public struct PokitSearchView: View {
     @Perception.Bindable
     public var store: StoreOf<PokitSearchFeature>
     @FocusState
-        private var focused: Bool
+    private var focused: Bool
 
     /// - Initializer
     public init(store: StoreOf<PokitSearchFeature>) {
@@ -35,9 +35,12 @@ public extension PokitSearchView {
                 PokitDivider()
                     .padding(.top, 28)
 
-                resultList
-
-                Spacer()
+                if store.isSearching {
+                    resultList
+                } else {
+
+                    Spacer()
+                }
             }
             .background(.pokit(.bg(.base)))
             .ignoresSafeArea(edges: .bottom)
@@ -307,16 +310,17 @@ private extension PokitSearchView {
 
                         if store.hasNext {
                             PokitLoading()
-                                .task { await send(.로딩_isPresented, animation: .pokitDissolve).finish() }
+                                .task { await send(.로딩_isPresented).finish() }
                         }
                     }
                     .padding(.horizontal, 20)
+                    .padding(.bottom, store.hasNext ? 0 : 36)
                 }
             } else {
                 PokitLoading()
             }
         }
-        .padding(.vertical, 24)
+        .padding(.top, 24)
     }
 }
 //MARK: - Preview