Skip to content

Commit 42f6083

Browse files
author
Hwashiang Yu
committed
MC-3709: Safari and firefox button grab handles display on multiple button items
- Updated logic to focus on link-text data element to ensure it can unfocus
1 parent 46c4377 commit 42f6083

File tree

2 files changed

+39
-2
lines changed
  • app/code/Magento/PageBuilder/view/adminhtml/web

2 files changed

+39
-2
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/button-item/preview.js

Lines changed: 20 additions & 0 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/content-type/button-item/preview.ts

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,27 @@ export default class Preview extends BasePreview {
6161
if (!$(currentTarget).hasClass("type-nested")) {
6262
optionsMenu = optionsMenu.first();
6363
}
64-
6564
optionsMenu.parent().addClass("pagebuilder-options-visible");
66-
6765
$(currentTarget).addClass("pagebuilder-content-type-active");
66+
$(currentTarget).find("[data-element='link_text']").focus();
67+
}
68+
69+
/**
70+
* Set state based on mouseout event for the preview
71+
*
72+
* @param {Preview} context
73+
* @param {Event} event
74+
*/
75+
public onMouseOut(context: Preview, event: Event) {
76+
const currentTarget = event.currentTarget;
77+
let optionsMenu = $(currentTarget).find(".pagebuilder-options-wrapper");
78+
79+
if (!$(currentTarget).hasClass("type-nested")) {
80+
optionsMenu = optionsMenu.first();
81+
}
82+
83+
optionsMenu.parent().removeClass("pagebuilder-options-visible");
84+
$(currentTarget).removeClass("pagebuilder-content-type-active");
6885
}
6986

7087
/**

0 commit comments

Comments
 (0)