@atlassian/aui 9.5.2 → 9.6.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@atlassian/aui",
     "description": "Atlassian User Interface library",
-    "version": "9.5.2",
+    "version": "9.6.0",
     "author": "Atlassian Pty Ltd.",
     "homepage": "https://aui.atlassian.com",
     "license": "Apache-2.0",
@@ -34,29 +34,29 @@
     },
     "dependencies": {
         "@atlassian/tipsy": "1.3.3",
-        "@popperjs/core": "2.4.4",
+        "@popperjs/core": "2.11.6",
         "backbone": "1.4.1",
         "css.escape": "1.5.1",
-        "dompurify": "2.4.0",
+        "dompurify": "2.4.5",
         "fancy-file-input": "2.0.4",
         "jquery-ui": "1.13.2",
         "skatejs": "0.13.17",
         "skatejs-template-html": "0.0.0",
         "trim-extra-html-whitespace": "1.3.0",
-        "underscore": "1.13.4"
+        "underscore": "1.13.6"
     },
     "devDependencies": {
         "@atlassian/adg-server-iconfont": "3.1.0",
         "@atlassian/aui-webpack-config": "3.0.1",
-        "@babel/core": "7.18.6",
-        "@babel/preset-env": "7.18.6",
+        "@babel/core": "7.18.13",
+        "@babel/preset-env": "7.18.10",
         "bundlesize": "1.0.0-beta.2",
         "cross-env": "7.0.3",
         "eslint": "7.32.0",
         "glob": "7.2.3",
         "ignore-emit-webpack-plugin": "2.0.6",
         "jquery": "3.5.1",
-        "jquery-migrate": "3.4.0",
+        "jquery-migrate": "3.4.1",
         "less": "3.13.1"
     },
     "scripts": {

package/src/css-vendor/jquery/plugins/jquery.select2.css

@@ -1,5 +1,5 @@
 /*
-Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
+Version: 3.5.4 Timestamp: Sun Aug 30 13:30:32 EDT 2015
 */
 .select2-container {
     margin: 0;
@@ -15,7 +15,6 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
   /*
     Force border-box so that % widths fit the parent
     container without overlap because of margin/padding.
-
     More Info : http://www.quirksmode.org/css/box.html
   */
   -webkit-box-sizing: border-box; /* webkit */
@@ -51,7 +50,11 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 50%);
     background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 50%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#eeeeee', GradientType = 0);
-    background-image: linear-gradient(top, #fff 0%, #eee 50%);
+    background-image: linear-gradient(to top, #eee 0%, #fff 50%);
+}
+
+html[dir="rtl"] .select2-container .select2-choice {
+    padding: 0 8px 0 0;
 }
 
 .select2-container.select2-drop-above .select2-choice {
@@ -63,7 +66,7 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 90%);
     background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 90%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0);
-    background-image: linear-gradient(top, #eee 0%, #fff 90%);
+    background-image: linear-gradient(to bottom, #eee 0%, #fff 90%);
 }
 
 .select2-container.select2-allowclear .select2-choice .select2-chosen {
@@ -78,6 +81,13 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     white-space: nowrap;
 
     text-overflow: ellipsis;
+    float: none;
+    width: auto;
+}
+
+html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
+    margin-left: 26px;
+    margin-right: 0;
 }
 
 .select2-container .select2-choice abbr {
@@ -142,15 +152,6 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
             box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
 }
 
-.select2-drop-auto-width {
-    border-top: 1px solid #aaa;
-    width: auto;
-}
-
-.select2-drop-auto-width .select2-search {
-    padding-top: 4px;
-}
-
 .select2-drop.select2-drop-above {
     margin-top: 1px;
     border-top: 1px solid #aaa;
@@ -171,6 +172,11 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     border-top: 1px solid #5897fb;
 }
 
+.select2-drop-auto-width {
+    border-top: 1px solid #aaa;
+    width: auto;
+}
+
 .select2-container .select2-choice .select2-arrow {
     display: inline-block;
     width: 18px;
@@ -189,7 +195,16 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
     background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#cccccc', GradientType = 0);
-    background-image: linear-gradient(top, #ccc 0%, #eee 60%);
+    background-image: linear-gradient(to top, #ccc 0%, #eee 60%);
+}
+
+html[dir="rtl"] .select2-container .select2-choice .select2-arrow {
+    left: 0;
+    right: auto;
+
+    border-left: none;
+    border-right: 1px solid #aaa;
+    border-radius: 4px 0 0 4px;
 }
 
 .select2-container .select2-choice .select2-arrow b {
@@ -199,13 +214,16 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     background: url('select2.png') no-repeat 0 1px;
 }
 
+html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
+    background-position: 2px 1px;
+}
+
 .select2-search {
     display: inline-block;
     width: 100%;
     min-height: 26px;
     margin: 0;
-    padding-left: 4px;
-    padding-right: 4px;
+    padding: 4px 4px 0 4px;
 
     position: relative;
     z-index: 10000;
@@ -234,11 +252,17 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
     background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
     background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('select2.png') no-repeat 100% -22px, linear-gradient(top, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
 }
 
-.select2-drop.select2-drop-above .select2-search input {
-    margin-top: 4px;
+html[dir="rtl"] .select2-search input {
+    padding: 4px 5px 4px 20px;
+
+    background: #fff url('select2.png') no-repeat -37px -22px;
+    background: url('select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
 }
 
 .select2-search input.select2-active {
@@ -246,7 +270,7 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     background: url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
     background: url('select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
     background: url('select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('select2-spinner.gif') no-repeat 100%, linear-gradient(top, #fff 85%, #eee 99%);
+    background: url('select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
 }
 
 .select2-container-active .select2-choice,
@@ -271,7 +295,7 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     background-image: -webkit-linear-gradient(center bottom, #fff 0%, #eee 50%);
     background-image: -moz-linear-gradient(center bottom, #fff 0%, #eee 50%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0);
-    background-image: linear-gradient(top, #fff 0%, #eee 50%);
+    background-image: linear-gradient(to top, #fff 0%, #eee 50%);
 }
 
 .select2-dropdown-open.select2-drop-above .select2-choice,
@@ -283,7 +307,7 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     background-image: -webkit-linear-gradient(center top, #fff 0%, #eee 50%);
     background-image: -moz-linear-gradient(center top, #fff 0%, #eee 50%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0);
-    background-image: linear-gradient(bottom, #fff 0%, #eee 50%);
+    background-image: linear-gradient(to bottom, #fff 0%, #eee 50%);
 }
 
 .select2-dropdown-open .select2-choice .select2-arrow {
@@ -291,10 +315,29 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     border-left: none;
     filter: none;
 }
+html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow {
+    border-right: none;
+}
+
 .select2-dropdown-open .select2-choice .select2-arrow b {
     background-position: -18px 1px;
 }
 
+html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow b {
+    background-position: -16px 1px;
+}
+
+.select2-hidden-accessible {
+    border: 0;
+    clip: rect(0 0 0 0);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    width: 1px;
+}
+
 /* results */
 .select2-results {
     max-height: 200px;
@@ -306,19 +349,16 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
+html[dir="rtl"] .select2-results {
+    padding: 0 4px 0 0;
+    margin: 4px 0 4px 4px;
+}
+
 .select2-results ul.select2-result-sub {
     margin: 0;
     padding-left: 0;
 }
 
-.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px }
-.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px }
-.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px }
-.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px }
-.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px }
-.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px }
-.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px }
-
 .select2-results li {
     list-style: none;
     display: list-item;
@@ -343,6 +383,14 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
               user-select: none;
 }
 
+.select2-results-dept-1 .select2-result-label { padding-left: 20px }
+.select2-results-dept-2 .select2-result-label { padding-left: 40px }
+.select2-results-dept-3 .select2-result-label { padding-left: 60px }
+.select2-results-dept-4 .select2-result-label { padding-left: 80px }
+.select2-results-dept-5 .select2-result-label { padding-left: 100px }
+.select2-results-dept-6 .select2-result-label { padding-left: 110px }
+.select2-results-dept-7 .select2-result-label { padding-left: 120px }
+
 .select2-results .select2-highlighted {
     background: #3875d7;
     color: #fff;
@@ -362,12 +410,13 @@ Version: 3.4.4 Timestamp: Thu Oct 24 13:23:11 PDT 2013
     color: #000;
 }
 
-
 .select2-results .select2-no-results,
 .select2-results .select2-searching,
+.select2-results .select2-ajax-error,
 .select2-results .select2-selection-limit {
     background: #f4f4f4;
     display: list-item;
+    padding-left: 5px;
 }
 
 /*
@@ -393,6 +442,10 @@ disabled look for disabled choices in the results dropdown
     background: #f4f4f4 url('select2-spinner.gif') no-repeat 100%;
 }
 
+.select2-results .select2-ajax-error {
+    background: rgba(255, 50, 50, .2);
+}
+
 .select2-more-results {
     background: #f4f4f4;
     display: list-item;
@@ -424,7 +477,7 @@ disabled look for disabled choices in the results dropdown
     height: auto !important;
     height: 1%;
     margin: 0;
-    padding: 0;
+    padding: 0 5px 0 0;
     position: relative;
 
     border: 1px solid #aaa;
@@ -435,7 +488,11 @@ disabled look for disabled choices in the results dropdown
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eee), color-stop(15%, #fff));
     background-image: -webkit-linear-gradient(top, #eee 1%, #fff 15%);
     background-image: -moz-linear-gradient(top, #eee 1%, #fff 15%);
-    background-image: linear-gradient(top, #eee 1%, #fff 15%);
+    background-image: linear-gradient(to bottom, #eee 1%, #fff 15%);
+}
+
+html[dir="rtl"] .select2-container-multi .select2-choices {
+    padding: 0 0 0 5px;
 }
 
 .select2-locked {
@@ -457,6 +514,10 @@ disabled look for disabled choices in the results dropdown
     float: left;
     list-style: none;
 }
+html[dir="rtl"] .select2-container-multi .select2-choices li
+{
+    float: right;
+}
 .select2-container-multi .select2-choices .select2-search-field {
     margin: 0;
     padding: 0;
@@ -513,7 +574,12 @@ disabled look for disabled choices in the results dropdown
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
     background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
     background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
-    background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+    background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
+html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
+{
+    margin: 3px 5px 3px 0;
+    padding: 3px 18px 3px 5px;
 }
 .select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
     cursor: default;
@@ -534,11 +600,20 @@ disabled look for disabled choices in the results dropdown
     outline: none;
     background: url('select2.png') right top no-repeat;
 }
+html[dir="rtl"] .select2-search-choice-close {
+    right: auto;
+    left: 3px;
+}
 
 .select2-container-multi .select2-search-choice-close {
     left: 3px;
 }
 
+html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
+    left: auto;
+    right: 2px;
+}
+
 .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
   background-position: right -11px;
 }
@@ -598,15 +673,20 @@ disabled look for disabled choices in the results dropdown
     height: 100px;
     overflow: scroll;
 }
+
 /* Retina-ize icons */
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi)  {
-  .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b {
-      background-image: url('select2x2.png') !important;
-      background-repeat: no-repeat !important;
-      background-size: 60px 40px !important;
-  }
-  .select2-search input {
-      background-position: 100% -21px !important;
-  }
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 2dppx)  {
+    .select2-search input,
+    .select2-search-choice-close,
+    .select2-container .select2-choice abbr,
+    .select2-container .select2-choice .select2-arrow b {
+        background-image: url('select2x2.png') !important;
+        background-repeat: no-repeat !important;
+        background-size: 60px 40px !important;
+    }
+
+    .select2-search input {
+        background-position: 100% -21px !important;
+    }
 }

package/src/js/aui/blanket.js

@@ -4,7 +4,18 @@ import { recomputeStyle } from './internal/animation';
 import globalize from './internal/globalize';
 
 var overflowEl;
-var _hiddenByAui = [];
+
+/**
+ * Blanketing is pattern for hiding all page content from user when overlapping layer is open.
+ *
+ * This pattern is old and should be removed, but it has a lot of dependants:
+ * - Layer, LayerManager
+ * - Dialog2, Dialog1
+ * - Dropdown2
+ * - InlineDialog2
+ *
+ * Removal should be done as separate process with usage research and go through deprecation.
+ */
 
 /**
  * Dims the screen using a blanket div
@@ -13,21 +24,14 @@ var _hiddenByAui = [];
 function dim (useShim, zIndex) {
 
     //if we're blanketing the page it means we want to hide the whatever is under the blanket from the screen readers as well
-    function hasAriaHidden(element) {
+    function hasAriaHidden(element) { // eslint-disable-line no-unused-vars
         return element.hasAttribute('aria-hidden');
     }
 
-    function isAuiLayer(element) {
+    function isAuiLayer(element) { // eslint-disable-line no-unused-vars
         return element.classList && element.classList.contains('aui-layer');
     }
 
-    Array.prototype.forEach.call(document.body.children, function (element) {
-        if (!hasAriaHidden(element) && !isAuiLayer(element)) {
-            element.setAttribute('aria-hidden', 'true');
-            _hiddenByAui.push(element);
-        }
-    });
-
     if (!overflowEl) {
         overflowEl = document.body;
     }
@@ -36,7 +40,7 @@ function dim (useShim, zIndex) {
         useShimDeprecationLogger();
     }
 
-    var isBlanketShowing = (!!dim.$dim) && !dim.$dim[0].hasAttribute('hidden');
+    const isBlanketShowing = (!!dim.$dim) && !dim.$dim[0].hasAttribute('hidden');
 
     if (!!dim.$dim) {
         dim.$dim.remove();
@@ -44,7 +48,6 @@ function dim (useShim, zIndex) {
     }
 
     dim.$dim = $('<div aria-hidden="true"></div>').addClass('aui-blanket');
-    dim.$dim.attr('tabindex', '0'); //required, or the last element's focusout event will go to the browser
     dim.$dim.appendTo(document.body);
 
     if (!isBlanketShowing) {
@@ -77,11 +80,6 @@ function dim (useShim, zIndex) {
  * @see dim
  */
 function undim () {
-    _hiddenByAui.forEach(function (element) {
-        element.removeAttribute('aria-hidden');
-    });
-
-    _hiddenByAui = [];
 
     if (dim.$dim) {
         dim.$dim[0].setAttribute('hidden', '');
@@ -94,7 +92,7 @@ function undim () {
     }
 }
 
-var useShimDeprecationLogger = getMessageLogger('useShim', {
+const useShimDeprecationLogger = getMessageLogger('useShim', {
     extraInfo: 'useShim has no alternative as it is now calculated by dim().'
 });
 

package/src/js/aui/dialog2.js

@@ -4,29 +4,120 @@ import globalize from './internal/globalize';
 import layerWidget from './layer';
 import widget from './internal/widget';
 import keyCode from './key-code';
-import {CLOSE_BUTTON, CLOSE_BUTTON_CLASS_SELECTOR} from './close-button';
+import { CLOSE_BUTTON, CLOSE_BUTTON_CLASS, CLOSE_BUTTON_CLASS_SELECTOR } from './close-button';
+import * as deprecate from './internal/deprecation';
 
-var defaults = {
+const defaults = {
     'aui-focus': 'false', // do not focus by default as it's overridden below
     'aui-blanketed': 'true'
 };
 
 function applyDefaults($el) {
     $.each(defaults, function (key, value) {
-        var dataKey = 'data-' + key;
+        const dataKey = 'data-' + key;
         if (!$el[0].hasAttribute(dataKey)) {
             $el.attr(dataKey, value);
         }
     });
 }
 
+/**
+ * Gets keyboard-focusable elements within a specified element
+ * https://zellwk.com/blog/keyboard-focusable-elements/
+ * @param {HTMLElement} [element=document] element
+ * @returns {Array}
+ */
+function getKeyboardFocusableElements(element) {
+    const focusableSelector = 'a[href], button, input, textarea, select, details,[tabindex]:not([tabindex="-1"])';
+    const elementList = [...element.querySelectorAll(focusableSelector)];
+
+    return elementList.filter(el => !el.hasAttribute('disabled') && !el.getAttribute('aria-hidden'));
+}
+
+function handleInitialFocus(el) {
+
+    // prevent inability to focus the close button.
+    const closeButton = el.querySelector(CLOSE_BUTTON_CLASS_SELECTOR)
+
+    if (closeButton) {
+        const lazyDeprecate = deprecate.getMessageLogger(`Dialog2 [${CLOSE_BUTTON_CLASS_SELECTOR}] element is deprecated.`, {
+            removeInVersion: '10.0.0',
+            sinceVersion: '9.6.0',
+            extraInfo: 'Replace it with another actionable element inside your Dialog which will trigger closing of the modal.',
+            deprecationType: 'MARKUP'
+        });
+        lazyDeprecate();
+        closeButton.setAttribute('tabindex', '0');
+    }
+
+    el.setAttribute('tabindex', '-1');
+
+    // Print deprecation note for old custom focus selection if found
+    const deprecatedFocusSelector = el.hasAttribute('data-aui-focus-selector');
+    if (deprecatedFocusSelector) {
+        const lazyDeprecate = deprecate.getMessageLogger('Dialog2 [data-aui-focus-selector] attribute is deprecated.', {
+            removeInVersion: '10.0.0',
+            alternativeName: 'initialisation on DOM insertion',
+            sinceVersion: '9.6.0',
+            extraInfo: 'Replace [data-aui-focus-selector] attribute with HTML [autofocus] attribute',
+            deprecationType: 'ATTRIBUTE'
+        });
+        lazyDeprecate();
+    }
+
+    // Focus custom element user marked by autofocus if found
+    const autofocusEl = el.querySelector('[autofocus]');
+    if (autofocusEl) {
+        // Set timeout and blur are needed to avoid Chrome complaining about focus already set on an element
+        // Also helps to ensure focus will 100% work in every environment
+        document.activeElement.blur();
+        setTimeout(() => autofocusEl.focus(), 0);
+        return;
+    }
+
+    // Deprecated focus selection, if autofocus not found
+    if (deprecatedFocusSelector) {
+        const elementToFocus = el.querySelector(deprecatedFocusSelector);
+        if (elementToFocus) {// Set timeout and blur are needed to avoid Chrome complaining about focus already set on an element
+            // Also helps to ensure focus will 100% work in every environment
+            elementToFocus.blur();
+            setTimeout(() => elementToFocus.focus(), 0);
+            return
+        }
+    }
+
+    // If not custom focus target, focus first focusable element if possible
+    const focusableElementList = getKeyboardFocusableElements(el);
+    if (focusableElementList.length) {
+        let focusableElement = focusableElementList.shift();
+
+        // if the first focusable element is Dialog's close button
+        // then take another one from the list
+        if (focusableElement.classList.contains(CLOSE_BUTTON_CLASS)) {
+            focusableElement = focusableElementList.shift();
+        }
+
+        if (focusableElement) {
+            // Set timeout and blur are needed to avoid Chrome complaining about focus already set on an element
+            // Also helps to ensure focus will 100% work in every environment
+            focusableElement.blur();
+            setTimeout(() => focusableElement.focus(), 0);
+        }
+
+        return;
+    }
+
+    // If no focusable elements found, put focus on dialog container itself
+    el.focus();
+}
+
 function Dialog2(selector) {
     this._handlers = new WeakMap();
     if (selector) {
         this.$el = $(selector);
     } else {
         this.$el = $(`
-        <section role="dialog" class="aui-layer aui-dialog2 aui-dialog2-medium">
+        <section role="dialog" aria-modal="true" class="aui-layer aui-dialog2 aui-dialog2-medium">
             <header class="aui-dialog2-header">
                 <h2 class="aui-dialog2-header-main"></h2>
                 ${CLOSE_BUTTON}
@@ -113,24 +204,11 @@ $(document).on('click keydown', `.aui-dialog2-header ${CLOSE_BUTTON_CLASS_SELECT
 });
 
 dialog2Widget.on('show', function (e, $el) {
-    // prevent inability to focus the close button.
-    $el.find(CLOSE_BUTTON_CLASS_SELECTOR).attr('tabindex', 0);
-    $el.attr('tabindex', -1);
-    // find appropriate content to focus, in order of importance of the content.
-    var focusSelector = $el[0].hasAttribute('data-aui-focus-selector') && $el.attr('data-aui-focus-selector');
-    if (focusSelector) {
-        var $elementToFocus = $el.find(focusSelector);
-        if ($elementToFocus.length > 0) {
-            return $elementToFocus.first().focus();
-        }
-    }
-
-    // focus the dialog element itself #a11y #FEP-607
-    $el.focus();
+    handleInitialFocus($el[0]);
 });
 
 dialog2Widget.on('hide', function (e,$el) {
-    var layer = layerWidget($el);
+    const layer = layerWidget($el);
 
     if ($el.data('aui-remove-on-hide')) {
         layer.remove();