@applicaster/quick-brick-native-apple 6.11.1 → 6.11.2

package/apple/QuickBrickApple.podspec.json

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

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

@@ -12,7 +12,6 @@ import React
 
 protocol FocusableGroupManagerUpdater {
     var focusableGroupRegistrationUpdates: PassthroughSubject<FocusableGroupView, Never> { get }
-    var focusableItemsUpdatedAddedToGroupUpdate: PassthroughSubject<FocusableGroupUpdateEvent, Never> { get }
     var focusableItemDidUpdatePreferredFocus: PassthroughSubject<FocusableView, Never> { get }
 }
 
@@ -50,8 +49,6 @@ class FocusableGroupManager {
         for itemId in items.keys {
             await itemStorage.unregisterItem(withId: itemId, inGroup: groupId)
         }
-
-        await notifyGroupView(groupId: groupId)
     }
 
     public func getGroup(by groupID: String) async -> FocusableGroupView? {
@@ -64,7 +61,6 @@ class FocusableGroupManager {
         let success = await itemStorage.registerItem(item)
         if success,
            let groupId = await item.groupId {
-            await notifyGroupView(groupId: groupId)
             if let itemGroup = await getGroup(by: groupId) {
                 // Handler in case group was registerd later then items
                 // TODO: Check this it gives a lot of calls, need to be optimized
@@ -76,7 +72,6 @@ class FocusableGroupManager {
 
     public func unregisterItem(withId itemId: String, inGroup groupId: String) async {
         await itemStorage.unregisterItem(withId: itemId, inGroup: groupId)
-        await notifyGroupView(groupId: groupId)
     }
 
     public func getItems(forGroup groupId: String) async -> [String: FocusableView] {
@@ -87,15 +82,6 @@ class FocusableGroupManager {
         await itemStorage.item(withId: itemId, inGroup: groupId)
     }
 
-    /// Notify group view that item relevant to it was updated
-    ///
-    /// - Parameter groupID: ID of the group
-    private func notifyGroupView(groupId: String) async {
-        let groupItems = await getItems(forGroup: groupId)
-        updateService.sendFocusableItemInGroupUpdate(groupId: groupId,
-                                                     focusableItems: groupItems)
-    }
-
     public func notifyFocusableItemDidUpdatePreferredFocus(focusableView: FocusableView) {
         updateService.sendFocusableItemDidUpdatePreferredFocus(focusableView)
     }
@@ -174,8 +160,4 @@ extension FocusableGroupManager: FocusableGroupManagerUpdater {
     var focusableGroupRegistrationUpdates: PassthroughSubject<FocusableGroupView, Never> {
         updateService.focusableGroupRegistrationUpdates
     }
-
-    var focusableItemsUpdatedAddedToGroupUpdate: PassthroughSubject<FocusableGroupUpdateEvent, Never> {
-        updateService.focusableItemsUpdatedAddedToGroupUpdate
-    }
 }

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

@@ -14,20 +14,12 @@ struct FocusableGroupUpdateEvent {
 
 class UpdateService {
     let focusableGroupRegistrationUpdates = PassthroughSubject<FocusableGroupView, Never>()
-    let focusableItemsUpdatedAddedToGroupUpdate = PassthroughSubject<FocusableGroupUpdateEvent, Never>()
     let focusableItemDidUpdatePreferredFocus = PassthroughSubject<FocusableView, Never>()
 
     public func sendFocusableGroupRegisteredUpdate(_ focusableGroupView: FocusableGroupView) {
         focusableGroupRegistrationUpdates.send(focusableGroupView)
     }
 
-    public func sendFocusableItemInGroupUpdate(groupId: String,
-                                               focusableItems: [String: FocusableView]) {
-        let event = FocusableGroupUpdateEvent(groupId: groupId,
-                                              focusableItems: focusableItems)
-        focusableItemsUpdatedAddedToGroupUpdate.send(event)
-    }
-
     public func sendFocusableItemDidUpdatePreferredFocus(_ focusableView: FocusableView) {
         focusableItemDidUpdatePreferredFocus.send(focusableView)
     }

package/apple/tvos/ReactNativeModulesExportstvOS.m

@@ -22,8 +22,7 @@ RCT_EXPORT_VIEW_PROPERTY(onGroupFocus, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onGroupBlur, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(itemId, NSString);
 RCT_EXPORT_VIEW_PROPERTY(groupId, NSString);
-RCT_EXPORT_VIEW_PROPERTY(initialItemId, NSString);
-RCT_EXPORT_VIEW_PROPERTY(isPreferredFocusDisabled, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(isWithMemory, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(isFocusDisabled, BOOL);
 @end
 

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

@@ -15,7 +15,24 @@ import UIKit
 ///
 public class FocusableGroupView: RCTTVView {
     override public var debugDescription: String {
-        "GROUP_ID: \(groupId ?? "NONE"), ID: \(itemId ?? "NONE"), \(super.debugDescription)"
+        let groupIdDesc = groupId ?? "NO_GROUP"
+        let itemIdDesc = itemId ?? "NO_ID"
+        let activeStateDesc = activeStateNotifier.isActive ? "ACTIVE" : "inactive"
+        let focusDisabledDesc = isFocusDisabled ? "focus-disabled" : "focus-enabled"
+        let preferredFocusDisabledDesc = isPreferredFocusDisabled ? "preferred-focus-disabled" : "preferred-focus-enabled"
+        let dependentGroupsDesc = dependantGroupIds?.joined(separator: ",") ?? "NO_DEPS"
+        let reactTagDesc = reactTag?.stringValue ?? "NO_TAG"
+
+        return """
+        FocusableGroupView[
+            ID: \(itemIdDesc)
+            GROUP: \(groupIdDesc)
+            TAG: \(reactTagDesc)
+            STATE: \(activeStateDesc), \(focusDisabledDesc), \(preferredFocusDisabledDesc)
+            DEPS: \(dependentGroupsDesc)
+            FRAME: \(frame)
+        ]
+        """
     }
 
     private var cancellables = Set<AnyCancellable>()
@@ -35,13 +52,9 @@ public class FocusableGroupView: RCTTVView {
     @objc public var dependantGroupIds: [String]?
 
     /// Check if preferred focus environment disabled
-    @objc public var isPreferredFocusDisabled: Bool = false
-
-    /// ID of the item that must be focused as init focus
-    @objc public var initialItemId: String? {
-        didSet {
-            updateInitialItemId()
-        }
+    @objc public var isWithMemory: Bool = true
+    var isPreferredFocusDisabled: Bool {
+        isWithMemory == false
     }
 
     /// ID of the Connected GroupView provided by React-Native env
@@ -58,15 +71,13 @@ public class FocusableGroupView: RCTTVView {
     /// ID of the parent group, if relevant
     @objc public var groupId: String?
 
-    private var userPreferredFocusEnvironments: [UIFocusEnvironment]?
+    @MainActor private var userPreferredFocusEnvironments: [UIFocusEnvironment]?
+    @MainActor private var customPreferredFocusEnvironment: [UIFocusEnvironment]?
 
     private var manager: FocusableGroupManager {
         FocusableGroupManager.shared
     }
 
-    /// If this variable not nil it overrides default preferred focus environment
-    @MainActor private var customPreferredFocusEnvironment: [UIFocusEnvironment]?
-
     /// Manager that connects View instance to FocusableGroupViewModule
     private weak var module: FocusableGroupViewModule?
     public func setModule(_ module: FocusableGroupViewModule) {
@@ -120,13 +131,6 @@ public class FocusableGroupView: RCTTVView {
         focusGuide.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
         focusGuide.rightAnchor.constraint(equalTo: rightAnchor).isActive = true
 
-        manager.focusableItemsUpdatedAddedToGroupUpdate
-            .filter { $0.groupId == self.groupId }
-            .sink { [weak self] _ in
-                guard let self else { return }
-                updateInitialItemId()
-            }.store(in: &cancellables)
-
         manager.focusableItemDidUpdatePreferredFocus
             .filter { self.groupId != nil && $0.groupId == self.itemId }
             .sink { [weak self] focusableView in
@@ -143,23 +147,6 @@ public class FocusableGroupView: RCTTVView {
             }.store(in: &cancellables)
     }
 
-    /// Update initial item id
-    @MainActor private func updateInitialItemId() {
-        Task(priority: .userInitiated) { [weak self] in
-            guard let self else { return }
-
-            guard
-                let initialItemId,
-                let groupId,
-                let initialView = await manager.getItem(withId: initialItemId, inGroup: groupId)
-            else {
-                return
-            }
-
-            updatePreferredFocusEnv(with: initialView)
-        }
-    }
-
     private func createFocusEventParams(context: UIFocusUpdateContext, isActive: Bool) -> [String: Any] {
         var params: [String: Any] = [
             GroupViewUpdateEvents.focusHeading: focusHeadingToString(focusHeading: context.focusHeading),
@@ -256,7 +243,7 @@ public class FocusableGroupView: RCTTVView {
     // MARK: Focus Engine
 
     override public var preferredFocusEnvironments: [UIFocusEnvironment] {
-        userPreferredFocusEnvironments ?? customPreferredFocusEnvironment ?? super.preferredFocusEnvironments
+        customPreferredFocusEnvironment ?? userPreferredFocusEnvironments ?? super.preferredFocusEnvironments
     }
 
     override public func shouldUpdateFocus(in _: UIFocusUpdateContext) -> Bool {

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

@@ -14,7 +14,26 @@ import UIKit
 /// RCTTVView subclass that has api how to conects to FocusableGroup
 public class FocusableView: ParallaxView {
     override public var debugDescription: String {
-        "GROUP_ID: \(groupId ?? "NONE"), ID: \(itemId ?? "NONE"), \(super.debugDescription)"
+        let groupIdDesc = groupId ?? "NO_GROUP"
+        let itemIdDesc = itemId ?? "NO_ID"
+        let focusableDesc = focusable ? "focusable" : "non-focusable"
+        let preferredFocusDesc = preferredFocus ? "preferred" : "not-preferred"
+        let isRegisteredDesc = isViewRegistered ? "registered" : "unregistered"
+        let reactTagDesc = reactTag?.stringValue ?? "NO_TAG"
+        let focusStateDesc = isFocused ? "FOCUSED" : "unfocused"
+        let parallelDesc = isParallaxDisabled ? "parallax-off" : "parallax-on"
+        let pressDesc = isPressDisabled ? "press-disabled" : "press-enabled"
+
+        return """
+        FocusableView[
+            ID: \(itemIdDesc)
+            GROUP: \(groupIdDesc)
+            TAG: \(reactTagDesc)
+            STATE: \(focusStateDesc), \(focusableDesc), \(preferredFocusDesc), \(isRegisteredDesc)
+            SETTINGS: \(parallelDesc), \(pressDesc)
+            FRAME: \(frame)
+        ]
+        """
     }
 
     private var cancellables = Set<AnyCancellable>()

package/package.json

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