@applicaster/quick-brick-native-apple 6.14.0 → 6.14.2

package/apple/QuickBrickApple.podspec.json

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

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

@@ -25,15 +25,15 @@ extension FocusableGroupManager {
             Task { @MainActor
                 [weak self] in
                 guard let self else { return }
+
                 logFocusError(userInfo: userInfo,
                               ctx: ctx,
                               prev: prev,
                               next: next)
+                simulateFocusUpdateRequest(prev: prev, next: next)
 
-                // TODO: Unocomment for debugging
-                // simulateFocusUpdateRequest(prev: prev, next: next)
-
-                await tryToRestoreCorruptedFocusState(rootView: rootView, next: next)
+                // TODO: Imlamentation not need now, uncommit in futer if needed
+//                await tryToRestoreCorruptedFocusState(rootView: rootView, next: next)
             }
         }
     }

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

@@ -30,7 +30,8 @@ class FocusableGroupManager {
         self.itemStorage = itemStorage
         self.updateService = updateService
 
-        registerForMovementDidFailNotification()
+        // TODO: Unocomment for debugging or catch focus
+        // registerForMovementDidFailNotification()
     }
 
     // MARK: - Group Managment

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

@@ -154,7 +154,7 @@ public class FocusableGroupView: RCTTVView {
 
         params[GroupViewUpdateEvents.previouslyFocusedItem] = dataForFocusItem(focusItem: context.previouslyFocusedView)
         params[GroupViewUpdateEvents.nextFocusedItem] = dataForFocusItem(focusItem: context.nextFocusedView)
-        params[GroupViewUpdateEvents.preferredFocusEnvironment] = dataForFocusItem(focusItem: customPreferredFocusEnvironment?.first)
+        params[GroupViewUpdateEvents.preferredFocusEnvironment] = dataForFocusItem(focusItem: preferredFocusEnvironments.first)
         params[GroupViewUpdateEvents.groupId] = groupId
         params[GroupViewUpdateEvents.isActive] = isActive
         params[GroupViewUpdateEvents.isFocusDisabled] = isFocusDisabled
@@ -179,12 +179,16 @@ public class FocusableGroupView: RCTTVView {
     /// - Returns: dictionary instance in case data exists, otherwise nil
     private func dataForFocusItem(focusItem: Any?) -> [String: Any]? {
         var retVal = [String: Any]()
-        if let focusedView = focusItem as? RCTTVView {
+        if let focusedView = focusItem as? FocusableView {
             retVal[FocusItemDataKeys.describingView] = String(describing: focusedView)
             if let reactTag = focusedView.reactTag?.stringValue {
                 retVal[FocusItemDataKeys.reactTag] = reactTag
             }
             retVal[FocusItemDataKeys.isDescendant] = focusedView.isDescendant(of: self)
+            retVal[FocusItemDataKeys.itemId] = focusedView.itemId ?? "NO_ID"
+            retVal[FocusItemDataKeys.groupId] = focusedView.groupId ?? "NO_GROUP"
+            retVal[FocusItemDataKeys.preferredFocus] = focusedView.preferredFocus
+            retVal[FocusItemDataKeys.forceFocus] = focusedView.forceFocus
         }
         return retVal.keys.count == 0 ? nil : retVal
     }

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

@@ -35,4 +35,8 @@ public enum FocusItemDataKeys {
     static let describingView = "describingView"
     static let reactTag = "reactTag"
     static let isDescendant = "isDescendant"
+    static let groupId = "groupId"
+    static let itemId = "itemId"
+    static let preferredFocus = "preferredFocus"
+    static let forceFocus = "forceFocus"
 }

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

@@ -40,6 +40,8 @@ extension FocusableView: ParallaxViewDelegate {
         var retVal: [String: Any] = [:]
         retVal["tag"] = reactTag
         retVal["itemID"] = itemId
+        retVal["groupId"] = groupId
+        retVal["preferred"] = preferredFocus
         return retVal
     }
 }

package/package.json

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