Merge pull request #24 from hainayanda/improvement/callbackcallmove

Call callback now run first
hainayanda · Jun 6, 2022 · 91731f5 · 91731f5
2 parents a089b34 + c9d3c99
commit 91731f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/Pharos/Classes/Observable/Subject.swift b/Pharos/Classes/Observable/Subject.swift
@@ -16,10 +16,8 @@ public final class Subject<Wrapped>: BindableObservable<Wrapped> {
             _wrappedValue
         }
         set {
-            let oldValue = _wrappedValue
-            _wrappedValue = newValue
             relay(
-                changes: Changes(old: oldValue, new: newValue, source: self),
+                changes: Changes(old: _wrappedValue, new: newValue, source: self),
                 context: PharosContext()
             )
         }

diff --git a/Pharos/Classes/Relay/BindableKVOObservable.swift b/Pharos/Classes/Relay/BindableKVOObservable.swift
@@ -46,8 +46,8 @@ final class BindableKVOObservable<Object: NSObject, Observed>: BindableObservabl
             super.superRelay(changes, context)
             self.recentSource = .none
         case .external:
-            super.superRelay(changes, context)
             super.callCallback(changes)
+            super.superRelay(changes, context)
         case .none:
             return
         }

diff --git a/Pharos/Classes/Relay/BindableObservable.swift b/Pharos/Classes/Relay/BindableObservable.swift
@@ -34,8 +34,8 @@ open class BindableObservable<State>: RootObservable<State> {
     }
 
     override func relay(changes: Changes<State>, context: PharosContext) {
-        superRelay(changes, context)
         callCallback(changes)
+        superRelay(changes, context)
     }
 
     public override func relayChanges(to relay: BindableObservable<State>) -> Observed<State> {