@applicaster/quick-brick-native-apple 6.19.0 → 6.19.1-alpha.0

package/apple/QuickBrickApple.podspec.json

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

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

@@ -19,7 +19,12 @@ public class FocusableGroupView: RCTTVView {
         let preferredFocusDisabledDesc = isPreferredFocusDisabled ? "preferred-focus-disabled" : "preferred-focus-enabled"
         let dependentGroupsDesc = dependantGroupIds?.joined(separator: ",") ?? "NO_DEPS"
         let reactTagDesc = reactTag?.stringValue ?? "NO_TAG"
-        let preferredFocusEnvDesc = preferredFocusEnvironments.first.map { String(describing: $0) } ?? "N/A"
+        let preferredFocusEnvDesc = preferredFocusEnvironments.first.map {
+            if let view = $0 as? FocusableView {
+                return "FocusableView(itemId: \(view.itemId ?? "NO_ID"), groupId: \(view.groupId ?? "NO_GROUP"), reactTag: \(view.reactTag?.stringValue ?? "NO_TAG"))"
+            }
+            return "N/A"
+        } ?? "N/A"
 
         return """
         FocusableGroupView[
@@ -205,6 +210,7 @@ public class FocusableGroupView: RCTTVView {
     private func setupFocus() {
         addLayoutGuide(groupFocusGuide)
 
+        backgroundColor = UIColor.yellow
         groupFocusGuide.leftAnchor.constraint(equalTo: leftAnchor).isActive = true
         groupFocusGuide.topAnchor.constraint(equalTo: topAnchor).isActive = true
         groupFocusGuide.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
@@ -259,6 +265,7 @@ public class FocusableGroupView: RCTTVView {
     }
 
     /// Update preferred Focus View for focus guide if next focusable view is part of this focus guide
+    /// and directly belongs to this group (not to a nested child group).
     ///
     /// - Parameter nextFocusItem: next focus item instance
     @MainActor func updatePreferredFocusView(nextFocusItem: UIFocusEnvironment?) {
@@ -269,6 +276,17 @@ public class FocusableGroupView: RCTTVView {
             return
         }
 
+        if let focusableView = nextFocusView as? FocusableView,
+           let childGroupId = focusableView.groupId,
+           childGroupId != itemId {
+            if let nestedProxy = GroupProxyManager.shared.getProxy(forGroupId: childGroupId),
+               let nestedGroup = nestedProxy.getGroup(),
+               nestedGroup.isDescendant(of: self) {
+                updatePreferredFocusEnv(with: nestedGroup)
+            }
+            return
+        }
+
         updatePreferredFocusEnv(with: nextFocusView)
     }
 

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

@@ -243,7 +243,7 @@ public class FocusableView: ParallaxView {
     /// Define if this view is preffered tv focused View
     @objc public var forceFocus: Bool = false {
         didSet {
-            guard forceFocus else {
+            guard forceFocus, oldValue != forceFocus else {
                 return
             }
 

package/package.json

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