Skip to content

Commit 224f5f8

Browse files
Merge pull request #589 from magento/514_1_content-snapshot-category-admin-page
#514: User sees content snapshot on Category page in Admin Panel #1
2 parents 6137518 + 74e32ee commit 224f5f8

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</arguments>
1717
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="waitForEditWithPageBuilderButton"/>
1818
<see userInput="Edit with Page Builder" selector="{{pageBuilderArea}}{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="seeEditWithPageBuilderButton"/>
19-
<dontSeeElementInDOM selector="{{PageBuilderPanel.leftPanel}}" stepKey="dontSeePageBuilderContentTypePanel"/>
19+
<dontSeeElement selector="{{PageBuilderPanel.leftPanel}}" stepKey="dontSeePageBuilderContentTypePanel"/>
2020
<dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="dontSeePageBuilderApplyTemplateButton"/>
2121
<dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.saveAsTemplateButton}}" stepKey="dontSeePageBuilderSaveAsTemplateButton"/>
2222
<waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
attr="{title: isFullScreen() ? $t('Close Full Screen') : $t('Open in Full Screen')}">
1818
</i>
1919
</div>
20-
<with args="panel" if="!isSnapshot()">
20+
<with args="panel">
2121
<render/>
2222
</with>
2323
<if args="isStageReady">

app/code/Magento/PageBuilder/view/adminhtml/web/template/panel.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
-->
77

8-
<div id="pagebuilder-panel-wrapper" class="pagebuilder-panel-wrapper"
9-
css="visible: isVisible, 'sticky-top': isStickyTop, 'sticky-bottom': isStickyBottom, 'transition-out': pageBuilder.isSnapshotTransition"
10-
afterRender="afterRender">
8+
<div id="pagebuilder-panel-wrapper" class="pagebuilder-panel-wrapper" visible="!pageBuilder.isSnapshot()"
9+
css="visible: isVisible(), 'sticky-top': isStickyTop, 'sticky-bottom': isStickyBottom, 'transition-out': pageBuilder.isSnapshotTransition"
10+
afterRender="afterRender">
1111
<div id="pagebuilder-panel" class="pagebuilder-panel">
1212
<div class="search-content-types">
1313
<label for="search-content-types-input"></label>

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ export default class PageBuilder implements PageBuilderInterface {
4949
this.preloadTemplates(config);
5050
this.initialValue = initialValue;
5151
this.isFullScreen(config.isFullScreen);
52-
this.isSnapshot(config.pagebuilder_content_snapshot);
52+
this.isSnapshot(!!config.pagebuilder_content_snapshot);
5353
this.isSnapshotTransition(false);
54-
this.snapshot = config.pagebuilder_content_snapshot;
54+
this.snapshot = !!config.pagebuilder_content_snapshot;
5555
this.config = config;
5656

5757
this.isAllowedTemplateApply = isAllowed(resources.TEMPLATE_APPLY);
@@ -109,8 +109,6 @@ export default class PageBuilder implements PageBuilderInterface {
109109

110110
if (!this.isFullScreen()) {
111111
pageBuilderWrapper.css("height", pageBuilderWrapper.outerHeight());
112-
this.previousPanelHeight = panel.outerHeight();
113-
panel.css("height", this.previousPanelHeight + "px");
114112
/**
115113
* Fix the stage in the exact place it is when it's part of the content and allow it to transition to full
116114
* screen.
@@ -130,6 +128,8 @@ export default class PageBuilder implements PageBuilderInterface {
130128
this.isSnapshot(false);
131129
this.stageStyles(this.previousStyles);
132130
} else {
131+
this.previousPanelHeight = panel.outerHeight();
132+
panel.css("height", this.previousPanelHeight + "px");
133133
this.wrapperStyles(this.previousStyles);
134134
}
135135

0 commit comments

Comments
 (0)