Skip to content

Commit fc4b798

Browse files
melnikovimelnikovi
committed
Merge branch 'cms-team-2-sprint-14' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-2-sprint-14
2 parents 2535074 + 5914be1 commit fc4b798

File tree

12 files changed

+14
-68
lines changed

12 files changed

+14
-68
lines changed

‎app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ private function convertCss(\DOMElement $elementNode): array
327327
$cssNode = $elementNode->getElementsByTagName('css')->item(0);
328328
if ($cssNode) {
329329
$cssData['var'] = $this->getAttributeValue($cssNode, 'name');
330-
$cssData['converter'] = $this->getAttributeValue($cssNode, 'converter');
331330
$filterClasses = [];
332331
$filterNode = $cssNode->getElementsByTagName('filter')->item(0);
333332
if ($filterNode) {

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<element name="optionsMenu" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//div[contains(@class,'pagebuilder-options-wrapper')]" parameterized="true"/>
6060
<element name="optionsMenuButton" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//div[contains(@class,'pagebuilder-options-wrapper')]//a[contains(@class,'{{arg2}}')]" parameterized="true"/>
6161
<!-- Content Configuration -->
62-
<element name="buttonItemText" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')]//span[contains(.,'{{arg2}}')]" parameterized="true"/>
63-
<element name="buttonItemTextByButtonGroup" type="button" selector="((//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]//div[contains(@class,'pagebuilder-button-item')])[{{arg2}}]//span[contains(.,'{{arg3}}')]" parameterized="true"/>
62+
<element name="buttonItemText" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')]//span[@data-element='link_text' and contains(.,'{{arg2}}')]" parameterized="true"/>
63+
<element name="buttonItemTextByButtonGroup" type="button" selector="((//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]//div[contains(@class,'pagebuilder-button-item')])[{{arg2}}]//span[@data-element='link_text' and contains(.,'{{arg3}}')]" parameterized="true"/>
6464
<element name="buttonItemType" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[@class='{{arg2}}']" parameterized="true"/>
6565
<element name="buttonItemUrl" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][@href='{{arg2}}']" parameterized="true"/>
6666
<element name="buttonItemNewTab" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][@target='{{arg2}}']" parameterized="true"/>
@@ -84,8 +84,8 @@
8484
<element name="emptyButtonItemElement" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a//span[not(text())]" parameterized="true"/>
8585
<element name="jsButtonSelector" type="text" selector="document.querySelectorAll('div[data-role=\'button-item\'] a')[{{arg1}}-1]" parameterized="true"/>
8686
<!-- Content Configuration -->
87-
<element name="buttonItemText" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//span[contains(.,'{{arg2}}')]" parameterized="true"/>
88-
<element name="buttonItemTextByButtonGroup" type="button" selector="((//div[@data-role='buttons'])[{{arg1}}]//div[@data-role='button-item'])[{{arg2}}]//span[contains(.,'{{arg3}}')]" parameterized="true"/>
87+
<element name="buttonItemText" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//span[@data-element='link_text' and contains(.,'{{arg2}}')]" parameterized="true"/>
88+
<element name="buttonItemTextByButtonGroup" type="button" selector="((//div[@data-role='buttons'])[{{arg1}}]//div[@data-role='button-item'])[{{arg2}}]//span[@data-element='link_text' and contains(.,'{{arg3}}')]" parameterized="true"/>
8989
<element name="buttonItemType" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@class='{{arg2}}']" parameterized="true"/>
9090
<element name="buttonItemUrl" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@href='{{arg2}}']" parameterized="true"/>
9191
<element name="buttonItemNewTab" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@target='{{arg2}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<element name="headingOnStage" type="text" selector="(//{{arg1}}[contains(@data-bind,'heading_text')])[{{arg2}}]" parameterized="true"/>
1818
<element name="headingType" type="button" selector="(//{{arg1}})[{{arg2}}]" parameterized="true"/>
1919
<element name="headingEditableText" type="button" selector="(//div[contains(@class, 'pagebuilder-heading')])[{{arg1}}]//h2[contains(@contenteditable, 'true')]" parameterized="true"/>
20-
<element name="headingToolbar" type="text" selector="(//div[contains(@class,'pagebuilder-heading')])[{{arg1}}]//div[contains(@class, 'pagebuilder-toolbar-options')]" parameterized="true"/>
2120
<element name="headingTypeToolbar" type="text" selector="(//div[contains(@class,'pagebuilder-heading')])[{{arg1}}]//span[text()='{{arg2}}']" parameterized="true"/>
2221
<element name="headingTypeToolbarSelected" type="text" selector="(//div[contains(@class,'pagebuilder-heading')])[{{arg1}}]//a[contains(@class, 'toolbar-active')]//span[text()='{{arg2}}']" parameterized="true"/>
2322
<element name="headingTextAlignToolbar" type="button" selector="(//div[contains(@class,'pagebuilder-heading')])[{{arg1}}]//i[contains(@class,'icon-pagebuilder-align-{{arg2}}')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest.xml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,44 +1574,4 @@
15741574
<expectedResult type="variable">actualLastButtonYPosition</expectedResult>
15751575
</assertLessThan>
15761576
</test>
1577-
<test name="HeadingToolbarHideOnDrag">
1578-
<annotations>
1579-
<features value="PageBuilder"/>
1580-
<stories value="Heading"/>
1581-
<title value="Stage Edit - Heading Toolbar should hide on drag action"/>
1582-
<description value="Heading live edit should become unfocused on drag action"/>
1583-
<severity value="MINOR"/>
1584-
<useCaseId value="MC-843"/>
1585-
<testCaseId value="MC-3540"/>
1586-
<group value="pagebuilder"/>
1587-
<group value="pagebuilder-heading"/>
1588-
</annotations>
1589-
<before>
1590-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1591-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1592-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1593-
</before>
1594-
<after>
1595-
<actionGroup ref="logout" stepKey="logout"/>
1596-
</after>
1597-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1598-
<argument name="group" value="PageBuilderHeadingContentType"/>
1599-
</actionGroup>
1600-
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingIntoStage">
1601-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1602-
</actionGroup>
1603-
<!-- Validate Heading edit toolbar shows after dragging in -->
1604-
<comment userInput="Validate Heading edit toolbar" stepKey="CommentHeadingEditToolbar"/>
1605-
<seeElement selector="{{HeadingOnStage.headingToolbar('1')}}" stepKey="seeHeadingToolbar"/>
1606-
<!-- Check if clicking on draggable content, the heading input loses focus and the toolbar hides -->
1607-
<comment userInput="When click on draggable content, heading input loses focus, toolbar disappears, and placeholder displays Enter Heading Text" stepKey="commentClickOnDraggable"/>
1608-
<click selector="{{PageBuilderPanel.draggableContentTypeInPanel(PageBuilderHeadingContentType.name)}}" stepKey="clickDraggableInPanel"/>
1609-
<dontSeeElement selector="{{HeadingOnStage.headingToolbar('1')}}" stepKey="dontSeeHeadingToolbar"/>
1610-
<!-- Check if heading toolbar shows after focusing on heading content type -->
1611-
<comment userInput="When click inside heading see heading input gain focus, placeholder disappears and WYSIWYG toolbar appears" stepKey="commentClickInsideHeading"/>
1612-
<actionGroup ref="clickInsideLiveEditHeading" stepKey="clickInsideLiveEditHeading">
1613-
<argument name="index" value="1"/>
1614-
</actionGroup>
1615-
<seeElement selector="{{HeadingOnStage.headingToolbar('1')}}" stepKey="seeHeadingToolbar2"/>
1616-
</test>
16171577
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_default.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
cursor: grab;
4141
cursor: -moz-grab;
4242
cursor: -webkit-grab;
43-
position: relative;
43+
position: absolute;
4444

4545
&:active {
4646
cursor: grabbing;

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/binding/draggable.js

Lines changed: 1 addition & 5 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/ts/js/binding/draggable.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ import ko from "knockout";
1212
// Create a new sortable Knockout binding
1313
ko.bindingHandlers.draggable = {
1414
init(element, valueAccessor) {
15-
$(element).on("mousedown", () => {
16-
if (document.hasFocus()) {
17-
(document.activeElement as HTMLElement).blur();
18-
}
19-
}).draggable(valueAccessor());
15+
$(element).draggable(valueAccessor());
2016
},
2117
};

‎app/code/Magento/PageBuilder/view/frontend/web/js/content-type/buttons/appearance/inline/widget.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,25 @@ define([
1515
var equalizeButtonWidth = function (buttonList) {
1616
var buttonMinWidth = 0;
1717

18+
buttonList.css('min-width', buttonMinWidth);
1819
buttonList.each(function () {
1920
var buttonWidth = this.offsetWidth;
2021

2122
if (buttonWidth > buttonMinWidth) {
2223
buttonMinWidth = buttonWidth;
2324
}
2425
});
25-
buttonList.css('width', buttonMinWidth);
26+
buttonList.css('min-width', buttonMinWidth);
2627
};
2728

2829
return function (config, element) {
2930
var $element = $(element);
3031

3132
if ($element.data('sameWidth')) {
3233
equalizeButtonWidth($element.find('[data-element="link"]'));
34+
$(window).resize(function () {
35+
equalizeButtonWidth($element.find('[data-element="link"]'));
36+
});
3337
}
3438
};
3539
});

‎dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
'html' => [],
7676
'css' => [
7777
'var' => 'css_classes',
78-
'converter' => null,
7978
'filter' => []
8079
]
8180
]
@@ -409,7 +408,6 @@
409408
],
410409
'css' => [
411410
'var' => 'css_classes',
412-
'converter' => 'Path/to/custom/converter',
413411
'filter' => [
414412
0 => 'class-name',
415413
1 => 'new-class'
@@ -441,7 +439,6 @@
441439
'html' => [],
442440
'css' => [
443441
'var' => 'css_classes',
444-
'converter' => null,
445442
'filter' => []
446443
]
447444
],
@@ -470,7 +467,6 @@
470467
'html' => [],
471468
'css' => [
472469
'var' => 'css_classes',
473-
'converter' => null,
474470
'filter' => []
475471
]
476472
]
@@ -541,7 +537,6 @@
541537
'html' => [],
542538
'css' => [
543539
'var' => 'css_classes',
544-
'converter' => null,
545540
'filter' => [],
546541
],
547542
],
@@ -602,7 +597,6 @@
602597
'html' => [],
603598
'css' => [
604599
'var' => 'css_classes',
605-
'converter' => null,
606600
'filter' => [],
607601
],
608602
],
@@ -664,7 +658,6 @@
664658
'html' => [],
665659
'css' => [
666660
'var' => 'css_classes',
667-
'converter' => null,
668661
'filter' => [],
669662
],
670663
],

‎dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/type2_content_type1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<static_attribute source="static_attribute_change" value="value"/>
3939
<tag name="tag" converter="Path/to/converter"/>
4040
<html name="html"/>
41-
<css name="css_classes" converter="Path/to/converter">
41+
<css name="css_classes">
4242
<filter>
4343
<class source="class-name"/>
4444
</filter>

0 commit comments

Comments
 (0)