gatsby-matrix-theme 48.0.2 → 48.0.3
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.
- package/CHANGELOG.md +13 -0
- package/package.json +2 -2
- package/src/gatsby-core-theme/components/pages/body/index.js +10 -11
- package/storybook/public/{388.22aa29a5.iframe.bundle.js → 388.184e1132.iframe.bundle.js} +3 -3
- package/storybook/public/{388.22aa29a5.iframe.bundle.js.map → 388.184e1132.iframe.bundle.js.map} +1 -1
- package/storybook/public/iframe.html +1 -1
- package/storybook/public/project.json +1 -2
- /package/storybook/public/{388.22aa29a5.iframe.bundle.js.LICENSE.txt → 388.184e1132.iframe.bundle.js.LICENSE.txt} +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,16 @@
|
|
|
1
|
+
## [48.0.3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v48.0.2...v48.0.3) (2024-07-17)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* rename const ([32980a1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/32980a1b36405211e1c38e1c66f81f5ffaed92e0))
|
|
7
|
+
* resolve conflicts ([09766f6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/09766f64b3c05d1fd348ec15d0a47b4f8364917b))
|
|
8
|
+
* update core version ([8012e9d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8012e9dabce33b6214bf8f84e7e3f85138592811))
|
|
9
|
+
* update pages body ([74837a0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/74837a0cfe5c6fc5f91792af6c80853be09a7850))
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
* Merge branch 'tm-4420-info-page-type' into 'master' ([561b0e3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/561b0e3b101f1c058d044c2743d4c90c0c7f78aa))
|
|
13
|
+
|
|
1
14
|
## [48.0.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v48.0.1...v48.0.2) (2024-07-16)
|
|
2
15
|
|
|
3
16
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gatsby-matrix-theme",
|
|
3
|
-
"version": "48.0.
|
|
3
|
+
"version": "48.0.3",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"description": "Matrix Theme NPM Package",
|
|
6
6
|
"author": "",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@react-icons/all-files": "^4.1.0",
|
|
27
27
|
"gatsby": "^5.11.0",
|
|
28
|
-
"gatsby-core-theme": "35.0.
|
|
28
|
+
"gatsby-core-theme": "35.0.1",
|
|
29
29
|
"gatsby-plugin-sharp": "^5.11.0",
|
|
30
30
|
"gatsby-transformer-sharp": "^5.11.0",
|
|
31
31
|
"prop-types": "15.7.2",
|
|
@@ -18,7 +18,7 @@ import { isSearchPath } from '~helpers/isSearchPath';
|
|
|
18
18
|
import ExclusiveOperator from '../../../../components/molecules/operator-exclusive';
|
|
19
19
|
import { setCookie, getCookie } from '~helpers/cookies';
|
|
20
20
|
|
|
21
|
-
function Body({ pageContext, children,
|
|
21
|
+
function Body({ pageContext, children, serverData }) {
|
|
22
22
|
useEffect(() => {
|
|
23
23
|
if (!getCookie('affUUID')) {
|
|
24
24
|
setCookie('affUUID', uuidv4());
|
|
@@ -53,6 +53,8 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], serverData }
|
|
|
53
53
|
const exclusiveOperator =
|
|
54
54
|
pageTypes[template]?.exclusiveOperator ?? pageTypes.default.exclusiveOperator;
|
|
55
55
|
|
|
56
|
+
const disablePopup = pageTypes[template]?.disablePopup ?? pageTypes.default.disablePopup;
|
|
57
|
+
|
|
56
58
|
const showExclusiveOperator = excOperator && pageType !== 'operator' && exclusiveOperator;
|
|
57
59
|
|
|
58
60
|
const popupData = pageContext?.marketSections?.popup?.modules?.find((m) => m.name === 'top_list');
|
|
@@ -112,15 +114,13 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], serverData }
|
|
|
112
114
|
dmcaImage="../../../../../../images/dmca.png"
|
|
113
115
|
/>
|
|
114
116
|
)}
|
|
115
|
-
{!
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
/>
|
|
123
|
-
)}
|
|
117
|
+
{!disablePopup && pageContext?.marketSections?.popup && popupData && (
|
|
118
|
+
<Popup
|
|
119
|
+
module={popupData}
|
|
120
|
+
template={pageContext?.page?.template}
|
|
121
|
+
operatorStatus={pageContext?.page?.relation?.status}
|
|
122
|
+
/>
|
|
123
|
+
)}
|
|
124
124
|
<FloatingArea pageContext={pageContext} template={template} />
|
|
125
125
|
</>
|
|
126
126
|
);
|
|
@@ -148,7 +148,6 @@ Body.propTypes = {
|
|
|
148
148
|
}),
|
|
149
149
|
}),
|
|
150
150
|
}).isRequired,
|
|
151
|
-
excludeTemplateInPopup: PropTypes.arrayOf(PropTypes.string),
|
|
152
151
|
children: PropTypes.element,
|
|
153
152
|
serverData: PropTypes.shape({}),
|
|
154
153
|
};
|