@applicaster/quick-brick-native-apple 6.11.0-alpha.0 → 6.11.1

package/apple/QuickBrickApple.podspec.json

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

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

@@ -13,6 +13,7 @@ import React
 protocol FocusableGroupManagerUpdater {
     var focusableGroupRegistrationUpdates: PassthroughSubject<FocusableGroupView, Never> { get }
     var focusableItemsUpdatedAddedToGroupUpdate: PassthroughSubject<FocusableGroupUpdateEvent, Never> { get }
+    var focusableItemDidUpdatePreferredFocus: PassthroughSubject<FocusableView, Never> { get }
 }
 
 /// Class control focusable group view with focusable items
@@ -66,6 +67,7 @@ class FocusableGroupManager {
             await notifyGroupView(groupId: 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)
             }
         }
@@ -94,6 +96,10 @@ class FocusableGroupManager {
                                                      focusableItems: groupItems)
     }
 
+    public func notifyFocusableItemDidUpdatePreferredFocus(focusableView: FocusableView) {
+        updateService.sendFocusableItemDidUpdatePreferredFocus(focusableView)
+    }
+
     /// Make focus item focusable if exists and registered
     ///
     /// - Parameters:
@@ -161,6 +167,10 @@ class FocusableGroupManager {
 }
 
 extension FocusableGroupManager: FocusableGroupManagerUpdater {
+    var focusableItemDidUpdatePreferredFocus: PassthroughSubject<FocusableView, Never> {
+        updateService.focusableItemDidUpdatePreferredFocus
+    }
+
     var focusableGroupRegistrationUpdates: PassthroughSubject<FocusableGroupView, Never> {
         updateService.focusableGroupRegistrationUpdates
     }

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

@@ -15,6 +15,7 @@ struct FocusableGroupUpdateEvent {
 class UpdateService {
     let focusableGroupRegistrationUpdates = PassthroughSubject<FocusableGroupView, Never>()
     let focusableItemsUpdatedAddedToGroupUpdate = PassthroughSubject<FocusableGroupUpdateEvent, Never>()
+    let focusableItemDidUpdatePreferredFocus = PassthroughSubject<FocusableView, Never>()
 
     public func sendFocusableGroupRegisteredUpdate(_ focusableGroupView: FocusableGroupView) {
         focusableGroupRegistrationUpdates.send(focusableGroupView)
@@ -26,4 +27,8 @@ class UpdateService {
                                               focusableItems: focusableItems)
         focusableItemsUpdatedAddedToGroupUpdate.send(event)
     }
+
+    public func sendFocusableItemDidUpdatePreferredFocus(_ focusableView: FocusableView) {
+        focusableItemDidUpdatePreferredFocus.send(focusableView)
+    }
 }

package/apple/tvos/ReactNativeModulesExportstvOS.m

@@ -23,7 +23,7 @@ RCT_EXPORT_VIEW_PROPERTY(onGroupBlur, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(itemId, NSString);
 RCT_EXPORT_VIEW_PROPERTY(groupId, NSString);
 RCT_EXPORT_VIEW_PROPERTY(initialItemId, NSString);
-RCT_EXPORT_VIEW_PROPERTY(isPreferredFocusEnvironmentDisabled, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(isPreferredFocusDisabled, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(isFocusDisabled, BOOL);
 @end
 

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

@@ -23,7 +23,7 @@ public class FocusableGroupView: RCTTVView {
     /// Completion that will be used when focus manager forcing to update focusable group
     public var didFocusCallBack: (completion: () -> Void, focusableItemId: String)?
 
-    private var activeStateNotifier: FocusableGroupStateNotifier?
+    private lazy var activeStateNotifier: FocusableGroupStateNotifier = FocusableGroupStateNotifierDefault(action: notifyReactNativeFocusUpdate)
 
     @objc public var onGroupFocus: RCTDirectEventBlock?
     @objc public var onGroupBlur: RCTDirectEventBlock?
@@ -58,6 +58,8 @@ public class FocusableGroupView: RCTTVView {
     /// ID of the parent group, if relevant
     @objc public var groupId: String?
 
+    private var userPreferredFocusEnvironments: [UIFocusEnvironment]?
+
     private var manager: FocusableGroupManager {
         FocusableGroupManager.shared
     }
@@ -69,7 +71,6 @@ public class FocusableGroupView: RCTTVView {
     private weak var module: FocusableGroupViewModule?
     public func setModule(_ module: FocusableGroupViewModule) {
         self.module = module
-        activeStateNotifier = FocusableGroupStateNotifierDefault(action: notifyReactNativeFocusUpdate)
     }
 
     override init(bridge: RCTBridge) {
@@ -105,7 +106,6 @@ public class FocusableGroupView: RCTTVView {
     ///
     /// - Parameter view: view instance that should be preferred
     @MainActor func updatePreferredFocusEnv(with view: UIFocusEnvironment) {
-        focusGuide.preferredFocusEnvironments = [view]
         customPreferredFocusEnvironment = [view]
     }
 
@@ -126,6 +126,21 @@ public class FocusableGroupView: RCTTVView {
                 guard let self else { return }
                 updateInitialItemId()
             }.store(in: &cancellables)
+
+        manager.focusableItemDidUpdatePreferredFocus
+            .filter { self.groupId != nil && $0.groupId == self.itemId }
+            .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 {
+                    userPreferredFocusEnvironments = nil
+                }
+            }.store(in: &cancellables)
     }
 
     /// Update initial item id
@@ -135,7 +150,8 @@ public class FocusableGroupView: RCTTVView {
 
             guard
                 let initialItemId,
-                let initialView = await manager.getItem(withId: initialItemId, inGroup: initialItemId)
+                let groupId,
+                let initialView = await manager.getItem(withId: initialItemId, inGroup: groupId)
             else {
                 return
             }
@@ -161,8 +177,8 @@ public class FocusableGroupView: RCTTVView {
         return params
     }
 
-    private func notifyReactNativeFocusUpdate(_ type: FocusableGroupNotifierActionType,
-                                              _ context: UIFocusUpdateContext) {
+    @MainActor private func notifyReactNativeFocusUpdate(_ type: FocusableGroupNotifierActionType,
+                                                         _ context: UIFocusUpdateContext) {
         switch type {
         case .onBlur:
             onGroupBlur?(createFocusEventParams(context: context, isActive: false))
@@ -240,7 +256,7 @@ public class FocusableGroupView: RCTTVView {
     // MARK: Focus Engine
 
     override public var preferredFocusEnvironments: [UIFocusEnvironment] {
-        customPreferredFocusEnvironment ?? super.preferredFocusEnvironments
+        userPreferredFocusEnvironments ?? customPreferredFocusEnvironment ?? super.preferredFocusEnvironments
     }
 
     override public func shouldUpdateFocus(in _: UIFocusUpdateContext) -> Bool {
@@ -252,7 +268,7 @@ public class FocusableGroupView: RCTTVView {
     private func needsFocusUpdateDueToWrongFocus(context: UIFocusUpdateContext,
                                                  with coordinator: UIFocusAnimationCoordinator) -> Bool {
         guard
-            let preferredFocusedItem = customPreferredFocusEnvironment?.first as? FocusableView,
+            let preferredFocusedItem = preferredFocusEnvironments.first as? FocusableView,
             let nextFocusedItem = context.nextFocusedItem as? FocusableView,
             let previouslyFocusedItem = context.previouslyFocusedItem as? FocusableView else { return false }
 
@@ -293,7 +309,7 @@ public class FocusableGroupView: RCTTVView {
         }
 
         let isActive = focusItemIsDescendant(nextFocusItem: context.nextFocusedItem)
-        activeStateNotifier?.updateFocus(currentlyActive: isActive, context: context)
+        activeStateNotifier.updateFocus(currentlyActive: isActive, context: context)
 
         tryDidFocusCallCallback(context: context)
     }
@@ -321,7 +337,7 @@ public class FocusableGroupView: RCTTVView {
 }
 
 extension FocusableGroupView: FocusableGroupProtocol {
-    var canBacomeFocusable: Bool {
+    var canBecomeFocusable: Bool {
         !isFocusDisabled
     }
 }

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

@@ -24,8 +24,6 @@ public class FocusableView: ParallaxView {
         self.module = module
     }
 
-    @MainActor private weak var focusableGroup: FocusableGroupProtocol?
-
     @objc public var onViewFocus: RCTDirectEventBlock?
     @objc public var onViewPress: RCTDirectEventBlock?
     @objc public var onViewBlur: RCTDirectEventBlock?
@@ -48,16 +46,15 @@ public class FocusableView: ParallaxView {
         FocusableGroupManager.shared
     }
 
-    @MainActor @objc public var preferredFocus: Bool = false {
+    @MainActor private weak var focusableGroup: FocusableGroupProtocol? {
         didSet {
-            guard preferredFocus else {
-                return
-            }
+            manager.notifyFocusableItemDidUpdatePreferredFocus(focusableView: self)
+        }
+    }
 
-            if let focusableGroup {
-                // Update Prefered focus view in group
-                focusableGroup.updatePreferredFocusEnv(with: self)
-            }
+    @MainActor @objc public var preferredFocus: Bool = false {
+        didSet {
+            manager.notifyFocusableItemDidUpdatePreferredFocus(focusableView: self)
         }
     }
 
@@ -87,7 +84,6 @@ public class FocusableView: ParallaxView {
                 DispatchQueue.main.async {
                     self.focusableGroup = focusableGroup
                 }
-
             }.store(in: &cancellables)
     }
 
@@ -131,20 +127,6 @@ public class FocusableView: ParallaxView {
         }
     }
 
-//    TODO: Example of solution for future with groupId and focuse id
-//    func hintLeftFocusId() {
-//        if let onFocusLeft = dictFromReactNative,
-//           let groupId = onFocusLeft["groupId"],
-//           let id = onFocusLeft["id"],
-//           let view = FocusableGroupManager.item(byGroupId: groupId,
-//                                                 andItemId: id) {
-//            _ = addFocusGuide(from: self,
-//                              to: view,
-//                              direction: .left,
-//                              debugMode: true)
-//        }
-//    }
-
     override public func removeFromSuperview() {
         super.removeFromSuperview()
         guard let itemId, let groupId else {
@@ -225,6 +207,7 @@ public class FocusableView: ParallaxView {
             }
 
             DispatchQueue.main.async { [weak self] in
+
                 FocusableGroupManager.shared.updateFocus(groupId: self?.groupId,
                                                          itemId: self?.itemId,
                                                          needsForceUpdate: true)
@@ -237,6 +220,20 @@ public class FocusableView: ParallaxView {
             return focusable
         }
 
-        return focusableGroup.canBacomeFocusable && focusable
+        return focusableGroup.canBecomeFocusable && focusable
     }
 }
+
+//    TODO: Example of solution for future with groupId and focuse id
+//    func hintLeftFocusId() {
+//        if let onFocusLeft = dictFromReactNative,
+//           let groupId = onFocusLeft["groupId"],
+//           let id = onFocusLeft["id"],
+//           let view = FocusableGroupManager.item(byGroupId: groupId,
+//                                                 andItemId: id) {
+//            _ = addFocusGuide(from: self,
+//                              to: view,
+//                              direction: .left,
+//                              debugMode: true)
+//        }
+//    }

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

@@ -6,6 +6,6 @@
 //
 
 protocol FocusableGroupProtocol: AnyObject {
-    var canBacomeFocusable: Bool { get }
-    @MainActor func updatePreferredFocusEnv(with view: UIFocusEnvironment)
+    var canBecomeFocusable: Bool { get }
+    var itemId: String? { get }
 }

package/apple/universal/ReactNative/ReactNativeModulesExports.m

@@ -13,7 +13,8 @@
 @interface RCT_EXTERN_MODULE (TrackedView, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(groupId, NSString);
-RCT_EXPORT_VIEW_PROPERTY(onPositionUpdated, RCTBubblingEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onPositionUpdated, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(clipThreshold, NSNumber);
 
 @end
 

package/apple/universal/Views/TrackedView.swift

@@ -9,17 +9,33 @@ import Foundation
 import React
 
 public class TrackedComponentView: RCTView {
-    @objc public var onPositionUpdated: RCTBubblingEventBlock?
+    @objc public var onPositionUpdated: RCTDirectEventBlock?
+    @objc public var clipThreshold: NSNumber = 0
 
     /// Convert the view frame to the window's coordinate system
     private func getViewFrameInWindow() -> CGRect {
         convert(bounds, to: window)
     }
 
-    // Check if the view is completely within the window's bounds
+    // Check if the view is completely within the window's bounds with a threshold
     private var isCompletelyVisibleOnScreen: Bool {
         guard let window else { return false }
-        return window.bounds.contains(getViewFrameInWindow())
+
+        guard clipThreshold.intValue > 0 else {
+            return window.bounds.contains(getViewFrameInWindow())
+        }
+
+        let fullRect = getViewFrameInWindow()
+        let visibleRect = fullRect.intersection(window.bounds)
+
+        guard !visibleRect.isNull else { return false }
+
+        let threshold = CGFloat(truncating: clipThreshold)
+
+        let clippedWidth = fullRect.width - visibleRect.width
+        let clippedHeight = fullRect.height - visibleRect.height
+
+        return clippedWidth <= threshold && clippedHeight <= threshold
     }
 
     deinit {
@@ -46,8 +62,7 @@ public class TrackedComponentView: RCTView {
     }
 
     func startObserver() {
-        timer = Timer.scheduledTimer(withTimeInterval: 1.0,
-                                     repeats: true) { [weak self] _ in
+        timer = Timer(timeInterval: 1.0, repeats: true) { [weak self] _ in
             guard let self else { return }
             let viewFrameInWindow = getViewFrameInWindow()
 
@@ -59,6 +74,13 @@ public class TrackedComponentView: RCTView {
                     nil)
             }
         }
+
+        // Known limitation using timers is that they won’t fire when the user is interacting with your app.
+        // To avoid this we could manually add timer to the run loop in .common mode
+        // See this article: https://www.hackingwithswift.com/articles/117/the-ultimate-guide-to-timer#Working%20with%20runloops
+        if let timer {
+            RunLoop.current.add(timer, forMode: .common)
+        }
     }
 
     func stopObserver() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-native-apple",
-  "version": "6.11.0-alpha.0",
+  "version": "6.11.1",
   "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"