Skip to content

Commit b5f600e

Browse files
committed
MC-10833: Resolve TypeScript errors
- Resolve utils/loader issues - Add target=_blank to GoogleMaps API link - Add title to full screen icon - Fix styling for full screen icon - Fix issue with all child option menus displaying instead of just the dragged content types
1 parent 91fb2de commit b5f600e

File tree

11 files changed

+19
-11
lines changed

11 files changed

+19
-11
lines changed

app/code/Magento/PageBuilder/Block/GoogleMapsApi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function getStyle(): ?string
5858
public function getInvalidApiKeyMessage(): \Magento\Framework\Phrase
5959
{
6060
return __(
61-
"You must provide a valid <a href='%1'>Google Maps API key</a> to use a map.",
61+
"You must provide a valid <a href='%1' target='_blank'>Google Maps API key</a> to use a map.",
6262
$this->_urlBuilder->getUrl('adminhtml/system_config/edit/section/cms', ['_fragment' => 'cms_pagebuilder'])
6363
);
6464
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_drag-drop.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
.pagebuilder-content-type-wrapper.ui-sortable-helper {
4949
opacity: .7;
5050

51-
.pagebuilder-options {
51+
> .pagebuilder-content-type > .pagebuilder-options {
5252
.pagebuilder-options-visible;
5353
}
5454
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
@border-size: 2px;
77

88
.pagebuilder-header {
9-
margin-bottom: 15px;
109
text-align: right;
1110

1211
> .icon-pagebuilder-fullscreen {
1312
cursor: pointer;
13+
display: inline-block;
14+
padding: 15px 0 15px 15px;
15+
}
16+
17+
> .icon-pagebuilder-fullscreen-exit:before {
18+
padding-left: 0;
1419
}
1520
}
1621

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-factory.js

Lines changed: 1 addition & 1 deletion
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/js/converter/converter-pool-factory.js

Lines changed: 1 addition & 1 deletion
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/js/mass-converter/converter-pool-factory.js

Lines changed: 1 addition & 1 deletion
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/js/property/property-reader-pool-factory.js

Lines changed: 1 addition & 1 deletion
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/js/stage-builder.js

Lines changed: 1 addition & 1 deletion
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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
css="'stage-full-screen': isFullScreen"
99
ko-style="wrapperStyles">
1010
<div class="admin__field pagebuilder-header">
11-
<i click="function() { toggleFullScreen($element); }" css="'icon-pagebuilder-fullscreen': !isFullScreen(), 'icon-pagebuilder-fullscreen-exit': isFullScreen()"></i>
11+
<i click="function() { toggleFullScreen($element); }"
12+
css="'icon-pagebuilder-fullscreen': !isFullScreen(), 'icon-pagebuilder-fullscreen-exit': isFullScreen()"
13+
attr="{title: isFullScreen() ? $t('Close Full Screen') : $t('Open in Full Screen')}">
14+
</i>
1215
</div>
1316
<with args="panel">
1417
<render/>

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
import events from "Magento_PageBuilder/js/events";
77
import _ from "underscore";
8-
import loadModule from "utils/loader";
98
import ContentType from "./content-type";
109
import ContentTypeCollectionInterface from "./content-type-collection.types";
1110
import ContentTypeConfigInterface from "./content-type-config.types";
1211
import ContentTypeInterface from "./content-type.types";
1312
import {ContentTypeMountEventParamsInterface} from "./content-type/content-type-events.types";
1413
import masterFactory from "./content-type/master-factory";
1514
import previewFactory from "./content-type/preview-factory";
15+
import loadModule from "./utils/loader";
1616

1717
/**
1818
* Create new content type

0 commit comments

Comments
 (0)