@applicaster/quick-brick-native-apple 6.14.2 → 6.15.0-alpha.0

package/apple/QuickBrickApple.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "QuickBrickApple",
-  "version": "6.14.2",
+  "version": "6.15.0-alpha.0",
   "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.15.0-alpha.0"
   },
   "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,34 @@ 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(),
+        ]
+
+        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)
+    }
+
+    func storeFatalJSException(_ message: String,
+                               data: [String: Any],
+                               exceptionId _: NSNumber,
+                               extraDataAsJSON _: String?) {
+        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

@@ -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: preferredFocusEnvironments.first)
+        params[GroupViewUpdateEvents.preferredFocusEnvironment] = dataForFocusItem(focusItem: customPreferredFocusEnvironment?.first)
         params[GroupViewUpdateEvents.groupId] = groupId
         params[GroupViewUpdateEvents.isActive] = isActive
         params[GroupViewUpdateEvents.isFocusDisabled] = isFocusDisabled
@@ -179,16 +179,12 @@ 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? FocusableView {
+        if let focusedView = focusItem as? RCTTVView {
             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
     }

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

@@ -35,8 +35,4 @@ 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,8 +40,6 @@ extension FocusableView: ParallaxViewDelegate {
         var retVal: [String: Any] = [:]
         retVal["tag"] = reactTag
         retVal["itemID"] = itemId
-        retVal["groupId"] = groupId
-        retVal["preferred"] = preferredFocus
         return retVal
     }
 }

package/apple/universal/ReactNative/ReactNativeModulesExports.m

@@ -29,8 +29,8 @@ RCT_EXTERN_METHOD(setAppLanguage:(NSString *)language
 @end
 
 @interface RCT_EXTERN_MODULE (AnalyticsBridge, NSObject)
-RCT_EXTERN_METHOD(postEvent:(NSString *)event
-                      payload:(NSDictionary *)payload);
+//RCT_EXTERN_METHOD(postEvent:(NSString *)event
+//                      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.15.0-alpha.0",
   "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"