@gem-sdk/pages 1.57.0-staging.16 → 1.57.0-staging.20
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/dist/cjs/components/builder/Header.js +2 -2
- package/dist/cjs/components/builder/InteractionSelectOnPageHeader.js +5 -2
- package/dist/cjs/components/builder/Toolbox.js +11 -1
- package/dist/esm/components/builder/Header.js +2 -2
- package/dist/esm/components/builder/InteractionSelectOnPageHeader.js +5 -2
- package/dist/esm/components/builder/Toolbox.js +11 -1
- package/package.json +2 -2
|
@@ -22,7 +22,7 @@ const sizeCheck = {
|
|
|
22
22
|
const Header = (props)=>{
|
|
23
23
|
const { pageType, isOriginTemplate, openPageSetting } = props;
|
|
24
24
|
const layoutSetting = core.useShopStore((s)=>s.layoutSettings);
|
|
25
|
-
const
|
|
25
|
+
const sidebarMode = core.usePageStore((s)=>s.sidebarMode);
|
|
26
26
|
const activeHeader = layoutSetting?.showHeader || isOriginTemplate;
|
|
27
27
|
const headerColor = activeHeader ? HEADER_ON_COLOR : HEADER_OFF_COLOR;
|
|
28
28
|
return /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
|
|
@@ -181,7 +181,7 @@ const Header = (props)=>{
|
|
|
181
181
|
]
|
|
182
182
|
})
|
|
183
183
|
}),
|
|
184
|
-
|
|
184
|
+
sidebarMode === 'interaction' && /*#__PURE__*/ jsxRuntime.jsx(InteractionSelectOnPageHeader.default, {})
|
|
185
185
|
]
|
|
186
186
|
});
|
|
187
187
|
};
|
|
@@ -14,6 +14,7 @@ const InteractionSelectOnPageHeader = ()=>{
|
|
|
14
14
|
const [hoverOption, setHoverOption] = react.useState(null);
|
|
15
15
|
const [openDropdown, setOpenDropdown] = react.useState(false);
|
|
16
16
|
const popupRef = react.useRef(null);
|
|
17
|
+
const isSelectOnPage = core.usePageStore((s)=>s.interactionData?.isSelectOnPage);
|
|
17
18
|
const handleSetInteraction = (type)=>{
|
|
18
19
|
setOpenDropdown(false);
|
|
19
20
|
setInteractionSelectType(type);
|
|
@@ -70,7 +71,7 @@ const InteractionSelectOnPageHeader = ()=>{
|
|
|
70
71
|
};
|
|
71
72
|
return /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
|
|
72
73
|
children: [
|
|
73
|
-
/*#__PURE__*/ jsxRuntime.jsx("header", {
|
|
74
|
+
isSelectOnPage && /*#__PURE__*/ jsxRuntime.jsx("header", {
|
|
74
75
|
className: "gp-flex gp-text-[12px] gp-justify-center gp-items-center gp-h-10 gp-fixed gp-top-0 gp-left-0 gp-w-full gp-z-[1000] gp-bg-[#151515] gp-text-white interaction-select-mode-header",
|
|
75
76
|
children: /*#__PURE__*/ jsxRuntime.jsxs("section", {
|
|
76
77
|
className: "gp-flex gp-bg-[#151515]/[0.15] gp-items-center gp-h-full gp-rounded-b-lg gp-pt-1 gp-gap-2",
|
|
@@ -178,7 +179,9 @@ const InteractionSelectOnPageHeader = ()=>{
|
|
|
178
179
|
})
|
|
179
180
|
}),
|
|
180
181
|
/*#__PURE__*/ jsxRuntime.jsx("div", {
|
|
181
|
-
className: `gp-w-full gp-fixed gp-top-0 gp-left-0 gp-mt-[40px] gp-z-[999] ${isShowOverlay ? 'gp-z-[999] gp-bg-[#3c67ff]/[0.25]' : '
|
|
182
|
+
className: `gp-w-full gp-fixed gp-top-0 gp-left-0 gp-mt-[40px] gp-z-[999] ${isShowOverlay ? 'gp-z-[999] gp-bg-[#3c67ff]/[0.25]' : ''}
|
|
183
|
+
${isSelectOnPage ? 'gp-pointer-events-none' : 'gp-pointer-events-auto'}
|
|
184
|
+
`,
|
|
182
185
|
style: {
|
|
183
186
|
height: 'calc(100% - 40px)'
|
|
184
187
|
}
|
|
@@ -41,6 +41,7 @@ const Toolbox = ()=>{
|
|
|
41
41
|
const setInteractionItem = core.usePageStore((s)=>s.setInteractionItem);
|
|
42
42
|
const setInteractionSelectType = core.usePageStore((s)=>s.setInteractionSelectType);
|
|
43
43
|
const setInteractionSettingType = core.usePageStore((s)=>s.setInteractionSettingType);
|
|
44
|
+
const setSidebarMode = core.usePageStore((s)=>s.setSidebarMode);
|
|
44
45
|
const fonts = react.useMemo(()=>genFonts.getFontsFromDataBuilder(state), [
|
|
45
46
|
state
|
|
46
47
|
]);
|
|
@@ -359,6 +360,13 @@ const Toolbox = ()=>{
|
|
|
359
360
|
}, [
|
|
360
361
|
setInteractionSettingType
|
|
361
362
|
]);
|
|
363
|
+
const onChangeSidebarMode = react.useCallback((e)=>{
|
|
364
|
+
const mode = e.detail.mode;
|
|
365
|
+
console.log(mode);
|
|
366
|
+
setSidebarMode(mode);
|
|
367
|
+
}, [
|
|
368
|
+
setSidebarMode
|
|
369
|
+
]);
|
|
362
370
|
const onUpdateInteractionItem = react.useCallback((e)=>{
|
|
363
371
|
const interactionItem = e.detail;
|
|
364
372
|
setInteractionItem(interactionItem);
|
|
@@ -396,6 +404,7 @@ const Toolbox = ()=>{
|
|
|
396
404
|
window.addEventListener('update-interaction-is-select-on-page', onUpdateInteractionIsSelectOnPage);
|
|
397
405
|
window.addEventListener('update-interaction-item', onUpdateInteractionItem);
|
|
398
406
|
window.addEventListener('update-interaction-setting-type', onUpdateInteractionSettingType);
|
|
407
|
+
window.addEventListener('change-sidebar-mode', onChangeSidebarMode);
|
|
399
408
|
return ()=>{
|
|
400
409
|
window.removeEventListener('update-shop-info', onChangeShopInfo);
|
|
401
410
|
window.removeEventListener('revalidate-query', onRevalidateQuery);
|
|
@@ -443,7 +452,8 @@ const Toolbox = ()=>{
|
|
|
443
452
|
onLimitCreateThemeSection,
|
|
444
453
|
onUpdateInteractionItem,
|
|
445
454
|
onUpdateInteractionIsSelectOnPage,
|
|
446
|
-
onUpdateInteractionSettingType
|
|
455
|
+
onUpdateInteractionSettingType,
|
|
456
|
+
onChangeSidebarMode
|
|
447
457
|
]);
|
|
448
458
|
return /*#__PURE__*/ jsxRuntime.jsx("div", {
|
|
449
459
|
className: "toolbox"
|
|
@@ -18,7 +18,7 @@ const sizeCheck = {
|
|
|
18
18
|
const Header = (props)=>{
|
|
19
19
|
const { pageType, isOriginTemplate, openPageSetting } = props;
|
|
20
20
|
const layoutSetting = useShopStore((s)=>s.layoutSettings);
|
|
21
|
-
const
|
|
21
|
+
const sidebarMode = usePageStore((s)=>s.sidebarMode);
|
|
22
22
|
const activeHeader = layoutSetting?.showHeader || isOriginTemplate;
|
|
23
23
|
const headerColor = activeHeader ? HEADER_ON_COLOR : HEADER_OFF_COLOR;
|
|
24
24
|
return /*#__PURE__*/ jsxs(Fragment, {
|
|
@@ -177,7 +177,7 @@ const Header = (props)=>{
|
|
|
177
177
|
]
|
|
178
178
|
})
|
|
179
179
|
}),
|
|
180
|
-
|
|
180
|
+
sidebarMode === 'interaction' && /*#__PURE__*/ jsx(InteractionSelectOnPageHeader, {})
|
|
181
181
|
]
|
|
182
182
|
});
|
|
183
183
|
};
|
|
@@ -10,6 +10,7 @@ const InteractionSelectOnPageHeader = ()=>{
|
|
|
10
10
|
const [hoverOption, setHoverOption] = useState(null);
|
|
11
11
|
const [openDropdown, setOpenDropdown] = useState(false);
|
|
12
12
|
const popupRef = useRef(null);
|
|
13
|
+
const isSelectOnPage = usePageStore((s)=>s.interactionData?.isSelectOnPage);
|
|
13
14
|
const handleSetInteraction = (type)=>{
|
|
14
15
|
setOpenDropdown(false);
|
|
15
16
|
setInteractionSelectType(type);
|
|
@@ -66,7 +67,7 @@ const InteractionSelectOnPageHeader = ()=>{
|
|
|
66
67
|
};
|
|
67
68
|
return /*#__PURE__*/ jsxs(Fragment, {
|
|
68
69
|
children: [
|
|
69
|
-
/*#__PURE__*/ jsx("header", {
|
|
70
|
+
isSelectOnPage && /*#__PURE__*/ jsx("header", {
|
|
70
71
|
className: "gp-flex gp-text-[12px] gp-justify-center gp-items-center gp-h-10 gp-fixed gp-top-0 gp-left-0 gp-w-full gp-z-[1000] gp-bg-[#151515] gp-text-white interaction-select-mode-header",
|
|
71
72
|
children: /*#__PURE__*/ jsxs("section", {
|
|
72
73
|
className: "gp-flex gp-bg-[#151515]/[0.15] gp-items-center gp-h-full gp-rounded-b-lg gp-pt-1 gp-gap-2",
|
|
@@ -174,7 +175,9 @@ const InteractionSelectOnPageHeader = ()=>{
|
|
|
174
175
|
})
|
|
175
176
|
}),
|
|
176
177
|
/*#__PURE__*/ jsx("div", {
|
|
177
|
-
className: `gp-w-full gp-fixed gp-top-0 gp-left-0 gp-mt-[40px] gp-z-[999] ${isShowOverlay ? 'gp-z-[999] gp-bg-[#3c67ff]/[0.25]' : '
|
|
178
|
+
className: `gp-w-full gp-fixed gp-top-0 gp-left-0 gp-mt-[40px] gp-z-[999] ${isShowOverlay ? 'gp-z-[999] gp-bg-[#3c67ff]/[0.25]' : ''}
|
|
179
|
+
${isSelectOnPage ? 'gp-pointer-events-none' : 'gp-pointer-events-auto'}
|
|
180
|
+
`,
|
|
178
181
|
style: {
|
|
179
182
|
height: 'calc(100% - 40px)'
|
|
180
183
|
}
|
|
@@ -37,6 +37,7 @@ const Toolbox = ()=>{
|
|
|
37
37
|
const setInteractionItem = usePageStore((s)=>s.setInteractionItem);
|
|
38
38
|
const setInteractionSelectType = usePageStore((s)=>s.setInteractionSelectType);
|
|
39
39
|
const setInteractionSettingType = usePageStore((s)=>s.setInteractionSettingType);
|
|
40
|
+
const setSidebarMode = usePageStore((s)=>s.setSidebarMode);
|
|
40
41
|
const fonts = useMemo(()=>getFontsFromDataBuilder(state), [
|
|
41
42
|
state
|
|
42
43
|
]);
|
|
@@ -355,6 +356,13 @@ const Toolbox = ()=>{
|
|
|
355
356
|
}, [
|
|
356
357
|
setInteractionSettingType
|
|
357
358
|
]);
|
|
359
|
+
const onChangeSidebarMode = useCallback((e)=>{
|
|
360
|
+
const mode = e.detail.mode;
|
|
361
|
+
console.log(mode);
|
|
362
|
+
setSidebarMode(mode);
|
|
363
|
+
}, [
|
|
364
|
+
setSidebarMode
|
|
365
|
+
]);
|
|
358
366
|
const onUpdateInteractionItem = useCallback((e)=>{
|
|
359
367
|
const interactionItem = e.detail;
|
|
360
368
|
setInteractionItem(interactionItem);
|
|
@@ -392,6 +400,7 @@ const Toolbox = ()=>{
|
|
|
392
400
|
window.addEventListener('update-interaction-is-select-on-page', onUpdateInteractionIsSelectOnPage);
|
|
393
401
|
window.addEventListener('update-interaction-item', onUpdateInteractionItem);
|
|
394
402
|
window.addEventListener('update-interaction-setting-type', onUpdateInteractionSettingType);
|
|
403
|
+
window.addEventListener('change-sidebar-mode', onChangeSidebarMode);
|
|
395
404
|
return ()=>{
|
|
396
405
|
window.removeEventListener('update-shop-info', onChangeShopInfo);
|
|
397
406
|
window.removeEventListener('revalidate-query', onRevalidateQuery);
|
|
@@ -439,7 +448,8 @@ const Toolbox = ()=>{
|
|
|
439
448
|
onLimitCreateThemeSection,
|
|
440
449
|
onUpdateInteractionItem,
|
|
441
450
|
onUpdateInteractionIsSelectOnPage,
|
|
442
|
-
onUpdateInteractionSettingType
|
|
451
|
+
onUpdateInteractionSettingType,
|
|
452
|
+
onChangeSidebarMode
|
|
443
453
|
]);
|
|
444
454
|
return /*#__PURE__*/ jsx("div", {
|
|
445
455
|
className: "toolbox"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gem-sdk/pages",
|
|
3
|
-
"version": "1.57.0-staging.
|
|
3
|
+
"version": "1.57.0-staging.20",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"main": "dist/cjs/index.js",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"next": "latest"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@gem-sdk/core": "1.57.0-staging.
|
|
29
|
+
"@gem-sdk/core": "1.57.0-staging.20",
|
|
30
30
|
"@gem-sdk/plugin-cookie-bar": "1.57.0-staging.2",
|
|
31
31
|
"@gem-sdk/plugin-quick-view": "1.57.0-staging.2",
|
|
32
32
|
"@gem-sdk/plugin-sticky-add-to-cart": "1.57.0-staging.2"
|