@applicaster/quick-brick-native-apple 6.6.2 → 6.6.3

package/apple/QuickBrickApple.podspec.json

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

package/apple/universal/ReactNative/AppLoaderBridge.swift

@@ -83,6 +83,7 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
 
             let remoteConfigJsonString = remoteConfig.getJsonString()
             resolver(remoteConfigJsonString)
+
         case .pluginConfigurations:
             guard let pluginsContent = applicationData.pluginsUrlContent() else {
                 rejecter(Errors.canNotGetPluginsContent.code, Errors.canNotGetPluginsContent.message, nil)
@@ -91,6 +92,7 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
 
             let jsonString = JsonHelper.convertObjectToJsonString(object: pluginsContent, options: [])
             resolver(jsonString)
+
         case .layout:
             guard let layoutId = getActiveOrDefaultFallbackLayoutId() else {
                 if let layoutContent = applicationData.layoutUrlContent() {
@@ -103,14 +105,19 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
                 return
             }
 
-            applicationData.layoutUrlContent(for: layoutId) { layoutUrlContent in
-                guard let layoutUrlContent else {
-                    rejecter(Errors.canNotGetLayoutContentFromId.code, Errors.canNotGetLayoutContentFromId.message, nil)
+            Task {
+                guard let layoutUrlContent = await applicationData.layoutUrlContent(for: layoutId) else {
+                    DispatchQueue.main.async {
+                        rejecter(Errors.canNotGetLayoutContentFromId.code, Errors.canNotGetLayoutContentFromId.message, nil)
+                    }
                     return
                 }
 
-                resolver(layoutUrlContent.getJsonString())
+                DispatchQueue.main.async {
+                    resolver(layoutUrlContent.getJsonString())
+                }
             }
+
         case .cellStyles:
             guard let layoutId = getActiveOrDefaultFallbackLayoutId() else {
                 if let cellStylesContent = applicationData.cellStylesUrlContent() {
@@ -122,14 +129,19 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
                 return
             }
 
-            applicationData.cellStylesUrlContent(for: layoutId) { cellStylesUrlContent in
-                guard let cellStylesUrlContent else {
-                    rejecter(Errors.canNotGetCellStylesContent.code, Errors.canNotGetCellStylesContent.message, nil)
+            Task {
+                guard let cellStylesUrlContent = await applicationData.cellStylesUrlContent(for: layoutId) else {
+                    DispatchQueue.main.async {
+                        rejecter(Errors.canNotGetCellStylesContent.code, Errors.canNotGetCellStylesContent.message, nil)
+                    }
                     return
                 }
 
-                resolver(cellStylesUrlContent.getJsonString())
+                DispatchQueue.main.async {
+                    resolver(cellStylesUrlContent.getJsonString())
+                }
             }
+
         case .styles:
             guard let stylesURLContent = applicationData.stylesUrlContent() else {
                 rejecter(Errors.canNotGetStylesContent.code, Errors.canNotGetStylesContent.message, nil)
@@ -138,18 +150,37 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
 
             let stylesURLContentJsonString = stylesURLContent.getJsonString()
             resolver(stylesURLContentJsonString)
+
         case .pipesEndpoints:
             guard let pipesEndpointContent = applicationData.pipesEndpointContent() else {
                 rejecter(Errors.canNotGetPipesEndpointContent.code, Errors.canNotGetPipesEndpointContent.message, nil)
                 return
             }
             resolver(pipesEndpointContent.getJsonString())
+
         case .presetsMapping:
-            guard let presetsMappingContent = applicationData.presetsMappingContent() else {
-                rejecter(Errors.canNotGetPresetsMappingContent.code, Errors.canNotGetPresetsMappingContent.message, nil)
+            guard let layoutId = getActiveOrDefaultFallbackLayoutId() else {
+                if let presetsMappingContent = applicationData.presetsMappingContent() {
+                    let presetsMappingContentJsonString = presetsMappingContent.getJsonString()
+                    resolver(presetsMappingContentJsonString)
+                } else {
+                    rejecter(Errors.canNotGetPresetsMappingContent.code, Errors.canNotGetPresetsMappingContent.message, nil)
+                }
                 return
             }
-            resolver(presetsMappingContent.getJsonString())
+
+            Task {
+                guard let presetsMappingContent = await applicationData.presetsMappingContent(for: layoutId) else {
+                    DispatchQueue.main.async {
+                        rejecter(Errors.canNotGetPresetsMappingContent.code, Errors.canNotGetPresetsMappingContent.message, nil)
+                    }
+                    return
+                }
+
+                DispatchQueue.main.async {
+                    resolver(presetsMappingContent.getJsonString())
+                }
+            }
         }
     }
 
@@ -163,22 +194,21 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
             return
         }
 
-        applicationData.layoutUrlContent(for: layoutId) { layoutUrlContent in
-            guard let _ = layoutUrlContent else {
-                rejecter(Errors.switchToNewLayoutMessage.code, Errors.switchToNewLayoutMessage.message, nil)
+        Task {
+            guard let _ = await applicationData.layoutUrlContent(for: layoutId),
+                  let _ = await applicationData.cellStylesUrlContent(for: layoutId),
+                  self.saveActiveLayoutId(id: layoutId) else {
+                DispatchQueue.main.async {
+                    rejecter(Errors.switchToNewLayoutMessage.code, Errors.switchToNewLayoutMessage.message, nil)
+                }
                 return
             }
 
-            applicationData.cellStylesUrlContent(for: layoutId) { cellStylesUrlContent in
-                DispatchQueue.main.async {
-                    guard let _ = cellStylesUrlContent,
-                          self.saveActiveLayoutId(id: layoutId)
-                    else {
-                        rejecter(Errors.switchToNewLayoutMessage.code, Errors.switchToNewLayoutMessage.message, nil)
-                        return
-                    }
-                    resolver(true)
-                }
+            // optional presets mapping
+            let _ = await applicationData.presetsMappingContent(for: layoutId)
+
+            DispatchQueue.main.async {
+                resolver(true)
             }
         }
     }

package/package.json

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