fix: immediate 모드로 update가 되고 짧은 시간 내에 delay 모드가 호출된 후 end 되버리면 깜빡이는 현상 해결

Author: opficdev

DevLog/Presentation/Common/LoadingState.swift

@@ -23,6 +23,7 @@ final class LoadingState {
     private var delayedCountByTarget: [AnyHashable: Int] = [:]
     private var delayedTaskByTarget: [AnyHashable: Task<Void, Never>] = [:]
     private var visibleDelayedTargets = Set<AnyHashable>()
+    private var visibleTargets = Set<AnyHashable>()
 
     init(delay: Duration = .milliseconds(500)) {
         self.delay = delay
@@ -76,7 +77,7 @@ final class LoadingState {
         switch mode {
         case .immediate:
             immediateCountByTarget[target, default: 0] += 1
-            update(true)
+            setVisibilityIfNeeded(for: target, isVisible: true, update: update)
         case .delayed:
             delayedCountByTarget[target, default: 0] += 1
             scheduleDelayedLoadingIfNeeded(for: target, update: update)
@@ -115,7 +116,7 @@ final class LoadingState {
                 guard 0 < self.delayedCountByTarget[target, default: 0] else { return }
                 self.visibleDelayedTargets.insert(target)
                 if self.immediateCountByTarget[target, default: 0] == 0 {
-                    update(true)
+                    self.setVisibilityIfNeeded(for: target, isVisible: true, update: update)
                 }
             }
         }
@@ -126,25 +127,47 @@ final class LoadingState {
         update: @escaping @MainActor (Bool) -> Void
     ) {
         if 0 < immediateCountByTarget[target, default: 0] {
-            update(true)
+            setVisibilityIfNeeded(for: target, isVisible: true, update: update)
             return
         }
         if visibleDelayedTargets.contains(target) {
             if delayedCountByTarget[target, default: 0] == 0 {
                 visibleDelayedTargets.remove(target)
-                update(false)
+                setVisibilityIfNeeded(for: target, isVisible: false, update: update)
             } else {
-                update(true)
+                setVisibilityIfNeeded(for: target, isVisible: true, update: update)
             }
             return
         }
         if 0 < delayedCountByTarget[target, default: 0] {
-            update(false)
+            if visibleTargets.contains(target) {
+                setVisibilityIfNeeded(for: target, isVisible: true, update: update)
+            } else {
+                setVisibilityIfNeeded(for: target, isVisible: false, update: update)
+            }
             scheduleDelayedLoadingIfNeeded(for: target, update: update)
             return
         }
         delayedTaskByTarget[target]?.cancel()
         delayedTaskByTarget[target] = nil
-        update(false)
+        setVisibilityIfNeeded(for: target, isVisible: false, update: update)
+    }
+
+    private func setVisibilityIfNeeded(
+        for target: AnyHashable,
+        isVisible: Bool,
+        update: @escaping @MainActor (Bool) -> Void
+    ) {
+        let wasVisible = visibleTargets.contains(target)
+
+        if isVisible {
+            visibleTargets.insert(target)
+        } else {
+            visibleTargets.remove(target)
+        }
+
+        if wasVisible != isVisible {
+            update(isVisible)
+        }
     }
 }