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

package/apple/QuickBrickApple.podspec.json

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

package/apple/ios/ReactNative/QuickBrickExceptionManagerDelegate.swift

@@ -12,9 +12,15 @@ import XrayLogger
 import ZappCore
 
 class QuickBrickExceptionManagerDelegate: NSObject, RCTExceptionsManagerDelegate {
-    public lazy var logger = Logger.getLogger(for: ReactNativeManagerLogs.subsystem)
+    public lazy var logger = Logger.getLogger(for: ReactNativeManagerLogs.subsystemExceptions)
 
-    func handleSoftJSException(withMessage message: String?, stack: [Any]?, exceptionId: NSNumber, extraDataAsJSON _: String?) {
+    enum Params {
+        static let message = "message"
+        static let extraInfoRawStack = "extraInfo.rawStack"
+        static let exceptionId = "exceptionId"
+    }
+
+    func handleSoftJSException(withMessage message: String?, stack: [Any]?, exceptionId: NSNumber, extraDataAsJSON: String?) {
         guard let message,
               let stack
         else {
@@ -30,13 +36,13 @@ class QuickBrickExceptionManagerDelegate: NSObject, RCTExceptionsManagerDelegate
         logger?.errorLog(message: ReactNativeManagerLogs.handleSoftJSException.message,
                          category: ReactNativeManagerLogs.handleSoftJSException.category,
                          data: [
-                             "message": message,
-                             "stack": stack,
-                             "exceptionId": "\(exceptionId)",
+                             Params.message: message,
+                             Params.extraInfoRawStack: extraDataAsJSON ?? "",
+                             Params.exceptionId: "\(exceptionId)",
                          ])
     }
 
-    func handleFatalJSException(withMessage message: String?, stack: [Any]?, exceptionId: NSNumber, extraDataAsJSON _: String?) {
+    func handleFatalJSException(withMessage message: String?, stack: [Any]?, exceptionId: NSNumber, extraDataAsJSON: String?) {
         guard let message,
               let stack
         else {
@@ -49,12 +55,43 @@ class QuickBrickExceptionManagerDelegate: NSObject, RCTExceptionsManagerDelegate
                type: .error,
                message, stack)
 
+        let data = [
+            Params.message: message,
+            Params.extraInfoRawStack: extraDataAsJSON ?? "",
+            Params.exceptionId: "\(exceptionId)",
+            EventsRelatedKeys.Generic.crashId: (extraDataAsJSON ?? message).md5().lowercased(),
+        ]
+
+        Task { @MainActor in
+            storeFatalJSException(message,
+                                  data: data,
+                                  exceptionId: exceptionId,
+                                  extraDataAsJSON: extraDataAsJSON)
+        }
+
+        // try to post exception to the logger
         logger?.errorLog(message: ReactNativeManagerLogs.handleFatalJSException.message,
                          category: ReactNativeManagerLogs.handleFatalJSException.category,
-                         data: [
-                             "message": message,
-                             "stack": stack,
-                             "exceptionId": "\(exceptionId)",
-                         ])
+                         data: data)
+    }
+
+    @MainActor
+    func storeFatalJSException(_ message: String,
+                               data: [String: Any],
+                               exceptionId _: NSNumber,
+                               extraDataAsJSON _: String?) {
+        let isDebugEnvironment = FacadeConnector.instance?.applicationData?.isDebugEnvironment() ?? false
+        guard !isDebugEnvironment else {
+            return
+        }
+
+        let event = logger?.getEvent(message: ReactNativeManagerLogs.handleFatalJSException.message,
+                                     category: ReactNativeManagerLogs.handleFatalJSException.category,
+                                     data: data,
+                                     logLevel: .error)
+        if let dict = event?.toDictionary() {
+            UserDefaults.standard.setValue(dict,
+                                           forKey: EventsRelatedKeys.UserDefaults.lastFatalJsException)
+        }
     }
 }

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

@@ -253,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/universal/ReactNative/ReactNativeModulesExports.m

@@ -30,7 +30,7 @@ RCT_EXTERN_METHOD(setAppLanguage:(NSString *)language
 
 @interface RCT_EXTERN_MODULE (AnalyticsBridge, NSObject)
 RCT_EXTERN_METHOD(postEvent:(NSString *)event
-                      payload:(NSDictionary *)payload);
+                     payload:(NSDictionary *)payload);
 RCT_EXTERN_METHOD(postTimedEvent:(NSString *)event
                       payload:(NSDictionary *)payload);
 RCT_EXTERN_METHOD(endTimedEvent:(NSString *)event

package/apple/universal/Utils/XrayLoggerTemplates/ReactNativeManagerLogs.swift

@@ -12,12 +12,13 @@ import ZappCore
 
 public struct ReactNativeManagerLogs: XrayLoggerTemplateProtocol {
     public static var subsystem: String = "\(kNativeSubsystemPath)/react_native_manager"
+    public static var subsystemExceptions: String = "\(kNativeSubsystemPath)/react_native_manager/exceptions"
 
     public static var mountingReactApp = LogTemplate(message: "Mounting React App")
     public static var noReactBridge = LogTemplate(message: "No React Bridge")
     public static var presentingReactViewController = LogTemplate(message: "Presenting React ViewController")
     public static var setRightToLeftFlagError = LogTemplate(message: "Error setting RTL")
     public static var failedToLoadJson = LogTemplate(message: "Failed to load json")
-    public static var handleSoftJSException = LogTemplate(message: "Soft JS Exception")
-    public static var handleFatalJSException = LogTemplate(message: "Fatal JS Exception")
+    public static var handleSoftJSException = LogTemplate(message: "Soft JS Exception", category: EventsRelatedKeys.CrashType.jsSoft.rawValue)
+    public static var handleFatalJSException = LogTemplate(message: "Fatal JS Exception", category: EventsRelatedKeys.CrashType.jsFatal.rawValue)
 }

package/package.json

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