@applicaster/quick-brick-native-apple 5.22.4-alpha.0 → 5.22.5

package/apple/QuickBrickApple.podspec.json

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

package/apple/ios/ReactNative/PushBridge.swift

@@ -11,9 +11,11 @@ import ZappCore
 
 @objc(PushBridge)
 class PushBridge: NSObject, RCTBridgeModule {
-    let addTagsErrorCode = "error_add_tags"
-    let removeTagsErrorCode = "error_remove_tags"
-    let getTagsErrorCode = "error_get_tags"
+    enum Errors {
+        static let addTagsErrorCode = "error_add_tags"
+        static let removeTagsErrorCode = "error_remove_tags"
+        static let getTagsErrorCode = "error_get_tags"
+    }
 
     static func moduleName() -> String! {
         "PushBridge"
@@ -42,7 +44,7 @@ class PushBridge: NSObject, RCTBridgeModule {
             case .success:
                 resolver(true)
             case let .failure(error):
-                rejecter(self.addTagsErrorCode, error.description, nil)
+                rejecter(Errors.addTagsErrorCode, error.description, nil)
             }
         })
     }
@@ -61,7 +63,7 @@ class PushBridge: NSObject, RCTBridgeModule {
             case .success:
                 resolver(true)
             case let .failure(error):
-                rejecter(self.removeTagsErrorCode, error.localizedDescription, nil)
+                rejecter(Errors.removeTagsErrorCode, error.localizedDescription, nil)
             }
         })
     }
@@ -71,8 +73,15 @@ class PushBridge: NSObject, RCTBridgeModule {
     /// - Parameters:
     ///   - resolver: resolver when everything succeed
     @objc func getRegisteredTags(_ resolver: @escaping RCTPromiseResolveBlock,
-                                 rejecter _: @escaping RCTPromiseResolveBlock) {
-        let tags = FacadeConnector.connector?.push?.getDeviceTags()
-        resolver(tags)
+                                 rejecter: @escaping RCTPromiseRejectBlock) {
+        FacadeConnector.connector?.push?.getDeviceTags { result in
+            switch result {
+            case let .success(tags):
+                let mergedTags = tags?.values.flatMap { $0 }
+                resolver(mergedTags)
+            case let .failure(error):
+                rejecter(Errors.getTagsErrorCode, error.description, nil)
+            }
+        }
     }
 }

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

@@ -144,13 +144,12 @@ public class FocusableGroupView: RCTTVView {
         return true
     }
 
+    /// Focus guide that will catch the focus of the groups
+    var focusGuide = UIFocusGuide()
+
     /// Manager that connects View instance to FocusableGroupViewModule
     var manager: FocusableGroupViewModule?
 
-    override init(bridge: RCTBridge) {
-        super.init(bridge: bridge)
-    }
-
     public required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
         setupFocus()
@@ -161,12 +160,6 @@ public class FocusableGroupView: RCTTVView {
         setupFocus()
     }
 
-    func initializeFocusGuideIfNeeded() {
-        if focusGuide == nil {
-            focusGuide = UIFocusGuide()
-        }
-    }
-
     /// Update customPrefferedFocusEnvironment
     ///
     /// - Parameter view: view instance that should be preffered
@@ -176,8 +169,6 @@ public class FocusableGroupView: RCTTVView {
 
     /// Setup Focus Guide for use
     func setupFocus() {
-        initializeFocusGuideIfNeeded()
-
         addLayoutGuide(focusGuide)
 
         focusGuide.leftAnchor.constraint(equalTo: leftAnchor).isActive = true

package/apple/universal/ReactNative/ReactNativeManager.swift

@@ -29,7 +29,7 @@ open class ReactNativeManager: NSObject, UserInterfaceLayerProtocol, UserInterfa
     /// url of the react server
     private var jsBundleUrl: URL? {
         RCTBundleURLProvider.sharedSettings()?.jsLocation = reactNativePackagerRoot
-        return RCTBundleURLProvider.sharedSettings()?.jsBundleURL(forBundleRoot: "index")
+        return RCTBundleURLProvider.sharedSettings()?.jsBundleURL(forBundleRoot: "index", fallbackResource: nil)
     }
 
     /// url of the react bundle file

package/package.json

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