@applicaster/quick-brick-native-apple 6.14.1 → 6.14.3

package/apple/QuickBrickApple.podspec.json

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

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
     }
@@ -249,49 +253,9 @@ public class FocusableGroupView: RCTTVView {
         isFocusDisabled == false
     }
 
-    // This was added because on fast scroll preferred focus was not called,
-    // that cause to select wrong item. On future must be removed if resolved
-    private func needsFocusUpdateDueToWrongFocus(context: UIFocusUpdateContext,
-                                                 with coordinator: UIFocusAnimationCoordinator) -> Bool {
-        guard
-            let preferredFocusedItem = preferredFocusEnvironments.first as? FocusableView,
-            let nextFocusedItem = context.nextFocusedItem as? FocusableView,
-            let previouslyFocusedItem = context.previouslyFocusedItem as? FocusableView else { return false }
-
-        let previousFocusedItemNotFromSameGroup = previouslyFocusedItem.groupId != nextFocusedItem.groupId
-        let nextFocusedBelongsToCurrentGroup = nextFocusedItem.groupId == itemId
-        let nextFocusItemNotPreferredFocusedItem = nextFocusedItem.itemId != preferredFocusedItem.itemId
-
-        guard previousFocusedItemNotFromSameGroup,
-              nextFocusedBelongsToCurrentGroup,
-              nextFocusItemNotPreferredFocusedItem else {
-            return false
-        }
-
-        coordinator.addCoordinatedAnimations({
-            let duration: TimeInterval = UIView.inheritedAnimationDuration
-            UIView.animate(withDuration: duration,
-                           delay: 0.0,
-                           options: [],
-                           animations: {
-                               self.setNeedsFocusUpdate()
-                               DispatchQueue.main.async {
-                                   self.updateFocusIfNeeded()
-                               }
-                           }, completion: nil)
-        }, completion: nil)
-
-        return true
-    }
-
-    override public func didUpdateFocus(in context: UIFocusUpdateContext, with coordinator: UIFocusAnimationCoordinator) {
+    override public func didUpdateFocus(in context: UIFocusUpdateContext, with _: UIFocusAnimationCoordinator) {
         guard isFocusDisabled == false else { return }
 
-        guard needsFocusUpdateDueToWrongFocus(context: context,
-                                              with: coordinator) == false else {
-            return
-        }
-
         if isPreferredFocusDisabled == false {
             updatePreferredFocusView(nextFocusItem: context.nextFocusedItem)
         }

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.1",
+  "version": "6.14.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"