avada-components-seoon 1.0.30 → 1.0.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/CrossAppBanner/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,EACL,mBAAmB,EAGnB,uBAAuB,EAIxB,MAAM,SAAS,CAAC;AASjB,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/CrossAppBanner/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,EACL,mBAAmB,EAGnB,uBAAuB,EAIxB,MAAM,SAAS,CAAC;AASjB,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,cAAc,EAAE,uBAsJ5B,CAAC;;AAEF,wBAA0C"}
|
|
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
|
|
|
3
3
|
import { isEmpty } from '../../helpers/isEmpty';
|
|
4
4
|
import useFetchBannerData from '../../hooks/useFetchBannerData';
|
|
5
5
|
import { useCheckAppInstalled } from '../../hooks/useCheckAppInstalled';
|
|
6
|
-
import { APP_IDS, APP_ID_KEYS,
|
|
6
|
+
import { APP_IDS, APP_ID_KEYS, } from './types';
|
|
7
7
|
import { createInitialDismissedState, createInitialInstalledState, getStorageKey, checkIfAppInstalled, } from './helpers';
|
|
8
8
|
import { BannerLoadingSkeleton } from './BannerLoadingSkeleton';
|
|
9
9
|
import { BannerCard } from './BannerCard';
|
|
@@ -27,7 +27,7 @@ export const CrossAppBanner = ({ shopDomain, clickInstallCallback, appIds: propA
|
|
|
27
27
|
setResolvedAppIds(newAppIds);
|
|
28
28
|
}, [bannerData, appName, position, propAppIds]);
|
|
29
29
|
const appIds = resolvedAppIds;
|
|
30
|
-
const hasOutsideSeoApps = appIds.some(appId =>
|
|
30
|
+
const hasOutsideSeoApps = appIds.some(appId => bannerData?.appOutSide?.some(app => app.key === appId));
|
|
31
31
|
// Load dismissed apps from localStorage
|
|
32
32
|
useEffect(() => {
|
|
33
33
|
const dismissed = createInitialDismissedState();
|
|
@@ -67,18 +67,31 @@ export const CrossAppBanner = ({ shopDomain, clickInstallCallback, appIds: propA
|
|
|
67
67
|
const getFirstNonInstalledApp = () => {
|
|
68
68
|
if (isBannerDismissed || isEmpty(bannerData) || isLoadingBannerData)
|
|
69
69
|
return null;
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
70
|
+
const firstNonDismissedApp = appIds.find(appKey => !dismissedApps[appKey]);
|
|
71
|
+
if (!firstNonDismissedApp)
|
|
72
|
+
return null;
|
|
73
|
+
if (bannerData.appOutSide?.length) {
|
|
74
|
+
const outsideApp = bannerData.appOutSide.find(app => app.key === firstNonDismissedApp);
|
|
75
|
+
if (outsideApp)
|
|
76
|
+
return outsideApp;
|
|
77
|
+
}
|
|
78
|
+
if (bannerData.appSeoon?.length) {
|
|
79
|
+
const seoApp = bannerData.appSeoon.find(app => {
|
|
80
|
+
if (app.key === firstNonDismissedApp)
|
|
81
|
+
return true;
|
|
82
|
+
const mappedKey = APP_IDS[firstNonDismissedApp];
|
|
83
|
+
return mappedKey && app.key === mappedKey;
|
|
84
|
+
});
|
|
85
|
+
if (seoApp) {
|
|
86
|
+
const mappedKey = APP_IDS[firstNonDismissedApp];
|
|
87
|
+
if (mappedKey && installedApps[mappedKey]) {
|
|
88
|
+
setDismissedApps(prev => ({ ...prev, [firstNonDismissedApp]: true }));
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
91
|
+
return seoApp;
|
|
74
92
|
}
|
|
75
93
|
}
|
|
76
|
-
|
|
77
|
-
return !installedApps[APP_IDS[appKey]] && !dismissedApps[appKey];
|
|
78
|
-
});
|
|
79
|
-
if (!priorityApp || !bannerData.appSeoon)
|
|
80
|
-
return null;
|
|
81
|
-
return bannerData.appSeoon.find(app => APP_IDS[priorityApp] === app.key) ?? null;
|
|
94
|
+
return null;
|
|
82
95
|
};
|
|
83
96
|
if (isLoadingBannerData || isCheckingInstalled) {
|
|
84
97
|
return _jsx(BannerLoadingSkeleton, {});
|
|
@@ -88,10 +101,14 @@ export const CrossAppBanner = ({ shopDomain, clickInstallCallback, appIds: propA
|
|
|
88
101
|
return null;
|
|
89
102
|
}
|
|
90
103
|
console.log('%c[Avada]%c Banner SEOon!', 'color: white; background: linear-gradient(90deg, #B7ECF5, #4CC9F0); padding: 2px 6px; border-radius: 4px;', 'color: #333; font-weight: bold;');
|
|
91
|
-
const currentAppIdToShow =
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
104
|
+
const currentAppIdToShow = appIds.find(appId => {
|
|
105
|
+
if (appId === appToShow.key)
|
|
106
|
+
return true;
|
|
107
|
+
const mappedKey = APP_IDS[appId];
|
|
108
|
+
return mappedKey === appToShow.key;
|
|
109
|
+
});
|
|
110
|
+
const isCurrentAppOutside = bannerData?.appOutSide?.some(app => app.key === appToShow.key) ?? false;
|
|
111
|
+
return (_jsx(_Fragment, { children: _jsx(BannerCard, { app: appToShow, appId: currentAppIdToShow, isOutsideApp: isCurrentAppOutside, onDismiss: handleDismiss, onInstallClick: clickInstallCallback }) }));
|
|
95
112
|
};
|
|
96
113
|
export default React.memo(CrossAppBanner);
|
|
97
114
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/CrossAppBanner/index.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,kBAAqC,MAAM,gCAAgC,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAKL,OAAO,EACP,WAAW,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/CrossAppBanner/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "avada-components-seoon",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.31",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "A collection of React components built with Shopify Polaris",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"react-circular-progressbar": "^2.2.0",
|
|
46
46
|
"react-dom": "^18.0.0",
|
|
47
47
|
"swr": "^2.3.6",
|
|
48
|
-
"
|
|
48
|
+
"uuid": "^11.0.3"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@google-cloud/translate": "8.0.2",
|