@atlassian/aui 9.6.1 → 9.6.3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@atlassian/aui",
     "description": "Atlassian User Interface library",
-    "version": "9.6.1",
+    "version": "9.6.3",
     "author": "Atlassian Pty Ltd.",
     "homepage": "https://aui.atlassian.com",
     "license": "Apache-2.0",

package/src/js/aui/dropdown2.js

@@ -798,7 +798,12 @@ var dropdownPrototype = {
         // the dropdown is closed.
         if (previousLayout && focusTrigger) {
             doIfTrigger(previousLayout.el, (trigger) => {
-                trigger.focus();
+                // Delay focusing to allow things to settle; otherwise
+                // Skatejs's MutationObserver kicks in and opens the dropdown
+                // again.
+                setTimeout(() => {
+                    trigger.focus();
+                }, 0)
                 setTrigger(previousLayout.el, null);
             });
         }

package/src/js/aui/i18n-stub.js

@@ -0,0 +1 @@
+console.debug('AUI import for WRM I18n not loaded');

package/src/js/aui/i18n.js

@@ -1,3 +1,5 @@
+// Import the I18n system from the WRM, webpack handles this
+import 'wrmI18n';
 import format from './format';
 import { putOnI18nIfAbsent } from './internal/globalize';
 import keys from './internal/i18n/aui';

package/src/js/aui/select2.js

@@ -39,34 +39,85 @@ $.fn.auiSelect2 = function (first) {
         updatedArgs = arguments;
     }
 
+    const options = updatedArgs[0];
+
+    /**
+     * AUI-5464: after the upgrade to select2 v3.5.4, custom error handling stopped
+     * working, as the `ajax.params.error` function is overriden by select2, and
+     * there is no alternative to this...
+     *
+     * This is a workaround for creating an array of ajax error handlers that will
+     * contain the default handler and the custom ones, which is supported starting
+     * from jQuery v1.5: http://api.jquery.com/jquery.ajax/
+     *
+     * Please note this issue is fixed starting from select2 v4, though the data format
+     * is different.
+     *
+     * @see https://atlassian.slack.com/archives/CFGN5350T/p1686741137056489
+     */
+    if (options.ajax && options.ajax.params && options.ajax.params.error) {
+        let customErrorHandlers = options.ajax.params.error;
+        if (!Array.isArray(customErrorHandlers)) {
+            customErrorHandlers = [customErrorHandlers];
+        }
+        let originalTransport = options.ajax.transport;
+        if (!originalTransport) {
+            originalTransport = originalSelect2.ajaxDefaults.transport
+        }
+
+        const newTransport = function(...args) {
+            args[0].error = [args[0].error, ...customErrorHandlers];
+            return originalTransport(...args);
+        };
+
+        options.ajax.transport = newTransport;
+    }
+
     const result = originalSelect2.apply(this, updatedArgs);
     const select2Instance = this;
-    const searchLabel = updatedArgs[0].searchLabel;
+    const searchLabel = options.searchLabel;
 
     select2Instance.on('select2-open', function () {
         const $selectInput = $(this);
 
-        if (updatedArgs[0].multiple || $selectInput.attr('multiple')) {
+        if (options.multiple || $selectInput.attr('multiple')) {
             // This is a multi-select, exiting
             return;
         }
 
-        const $selectDropdown = $selectInput.select2('dropdown')
+        const $selectDropdown = $selectInput.select2('dropdown');
 
         if (searchLabel) {
             $selectDropdown.find('.select2-search label').text(searchLabel);
         }
+    });
+
+    select2Instance.on('select2-close', function () {
+        const $selectInput = $(this);
+        $selectInput.removeData('was-ariadescribedby-cleared');
+    });
+
+    select2Instance.on('select2-loaded', function () {
+        const $selectInput = $(this);
+        const wasAriaDescribedByCleared = $selectInput.data('was-ariadescribedby-cleared');
+
+        if (options.multiple || $selectInput.attr('multiple') || wasAriaDescribedByCleared) {
+            return;
+        }
+
+        const $selectDropdown = $selectInput.select2('dropdown');
 
         // AUI-5461: when single select dropdown opens up, the first option is
         // instantly focused, making SRs announce it, while skipping the search field
         $selectDropdown.find('.select2-search .select2-input').attr('aria-activedescendant', '');
+        $selectInput.data('was-ariadescribedby-cleared', true);
     });
 
     select2Instance.on('select2-focus', function () {
         const $selectInput = $(this);
         const $container = $selectInput.parent().find('.select2-container');
 
-        if (updatedArgs[0].multiple || $selectInput.attr('multiple')) {
+        if (options.multiple || $selectInput.attr('multiple')) {
             if (searchLabel) {
                 $container.find('.select2-search-field label').text(searchLabel);
             }