@applicaster/quick-brick-native-apple 6.18.0 → 6.19.0

package/apple/QuickBrickApple.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "QuickBrickApple",
-  "version": "6.18.0",
+  "version": "6.19.0",
   "platforms": {
     "ios": "16.0",
     "tvos": "16.0"
@@ -16,7 +16,7 @@
   "authors": "Applicaster LTD.",
   "source": {
     "git": "https://github.com/applicaster/Zapp-Frameworks.git",
-    "tag": "@@applicaster/quick-brick-native-apple/6.18.0"
+    "tag": "@@applicaster/quick-brick-native-apple/6.19.0"
   },
   "requires_arc": true,
   "source_files": "universal/**/*.{m,swift}",

package/apple/tvos/Helpers/FocusableGroupManager/Coordinator/GroupProxyCoordinator.swift

@@ -14,11 +14,16 @@ class GroupProxyCoordinator {
 
     protocol Command {
         var groupId: String { get }
+        var shouldDiscard: Bool { get }
         func canBeApplied() -> Bool
         func apply()
         func cancel()
     }
 
+    protocol QueueTimeoutCommand: Command {
+        func startQueueTimeout()
+    }
+
     func tryApply(_ command: Command) {
         lock.lock()
         defer { lock.unlock() }
@@ -27,6 +32,7 @@ class GroupProxyCoordinator {
             command.apply()
         } else {
             commandsQueue.append(command)
+            (command as? QueueTimeoutCommand)?.startQueueTimeout()
         }
     }
 
@@ -37,6 +43,10 @@ class GroupProxyCoordinator {
         lock.unlock()
 
         for command in commands {
+            if command.shouldDiscard {
+                continue
+            }
+
             if command.canBeApplied() {
                 command.apply()
             } else {

package/apple/tvos/Helpers/FocusableGroupManager/Coordinator/SetItemFocus.swift

@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 
 extension GroupProxyCoordinator {
-    class SetItemFocus: Command {
+    class SetItemFocus: Command, QueueTimeoutCommand {
         let groupId: String
         let itemId: String
         let needsForceUpdate: Bool
@@ -17,6 +17,15 @@ extension GroupProxyCoordinator {
         weak var manager: GroupProxyManager?
         private var isCancelled = false
         private let lock = NSLock()
+        private var queueTimeoutWorkItem: DispatchWorkItem?
+
+        private static let queueTimeout: TimeInterval = 5.0
+
+        var shouldDiscard: Bool {
+            lock.lock()
+            defer { lock.unlock() }
+            return isCancelled
+        }
 
         init(groupId: String,
              itemId: String,
@@ -30,6 +39,37 @@ extension GroupProxyCoordinator {
             self.manager = manager
         }
 
+        func startQueueTimeout() {
+            lock.lock()
+            defer { lock.unlock() }
+
+            guard !isCancelled else { return }
+
+            let workItem = DispatchWorkItem { [weak self] in
+                self?.handleQueueTimeout()
+            }
+            queueTimeoutWorkItem = workItem
+            DispatchQueue.main.asyncAfter(deadline: .now() + Self.queueTimeout, execute: workItem)
+        }
+
+        private func handleQueueTimeout() {
+            lock.lock()
+            if isCancelled {
+                lock.unlock()
+                return
+            }
+            isCancelled = true
+            queueTimeoutWorkItem = nil
+            lock.unlock()
+
+            completion?(false)
+        }
+
+        private func cancelQueueTimeout() {
+            queueTimeoutWorkItem?.cancel()
+            queueTimeoutWorkItem = nil
+        }
+
         func canBeApplied() -> Bool {
             lock.lock()
             defer { lock.unlock() }
@@ -65,9 +105,9 @@ extension GroupProxyCoordinator {
 
         func apply() {
             lock.lock()
+            cancelQueueTimeout()
             if isCancelled {
                 lock.unlock()
-                completion?(false)
                 return
             }
             lock.unlock()
@@ -80,26 +120,41 @@ extension GroupProxyCoordinator {
                 return
             }
 
-            manager.setForceFocusUpdateData(itemId: itemId, groupId: groupId)
+            guard needsForceUpdate else {
+                let completionHandler = completion
+                DispatchQueue.main.async {
+                    groupView.forceFocus(
+                        view: focusableView,
+                        needsForceUpdate: false
+                    )
+                    completionHandler?(true)
+                }
+                return
+            }
+
+            let completionHandler = completion
+            manager.setForceFocusUpdateData(itemId: itemId, groupId: groupId, callback: { success in
+                completionHandler?(success)
+            })
 
-            DispatchQueue.main.async { [weak manager] in
+            DispatchQueue.main.async {
                 groupView.forceFocus(
                     view: focusableView,
-                    needsForceUpdate: self.needsForceUpdate,
-                    callback: { success in
-                        manager?.clearForceFocusUpdate()
-                        self.completion?(success)
-                    }
+                    needsForceUpdate: true
                 )
             }
         }
 
         func cancel() {
             lock.lock()
+            cancelQueueTimeout()
+            let wasAlreadyCancelled = isCancelled
             isCancelled = true
             lock.unlock()
 
-            completion?(false)
+            if !wasAlreadyCancelled {
+                completion?(false)
+            }
         }
     }
 }

package/apple/tvos/Helpers/FocusableGroupManager/Coordinator/SetPreferredFocus.swift

@@ -17,6 +17,12 @@ extension GroupProxyCoordinator {
         private var isCancelled = false
         private let lock = NSLock()
 
+        var shouldDiscard: Bool {
+            lock.lock()
+            defer { lock.unlock() }
+            return isCancelled
+        }
+
         init(groupId: String,
              itemId: String,
              isPreferred: Bool,
@@ -41,6 +47,10 @@ extension GroupProxyCoordinator {
                 return false
             }
 
+            if group.isFocusDisabled {
+                return false
+            }
+
             if !proxy.isExistingChild(itemId) {
                 return false
             }
@@ -71,8 +81,10 @@ extension GroupProxyCoordinator {
                 return
             }
 
-            DispatchQueue.main.async {
-                if self.isPreferred {
+            let isPreferred = isPreferred
+            DispatchQueue.main.async { [weak self] in
+                guard self != nil else { return }
+                if isPreferred {
                     group.setUserPreferredFocusEnvironments([focusableView])
                 } else if let currentPreferred = group.getUserPreferredFocusEnvironments()?.first as? FocusableView,
                           currentPreferred === focusableView {

package/apple/tvos/Helpers/FocusableGroupManager/GroupProxy.swift

@@ -26,7 +26,16 @@ class GroupProxy {
         lock.lock()
         defer { lock.unlock() }
 
-        return children[itemId]?.value
+        guard let box = children[itemId] else {
+            return nil
+        }
+
+        guard let view = box.value else {
+            children.removeValue(forKey: itemId)
+            return nil
+        }
+
+        return view
     }
 
     // MARK: - Child Management
@@ -66,7 +75,17 @@ class GroupProxy {
     func isExistingChild(_ itemId: String) -> Bool {
         lock.lock()
         defer { lock.unlock() }
-        return children[itemId]?.value != nil
+
+        guard let box = children[itemId] else {
+            return false
+        }
+
+        guard box.value != nil else {
+            children.removeValue(forKey: itemId)
+            return false
+        }
+
+        return true
     }
 
     // MARK: - Group Binding
@@ -101,7 +120,7 @@ class GroupProxy {
         coordinator?.onGroupBound(groupId: groupId)
     }
 
-    func unbindGroup(expectedGroup: FocusableGroupView) {
+    @MainActor func unbindGroup(expectedGroup: FocusableGroupView) {
         if let group,
            group !== expectedGroup {
             logger?.warningLog(message: """
@@ -109,7 +128,7 @@ class GroupProxy {
                 Expected group: \(expectedGroup.debugDescription)
                 Current bound group: \(String(describing: group.debugDescription))
                 identifier1: \(ObjectIdentifier(expectedGroup))
-                identifier2: \(ObjectIdentifier(group)))
+                identifier2: \(ObjectIdentifier(group))
                 Skipping unbind.
             """)
 
@@ -117,6 +136,7 @@ class GroupProxy {
         }
 
         lock.lock()
+        group = nil
         let shouldRemoveProxy = children.isEmpty
         lock.unlock()
 
@@ -124,10 +144,6 @@ class GroupProxy {
             coordinator?.cancelCommandsForGroup(groupId: groupId)
             GroupProxyManager.shared.removeProxy(forGroupId: groupId)
         }
-
-        lock.lock()
-        group = nil
-        lock.unlock()
     }
 
     // MARK: - Preferred Focus

package/apple/tvos/Helpers/FocusableGroupManager/GroupProxyManager.swift

@@ -56,20 +56,72 @@ class GroupProxyManager {
         proxies.removeValue(forKey: groupId)
     }
 
-    // MARK: - Focus Update
+    // MARK: - Force Focus Update
 
     private var forceFocusUpdateData: (itemId: String, groupId: String)?
+    private var forceFocusCallback: ((Bool) -> Void)?
 
-    func setForceFocusUpdateData(itemId: String, groupId: String) {
+    private var forceFocusTimer: Timer?
+
+    func setForceFocusUpdateData(itemId: String, groupId: String, callback: ((Bool) -> Void)?) {
         lock.lock()
+
+        let previousCallback = forceFocusCallback
         forceFocusUpdateData = (itemId: itemId, groupId: groupId)
+        forceFocusCallback = callback
         lock.unlock()
+
+        DispatchQueue.main.async { [weak self] in
+            previousCallback?(false)
+
+            self?.forceFocusTimer?.invalidate()
+            self?.startForceFocusTimer()
+        }
+    }
+
+    private func startForceFocusTimer() {
+        let timeout: TimeInterval = 1
+        forceFocusTimer = Timer.scheduledTimer(withTimeInterval: timeout, repeats: false) { [weak self] _ in
+            self?.handleForceFocusTimeout()
+        }
     }
 
-    func clearForceFocusUpdate() {
+    private func handleForceFocusTimeout() {
+        forceFocusTimer = nil
+
         lock.lock()
+        let callback = forceFocusCallback
+        forceFocusCallback = nil
         forceFocusUpdateData = nil
         lock.unlock()
+
+        callback?(false)
+    }
+
+    @MainActor
+    func notifyFocusDidUpdate(focusedView: FocusableView?) {
+        lock.lock()
+
+        guard let focusData = forceFocusUpdateData,
+              let callback = forceFocusCallback else {
+            lock.unlock()
+            return
+        }
+
+        guard let focusedView,
+              focusedView.itemId == focusData.itemId,
+              focusedView.groupId == focusData.groupId else {
+            lock.unlock()
+            return
+        }
+
+        forceFocusCallback = nil
+        forceFocusUpdateData = nil
+        lock.unlock()
+
+        forceFocusTimer?.invalidate()
+        forceFocusTimer = nil
+        callback(true)
     }
 
     func focusableViewCanBecomeFocusableForceFocusUpdate(groupId: String?, itemId: String?) -> Bool? {

package/apple/tvos/Views/FocusableGroupView/FocusableGroupView.swift

@@ -35,7 +35,6 @@ public class FocusableGroupView: RCTTVView {
     }
 
     public private(set) var isPresented: Bool = false
-    private var focusTimer: Timer?
 
     override public func didMoveToWindow() {
         super.didMoveToWindow()
@@ -74,8 +73,6 @@ public class FocusableGroupView: RCTTVView {
         isGroupRegistered = true
     }
 
-    public var didForceFocusCallBack: ((Bool) -> Void)?
-
     private let activeStateNotifier = FocusableGroupStateNotifierDefault()
 
     @objc public var onGroupFocus: RCTDirectEventBlock?
@@ -107,6 +104,9 @@ public class FocusableGroupView: RCTTVView {
         }
     }
 
+    /// Parent group ID for nested group hierarchy.
+    /// Currently used for informational purposes only (passed to React Native events).
+    /// If nested group registration is needed, implement didSet with proxy registration similar to FocusableView.
     @objc public var groupId: String?
 
     func sendGroupRegisteredEvent() {
@@ -138,69 +138,31 @@ public class FocusableGroupView: RCTTVView {
     }
 
     deinit {
-        focusTimer?.invalidate()
-        focusTimer = nil
         cleanup()
     }
 
     @MainActor public func forceFocus(view: FocusableView,
-                                      needsForceUpdate: Bool,
-                                      callback completion: ((Bool) -> Void)?) {
+                                      needsForceUpdate: Bool) {
         updatePreferredFocusEnv(with: view)
 
-        if !needsForceUpdate {
-            completion?(true)
+        guard needsForceUpdate else {
             return
         }
 
         guard let rootView = UIApplication.shared.rootViewController()?.view as? RCTRootView else {
-            completion?(false)
             return
         }
 
         guard itemId != nil else {
-            completion?(false)
             return
         }
 
-        focusTimer?.invalidate()
-        focusTimer = nil
-
-        didForceFocusCallBack = { [weak self] success in
-            guard let self else {
-                completion?(false)
-                return
-            }
-
-            focusTimer?.invalidate()
-            focusTimer = nil
-
-            completion?(success)
-            didForceFocusCallBack = nil
-        }
-
-        let cancelationTimeout: TimeInterval = 1
-        focusTimer?.invalidate()
-        focusTimer = Timer.scheduledTimer(withTimeInterval: cancelationTimeout, repeats: false) { [weak self] _ in
-            guard let self else {
-                completion?(false)
-                return
-            }
-
-            if let callback = didForceFocusCallBack {
-                callback(false)
-                didForceFocusCallBack = nil
-            }
-
-            focusTimer = nil
-        }
-
         rootView.setNeedsFocusUpdate()
         rootView.updateFocusIfNeeded()
     }
 
     private func cleanup() {
-        guard itemId != nil else {
+        guard isGroupRegistered else {
             return
         }
 
@@ -365,7 +327,7 @@ public class FocusableGroupView: RCTTVView {
             updatePreferredFocusView(nextFocusItem: context.nextFocusedItem)
         }
 
-        didForceFocusCallBack?(true)
+        GroupProxyManager.shared.notifyFocusDidUpdate(focusedView: context.nextFocusedView as? FocusableView)
 
         let isActive = focusItemIsDescendant(nextFocusItem: context.nextFocusedItem)
         activeStateNotifier.updateFocus(currentlyActive: isActive, context: context)
@@ -373,7 +335,7 @@ public class FocusableGroupView: RCTTVView {
 }
 
 extension FocusableGroupView: FocusableGroupProtocol {
-    var canBecomeFocusable: Bool {
+    var canChildrenBecomeFocused: Bool {
         if let forceFocusEnabled = GroupProxyManager.shared.focusableGroupCanBecomeFocusableForceFocusUpdate(groupId: itemId) {
             return forceFocusEnabled
         }

package/apple/tvos/Views/FocusableView/FocusableView.swift

@@ -112,11 +112,12 @@ public class FocusableView: ParallaxView {
         delegate = self
     }
 
-    @objc private(set) var itemId: String? {
+    @objc public var itemId: String? {
         didSet {
             if itemId != oldValue {
                 if oldValue != nil {
                     proxy?.removeChild(self)
+                    proxy = nil
                     isViewRegistered = false
                 }
 
@@ -125,7 +126,7 @@ public class FocusableView: ParallaxView {
         }
     }
 
-    @objc private(set) var groupId: String? {
+    @objc public var groupId: String? {
         didSet {
             if groupId != oldValue {
                 if oldValue != nil {
@@ -172,8 +173,13 @@ public class FocusableView: ParallaxView {
     }
 
     private func cleanup() {
+        guard isViewRegistered else {
+            return
+        }
+
         proxy?.removeChild(self)
         proxy = nil
+        isViewRegistered = false
     }
 
     private func addFocusGuideIfNeeded(tag: NSNumber?,
@@ -258,6 +264,6 @@ public class FocusableView: ParallaxView {
             return forceFocusEnabled
         }
 
-        return focusableGroup.canBecomeFocusable && focusable
+        return focusableGroup.canChildrenBecomeFocused && focusable
     }
 }

package/apple/tvos/Views/ParallaxView/Protocols/FocusableGroupProtocol.swift

@@ -6,6 +6,6 @@
 //
 
 protocol FocusableGroupProtocol: AnyObject {
-    var canBecomeFocusable: Bool { get }
+    var canChildrenBecomeFocused: Bool { get }
     var itemId: String? { get }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-native-apple",
-  "version": "6.18.0",
+  "version": "6.19.0",
   "description": "iOS and tvOS native code for QuickBrick applications. This package is used to provide native logic for QuickBrick",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"