@applicaster/quick-brick-native-apple 6.2.0 → 6.2.2

package/apple/QuickBrickApple.podspec.json

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

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

@@ -30,12 +30,28 @@ class FocusableGroupManager {
         if let itemsGroup = itemsGroups[groupId] {
             newItemsGroup = itemsGroup
         }
+
         newItemsGroup[itemId] = item
         itemsGroups[groupId] = newItemsGroup
         notifyGroupView(groupID: groupId)
         return true
     }
 
+    class func unregisterFusableItem(itemId: String, groupId: String) {
+        var newItemsGroup: [String: FocusableView] = [:]
+        if let itemsGroup = itemsGroups[groupId] {
+            newItemsGroup = itemsGroup
+        }
+
+        newItemsGroup[itemId] = nil
+        itemsGroups[groupId] = newItemsGroup
+    }
+
+    class func unregisterFusableGroup(itemId: String) {
+        itemsGroups[itemId] = nil
+        focusableGroups[itemId] = nil
+    }
+
     /// Register FocusableGroup at storage
     ///
     /// - Parameter item: FocusableGroup instance

package/apple/tvos/ReactNativeModulesExportstvOS.m

@@ -40,6 +40,13 @@ RCT_EXPORT_VIEW_PROPERTY(onViewPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onViewFocus, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onViewBlur, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(focusable, BOOL);
+
+//TODO: We need only in cases where we can not focus with focusable group
+RCT_EXPORT_VIEW_PROPERTY(nextTvosFocusLeft, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(nextTvosFocusRight, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(nextTvosFocusUp, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(nextTvosFocusDown, NSNumber)
+
 @end
 #endif
 

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

@@ -79,6 +79,16 @@ public class FocusableGroupView: RCTTVView {
     /// Note: In case Initial init when app start not calling shouldFocusUpdate
     var isGroupWasFocusedByUser = false
 
+    override public func removeFromSuperview() {
+        super.removeFromSuperview()
+        guard let itemId else {
+            return
+        }
+
+        // Removing when react native releases the view
+        FocusableGroupManager.unregisterFusableGroup(itemId: itemId)
+    }
+
     /// View connected to GroupView was updated
     ///
     /// - Parameter groupItems: dictionary connected to group view

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

@@ -0,0 +1,60 @@
+//
+//  FocusableView+FocusGuide.swift
+//  QuickBrickApple
+//
+//  Created by Anton Kononenko on 6/27/23.
+//
+
+import Foundation
+
+class FocusGuideDebugView: UIView {
+    init(focusGuide: UIFocusGuide) {
+        super.init(frame: focusGuide.layoutFrame)
+        backgroundColor = UIColor.green.withAlphaComponent(0.15)
+        layer.borderColor = UIColor.green.withAlphaComponent(0.3).cgColor
+        layer.borderWidth = 1
+    }
+
+    required init?(coder _: NSCoder) {
+        nil
+    }
+}
+
+extension FocusableView {
+    @discardableResult
+    func addFocusGuide(from origin: UIView, to destination: UIView, direction: UIRectEdge, debugMode: Bool = false) -> UIFocusGuide {
+        addFocusGuide(from: origin, to: [destination], direction: direction, debugMode: debugMode)
+    }
+
+    @discardableResult
+    func addFocusGuide(from origin: UIView, to destinations: [UIView], direction: UIRectEdge, debugMode: Bool = false) -> UIFocusGuide {
+        let focusGuide = UIFocusGuide()
+        addLayoutGuide(focusGuide)
+        focusGuide.preferredFocusEnvironments = destinations
+        focusGuide.widthAnchor.constraint(equalTo: origin.widthAnchor).isActive = true
+        focusGuide.heightAnchor.constraint(equalTo: origin.heightAnchor).isActive = true
+
+        switch direction {
+        case .bottom:
+            focusGuide.topAnchor.constraint(equalTo: origin.bottomAnchor).isActive = true
+            focusGuide.leftAnchor.constraint(equalTo: origin.leftAnchor).isActive = true
+        case .top:
+            focusGuide.bottomAnchor.constraint(equalTo: origin.topAnchor).isActive = true
+            focusGuide.leftAnchor.constraint(equalTo: origin.leftAnchor).isActive = true
+        case .left:
+            focusGuide.topAnchor.constraint(equalTo: origin.topAnchor).isActive = true
+            focusGuide.rightAnchor.constraint(equalTo: origin.leftAnchor).isActive = true
+        case .right:
+            focusGuide.topAnchor.constraint(equalTo: origin.topAnchor).isActive = true
+            focusGuide.leftAnchor.constraint(equalTo: origin.rightAnchor).isActive = true
+        default:
+            break
+        }
+
+        if debugMode {
+            addSubview(FocusGuideDebugView(focusGuide: focusGuide))
+        }
+
+        return focusGuide
+    }
+}

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

@@ -12,6 +12,8 @@ import UIKit
 
 /// RCTTVView subclass that has api how to conects to FocusableGroup
 public class FocusableView: ParallaxView {
+    weak var module: FocusableViewModule?
+
     @objc public var onViewFocus: RCTBubblingEventBlock?
     @objc public var onViewPress: RCTBubblingEventBlock?
     @objc public var onViewBlur: RCTBubblingEventBlock?
@@ -45,12 +47,105 @@ public class FocusableView: ParallaxView {
         }
     }
 
+    var isFocusLayoutConfigured = false
+    override public func layoutSubviews() {
+        super.layoutSubviews()
+
+        if isFocusLayoutConfigured == false {
+            configureFocusLayout()
+            isFocusLayoutConfigured = true
+        }
+    }
+
+//    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 {
+            return
+        }
+
+        // Removing when react native releases the view
+        FocusableGroupManager.unregisterFusableItem(itemId: itemId, groupId: groupId)
+    }
+
+    func addFocusGuideIfNeeded(tag: NSNumber?,
+                               direction: UIRectEdge) {
+        if let tag,
+           let view = module?.viewForTag(tag: tag) {
+            _ = addFocusGuide(from: self,
+                              to: view,
+                              direction: direction,
+                              debugMode: false)
+        }
+    }
+
+    func configureFocusLayout() {
+        addFocusGuideIfNeeded(tag: nextTvosFocusLeft, direction: .left)
+        addFocusGuideIfNeeded(tag: nextTvosFocusRight, direction: .right)
+        addFocusGuideIfNeeded(tag: nextTvosFocusUp, direction: .top)
+        addFocusGuideIfNeeded(tag: nextTvosFocusDown, direction: .bottom)
+    }
+
+    @objc public var nextTvosFocusLeft: NSNumber? {
+        didSet {
+            // This check needed in case refs assigned on later phase, after view ready
+            if nextTvosFocusLeft != oldValue,
+               isFocusLayoutConfigured {
+                addFocusGuideIfNeeded(tag: nextTvosFocusLeft, direction: .left)
+            }
+        }
+    }
+
+    @objc public var nextTvosFocusRight: NSNumber? {
+        didSet {
+            // This check needed in case refs assigned on later phase, after view ready
+            if nextTvosFocusRight != oldValue,
+               isFocusLayoutConfigured {
+                addFocusGuideIfNeeded(tag: nextTvosFocusRight, direction: .right)
+            }
+        }
+    }
+
+    @objc public var nextTvosFocusUp: NSNumber? {
+        didSet {
+            // This check needed in case refs assigned on later phase, after view ready
+            if nextTvosFocusUp != oldValue,
+               isFocusLayoutConfigured {
+                addFocusGuideIfNeeded(tag: nextTvosFocusUp, direction: .top)
+            }
+        }
+    }
+
+    @objc public var nextTvosFocusDown: NSNumber? {
+        didSet {
+            // This check needed in case refs assigned on later phase, after view ready
+            if nextTvosFocusDown != oldValue,
+               isFocusLayoutConfigured {
+                addFocusGuideIfNeeded(tag: nextTvosFocusDown, direction: .bottom)
+            }
+        }
+    }
+
     /// Define if this view is preffered tv focused View
     @objc public var forceFocus: Bool = false {
         didSet {
             guard forceFocus else {
                 return
             }
+
             DispatchQueue.main.async { [weak self] in
                 FocusableGroupManager.updateFocus(self?.groupId,
                                                   itemId: self?.itemId,

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

@@ -26,6 +26,13 @@ public class FocusableViewModule: RCTViewManager {
     }
 
     override public func view() -> UIView? {
-        FocusableView()
+        let view = FocusableView()
+        view.module = self
+
+        return view
+    }
+
+    public func viewForTag<T: UIView>(tag: NSNumber) -> T? {
+        bridge.uiManager.view(forReactTag: tag) as? T
     }
 }

package/package.json

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