@applicaster/quick-brick-native-apple 6.15.2 → 6.15.3

package/apple/QuickBrickApple.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "QuickBrickApple",
-  "version": "6.15.2",
+  "version": "6.15.3",
   "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.15.2"
+    "tag": "@@applicaster/quick-brick-native-apple/6.15.3"
   },
   "requires_arc": true,
   "source_files": "universal/**/*.{m,swift}",

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

@@ -11,8 +11,8 @@ import Foundation
 import React
 
 protocol FocusableGroupManagerUpdater {
-    var focusableGroupRegistrationUpdates: PassthroughSubject<FocusableGroupView, Never> { get }
-    var focusableItemDidUpdatePreferredFocus: PassthroughSubject<FocusableView, Never> { get }
+    var focusableGroupRegistrationUpdates: AnyPublisher<FocusableGroupView, Never> { get }
+    var focusableItemDidUpdatePreferredFocus: AnyPublisher<FocusableView, Never> { get }
 }
 
 /// Class control focusable group view with focusable items
@@ -62,14 +62,17 @@ class FocusableGroupManager {
 
     func registerItem(_ item: FocusableView) async -> Bool {
         let success = await itemStorage.registerItem(item)
+
+        // IMPORTANT: Handle edge case where group was registered BEFORE items
+        // PassthroughSubject doesn't replay events to new subscribers, so items
+        // that subscribe after group registration would miss the update.
+        // Performance is handled by efficient compactMap filter in FocusableGroupView
         if success,
-           let groupId = await item.groupId {
-            if let itemGroup = await getGroup(by: groupId) {
-                // Handler in case group was registerd later then items
-                // TODO: Check this it gives a lot of calls, need to be optimized
-                updateService.sendFocusableGroupRegisteredUpdate(itemGroup)
-            }
+           let groupId = await item.groupId,
+           let itemGroup = await getGroup(by: groupId) {
+            updateService.sendFocusableGroupRegisteredUpdate(itemGroup)
         }
+
         return success
     }
 
@@ -156,11 +159,11 @@ class FocusableGroupManager {
 }
 
 extension FocusableGroupManager: FocusableGroupManagerUpdater {
-    var focusableItemDidUpdatePreferredFocus: PassthroughSubject<FocusableView, Never> {
+    var focusableItemDidUpdatePreferredFocus: AnyPublisher<FocusableView, Never> {
         updateService.focusableItemDidUpdatePreferredFocus
     }
 
-    var focusableGroupRegistrationUpdates: PassthroughSubject<FocusableGroupView, Never> {
+    var focusableGroupRegistrationUpdates: AnyPublisher<FocusableGroupView, Never> {
         updateService.focusableGroupRegistrationUpdates
     }
 }

package/apple/tvos/Helpers/FocusableGroupManager/Protocols/UpdateService.swift

@@ -6,6 +6,7 @@
 //
 
 import Combine
+import Foundation
 
 struct FocusableGroupUpdateEvent {
     let groupId: String
@@ -13,14 +14,22 @@ struct FocusableGroupUpdateEvent {
 }
 
 class UpdateService {
-    let focusableGroupRegistrationUpdates = PassthroughSubject<FocusableGroupView, Never>()
-    let focusableItemDidUpdatePreferredFocus = PassthroughSubject<FocusableView, Never>()
+    private let _focusableGroupRegistrationUpdates = PassthroughSubject<FocusableGroupView, Never>()
+    private let _focusableItemDidUpdatePreferredFocus = PassthroughSubject<FocusableView, Never>()
+
+    lazy var focusableGroupRegistrationUpdates: AnyPublisher<FocusableGroupView, Never> = _focusableGroupRegistrationUpdates
+        .receive(on: DispatchQueue.main)
+        .eraseToAnyPublisher()
+
+    lazy var focusableItemDidUpdatePreferredFocus: AnyPublisher<FocusableView, Never> = _focusableItemDidUpdatePreferredFocus
+        .receive(on: DispatchQueue.main)
+        .eraseToAnyPublisher()
 
     func sendFocusableGroupRegisteredUpdate(_ focusableGroupView: FocusableGroupView) {
-        focusableGroupRegistrationUpdates.send(focusableGroupView)
+        _focusableGroupRegistrationUpdates.send(focusableGroupView)
     }
 
     func sendFocusableItemDidUpdatePreferredFocus(_ focusableView: FocusableView) {
-        focusableItemDidUpdatePreferredFocus.send(focusableView)
+        _focusableItemDidUpdatePreferredFocus.send(focusableView)
     }
 }

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

@@ -131,16 +131,22 @@ public class FocusableGroupView: RCTTVView {
         groupFocusGuide.rightAnchor.constraint(equalTo: rightAnchor).isActive = true
 
         manager.focusableItemDidUpdatePreferredFocus
-            .filter { self.groupId != nil && $0.groupId == self.itemId }
+            .compactMap { [weak self] focusableView -> FocusableView? in
+                guard let self,
+                      groupId != nil,
+                      focusableView.groupId == self.itemId
+                else {
+                    return nil
+                }
+                return focusableView
+            }
             .sink { [weak self] focusableView in
                 guard let self else { return }
-                guard focusableView.preferredFocus == false else {
-                    userPreferredFocusEnvironments = [focusableView]
-                    return
-                }
 
-                if let currentPreferred = userPreferredFocusEnvironments?.first as? FocusableView,
-                   currentPreferred == focusableView {
+                if focusableView.preferredFocus {
+                    userPreferredFocusEnvironments = [focusableView]
+                } else if let currentPreferred = userPreferredFocusEnvironments?.first as? FocusableView,
+                          currentPreferred == focusableView {
                     userPreferredFocusEnvironments = nil
                 }
             }.store(in: &cancellables)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-native-apple",
-  "version": "6.15.2",
+  "version": "6.15.3",
   "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"