@applicaster/quick-brick-native-apple 6.9.7 → 6.9.8-patch.1

package/apple/QuickBrickApple.podspec.json

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

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

@@ -101,6 +101,9 @@ public class FocusableGroupView: RCTTVView {
         Task {
             // Removing when react native releases the view
             await manager.unregisterGroup(withId: itemId)
+
+            cancellables.forEach { $0.cancel() }
+            cancellables.removeAll()
         }
     }
 

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

@@ -150,6 +150,9 @@ public class FocusableView: ParallaxView {
         Task {
             await FocusableGroupManager.shared.unregisterItem(withId: itemId, inGroup: groupId)
         }
+
+        cancellables.forEach { $0.cancel() }
+        cancellables.removeAll()
     }
 
     private func addFocusGuideIfNeeded(tag: NSNumber?,

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.9.7",
+  "version": "6.9.8-patch.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"