Merge remote-tracking branch 'origin/MC-3867' into cms-team-1-delivery

Author: cspruiell

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

@@ -19,9 +19,10 @@
              each="$parent.getChildren()"
              data-bind="sortableChildren: { handle: '.navigation-dot-anchor', containment: 'parent', placeholder: 'navigation-dot sortable-placeholder', tolerance: 'pointer', start: onSortStart.bind($parent.preview), stop: onSortStop.bind($parent.preview) }">
             <div class="navigation-dot"
+                 tabindex="0"
                  event="focusin: $parent.setFocusedSlide.bind($parent, $index(), false), focusout: $parent.onFocusOut.bind($parent)"
                  css="active: $parent.activeSlide() === $index(), focus: $parent.focusedSlide() === $index()">
-                <a class="navigation-dot-anchor" href="#" tabindex="0" click="$parent.onControlClick.bind($parent, $index())" hasFocus="$parent.focusedSlide() === $index()"/>
+                <a class="navigation-dot-anchor" href="#" click="$parent.onControlClick.bind($parent, $index())" hasFocus="$parent.focusedSlide() === $index()"/>
                 <with args="preview">
                     <render with="preview" args="getOptions().template" />
                 </with>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/preview.html

@@ -140,7 +140,7 @@ export default class Preview extends PreviewCollection {
      */
     public onFocusOut(data: PreviewCollection, event: JQueryEventObject) {
         if (_.isNull(event.relatedTarget) ||
-            event.relatedTarget && !$.contains(event.currentTarget as HTMLElement, event.relatedTarget)
+            event.relatedTarget && !$(event.currentTarget as HTMLElement).closest(event.relatedTarget).length
         ) {
             this.setFocusedSlide(null);
         }