From daf10a069572b2fb1d5ebcdf7cdb8400878e965d Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 5 Mar 2021 12:54:27 +0000
Subject: [PATCH] Issue #3113649 by bnjmnm, ayushmishra206, ilgnerfagundes,
lauriii, nod_, xjm, catch, alexpott, Kristen Pol: Remove
drupal.tabbingmanager's jQueryUI dependency
---
core/.eslintrc.json | 3 +-
core/assets/vendor/css-escape/css.escape.js | 106 ++++++
.../vendor/jquery.ui/ui/widgets/dialog-min.js | 2 +-
.../vendor/jquery.ui/ui/widgets/dialog.js | 1 -
core/assets/vendor/tabbable/README.txt | 15 +
core/assets/vendor/tabbable/index.umd.min.js | 6 +
.../vendor/tabbable/index.umd.min.js.map | 1 +
core/core.libraries.yml | 68 ++--
core/misc/collapse.es6.js | 5 +
core/misc/collapse.js | 1 +
core/misc/jquery.tabbable.shim.es6.js | 23 ++
core/misc/jquery.tabbable.shim.js | 23 ++
...bleShimDialogIntegrationTestController.php | 32 ++
.../Controller/TabbableShimTestController.php | 30 ++
.../tabbable_shim_test.info.yml | 5 +
.../tabbable_shim_test.routing.yml | 15 +
.../Libraries/JqueryUiLibraryAssetsTest.php | 49 +--
.../Asset/DeprecatedJqueryUiAssetsTest.php | 4 +-
.../Nightwatch/Tests/tabbableShimTest.js | 338 ++++++++++++++++++
19 files changed, 645 insertions(+), 82 deletions(-)
create mode 100644 core/assets/vendor/css-escape/css.escape.js
create mode 100644 core/assets/vendor/tabbable/README.txt
create mode 100644 core/assets/vendor/tabbable/index.umd.min.js
create mode 100644 core/assets/vendor/tabbable/index.umd.min.js.map
create mode 100644 core/misc/jquery.tabbable.shim.es6.js
create mode 100644 core/misc/jquery.tabbable.shim.js
create mode 100644 core/modules/system/tests/modules/tabbable_shim_test/src/Controller/TabbableShimDialogIntegrationTestController.php
create mode 100644 core/modules/system/tests/modules/tabbable_shim_test/src/Controller/TabbableShimTestController.php
create mode 100644 core/modules/system/tests/modules/tabbable_shim_test/tabbable_shim_test.info.yml
create mode 100644 core/modules/system/tests/modules/tabbable_shim_test/tabbable_shim_test.routing.yml
create mode 100644 core/tests/Drupal/Nightwatch/Tests/tabbableShimTest.js
diff --git a/core/.eslintrc.json b/core/.eslintrc.json
index 5a982db5a266..a133f542bb8f 100644
--- a/core/.eslintrc.json
+++ b/core/.eslintrc.json
@@ -20,7 +20,8 @@
"Modernizr": true,
"Popper": true,
"Sortable": true,
- "CKEDITOR": true
+ "CKEDITOR": true,
+ "tabbable": true
},
"settings": {
"react": {
diff --git a/core/assets/vendor/css-escape/css.escape.js b/core/assets/vendor/css-escape/css.escape.js
new file mode 100644
index 000000000000..397cf88d318d
--- /dev/null
+++ b/core/assets/vendor/css-escape/css.escape.js
@@ -0,0 +1,106 @@
+/*! https://mths.be/cssescape v1.5.1 by @mathias | MIT license */
+;(function(root, factory) {
+ // https://github.com/umdjs/umd/blob/master/returnExports.js
+ if (typeof exports == 'object') {
+ // For Node.js.
+ module.exports = factory(root);
+ } else if (typeof define == 'function' && define.amd) {
+ // For AMD. Register as an anonymous module.
+ define([], factory.bind(root, root));
+ } else {
+ // For browser globals (not exposing the function separately).
+ factory(root);
+ }
+}(typeof global != 'undefined' ? global : this, function(root) {
+
+ if (root.CSS && root.CSS.escape) {
+ return root.CSS.escape;
+ }
+
+ // https://drafts.csswg.org/cssom/#serialize-an-identifier
+ var cssEscape = function(value) {
+ if (arguments.length == 0) {
+ throw new TypeError('`CSS.escape` requires an argument.');
+ }
+ var string = String(value);
+ var length = string.length;
+ var index = -1;
+ var codeUnit;
+ var result = '';
+ var firstCodeUnit = string.charCodeAt(0);
+ while (++index < length) {
+ codeUnit = string.charCodeAt(index);
+ // Note: there’s no need to special-case astral symbols, surrogate
+ // pairs, or lone surrogates.
+
+ // If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
+ // (U+FFFD).
+ if (codeUnit == 0x0000) {
+ result += '\uFFFD';
+ continue;
+ }
+
+ if (
+ // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
+ // U+007F, […]
+ (codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F ||
+ // If the character is the first character and is in the range [0-9]
+ // (U+0030 to U+0039), […]
+ (index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
+ // If the character is the second character and is in the range [0-9]
+ // (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
+ (
+ index == 1 &&
+ codeUnit >= 0x0030 && codeUnit <= 0x0039 &&
+ firstCodeUnit == 0x002D
+ )
+ ) {
+ // https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
+ result += '\\' + codeUnit.toString(16) + ' ';
+ continue;
+ }
+
+ if (
+ // If the character is the first character and is a `-` (U+002D), and
+ // there is no second character, […]
+ index == 0 &&
+ length == 1 &&
+ codeUnit == 0x002D
+ ) {
+ result += '\\' + string.charAt(index);
+ continue;
+ }
+
+ // If the character is not handled by one of the above rules and is
+ // greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
+ // is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
+ // U+005A), or [a-z] (U+0061 to U+007A), […]
+ if (
+ codeUnit >= 0x0080 ||
+ codeUnit == 0x002D ||
+ codeUnit == 0x005F ||
+ codeUnit >= 0x0030 && codeUnit <= 0x0039 ||
+ codeUnit >= 0x0041 && codeUnit <= 0x005A ||
+ codeUnit >= 0x0061 && codeUnit <= 0x007A
+ ) {
+ // the character itself
+ result += string.charAt(index);
+ continue;
+ }
+
+ // Otherwise, the escaped character.
+ // https://drafts.csswg.org/cssom/#escape-a-character
+ result += '\\' + string.charAt(index);
+
+ }
+ return result;
+ };
+
+ if (!root.CSS) {
+ root.CSS = {};
+ }
+
+ root.CSS.escape = cssEscape;
+ return cssEscape;
+
+}));
diff --git a/core/assets/vendor/jquery.ui/ui/widgets/dialog-min.js b/core/assets/vendor/jquery.ui/ui/widgets/dialog-min.js
index 88f6d3a82a7d..583c500e0c1b 100644
--- a/core/assets/vendor/jquery.ui/ui/widgets/dialog-min.js
+++ b/core/assets/vendor/jquery.ui/ui/widgets/dialog-min.js
@@ -6,4 +6,4 @@
* Released under the MIT license.
* http://jquery.org/license
*/
-!function(i){"function"==typeof define&&define.amd?define(["jquery","./button","./draggable","./mouse","./resizable","../focusable","../keycode","../position","../safe-active-element","../safe-blur","../tabbable","../unique-id","../version","../widget"],i):i(jQuery)}((function(i){return i.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var e=i(this).css(t).offset().top;e<0&&i(this).css("top",t.top-e)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&i.fn.draggable&&this._makeDraggable(),this.options.resizable&&i.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?i(t):this.document.find(t||"body").eq(0)},_destroy:function(){var i,t=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),(i=t.parent.children().eq(t.index)).length&&i[0]!==this.element[0]?i.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:i.noop,enable:i.noop,close:function(t){var e=this;this._isOpen&&!1!==this._trigger("beforeClose",t)&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||i.ui.safeBlur(i.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,(function(){e._trigger("close",t)})))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,e){var o=!1,s=this.uiDialog.siblings(".ui-front:visible").map((function(){return+i(this).css("z-index")})).get(),n=Math.max.apply(null,s);return n>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",n+1),o=!0),o&&!e&&this._trigger("focus",t),o},open:function(){var t=this;this._isOpen?this._moveToTop()&&this._focusTabbable():(this._isOpen=!0,this.opener=i(i.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,(function(){t._focusTabbable(),t._trigger("focus")})),this._makeFocusTarget(),this._trigger("open"))},_focusTabbable:function(){var i=this._focusedElement;i||(i=this.element.find("[autofocus]")),i.length||(i=this.element.find(":tabbable")),i.length||(i=this.uiDialogButtonPane.find(":tabbable")),i.length||(i=this.uiDialogTitlebarClose.filter(":tabbable")),i.length||(i=this.uiDialog),i.eq(0).trigger("focus")},_keepFocus:function(t){function e(){var t=i.ui.safeActiveElement(this.document[0]);this.uiDialog[0]===t||i.contains(this.uiDialog[0],t)||this._focusTabbable()}t.preventDefault(),e.call(this),this._delay(e)},_createWrapper:function(){this.uiDialog=i("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===i.ui.keyCode.ESCAPE)return t.preventDefault(),void this.close(t);if(t.keyCode===i.ui.keyCode.TAB&&!t.isDefaultPrevented()){var e=this.uiDialog.find(":tabbable"),o=e.filter(":first"),s=e.filter(":last");t.target!==s[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==o[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay((function(){s.trigger("focus")})),t.preventDefault()):(this._delay((function(){o.trigger("focus")})),t.preventDefault())}},mousedown:function(i){this._moveToTop(i)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=i("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(t){i(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=i("<button type='button'></button>").button({label:i("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(i){i.preventDefault(),this.close(i)}}),t=i("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(t,"ui-dialog-title"),this._title(t),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(i){this.options.title?i.text(this.options.title):i.html(" ")},_createButtonPane:function(){this.uiDialogButtonPane=i("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=i("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var t=this,e=this.options.buttons;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),i.isEmptyObject(e)||i.isArray(e)&&!e.length?this._removeClass(this.uiDialog,"ui-dialog-buttons"):(i.each(e,(function(e,o){var s,n;o=i.isFunction(o)?{click:o,text:e}:o,o=i.extend({type:"button"},o),s=o.click,n={icon:o.icon,iconPosition:o.iconPosition,showLabel:o.showLabel,icons:o.icons,text:o.text},delete o.click,delete o.icon,delete o.iconPosition,delete o.showLabel,delete o.icons,"boolean"==typeof o.text&&delete o.text,i("<button></button>",o).button(n).appendTo(t.uiButtonSet).on("click",(function(){s.apply(t.element[0],arguments)}))})),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog))},_makeDraggable:function(){var t=this,e=this.options;function o(i){return{position:i.position,offset:i.offset}}this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(e,s){t._addClass(i(this),"ui-dialog-dragging"),t._blockFrames(),t._trigger("dragStart",e,o(s))},drag:function(i,e){t._trigger("drag",i,o(e))},stop:function(s,n){var a=n.offset.left-t.document.scrollLeft(),l=n.offset.top-t.document.scrollTop();e.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" top"+(l>=0?"+":"")+l,of:t.window},t._removeClass(i(this),"ui-dialog-dragging"),t._unblockFrames(),t._trigger("dragStop",s,o(n))}})},_makeResizable:function(){var t=this,e=this.options,o=e.resizable,s=this.uiDialog.css("position"),n="string"==typeof o?o:"n,e,s,w,se,sw,ne,nw";function a(i){return{originalPosition:i.originalPosition,originalSize:i.originalSize,position:i.position,size:i.size}}this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:this._minHeight(),handles:n,start:function(e,o){t._addClass(i(this),"ui-dialog-resizing"),t._blockFrames(),t._trigger("resizeStart",e,a(o))},resize:function(i,e){t._trigger("resize",i,a(e))},stop:function(o,s){var n=t.uiDialog.offset(),l=n.left-t.document.scrollLeft(),h=n.top-t.document.scrollTop();e.height=t.uiDialog.height(),e.width=t.uiDialog.width(),e.position={my:"left top",at:"left"+(l>=0?"+":"")+l+" top"+(h>=0?"+":"")+h,of:t.window},t._removeClass(i(this),"ui-dialog-resizing"),t._unblockFrames(),t._trigger("resizeStop",o,a(s))}}).css("position",s)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=i(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),e=i.inArray(this,t);-1!==e&&t.splice(e,1)},_trackingInstances:function(){var i=this.document.data("ui-dialog-instances");return i||(i=[],this.document.data("ui-dialog-instances",i)),i},_minHeight:function(){var i=this.options;return"auto"===i.height?i.minHeight:Math.min(i.minHeight,i.height)},_position:function(){var i=this.uiDialog.is(":visible");i||this.uiDialog.show(),this.uiDialog.position(this.options.position),i||this.uiDialog.hide()},_setOptions:function(t){var e=this,o=!1,s={};i.each(t,(function(i,t){e._setOption(i,t),i in e.sizeRelatedOptions&&(o=!0),i in e.resizableRelatedOptions&&(s[i]=t)})),o&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",s)},_setOption:function(t,e){var o,s,n=this.uiDialog;"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:i("<a>").text(""+this.options.closeText).html()}),"draggable"===t&&((o=n.is(":data(ui-draggable)"))&&!e&&n.draggable("destroy"),!o&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&((s=n.is(":data(ui-resizable)"))&&!e&&n.resizable("destroy"),s&&"string"==typeof e&&n.resizable("option","handles",e),s||!1===e||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var i,t,e,o=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),o.minWidth>o.width&&(o.width=o.minWidth),i=this.uiDialog.css({height:"auto",width:o.width}).outerHeight(),t=Math.max(0,o.minHeight-i),e="number"==typeof o.maxHeight?Math.max(0,o.maxHeight-i):"none","auto"===o.height?this.element.css({minHeight:t,maxHeight:e,height:"auto"}):this.element.height(Math.max(0,o.height-i)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map((function(){var t=i(this);return i("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]}))},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return!!i(t.target).closest(".ui-dialog").length||!!i(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay((function(){t=!1})),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(i){t||this._allowInteraction(i)||(i.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=i("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var i=this.document.data("ui-dialog-overlays")-1;i?this.document.data("ui-dialog-overlays",i):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),!1!==i.uiBackCompat&&i.widget("ui.dialog",i.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(i,t){"dialogClass"===i&&this.uiDialog.removeClass(this.options.dialogClass).addClass(t),this._superApply(arguments)}}),i.ui.dialog}));
\ No newline at end of file
+!function(i){"function"==typeof define&&define.amd?define(["jquery","./button","./draggable","./mouse","./resizable","../focusable","../keycode","../position","../safe-active-element","../safe-blur","../unique-id","../version","../widget"],i):i(jQuery)}((function(i){return i.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var e=i(this).css(t).offset().top;e<0&&i(this).css("top",t.top-e)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&i.fn.draggable&&this._makeDraggable(),this.options.resizable&&i.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?i(t):this.document.find(t||"body").eq(0)},_destroy:function(){var i,t=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),(i=t.parent.children().eq(t.index)).length&&i[0]!==this.element[0]?i.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:i.noop,enable:i.noop,close:function(t){var e=this;this._isOpen&&!1!==this._trigger("beforeClose",t)&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||i.ui.safeBlur(i.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,(function(){e._trigger("close",t)})))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,e){var o=!1,s=this.uiDialog.siblings(".ui-front:visible").map((function(){return+i(this).css("z-index")})).get(),n=Math.max.apply(null,s);return n>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",n+1),o=!0),o&&!e&&this._trigger("focus",t),o},open:function(){var t=this;this._isOpen?this._moveToTop()&&this._focusTabbable():(this._isOpen=!0,this.opener=i(i.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,(function(){t._focusTabbable(),t._trigger("focus")})),this._makeFocusTarget(),this._trigger("open"))},_focusTabbable:function(){var i=this._focusedElement;i||(i=this.element.find("[autofocus]")),i.length||(i=this.element.find(":tabbable")),i.length||(i=this.uiDialogButtonPane.find(":tabbable")),i.length||(i=this.uiDialogTitlebarClose.filter(":tabbable")),i.length||(i=this.uiDialog),i.eq(0).trigger("focus")},_keepFocus:function(t){function e(){var t=i.ui.safeActiveElement(this.document[0]);this.uiDialog[0]===t||i.contains(this.uiDialog[0],t)||this._focusTabbable()}t.preventDefault(),e.call(this),this._delay(e)},_createWrapper:function(){this.uiDialog=i("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===i.ui.keyCode.ESCAPE)return t.preventDefault(),void this.close(t);if(t.keyCode===i.ui.keyCode.TAB&&!t.isDefaultPrevented()){var e=this.uiDialog.find(":tabbable"),o=e.filter(":first"),s=e.filter(":last");t.target!==s[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==o[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay((function(){s.trigger("focus")})),t.preventDefault()):(this._delay((function(){o.trigger("focus")})),t.preventDefault())}},mousedown:function(i){this._moveToTop(i)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=i("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(t){i(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=i("<button type='button'></button>").button({label:i("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(i){i.preventDefault(),this.close(i)}}),t=i("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(t,"ui-dialog-title"),this._title(t),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(i){this.options.title?i.text(this.options.title):i.html(" ")},_createButtonPane:function(){this.uiDialogButtonPane=i("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=i("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var t=this,e=this.options.buttons;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),i.isEmptyObject(e)||i.isArray(e)&&!e.length?this._removeClass(this.uiDialog,"ui-dialog-buttons"):(i.each(e,(function(e,o){var s,n;o=i.isFunction(o)?{click:o,text:e}:o,o=i.extend({type:"button"},o),s=o.click,n={icon:o.icon,iconPosition:o.iconPosition,showLabel:o.showLabel,icons:o.icons,text:o.text},delete o.click,delete o.icon,delete o.iconPosition,delete o.showLabel,delete o.icons,"boolean"==typeof o.text&&delete o.text,i("<button></button>",o).button(n).appendTo(t.uiButtonSet).on("click",(function(){s.apply(t.element[0],arguments)}))})),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog))},_makeDraggable:function(){var t=this,e=this.options;function o(i){return{position:i.position,offset:i.offset}}this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(e,s){t._addClass(i(this),"ui-dialog-dragging"),t._blockFrames(),t._trigger("dragStart",e,o(s))},drag:function(i,e){t._trigger("drag",i,o(e))},stop:function(s,n){var a=n.offset.left-t.document.scrollLeft(),l=n.offset.top-t.document.scrollTop();e.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" top"+(l>=0?"+":"")+l,of:t.window},t._removeClass(i(this),"ui-dialog-dragging"),t._unblockFrames(),t._trigger("dragStop",s,o(n))}})},_makeResizable:function(){var t=this,e=this.options,o=e.resizable,s=this.uiDialog.css("position"),n="string"==typeof o?o:"n,e,s,w,se,sw,ne,nw";function a(i){return{originalPosition:i.originalPosition,originalSize:i.originalSize,position:i.position,size:i.size}}this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:this._minHeight(),handles:n,start:function(e,o){t._addClass(i(this),"ui-dialog-resizing"),t._blockFrames(),t._trigger("resizeStart",e,a(o))},resize:function(i,e){t._trigger("resize",i,a(e))},stop:function(o,s){var n=t.uiDialog.offset(),l=n.left-t.document.scrollLeft(),h=n.top-t.document.scrollTop();e.height=t.uiDialog.height(),e.width=t.uiDialog.width(),e.position={my:"left top",at:"left"+(l>=0?"+":"")+l+" top"+(h>=0?"+":"")+h,of:t.window},t._removeClass(i(this),"ui-dialog-resizing"),t._unblockFrames(),t._trigger("resizeStop",o,a(s))}}).css("position",s)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=i(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),e=i.inArray(this,t);-1!==e&&t.splice(e,1)},_trackingInstances:function(){var i=this.document.data("ui-dialog-instances");return i||(i=[],this.document.data("ui-dialog-instances",i)),i},_minHeight:function(){var i=this.options;return"auto"===i.height?i.minHeight:Math.min(i.minHeight,i.height)},_position:function(){var i=this.uiDialog.is(":visible");i||this.uiDialog.show(),this.uiDialog.position(this.options.position),i||this.uiDialog.hide()},_setOptions:function(t){var e=this,o=!1,s={};i.each(t,(function(i,t){e._setOption(i,t),i in e.sizeRelatedOptions&&(o=!0),i in e.resizableRelatedOptions&&(s[i]=t)})),o&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",s)},_setOption:function(t,e){var o,s,n=this.uiDialog;"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:i("<a>").text(""+this.options.closeText).html()}),"draggable"===t&&((o=n.is(":data(ui-draggable)"))&&!e&&n.draggable("destroy"),!o&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&((s=n.is(":data(ui-resizable)"))&&!e&&n.resizable("destroy"),s&&"string"==typeof e&&n.resizable("option","handles",e),s||!1===e||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var i,t,e,o=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),o.minWidth>o.width&&(o.width=o.minWidth),i=this.uiDialog.css({height:"auto",width:o.width}).outerHeight(),t=Math.max(0,o.minHeight-i),e="number"==typeof o.maxHeight?Math.max(0,o.maxHeight-i):"none","auto"===o.height?this.element.css({minHeight:t,maxHeight:e,height:"auto"}):this.element.height(Math.max(0,o.height-i)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map((function(){var t=i(this);return i("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]}))},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return!!i(t.target).closest(".ui-dialog").length||!!i(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay((function(){t=!1})),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(i){t||this._allowInteraction(i)||(i.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=i("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var i=this.document.data("ui-dialog-overlays")-1;i?this.document.data("ui-dialog-overlays",i):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),!1!==i.uiBackCompat&&i.widget("ui.dialog",i.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(i,t){"dialogClass"===i&&this.uiDialog.removeClass(this.options.dialogClass).addClass(t),this._superApply(arguments)}}),i.ui.dialog}));
\ No newline at end of file
diff --git a/core/assets/vendor/jquery.ui/ui/widgets/dialog.js b/core/assets/vendor/jquery.ui/ui/widgets/dialog.js
index 27dccd2ad936..ab81979a8dd4 100644
--- a/core/assets/vendor/jquery.ui/ui/widgets/dialog.js
+++ b/core/assets/vendor/jquery.ui/ui/widgets/dialog.js
@@ -31,7 +31,6 @@
"../position",
"../safe-active-element",
"../safe-blur",
- "../tabbable",
"../unique-id",
"../version",
"../widget"
diff --git a/core/assets/vendor/tabbable/README.txt b/core/assets/vendor/tabbable/README.txt
new file mode 100644
index 000000000000..3800e9dc8fc8
--- /dev/null
+++ b/core/assets/vendor/tabbable/README.txt
@@ -0,0 +1,15 @@
+Drupal core uses the UMD build of tabbable.
+To create this build:
+Navigate to the root directory of the tabbable library.
+
+Ensure that dependencies have been installed:
+```
+yarn install
+```
+
+Build files for production:
+```
+yarn build
+```
+
+This will create an index.umd.min.js file in dist/ that can be used in Drupal.
diff --git a/core/assets/vendor/tabbable/index.umd.min.js b/core/assets/vendor/tabbable/index.umd.min.js
new file mode 100644
index 000000000000..3346c04b53b6
--- /dev/null
+++ b/core/assets/vendor/tabbable/index.umd.min.js
@@ -0,0 +1,6 @@
+/*!
+* tabbable 5.1.6
+* @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
+*/
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):(e="undefined"!=typeof globalThis?globalThis:e||self,function(){var n=e.tabbable,r=e.tabbable={};t(r),r.noConflict=function(){return e.tabbable=n,r}}())}(this,(function(e){"use strict";var t=["input","select","textarea","a[href]","button","[tabindex]","audio[controls]","video[controls]",'[contenteditable]:not([contenteditable="false"])',"details>summary:first-of-type","details"],n=t.join(","),r="undefined"==typeof Element?function(){}:Element.prototype.matches||Element.prototype.msMatchesSelector||Element.prototype.webkitMatchesSelector,o=function(e,t,o){var i=Array.prototype.slice.apply(e.querySelectorAll(n));return t&&r.call(e,n)&&i.unshift(e),i=i.filter(o)},i=function(e){var t=parseInt(e.getAttribute("tabindex"),10);return isNaN(t)?function(e){return"true"===e.contentEditable}(e)?0:"AUDIO"!==e.nodeName&&"VIDEO"!==e.nodeName&&"DETAILS"!==e.nodeName||null!==e.getAttribute("tabindex")?e.tabIndex:0:t},a=function(e,t){return e.tabIndex===t.tabIndex?e.documentOrder-t.documentOrder:e.tabIndex-t.tabIndex},u=function(e){return"INPUT"===e.tagName},c=function(e){return function(e){return u(e)&&"radio"===e.type}(e)&&!function(e){if(!e.name)return!0;var t,n=e.form||e.ownerDocument,r=function(e){return n.querySelectorAll('input[type="radio"][name="'+e+'"]')};if("undefined"!=typeof window&&void 0!==window.CSS&&"function"==typeof window.CSS.escape)t=r(window.CSS.escape(e.name));else try{t=r(e.name)}catch(e){return console.error("Looks like you have a radio button with a name attribute containing invalid CSS selector characters and need the CSS.escape polyfill: %s",e.message),!1}var o=function(e,t){for(var n=0;n<e.length;n++)if(e[n].checked&&e[n].form===t)return e[n]}(t,e.form);return!o||o===e}(e)},l=function(e){return!(e.disabled||function(e){return u(e)&&"hidden"===e.type}(e)||function(e){if("hidden"===getComputedStyle(e).visibility)return!0;var t=r.call(e,"details>summary:first-of-type")?e.parentElement:e;if(r.call(t,"details:not([open]) *"))return!0;for(;e;){if("none"===getComputedStyle(e).display)return!0;e=e.parentElement}return!1}(e)||function(e){return"DETAILS"===e.tagName&&Array.prototype.slice.apply(e.children).some((function(e){return"SUMMARY"===e.tagName}))}(e))},d=function(e){return!(!l(e)||c(e)||i(e)<0)},f=t.concat("iframe").join(",");e.focusable=function(e,t){return o(e,(t=t||{}).includeContainer,l)},e.isFocusable=function(e){if(!e)throw new Error("No node provided");return!1!==r.call(e,f)&&l(e)},e.isTabbable=function(e){if(!e)throw new Error("No node provided");return!1!==r.call(e,n)&&d(e)},e.tabbable=function(e,t){var n=[],r=[];return o(e,(t=t||{}).includeContainer,d).forEach((function(e,t){var o=i(e);0===o?n.push(e):r.push({documentOrder:t,tabIndex:o,node:e})})),r.sort(a).map((function(e){return e.node})).concat(n)},Object.defineProperty(e,"__esModule",{value:!0})}));
+//# sourceMappingURL=index.umd.min.js.map
diff --git a/core/assets/vendor/tabbable/index.umd.min.js.map b/core/assets/vendor/tabbable/index.umd.min.js.map
new file mode 100644
index 000000000000..a200e08b989f
--- /dev/null
+++ b/core/assets/vendor/tabbable/index.umd.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"index.umd.min.js","sources":["../src/index.js"],"sourcesContent":["const candidateSelectors = [\n 'input',\n 'select',\n 'textarea',\n 'a[href]',\n 'button',\n '[tabindex]',\n 'audio[controls]',\n 'video[controls]',\n '[contenteditable]:not([contenteditable=\"false\"])',\n 'details>summary:first-of-type',\n 'details',\n];\nconst candidateSelector = /* #__PURE__ */ candidateSelectors.join(',');\n\nconst matches =\n typeof Element === 'undefined'\n ? function () {}\n : Element.prototype.matches ||\n Element.prototype.msMatchesSelector ||\n Element.prototype.webkitMatchesSelector;\n\nconst getCandidates = function (el, includeContainer, filter) {\n let candidates = Array.prototype.slice.apply(\n el.querySelectorAll(candidateSelector)\n );\n if (includeContainer && matches.call(el, candidateSelector)) {\n candidates.unshift(el);\n }\n candidates = candidates.filter(filter);\n return candidates;\n};\n\nconst isContentEditable = function (node) {\n return node.contentEditable === 'true';\n};\n\nconst getTabindex = function (node) {\n const tabindexAttr = parseInt(node.getAttribute('tabindex'), 10);\n\n if (!isNaN(tabindexAttr)) {\n return tabindexAttr;\n }\n\n // Browsers do not return `tabIndex` correctly for contentEditable nodes;\n // so if they don't have a tabindex attribute specifically set, assume it's 0.\n if (isContentEditable(node)) {\n return 0;\n }\n\n // in Chrome, <details/>, <audio controls/> and <video controls/> elements get a default\n // `tabIndex` of -1 when the 'tabindex' attribute isn't specified in the DOM,\n // yet they are still part of the regular tab order; in FF, they get a default\n // `tabIndex` of 0; since Chrome still puts those elements in the regular tab\n // order, consider their tab index to be 0.\n if (\n (node.nodeName === 'AUDIO' ||\n node.nodeName === 'VIDEO' ||\n node.nodeName === 'DETAILS') &&\n node.getAttribute('tabindex') === null\n ) {\n return 0;\n }\n\n return node.tabIndex;\n};\n\nconst sortOrderedTabbables = function (a, b) {\n return a.tabIndex === b.tabIndex\n ? a.documentOrder - b.documentOrder\n : a.tabIndex - b.tabIndex;\n};\n\nconst isInput = function (node) {\n return node.tagName === 'INPUT';\n};\n\nconst isHiddenInput = function (node) {\n return isInput(node) && node.type === 'hidden';\n};\n\nconst isDetailsWithSummary = function (node) {\n const r =\n node.tagName === 'DETAILS' &&\n Array.prototype.slice\n .apply(node.children)\n .some((child) => child.tagName === 'SUMMARY');\n return r;\n};\n\nconst getCheckedRadio = function (nodes, form) {\n for (let i = 0; i < nodes.length; i++) {\n if (nodes[i].checked && nodes[i].form === form) {\n return nodes[i];\n }\n }\n};\n\nconst isTabbableRadio = function (node) {\n if (!node.name) {\n return true;\n }\n const radioScope = node.form || node.ownerDocument;\n\n const queryRadios = function (name) {\n return radioScope.querySelectorAll(\n 'input[type=\"radio\"][name=\"' + name + '\"]'\n );\n };\n\n let radioSet;\n if (\n typeof window !== 'undefined' &&\n typeof window.CSS !== 'undefined' &&\n typeof window.CSS.escape === 'function'\n ) {\n radioSet = queryRadios(window.CSS.escape(node.name));\n } else {\n try {\n radioSet = queryRadios(node.name);\n } catch (err) {\n // eslint-disable-next-line no-console\n console.error(\n 'Looks like you have a radio button with a name attribute containing invalid CSS selector characters and need the CSS.escape polyfill: %s',\n err.message\n );\n return false;\n }\n }\n\n const checked = getCheckedRadio(radioSet, node.form);\n return !checked || checked === node;\n};\n\nconst isRadio = function (node) {\n return isInput(node) && node.type === 'radio';\n};\n\nconst isNonTabbableRadio = function (node) {\n return isRadio(node) && !isTabbableRadio(node);\n};\n\nconst isHidden = function (node) {\n if (getComputedStyle(node).visibility === 'hidden') {\n return true;\n }\n\n const isDirectSummary = matches.call(node, 'details>summary:first-of-type');\n const nodeUnderDetails = isDirectSummary ? node.parentElement : node;\n if (matches.call(nodeUnderDetails, 'details:not([open]) *')) {\n return true;\n }\n\n while (node) {\n if (getComputedStyle(node).display === 'none') {\n return true;\n }\n node = node.parentElement;\n }\n\n return false;\n};\n\nconst isNodeMatchingSelectorFocusable = function (node) {\n if (\n node.disabled ||\n isHiddenInput(node) ||\n isHidden(node) ||\n /* For a details element with a summary, the summary element gets the focused */\n isDetailsWithSummary(node)\n ) {\n return false;\n }\n return true;\n};\n\nconst isNodeMatchingSelectorTabbable = function (node) {\n if (\n !isNodeMatchingSelectorFocusable(node) ||\n isNonTabbableRadio(node) ||\n getTabindex(node) < 0\n ) {\n return false;\n }\n return true;\n};\n\nconst tabbable = function (el, options) {\n options = options || {};\n\n const regularTabbables = [];\n const orderedTabbables = [];\n\n const candidates = getCandidates(\n el,\n options.includeContainer,\n isNodeMatchingSelectorTabbable\n );\n\n candidates.forEach(function (candidate, i) {\n const candidateTabindex = getTabindex(candidate);\n if (candidateTabindex === 0) {\n regularTabbables.push(candidate);\n } else {\n orderedTabbables.push({\n documentOrder: i,\n tabIndex: candidateTabindex,\n node: candidate,\n });\n }\n });\n\n const tabbableNodes = orderedTabbables\n .sort(sortOrderedTabbables)\n .map((a) => a.node)\n .concat(regularTabbables);\n\n return tabbableNodes;\n};\n\nconst focusable = function (el, options) {\n options = options || {};\n\n const candidates = getCandidates(\n el,\n options.includeContainer,\n isNodeMatchingSelectorFocusable\n );\n\n return candidates;\n};\n\nconst isTabbable = function (node) {\n if (!node) {\n throw new Error('No node provided');\n }\n if (matches.call(node, candidateSelector) === false) {\n return false;\n }\n return isNodeMatchingSelectorTabbable(node);\n};\n\nconst focusableCandidateSelector = /* #__PURE__ */ candidateSelectors\n .concat('iframe')\n .join(',');\n\nconst isFocusable = function (node) {\n if (!node) {\n throw new Error('No node provided');\n }\n if (matches.call(node, focusableCandidateSelector) === false) {\n return false;\n }\n return isNodeMatchingSelectorFocusable(node);\n};\n\nexport { tabbable, focusable, isTabbable, isFocusable };\n"],"names":["candidateSelectors","candidateSelector","join","matches","Element","prototype","msMatchesSelector","webkitMatchesSelector","getCandidates","el","includeContainer","filter","candidates","Array","slice","apply","querySelectorAll","call","unshift","getTabindex","node","tabindexAttr","parseInt","getAttribute","isNaN","contentEditable","isContentEditable","nodeName","tabIndex","sortOrderedTabbables","a","b","documentOrder","isInput","tagName","isNonTabbableRadio","type","isRadio","name","radioSet","radioScope","form","ownerDocument","queryRadios","window","CSS","escape","err","console","error","message","checked","nodes","i","length","getCheckedRadio","isTabbableRadio","isNodeMatchingSelectorFocusable","disabled","isHiddenInput","getComputedStyle","visibility","nodeUnderDetails","parentElement","display","isHidden","children","some","child","isDetailsWithSummary","isNodeMatchingSelectorTabbable","focusableCandidateSelector","concat","options","Error","regularTabbables","orderedTabbables","forEach","candidate","candidateTabindex","push","sort","map"],"mappings":";;;;oUAAA,IAAMA,EAAqB,CACzB,QACA,SACA,WACA,UACA,SACA,aACA,kBACA,kBACA,mDACA,gCACA,WAEIC,EAAoCD,EAAmBE,KAAK,KAE5DC,EACe,oBAAZC,QACH,aACAA,QAAQC,UAAUF,SAClBC,QAAQC,UAAUC,mBAClBF,QAAQC,UAAUE,sBAElBC,EAAgB,SAAUC,EAAIC,EAAkBC,OAChDC,EAAaC,MAAMR,UAAUS,MAAMC,MACrCN,EAAGO,iBAAiBf,WAElBS,GAAoBP,EAAQc,KAAKR,EAAIR,IACvCW,EAAWM,QAAQT,GAErBG,EAAaA,EAAWD,OAAOA,IAQ3BQ,EAAc,SAAUC,OACtBC,EAAeC,SAASF,EAAKG,aAAa,YAAa,WAExDC,MAAMH,GAPa,SAAUD,SACF,SAAzBA,EAAKK,gBAYRC,CAAkBN,GACb,EASY,UAAlBA,EAAKO,UACc,UAAlBP,EAAKO,UACa,YAAlBP,EAAKO,UAC2B,OAAlCP,EAAKG,aAAa,YAKbH,EAAKQ,SAHH,EApBAP,GA0BLQ,EAAuB,SAAUC,EAAGC,UACjCD,EAAEF,WAAaG,EAAEH,SACpBE,EAAEE,cAAgBD,EAAEC,cACpBF,EAAEF,SAAWG,EAAEH,UAGfK,EAAU,SAAUb,SACA,UAAjBA,EAAKc,SAgERC,EAAqB,SAAUf,UAJrB,SAAUA,UACjBa,EAAQb,IAAuB,UAAdA,EAAKgB,KAItBC,CAAQjB,KAzCO,SAAUA,OAC3BA,EAAKkB,YACD,MAULC,EAREC,EAAapB,EAAKqB,MAAQrB,EAAKsB,cAE/BC,EAAc,SAAUL,UACrBE,EAAWxB,iBAChB,6BAA+BsB,EAAO,UAMtB,oBAAXM,aACe,IAAfA,OAAOC,KACe,mBAAtBD,OAAOC,IAAIC,OAElBP,EAAWI,EAAYC,OAAOC,IAAIC,OAAO1B,EAAKkB,gBAG5CC,EAAWI,EAAYvB,EAAKkB,MAC5B,MAAOS,UAEPC,QAAQC,MACN,2IACAF,EAAIG,UAEC,MAILC,EAxCgB,SAAUC,EAAOX,OAClC,IAAIY,EAAI,EAAGA,EAAID,EAAME,OAAQD,OAC5BD,EAAMC,GAAGF,SAAWC,EAAMC,GAAGZ,OAASA,SACjCW,EAAMC,GAqCDE,CAAgBhB,EAAUnB,EAAKqB,aACvCU,GAAWA,IAAY/B,EAQNoC,CAAgBpC,IAwBrCqC,EAAkC,SAAUrC,WAE9CA,EAAKsC,UAxFa,SAAUtC,UACvBa,EAAQb,IAAuB,WAAdA,EAAKgB,KAwF3BuB,CAAcvC,IAxBD,SAAUA,MACiB,WAAtCwC,iBAAiBxC,GAAMyC,kBAClB,MAIHC,EADkB3D,EAAQc,KAAKG,EAAM,iCACAA,EAAK2C,cAAgB3C,KAC5DjB,EAAQc,KAAK6C,EAAkB,gCAC1B,OAGF1C,GAAM,IAC4B,SAAnCwC,iBAAiBxC,GAAM4C,eAClB,EAET5C,EAAOA,EAAK2C,qBAGP,EAOLE,CAAS7C,IAtFgB,SAAUA,SAElB,YAAjBA,EAAKc,SACLrB,MAAMR,UAAUS,MACbC,MAAMK,EAAK8C,UACXC,MAAK,SAACC,SAA4B,YAAlBA,EAAMlC,WAmFzBmC,CAAqBjD,KAOnBkD,EAAiC,SAAUlD,YAE5CqC,EAAgCrC,IACjCe,EAAmBf,IACnBD,EAAYC,GAAQ,IA8DlBmD,EAA6CvE,EAChDwE,OAAO,UACPtE,KAAK,iBAxBU,SAAUO,EAAIgE,UAGXjE,EACjBC,GAHFgE,EAAUA,GAAW,IAIX/D,iBACR+C,kBAoBgB,SAAUrC,OACvBA,QACG,IAAIsD,MAAM,2BAEqC,IAAnDvE,EAAQc,KAAKG,EAAMmD,IAGhBd,EAAgCrC,iBArBtB,SAAUA,OACtBA,QACG,IAAIsD,MAAM,2BAE4B,IAA1CvE,EAAQc,KAAKG,EAAMnB,IAGhBqE,EAA+BlD,eApDvB,SAAUX,EAAIgE,OAGvBE,EAAmB,GACnBC,EAAmB,UAENpE,EACjBC,GANFgE,EAAUA,GAAW,IAOX/D,iBACR4D,GAGSO,SAAQ,SAAUC,EAAWzB,OAChC0B,EAAoB5D,EAAY2D,GACZ,IAAtBC,EACFJ,EAAiBK,KAAKF,GAEtBF,EAAiBI,KAAK,CACpBhD,cAAeqB,EACfzB,SAAUmD,EACV3D,KAAM0D,OAKUF,EACnBK,KAAKpD,GACLqD,KAAI,SAACpD,UAAMA,EAAEV,QACboD,OAAOG"}
\ No newline at end of file
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index ab41b88e2234..f998d76c87d7 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -22,6 +22,16 @@ ckeditor:
js:
assets/vendor/ckeditor/ckeditor.js: { preprocess: false, minified: true }
+css.escape:
+ remote: https://github.com/mathiasbynens/CSS.escape
+ version: "1.5.1"
+ license:
+ name: MIT
+ url: https://raw.githubusercontent.com/mathiasbynens/CSS.escape/v1.5.1/LICENSE-MIT.txt
+ gpl-compatible: true
+ js:
+ assets/vendor/css-escape/css.escape.js: { weight: -20 }
+
drupal:
version: VERSION
js:
@@ -95,7 +105,6 @@ drupal.autocomplete:
assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/widgets/menu-min.js: { weight: -11.7, minified: true }
- assets/vendor/jquery.ui/ui/tabbable-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/data-min.js: { weight: -11.8, minified: true }
assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }
assets/vendor/jquery.ui/ui/escape-selector-min.js: { weight: -11.8, minified: true }
@@ -126,6 +135,7 @@ drupal.autocomplete:
- core/drupal
- core/drupalSettings
- core/drupal.ajax
+ - core/tabbable.jquery.shim
drupal.array.find:
version: VERSION
@@ -200,7 +210,6 @@ drupal.dialog:
assets/vendor/jquery.ui/ui/form-reset-mixin-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/widgets/mouse-min.js: { weight: -11.7, minified: true }
- assets/vendor/jquery.ui/ui/tabbable-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/data-min.js: { weight: -11.8, minified: true }
assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }
assets/vendor/jquery.ui/ui/form-min.js: { weight: -11.8, minified: true }
@@ -235,6 +244,7 @@ drupal.dialog:
- core/drupalSettings
- core/drupal.debounce
- core/drupal.displace
+ - core/tabbable.jquery.shim
drupal.dialog.ajax:
version: VERSION
@@ -338,37 +348,11 @@ drupal.tabbingmanager:
version: VERSION
js:
misc/tabbingmanager.js: {}
- # The remaining JavaScript assets previously came from core/jquery.ui, a
- # deprecated library. These assets are used to provide the :tabbable pseudo
- # selector to core's JavaScript. It should be possible to remove them once
- # :tabbable is provided via a non-jQuery UI based library.
- # All weights are based on on the requirements defined within each file.
- # @todo replace with solution found in https://drupal.org/node/3113649
- assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
- assets/vendor/jquery.ui/ui/tabbable-min.js: { weight: -11.7, minified: true }
- assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/form-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/escape-selector-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/focusable-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/ie-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/jquery-1-7-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/keycode-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/plugin-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/safe-active-element-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/safe-blur-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/scroll-parent-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/unique-id-min.js: { weight: -11.8, minified: true }
- assets/vendor/jquery.ui/ui/version-min.js: { weight: -11.9, minified: true }
- # All CSS assets previously came from core/jquery.ui, a deprecated library.
- # @todo replace with solution found in https://drupal.org/node/3113649
- css:
- component:
- assets/vendor/jquery.ui/themes/base/core.css: { weight: -11.8 }
- theme:
- assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }
dependencies:
- core/jquery
- core/drupal
+ - core/tabbable
+ - core/tabbable.jquery.shim
drupal.tabledrag:
version: VERSION
@@ -528,7 +512,6 @@ jquery.ui:
gpl-compatible: true
js:
assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
- assets/vendor/jquery.ui/ui/tabbable-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/data-min.js: { weight: -11.8, minified: true }
assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }
assets/vendor/jquery.ui/ui/escape-selector-min.js: { weight: -11.8, minified: true }
@@ -550,6 +533,7 @@ jquery.ui:
assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }
dependencies:
- core/jquery
+ - core/tabbable.jquery.shim
deprecated: &jquery_ui_unused_deprecated The "%library_id%" asset library is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/3067969
jquery.ui.autocomplete:
@@ -598,7 +582,6 @@ jquery.ui.dialog:
assets/vendor/jquery.ui/ui/form-reset-mixin-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/widgets/mouse-min.js: { weight: -11.7, minified: true }
- assets/vendor/jquery.ui/ui/tabbable-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/data-min.js: { weight: -11.8, minified: true }
assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }
assets/vendor/jquery.ui/ui/escape-selector-min.js: { weight: -11.8, minified: true }
@@ -627,6 +610,7 @@ jquery.ui.dialog:
assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }
dependencies:
- core/jquery
+ - core/tabbable.jquery.shim
deprecated: *jquery_ui_unused_deprecated
jquery.ui.draggable:
@@ -754,6 +738,26 @@ sortable:
js:
assets/vendor/sortable/Sortable.min.js: { minified: true }
+tabbable:
+ remote: https://github.com/focus-trap/tabbable
+ version: "5.1.6"
+ license:
+ name: MIT
+ url: https://raw.githubusercontent.com/focus-trap/tabbable/v5.1.6/LICENSE
+ gpl-compatible: true
+ js:
+ assets/vendor/tabbable/index.umd.min.js: { weight: -1, minified: true }
+ dependencies:
+ - core/css.escape
+
+tabbable.jquery.shim:
+ version: VERSION
+ js:
+ misc/jquery.tabbable.shim.js: {}
+ dependencies:
+ - core/tabbable
+ - core/jquery
+
underscore:
remote: https://github.com/jashkenas/underscore
version: "1.11.0"
diff --git a/core/misc/collapse.es6.js b/core/misc/collapse.es6.js
index 9c9783f5b777..8f0722d64e4f 100644
--- a/core/misc/collapse.es6.js
+++ b/core/misc/collapse.es6.js
@@ -50,6 +50,11 @@
// Turn the summary into a clickable link.
const $summary = this.$node.find('> summary');
+ // If this polyfill is in use, the browser does not recognize
+ // <summary> as a focusable element. The tabindex is set to -1 so the
+ // tabbable library does not incorrectly identify it as tabbable.
+ $summary.attr('tabindex', '-1');
+
$('<span class="details-summary-prefix visually-hidden"></span>')
.append(this.$node.attr('open') ? Drupal.t('Hide') : Drupal.t('Show'))
.prependTo($summary)
diff --git a/core/misc/collapse.js b/core/misc/collapse.js
index c2cddeef54e8..2a503e92f164 100644
--- a/core/misc/collapse.js
+++ b/core/misc/collapse.js
@@ -24,6 +24,7 @@
$.extend(CollapsibleDetails.prototype, {
setupSummaryPolyfill: function setupSummaryPolyfill() {
var $summary = this.$node.find('> summary');
+ $summary.attr('tabindex', '-1');
$('<span class="details-summary-prefix visually-hidden"></span>').append(this.$node.attr('open') ? Drupal.t('Hide') : Drupal.t('Show')).prependTo($summary).after(document.createTextNode(' '));
$('<a class="details-title"></a>').attr('href', "#".concat(this.$node.attr('id'))).prepend($summary.contents()).appendTo($summary);
$summary.append(this.$summary).on('click', $.proxy(this.onSummaryClick, this));
diff --git a/core/misc/jquery.tabbable.shim.es6.js b/core/misc/jquery.tabbable.shim.es6.js
new file mode 100644
index 000000000000..381355f2d665
--- /dev/null
+++ b/core/misc/jquery.tabbable.shim.es6.js
@@ -0,0 +1,23 @@
+/**
+ * @file
+ * Defines a backwards-compatible shim for the jQuery UI :tabbable selector.
+ */
+
+(($, Drupal, { isTabbable }) => {
+ $.extend($.expr[':'], {
+ tabbable(element) {
+ // The tabbable library considers the summary element tabbable, and also
+ // considers a details element without a summary tabbable. The jQuery UI
+ // :tabbable selector does not. This is due to those element types being
+ // inert in IE/Edge.
+ // @see https://allyjs.io/data-tables/focusable.html
+ if (element.tagName === 'SUMMARY' || element.tagName === 'DETAILS') {
+ const tabIndex = element.getAttribute('tabIndex');
+ if (tabIndex === null || tabIndex < 0) {
+ return false;
+ }
+ }
+ return isTabbable(element);
+ },
+ });
+})(jQuery, Drupal, window.tabbable);
diff --git a/core/misc/jquery.tabbable.shim.js b/core/misc/jquery.tabbable.shim.js
new file mode 100644
index 000000000000..dd95d9bf1bc0
--- /dev/null
+++ b/core/misc/jquery.tabbable.shim.js
@@ -0,0 +1,23 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function ($, Drupal, _ref) {
+ var isTabbable = _ref.isTabbable;
+ $.extend($.expr[':'], {
+ tabbable: function tabbable(element) {
+ if (element.tagName === 'SUMMARY' || element.tagName === 'DETAILS') {
+ var tabIndex = element.getAttribute('tabIndex');
+
+ if (tabIndex === null || tabIndex < 0) {
+ return false;
+ }
+ }
+
+ return isTabbable(element);
+ }
+ });
+})(jQuery, Drupal, window.tabbable);
\ No newline at end of file
diff --git a/core/modules/system/tests/modules/tabbable_shim_test/src/Controller/TabbableShimDialogIntegrationTestController.php b/core/modules/system/tests/modules/tabbable_shim_test/src/Controller/TabbableShimDialogIntegrationTestController.php
new file mode 100644
index 000000000000..9e15cba91002
--- /dev/null
+++ b/core/modules/system/tests/modules/tabbable_shim_test/src/Controller/TabbableShimDialogIntegrationTestController.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\tabbable_shim_test\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+
+/**
+ * For testing the jQuery :tabbable shim as used in a dialog.
+ */
+class TabbableShimDialogIntegrationTestController extends ControllerBase {
+
+ /**
+ * Provides a page with the jQuery UI dialog library for testing .
+ *
+ * @return array
+ * The render array.
+ */
+ public function build() {
+ return [
+ 'container' => [
+ '#type' => 'container',
+ '#attributes' => [
+ 'id' => 'tabbable-dialog-test-container',
+ ],
+ ],
+ '#attached' => [
+ 'library' => ['core/jquery.ui.dialog'],
+ ],
+ ];
+ }
+
+}
diff --git a/core/modules/system/tests/modules/tabbable_shim_test/src/Controller/TabbableShimTestController.php b/core/modules/system/tests/modules/tabbable_shim_test/src/Controller/TabbableShimTestController.php
new file mode 100644
index 000000000000..6ef837e55a19
--- /dev/null
+++ b/core/modules/system/tests/modules/tabbable_shim_test/src/Controller/TabbableShimTestController.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\tabbable_shim_test\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+
+/**
+ * For testing the jQuery :tabbable shim.
+ */
+class TabbableShimTestController extends ControllerBase {
+
+ /**
+ * Provides a page with the tabbingManager library for testing :tabbable.
+ *
+ * @return array
+ * The render array.
+ */
+ public function build() {
+ return [
+ 'container' => [
+ '#type' => 'container',
+ '#attributes' => [
+ 'id' => 'tabbable-test-container',
+ ],
+ ],
+ '#attached' => ['library' => ['core/drupal.tabbingmanager']],
+ ];
+ }
+
+}
diff --git a/core/modules/system/tests/modules/tabbable_shim_test/tabbable_shim_test.info.yml b/core/modules/system/tests/modules/tabbable_shim_test/tabbable_shim_test.info.yml
new file mode 100644
index 000000000000..4689243d510c
--- /dev/null
+++ b/core/modules/system/tests/modules/tabbable_shim_test/tabbable_shim_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Tabbable Shim Test'
+type: module
+description: 'Module for the testing the :tabbable selector shim'
+package: Testing
+version: VERSION
diff --git a/core/modules/system/tests/modules/tabbable_shim_test/tabbable_shim_test.routing.yml b/core/modules/system/tests/modules/tabbable_shim_test/tabbable_shim_test.routing.yml
new file mode 100644
index 000000000000..0be12dfb2f6b
--- /dev/null
+++ b/core/modules/system/tests/modules/tabbable_shim_test/tabbable_shim_test.routing.yml
@@ -0,0 +1,15 @@
+tabbable_test_page:
+ path: '/tabbable-shim-test'
+ defaults:
+ _controller: '\Drupal\tabbable_shim_test\Controller\TabbableShimTestController::build'
+ _title: 'Tabbable testing'
+ requirements:
+ _access: 'TRUE'
+
+tabbable_dialog_integration_test_page:
+ path: '/tabbable-shim-dialog-integration-test'
+ defaults:
+ _controller: '\Drupal\tabbable_shim_test\Controller\TabbableShimDialogIntegrationTestController::build'
+ _title: 'Tabbable dialog integration testing'
+ requirements:
+ _access: 'TRUE'
diff --git a/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
index d517791c8b2e..597dec65c9ed 100644
--- a/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
+++ b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
@@ -58,7 +58,6 @@ protected function setUp(): void {
$libraries_to_check = [
'drupal.autocomplete',
'drupal.dialog',
- 'drupal.tabbingmanager',
'jquery.ui',
'jquery.ui.autocomplete',
'jquery.ui.button',
@@ -138,7 +137,6 @@ public function testProperlySetWeights() {
'core/assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js',
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/widgets/menu-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/themes/base/autocomplete.css',
'core/assets/vendor/jquery.ui/themes/base/menu.css',
'core/assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js',
@@ -373,7 +371,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -407,7 +404,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -429,31 +425,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/widgets/dialog-min.js',
],
],
- 'drupal.tabbingmanager' => [
- 'library' => 'drupal.tabbingmanager',
- 'expected_css' => [
- 'core/assets/vendor/jquery.ui/themes/base/core.css',
- 'core/assets/vendor/jquery.ui/themes/base/theme.css',
- ],
- 'expected_js' => [
- 'core/assets/vendor/jquery.ui/ui/data-min.js',
- 'core/assets/vendor/jquery.ui/ui/disable-selection-min.js',
- 'core/assets/vendor/jquery.ui/ui/form-min.js',
- 'core/assets/vendor/jquery.ui/ui/labels-min.js',
- 'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
- 'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
- 'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
- 'core/assets/vendor/jquery.ui/ui/version-min.js',
- 'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
- 'core/assets/vendor/jquery.ui/ui/focusable-min.js',
- 'core/assets/vendor/jquery.ui/ui/ie-min.js',
- 'core/assets/vendor/jquery.ui/ui/keycode-min.js',
- 'core/assets/vendor/jquery.ui/ui/plugin-min.js',
- 'core/assets/vendor/jquery.ui/ui/safe-active-element-min.js',
- 'core/assets/vendor/jquery.ui/ui/safe-blur-min.js',
- ],
- ],
'jquery.ui' => [
'library' => 'jquery.ui',
'expected_css' => [
@@ -467,7 +438,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -494,7 +464,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -526,7 +495,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -560,7 +528,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -596,7 +563,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -624,7 +590,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -651,7 +616,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -678,7 +642,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -706,7 +669,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -722,8 +684,8 @@ public function providerTestAssetLoading() {
// A few instances of multiple libraries being checked simultaneously are
// here to ensure that multiple libraries requesting the same asset does
// not impact the expected loading order.
- 'drupal.tabbingmanager|jquery.ui|jquery.ui.widget' => [
- 'library' => 'drupal.tabbingmanager|jquery.ui|jquery.ui.widget',
+ 'jquery.ui|jquery.ui.widget' => [
+ 'library' => 'jquery.ui|jquery.ui.widget',
'expected_css' => [
'core/assets/vendor/jquery.ui/themes/base/core.css',
'core/assets/vendor/jquery.ui/themes/base/theme.css',
@@ -735,7 +697,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -768,7 +729,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
@@ -792,8 +752,8 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/widgets/dialog-min.js',
],
],
- 'jquery.ui.widget|jquery.ui.resizable|jquery.ui.position|jquery.ui.mouse|jquery.ui.menu|jquery.ui.dialog|jquery.ui.button|jquery.ui.autocomplete|jquery.ui|drupal.tabbingmanager|drupal.dialog|drupal.autocomplete' => [
- 'library' => 'jquery.ui.widget|jquery.ui.resizable|jquery.ui.position|jquery.ui.mouse|jquery.ui.menu|jquery.ui.dialog|jquery.ui.button|jquery.ui.autocomplete|jquery.ui|drupal.tabbingmanager|drupal.dialog|drupal.autocomplete',
+ 'jquery.ui.widget|jquery.ui.resizable|jquery.ui.position|jquery.ui.mouse|jquery.ui.menu|jquery.ui.dialog|jquery.ui.button|jquery.ui.autocomplete|jquery.ui|drupal.dialog|drupal.autocomplete' => [
+ 'library' => 'jquery.ui.widget|jquery.ui.resizable|jquery.ui.position|jquery.ui.mouse|jquery.ui.menu|jquery.ui.dialog|jquery.ui.button|jquery.ui.autocomplete|jquery.ui|drupal.dialog|drupal.autocomplete',
'expected_css' => [
'core/assets/vendor/jquery.ui/themes/base/core.css',
'core/assets/vendor/jquery.ui/themes/base/resizable.css',
@@ -812,7 +772,6 @@ public function providerTestAssetLoading() {
'core/assets/vendor/jquery.ui/ui/labels-min.js',
'core/assets/vendor/jquery.ui/ui/jquery-1-7-min.js',
'core/assets/vendor/jquery.ui/ui/scroll-parent-min.js',
- 'core/assets/vendor/jquery.ui/ui/tabbable-min.js',
'core/assets/vendor/jquery.ui/ui/unique-id-min.js',
'core/assets/vendor/jquery.ui/ui/version-min.js',
'core/assets/vendor/jquery.ui/ui/escape-selector-min.js',
diff --git a/core/tests/Drupal/KernelTests/Core/Asset/DeprecatedJqueryUiAssetsTest.php b/core/tests/Drupal/KernelTests/Core/Asset/DeprecatedJqueryUiAssetsTest.php
index 404c6ee58347..87fbd9432308 100644
--- a/core/tests/Drupal/KernelTests/Core/Asset/DeprecatedJqueryUiAssetsTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Asset/DeprecatedJqueryUiAssetsTest.php
@@ -20,10 +20,10 @@ public function testDeprecatedJqueryUi() {
/** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
$library_discovery = $this->container->get('library.discovery');
$deprecated_jquery_ui_libraries = [
- 'jquery.ui' => '1396fab9268ee2cce47df6ac3e4781c8',
+ 'jquery.ui' => '291c28f873a71cd6b3116218d1f5da22',
'jquery.ui.autocomplete' => '153f2836f8f2da39767208b6e09cb5b4',
'jquery.ui.button' => 'ad23e5de0fa1de1f511d10ba2e10d2dd',
- 'jquery.ui.dialog' => '2027aab39332607b62288c4d20c01f83',
+ 'jquery.ui.dialog' => '729090e5ddcd8563ddade80c3dabc87c',
'jquery.ui.draggable' => 'af0f2bdc8aa4ade1e3de8042f31a9312',
'jquery.ui.menu' => '7d0c4d57f43d2f881d2cd5e5b79effbb',
'jquery.ui.mouse' => '626bb203807fa2cdc62510412685df4a',
diff --git a/core/tests/Drupal/Nightwatch/Tests/tabbableShimTest.js b/core/tests/Drupal/Nightwatch/Tests/tabbableShimTest.js
new file mode 100644
index 000000000000..056e9464c55e
--- /dev/null
+++ b/core/tests/Drupal/Nightwatch/Tests/tabbableShimTest.js
@@ -0,0 +1,338 @@
+// Testing the shimmed jQuery UI :tabbable selector.
+
+// Test confirming the :tabbable shim returns the same values as jQuery UI
+// :tabbable.
+//
+// An array of objects with the following properties:
+// - element: the element to test
+// - tabbable: the number of items the :tabbable selector should return when
+// the element is the only item in the container being queried.
+const tabbableTestScenarios = [
+ {
+ element: '<div>',
+ tabbable: 0,
+ },
+ {
+ element: '<div tabindex="0">',
+ tabbable: 1,
+ },
+ {
+ element: '<div tabindex="0" hidden>',
+ tabbable: 0,
+ },
+ {
+ element: '<div tabindex="0" style="display:none;">',
+ tabbable: 0,
+ },
+ {
+ element: '<div href="#">',
+ tabbable: 0,
+ },
+ {
+ element: '<a>',
+ tabbable: 0,
+ },
+ {
+ element: '<a href="#">',
+ tabbable: 1,
+ },
+ {
+ element: '<a tabindex="0">',
+ tabbable: 1,
+ },
+ {
+ element: '<a tabindex="-1">',
+ tabbable: 0,
+ },
+ {
+ element: '<input type="hidden">',
+ tabbable: 0,
+ },
+ {
+ element: '<input type="hidden" tabindex="0">',
+ tabbable: 0,
+ },
+ {
+ element: '<input type="hidden" tabindex="1">',
+ tabbable: 0,
+ },
+ {
+ element:
+ '<details><summary>I am not :tabbable because IE does not support it</summary>This is unfortunate</details>',
+ tabbable: 0,
+ },
+ {
+ element:
+ '<details>A details without a summary should also not be :tabbable</details>',
+ tabbable: 0,
+ },
+ {
+ element: '<ul><li>List item</li></ul>',
+ tabbable: 0,
+ },
+ {
+ element: '<ul><li tabindex="0">List item</li></ul>',
+ tabbable: 1,
+ },
+];
+
+// Element types to add to the test scenarios.
+const elementTypesUsedByTabbableTest = [
+ 'input-button',
+ 'input-checkbox',
+ 'input-color',
+ 'input-date',
+ 'input-datetime-local',
+ 'input-email',
+ 'input-file',
+ 'input-image',
+ 'input-month',
+ 'input-number',
+ 'input-password',
+ 'input-radio',
+ 'input-range',
+ 'input-reset',
+ 'input-search',
+ 'input-submit',
+ 'input-tel',
+ 'input-text',
+ 'input-time',
+ 'input-url',
+ 'input-week',
+ 'select',
+ 'button',
+ 'textarea',
+];
+
+// Create multiple test scenarios.
+
+// For each element type being tested, create multiple variations with different
+// attributes and store them in the `element:` property. The `tabbable:` property
+// is the number of elements in `element:` that would match the :tabbable
+// selector.
+// Tha variations include:
+// - The element with no additional attributes.
+// - Separate scenarios for tabindex 0, 1, and -1.
+// - With the hidden attribute
+// - With `style="display:none;"`
+// - With `style="visibility: hidden;"`
+elementTypesUsedByTabbableTest.forEach((item) => {
+ let elementType = item;
+ let selfClose = '';
+ let type = '';
+ if (item.indexOf('-') > 0) {
+ [elementType, type] = item.split('-');
+ type = ` type="${type}"`;
+ selfClose = ' /';
+ }
+
+ tabbableTestScenarios.push({
+ element: `<${elementType}${type}${selfClose}>`,
+ tabbable: 1,
+ });
+ tabbableTestScenarios.push({
+ element: `<${elementType}${type} tabindex="0"${selfClose}>`,
+ tabbable: 1,
+ });
+ tabbableTestScenarios.push({
+ element: `<${elementType}${type} tabindex="1"${selfClose}>`,
+ tabbable: 1,
+ });
+ tabbableTestScenarios.push({
+ element: `<${elementType}${type} tabindex="-1"${selfClose}>`,
+ tabbable: 0,
+ });
+ tabbableTestScenarios.push({
+ element: `<${elementType}${type} hidden${selfClose}>`,
+ tabbable: 0,
+ });
+ tabbableTestScenarios.push({
+ element: `<${elementType}${type} style="display:none;"${selfClose}>`,
+ tabbable: 0,
+ });
+ tabbableTestScenarios.push({
+ element: `<${elementType}${type} style="visibility: hidden;"${selfClose}>`,
+ tabbable: 0,
+ });
+});
+
+// The default options for items in dialogIntegrationTestScenarios.
+const defaultDialogOptions = {
+ buttons: [
+ {
+ text: 'Ok',
+ click: () => {},
+ },
+ ],
+};
+
+// Contains scenarios for testing dialog's use of the :tabbable selector.
+// These are based on the "focus tabbable" tests within jQuery UI
+// @see
+// https://github.com/jquery/jquery-ui/blob/1.12.1/tests/unit/dialog/core.js
+const dialogIntegrationTestScenarios = [
+ {
+ info: 'An element that was focused previously.',
+ markup: '<div><input><input></div>',
+ options: {},
+ // eslint-disable-next-line object-shorthand, func-names
+ testActions: function ($element) {
+ const $input = $element
+ .find('input:last')
+ .trigger('focus')
+ .trigger('blur');
+ $element.dialog('instance')._focusTabbable();
+ return $input[0];
+ },
+ },
+ {
+ info: 'First element inside the dialog matching [autofocus]',
+ markup: '<div><input><input autofocus></div>',
+ options: defaultDialogOptions,
+ // eslint-disable-next-line object-shorthand, func-names
+ testActions: function ($element) {
+ return $element.find('input')[1];
+ },
+ },
+ {
+ info: 'Tabbable element inside the content element',
+ markup: '<div><input><input></div>',
+ options: defaultDialogOptions,
+ // eslint-disable-next-line object-shorthand, func-names
+ testActions: function ($element) {
+ return $element.find('input')[0];
+ },
+ },
+ {
+ info: 'Tabbable element inside the buttonpane',
+ markup: '<div>text</div>',
+ options: defaultDialogOptions,
+ // eslint-disable-next-line object-shorthand, func-names
+ testActions: function ($element) {
+ return $element.dialog('widget').find('.ui-dialog-buttonpane button')[0];
+ },
+ },
+ {
+ info: 'The close button',
+ markup: '<div>text</div>',
+ options: {},
+ // eslint-disable-next-line object-shorthand, func-names
+ testActions: function ($element) {
+ return $element
+ .dialog('widget')
+ .find('.ui-dialog-titlebar .ui-dialog-titlebar-close')[0];
+ },
+ },
+ {
+ info: 'The dialog itself',
+ markup: '<div>text</div>',
+ options: { autoOpen: false },
+ // eslint-disable-next-line object-shorthand, func-names
+ testActions: function ($element) {
+ $element.dialog('widget').find('.ui-dialog-titlebar-close').hide();
+ $element.dialog('open');
+ return $element.parent()[0];
+ },
+ },
+ {
+ info: 'Focus starts on second input',
+ markup: '<div><input><input autofocus></div>',
+ options: {
+ // eslint-disable-next-line object-shorthand, func-names
+ open: function () {
+ const inputs = jQuery(this).find('input');
+ inputs.last().on('keydown', function (event) {
+ event.preventDefault();
+ inputs.first().trigger('focus');
+ });
+ },
+ },
+ // eslint-disable-next-line object-shorthand, func-names
+ testActions: function ($element) {
+ const inputs = $element.find('input');
+ return inputs[1];
+ },
+ },
+];
+
+module.exports = {
+ '@tags': ['core'],
+ before(browser) {
+ browser.drupalInstall().drupalLoginAsAdmin(() => {
+ browser
+ .drupalRelativeURL('/admin/modules')
+ .setValue('input[type="search"]', 'Tabbable Shim Test')
+ .waitForElementVisible(
+ 'input[name="modules[tabbable_shim_test][enable]"]',
+ 1000,
+ )
+ .click('input[name="modules[tabbable_shim_test][enable]"]')
+ .click('input[type="submit"]');
+ });
+ },
+ after(browser) {
+ browser.drupalUninstall();
+ },
+ 'test tabbable': (browser) => {
+ browser
+ .drupalRelativeURL('/tabbable-shim-test')
+ .waitForElementPresent('#tabbable-test-container', 1000);
+
+ tabbableTestScenarios.forEach((iteration) => {
+ browser.execute(
+ // eslint-disable-next-line func-names, prefer-arrow-callback
+ function (scenario) {
+ const $container = jQuery('#tabbable-test-container');
+ $container.empty();
+ $container.append(jQuery(scenario.element));
+
+ return {
+ expected: scenario.tabbable,
+ actual: $container.find(':tabbable').length,
+ element: scenario.element,
+ };
+ },
+ [iteration],
+ (result) => {
+ browser.assert.equal(
+ result.value.actual,
+ result.value.expected,
+ `Expected :tabbable to return ${result.value.expected} for element ${result.value.element}`,
+ );
+ },
+ );
+ });
+ browser.drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'test tabbable dialog integration': (browser) => {
+ browser
+ .drupalRelativeURL('/tabbable-shim-dialog-integration-test')
+ .waitForElementPresent('#tabbable-dialog-test-container', 1000);
+
+ dialogIntegrationTestScenarios.forEach((iteration) => {
+ browser.execute(
+ // eslint-disable-next-line func-names
+ function (scenario, testActions) {
+ // Create the jQuery element that will be used in the test steps.
+ const $element = jQuery(scenario.markup).dialog(scenario.options);
+
+ // Convert the testActions string into a function. testActions is a
+ // string due to functions being removed from objects passed to
+ // browser.execute().
+ // The expectedActiveElement function performs steps specific to a test
+ // iteration, then returns the element expected to be active after
+ // those steps.
+ // eslint-disable-next-line no-new-func
+ const expectedActiveElement = new Function(`return ${testActions}`)();
+ return expectedActiveElement($element) === document.activeElement;
+ },
+ [iteration, iteration.testActions.toString()],
+ (result) => {
+ browser.assert.equal(result.value, true, iteration.info);
+ },
+ );
+ });
+
+ browser.drupalLogAndEnd({ onlyOnError: false });
+ },
+};
--
GitLab