@pushwoosh/smart-components-kit 1.0.39 → 1.0.41

package/OpenActions/usePresetOpenActions.js

@@ -25,11 +25,8 @@ export const usePresetOpenActions = pushPreset => {
       return '';
     }
   }, [openToast, rpcGateway]);
-  const getOpenActionsByPreset = useCallback(async () => {
+  const getOpenActionsFromV2Preset = useCallback(async pushPreset => {
     var _pushPreset$localized, _pushPreset$openActio, _pushPreset$openActio2;
-    if (!pushPreset) {
-      return;
-    }
     const safariUrlArgs = ((_pushPreset$localized = pushPreset.localizedProperties.default) === null || _pushPreset$localized === void 0 || (_pushPreset$localized = _pushPreset$localized.safari) === null || _pushPreset$localized === void 0 || (_pushPreset$localized = _pushPreset$localized.urlArguments) === null || _pushPreset$localized === void 0 ? void 0 : _pushPreset$localized[0]) ?? null;
     const webPageUrl = isWebLink(pushPreset.url) ? pushPreset.url : null;
     const {
@@ -46,18 +43,25 @@ export const usePresetOpenActions = pushPreset => {
       const deeplinkManual = pushPreset.openAction.kind.data;
       defaultDeeplinkUrl = deeplinkManual.url;
     }
+    return {
+      webPageUrl,
+      defaultDeeplinkUrl,
+      platformsDeeplinkUrls,
+      safariUrlArgs,
+      showRichmedia
+    };
+  }, [getDeeplinkUrl]);
+  const getOpenActionsByPreset = useCallback(async () => {
+    if (!pushPreset) {
+      return;
+    }
+    const openActions = pushPreset.isV2 ? await getOpenActionsFromV2Preset(pushPreset) : await getOpenActionsFromV1Preset(pushPreset);
     // setTimeout нужен, чтобы не получать ошибку 'ResizeObserver loop completed with undelivered notifications.'
     // Она возникает, когда этот хук вызывается ВНУТРИ Modal и с пересчетом её размера. Подробности в тикете FRONT-750
     setTimeout(() => {
-      setOpenActions({
-        webPageUrl,
-        defaultDeeplinkUrl,
-        platformsDeeplinkUrls,
-        safariUrlArgs,
-        showRichmedia
-      });
+      setOpenActions(openActions);
     }, 0);
-  }, [getDeeplinkUrl, pushPreset]);
+  }, [getOpenActionsFromV2Preset, pushPreset]);
   useEffect(() => {
     getOpenActionsByPreset();
   }, [getOpenActionsByPreset]);
@@ -93,4 +97,20 @@ const getPlatformDeeplinksByOpenActions = async (pushPreset, getDeeplinkUrl) =>
     platformsDeeplinkUrls,
     showRichmedia
   };
+};
+const getOpenActionsFromV1Preset = async pushPreset => {
+  var _pushPreset$localized2, _pushPreset$localized3;
+  const webPageUrl = !pushPreset.deeplink && isWebLink(pushPreset.url) ? pushPreset.url : null;
+  const defaultDeeplinkUrl = pushPreset.deeplink && pushPreset.url ? pushPreset.url : null;
+  const showRichmedia = pushPreset.richmedia ? {
+    code: pushPreset.richmedia
+  } : null;
+  const safariUrlArgs = ((_pushPreset$localized2 = pushPreset.localizedProperties.default) === null || _pushPreset$localized2 === void 0 || (_pushPreset$localized2 = _pushPreset$localized2.safari) === null || _pushPreset$localized2 === void 0 || (_pushPreset$localized2 = _pushPreset$localized2.urlArguments) === null || _pushPreset$localized2 === void 0 ? void 0 : _pushPreset$localized2[0]) ?? ((_pushPreset$localized3 = pushPreset.localizedProperties.en) === null || _pushPreset$localized3 === void 0 || (_pushPreset$localized3 = _pushPreset$localized3.safari) === null || _pushPreset$localized3 === void 0 || (_pushPreset$localized3 = _pushPreset$localized3.urlArguments) === null || _pushPreset$localized3 === void 0 ? void 0 : _pushPreset$localized3[0]) ?? null;
+  return {
+    webPageUrl,
+    defaultDeeplinkUrl,
+    platformsDeeplinkUrls: {},
+    safariUrlArgs,
+    showRichmedia
+  };
 };

package/context/types.d.ts

@@ -1,5 +1,4 @@
 import { type History } from 'history';
-import type { GrpcBridge } from '@pushwoosh/grpc-bridge';
 import type { GrpcClient, HttpClient, RpcClient } from '@pushwoosh/http-client';
 import type { API as RpcGatewayJourneyAPI } from '@pushwoosh/rpc-gateway-journey-data';
 import type { API as RpcGatewayAPI } from '@pushwoosh/rpc-v2-http-api-data';
@@ -9,7 +8,11 @@ export type SPAContextType = {
     readonly httpClient: HttpClient;
     readonly rpcClient: RpcClient;
     readonly grpcClient: GrpcClient;
-    readonly grpcBridge: GrpcBridge;
+    readonly grpcBridge: {
+        clients: {
+            billingGrpcClient: GrpcClient;
+        };
+    };
     readonly sessionStore: SessionStore;
     readonly rpcGateway: RpcGatewayAPI;
     readonly rpcGatewayJourney: RpcGatewayJourneyAPI;

package/package.json

@@ -16,7 +16,6 @@
   },
   "pre-commit": "check",
   "dependencies": {
-    "@emoji-mart/react": "^1.1.1",
     "@floating-ui/react-dom": "^2.1.2",
     "@pushwoosh/dumb-components": "^1.1.2",
     "@pushwoosh/kit-constants": "^1.6.9",
@@ -26,7 +25,6 @@
   },
   "devDependencies": {
     "@pushwoosh/frontend-builder-engine": "^1.0.17",
-    "@pushwoosh/grpc-bridge": "^1.5.36",
     "@pushwoosh/http-client": "^2.5.0",
     "@pushwoosh/session-store": "^2.5.0",
     "@types/react": "^18.3.5",
@@ -40,7 +38,6 @@
     "typescript": "^5.8.2"
   },
   "peerDependencies": {
-    "@pushwoosh/grpc-bridge": "^1.5.36",
     "@pushwoosh/http-client": "^2.5.0",
     "@pushwoosh/rpc-gateway-journey-data": "^0.26.206",
     "@pushwoosh/rpc-v2-http-api-data": "^0.1.566",
@@ -51,5 +48,5 @@
   "engines": {
     "node": ">= 18"
   },
-  "version": "1.0.39"
+  "version": "1.0.41"
 }