@applicaster/quick-brick-native-apple 5.22.1 → 5.22.3

package/apple/QuickBrickApple.podspec.json

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

package/apple/ios/ReactNative/QuickBrickExceptionManager.swift

@@ -15,8 +15,8 @@ class QuickBrickExceptionManager: RCTExceptionsManager, RCTExceptionsManagerDele
     public lazy var logger = Logger.getLogger(for: ReactNativeManagerLogs.subsystem)
 
     func handleSoftJSException(withMessage message: String?, stack: [Any]?, exceptionId: NSNumber) {
-        guard let message = message,
-              let stack = stack
+        guard let message,
+              let stack
         else {
             return
         }
@@ -37,8 +37,8 @@ class QuickBrickExceptionManager: RCTExceptionsManager, RCTExceptionsManagerDele
     }
 
     func handleFatalJSException(withMessage message: String?, stack: [Any]?, exceptionId: NSNumber) {
-        guard let message = message,
-              let stack = stack
+        guard let message,
+              let stack
         else {
             return
         }

package/apple/ios/ReactNative/QuickBrickViewController.swift

@@ -153,16 +153,6 @@ class QuickBrickViewController: UIViewController, UILayerViewControllerProtocol
     }
 
     private func forceOrientationWithMaskIfNeeded(_ orientationMask: UIInterfaceOrientationMask) {
-        if #available(iOS 16.0, *) {
-            logger?.debugLog(message: "\(QuickBrickViewControllerLogs.forceOrientation.message) UI orientation to: \(orientationMask.toString())",
-                             category: QuickBrickViewControllerLogs.forceOrientation.category)
-
-            let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene
-            windowScene?.requestGeometryUpdate(.iOS(interfaceOrientations: orientationMask))
-            UIViewController.attemptRotationToDeviceOrientation()
-            return
-        }
-
         if isSupportOrientation(mask: orientationMask,
                                 interfaceOrientation: currentInterfaceOrientation) {
             return
@@ -171,6 +161,19 @@ class QuickBrickViewController: UIViewController, UILayerViewControllerProtocol
         logger?.debugLog(message: "\(QuickBrickViewControllerLogs.forceOrientation.message) UI orientation to: \(orientationMask.toString())",
                          category: QuickBrickViewControllerLogs.forceOrientation.category)
 
+        if #available(iOS 16.0, *) {
+            let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene
+            // We need update first setNeedsUpdateOfSupportedInterfaceOrientations,
+            // otherwise requestGeometryUpdate returns errors
+            self.setNeedsUpdateOfSupportedInterfaceOrientations()
+            windowScene?.requestGeometryUpdate(.iOS(interfaceOrientations: orientationMask)) { [weak self] error in
+                self?.logger?.errorLog(message: "\(QuickBrickViewControllerLogs.forceOrientation.message), error: \(error.localizedDescription) UI orientation to: \(orientationMask.toString())",
+                                       category: QuickBrickViewControllerLogs.forceOrientation.category)
+            }
+
+            return
+        }
+
         changeOrienation(orientationMask: orientationMask)
     }
 

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

@@ -104,8 +104,8 @@ class FocusableGroupManager {
     ///   - completion: completion block in case need, that will be called when focusable item did focus
     class func updateFocus(_ groupId: String?, itemId: String?, needsForceUpdate: Bool = false, completion: ((_ success: Bool) -> Void)? = nil) {
         DispatchQueue.main.async {
-            if let groupId = groupId,
-               let itemId = itemId,
+            if let groupId,
+               let itemId,
                let groupView = focusableGroups[groupId],
                let viewToFocus = FocusableGroupManager.item(byGroupId: groupId,
                                                             andItemId: itemId) {
@@ -125,7 +125,7 @@ class FocusableGroupManager {
                     return
                 }
 
-                if let rootView = rootView,
+                if let rootView,
                    let superView = rootView.superview as? RCTRootView {
                     superView.reactPreferredFocusedView = viewToFocus
                     if needsForceUpdate == true {

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

@@ -85,7 +85,7 @@ public class FocusableGroupView: RCTTVView {
     public func groupItemsUpdated(groupItems: [String: FocusableView]) {
         guard
             isGroupWasFocusedByUser == false,
-            let initialItemId = initialItemId,
+            let initialItemId,
             let initialView = groupItems[initialItemId]
         else {
             return
@@ -103,15 +103,15 @@ public class FocusableGroupView: RCTTVView {
     /// - Returns: true if reser succeed
     func resetFocusPrefferedEnvironmentIfNeeded(nextFocusedItem: UIFocusItem?) -> Bool {
         var retVal = false
-        guard let nextFocusedItem = nextFocusedItem else {
+        guard let nextFocusedItem else {
             return retVal
         }
 
         if focusItemIsDescendant(nextFocuseItem: nextFocusedItem) == false {
             if resetFocusToInitialValue,
-               let initialItemId = initialItemId {
+               let initialItemId {
                 if tryTakePrefferedViewFromDependantGroups() == false {
-                    if let groupId = groupId,
+                    if let groupId,
                        let initialItemView = FocusableGroupManager.item(byGroupId: groupId,
                                                                         andItemId: initialItemId) {
                         customPrefferedFocusEnvironment = [initialItemView]
@@ -129,8 +129,8 @@ public class FocusableGroupView: RCTTVView {
     ///
     /// - Returns: true if can focus otherwise false
     func tryTakePrefferedViewFromDependantGroups() -> Bool {
-        guard let initialItemId = initialItemId,
-              let dependantGroupIds = dependantGroupIds,
+        guard let initialItemId,
+              let dependantGroupIds,
 
               let firstGroupId = dependantGroupIds.first,
               let initialView = FocusableGroupManager.item(byGroupId: firstGroupId,
@@ -181,7 +181,7 @@ public class FocusableGroupView: RCTTVView {
     ///
     /// - Parameter context: Update UIFocusUpdateContext instance
     func sendUpdateFocusEventToReactNative(bubbleEventBlock: RCTBubblingEventBlock?, context: UIFocusUpdateContext) {
-        guard let bubbleEventBlock = bubbleEventBlock else {
+        guard let bubbleEventBlock else {
             return
         }
         let focusHeading = focusHeadingToString(focusHeading: context.focusHeading)
@@ -205,8 +205,8 @@ public class FocusableGroupView: RCTTVView {
             params[GroupViewUpdateEvents.isActive] = false
             isFocusDisabled = false
             if resetFocusToInitialValue,
-               let initialItemId = initialItemId {
-                if let groupId = groupId {
+               let initialItemId {
+                if let groupId {
                     let groupItems = FocusableGroupManager.itemsForGroup(by: groupId)
                     if let initialItemView = groupItems[initialItemId] {
                         customPrefferedFocusEnvironment = [initialItemView]
@@ -286,7 +286,7 @@ public class FocusableGroupView: RCTTVView {
 
     /// Force manually focus update
     func manuallyBlockFocus() {
-        if let isManuallyBlockingFocusValue = isManuallyBlockingFocusValue {
+        if let isManuallyBlockingFocusValue {
             isManuallyBlockingFocus = true
             let delay = DispatchTime.now() + DispatchTimeInterval.milliseconds(Int(isManuallyBlockingFocusValue.floatValue * 1000))
 
@@ -299,7 +299,7 @@ public class FocusableGroupView: RCTTVView {
     // MARK: Focus Engine
 
     override public var preferredFocusEnvironments: [UIFocusEnvironment] {
-        if let customPrefferedFocusEnvironment = customPrefferedFocusEnvironment {
+        if let customPrefferedFocusEnvironment {
             return customPrefferedFocusEnvironment
         }
         return super.preferredFocusEnvironments

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

@@ -32,7 +32,7 @@ public class FocusableGroupViewModule: RCTViewManager {
     }
 
     public func viewFromReactTag(reactTag: NSNumber?) -> RCTTVView? {
-        guard let reactTag = reactTag else {
+        guard let reactTag else {
             return nil
         }
         return bridge.uiManager.view(forReactTag: reactTag) as? RCTTVView

package/apple/universal/ReactNative/AppLoaderBridge.swift

@@ -102,7 +102,7 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
             }
 
             applicationData.layoutUrlContent(for: layoutId) { layoutUrlContent in
-                guard let layoutUrlContent = layoutUrlContent else {
+                guard let layoutUrlContent else {
                     rejecter(Errors.canNotGetLayoutContentFromId.code, Errors.canNotGetLayoutContentFromId.message, nil)
                     return
                 }
@@ -121,7 +121,7 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
             }
 
             applicationData.cellStylesUrlContent(for: layoutId) { cellStylesUrlContent in
-                guard let cellStylesUrlContent = cellStylesUrlContent else {
+                guard let cellStylesUrlContent else {
                     rejecter(Errors.canNotGetCellStylesContent.code, Errors.canNotGetCellStylesContent.message, nil)
                     return
                 }

package/apple/universal/ReactNative/LocalNotification/LocalNotificationBridge.swift

@@ -35,7 +35,7 @@ class LocalNotificationBridge: NSObject, RCTBridgeModule {
     @objc func cancelLocalNotifications(_ identifiers: [String]?,
                                         resolver: @escaping RCTPromiseResolveBlock,
                                         rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let identifiers = identifiers else {
+        guard let identifiers else {
             rejecter(Errors.failedToCancelLocalNotifications,
                      nil,
                      nil)

package/apple/universal/ReactNative/OfflineAssetsBridge.swift

@@ -108,7 +108,7 @@ class OfflineAssetsBridge: NSObject, RCTBridgeModule {
         var success = false
         let fileManager = FileManager.default
 
-        guard let path = path else {
+        guard let path else {
             rejecter(Errors.failedToDeleteFileCode,
                      Errors.filePathNotProvidedBody,
                      nil)

package/apple/universal/ReactNative/PluginsManagerBridge.swift

@@ -44,7 +44,7 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
     @objc public func isPluginEnabled(_ identifier: String?,
                                       resolver: @escaping RCTPromiseResolveBlock,
                                       rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let identifier = identifier else {
+        guard let identifier else {
             rejecter(Errors.noIdentifierCode,
                      Errors.noIdentifierBody,
                      nil)
@@ -62,7 +62,7 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
     @objc public func disablePlugin(_ identifier: String?,
                                     resolver: @escaping RCTPromiseResolveBlock,
                                     rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let identifier = identifier else {
+        guard let identifier else {
             rejecter(Errors.noIdentifierCode,
                      Errors.noIdentifierBody,
                      nil)
@@ -82,7 +82,7 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
     @objc public func disableAllPlugins(_ pluginType: String?,
                                         resolver: @escaping RCTPromiseResolveBlock,
                                         rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let pluginType = pluginType else {
+        guard let pluginType else {
             rejecter(Errors.noTypeCode,
                      Errors.noTypeBody,
                      nil)
@@ -103,7 +103,7 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
     @objc public func enablePlugin(_ identifier: String?,
                                    resolver: @escaping RCTPromiseResolveBlock,
                                    rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let identifier = identifier else {
+        guard let identifier else {
             rejecter(Errors.noIdentifierCode,
                      Errors.noIdentifierBody,
                      nil)
@@ -125,7 +125,7 @@ class PluginsManagerBridge: NSObject, RCTBridgeModule {
     @objc public func enableAllPlugins(_ pluginType: String?,
                                        resolver: @escaping RCTPromiseResolveBlock,
                                        rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let pluginType = pluginType else {
+        guard let pluginType else {
             rejecter(Errors.noTypeCode,
                      Errors.noTypeBody,
                      nil)

package/apple/universal/ReactNative/ReactNativeCommunicationModule.swift

@@ -120,7 +120,7 @@ class ReactNativeCommunicationModule: NSObject, RCTBridgeModule {
      */
     @objc func quickBrickEvent(_ eventName: String, payload: [String: Any]?) {
         guard let event = Events(rawValue: eventName),
-              let delegateManager = delegateManager else {
+              let delegateManager else {
             _ = OSLog(subsystem: "QUICK_BRICK:: unknown manager event called: " + eventName, category: kQuickBrickCommunicationModule)
             return
         }
@@ -133,7 +133,7 @@ class ReactNativeCommunicationModule: NSObject, RCTBridgeModule {
                               rejecter: @escaping RCTPromiseRejectBlock) {
         let storageKey = "forcedLanguageCode"
 
-        guard let language = language else {
+        guard let language else {
             rejecter(ReactNativeCommunicationModuleError.errorCode,
                      ReactNativeCommunicationModuleError.languageIsUndefined,
                      nil)
@@ -147,7 +147,7 @@ class ReactNativeCommunicationModule: NSObject, RCTBridgeModule {
             return
         }
 
-        guard let delegateManager = delegateManager else {
+        guard let delegateManager else {
             rejecter(ReactNativeCommunicationModuleError.errorCode,
                      ReactNativeCommunicationModuleError.unableToUseDelegateManager, nil)
             return

package/apple/universal/ReactNative/ReactNativeManager.swift

@@ -47,7 +47,7 @@ open class ReactNativeManager: NSObject, UserInterfaceLayerProtocol, UserInterfa
     private var shouldUseReactServer: Bool {
         var retVal = false
 
-        guard var reactNativePackagerRoot = reactNativePackagerRoot else {
+        guard var reactNativePackagerRoot else {
             return retVal
         }
 

package/apple/universal/Storages/LocalStorage/LocalStorageBridge.swift

@@ -47,8 +47,8 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
     @objc public func setItem(_ key: String?, value: String?, namespace: String?,
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let value = value,
+        guard let key,
+              let value,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
@@ -75,7 +75,7 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                               namespace: String?,
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
+        guard let key,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageGet, nil)
@@ -97,7 +97,7 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                                  namespace: String?,
                                  resolver: @escaping RCTPromiseResolveBlock,
                                  rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
+        guard let key,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageRemove, nil)
@@ -140,8 +140,8 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                                       namespace: String?,
                                       resolver: @escaping RCTPromiseResolveBlock,
                                       rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let value = value,
+        guard let key,
+              let value,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
@@ -168,7 +168,7 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                                       namespace: String?,
                                       resolver: @escaping RCTPromiseResolveBlock,
                                       rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
+        guard let key,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageGet, nil)
@@ -190,7 +190,7 @@ class LocalStorageBridge: NSObject, RCTBridgeModule {
                                          namespace: String?,
                                          resolver: @escaping RCTPromiseResolveBlock,
                                          rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
+        guard let key,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageRemove, nil)

package/apple/universal/Storages/SessionStorage/SessionStorageBridge.swift

@@ -47,8 +47,8 @@ class SessionStorageBridge: NSObject, RCTBridgeModule {
     @objc public func setItem(_ key: String?, value: String?, namespace: String?,
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
-              let value = value,
+        guard let key,
+              let value,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageSet, nil)
@@ -74,7 +74,7 @@ class SessionStorageBridge: NSObject, RCTBridgeModule {
     @objc public func getItem(_ key: String?, namespace: String?,
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
+        guard let key,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageGet, nil)
@@ -97,7 +97,7 @@ class SessionStorageBridge: NSObject, RCTBridgeModule {
                                  namespace: String?,
                                  resolver: @escaping RCTPromiseResolveBlock,
                                  rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let key = key,
+        guard let key,
               let storage = FacadeConnector.connector?.storage
         else {
             rejecter(Errors.errorCode, Errors.errorMessageRemove, nil)

package/package.json

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