Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3296098 by catch, finnsky, smustgrave: Removal :tabbable usage in dialog.js

merge-requests/7849/head
nod_ 2024-04-17 17:13:43 +02:00
parent a825ce6415
commit 94bfd9fa39
No known key found for this signature in database
GPG Key ID: 76624892606FA197
11 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
View File

@ -76,6 +76,16 @@ class OpenDialogCommand implements CommandInterface, CommandWithAttachedAssetsIn
$title = PlainTextOutput::renderFromHtml($title);
$dialog_options += ['title' => $title];
if (isset($dialog_options['dialogClass'])) {
@trigger_error('Passing $dialog_options[\'dialogClass\'] to OpenDialogCommand::__construct() is deprecated in drupal:10.3.0 and will be removed in drupal:12.0.0. Use $dialog_options[\'classes\'] instead. See https://www.drupal.org/node/3440844', E_USER_DEPRECATED);
if (isset($dialog_options['classes']['ui-dialog'])) {
$dialog_options['classes']['ui-dialog'] = $dialog_options['classes']['ui-dialog'] . ' ' . $dialog_options['dialogClass'];
}
else {
$dialog_options['classes']['ui-dialog'] = $dialog_options['dialogClass'];
}
}
$this->selector = $selector;
$this->content = $content;
$this->dialogOptions = $dialog_options;

13
core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php
View File

@ -38,6 +38,15 @@ class OpenOffCanvasDialogCommand extends OpenDialogCommand {
* (optional) The position to render the off-canvas dialog.
*/
public function __construct(string|\Stringable|null $title, $content, array $dialog_options = [], $settings = NULL, $position = 'side') {
$dialog_class = '';
if (isset($dialog_options['dialogClass'])) {
@trigger_error('Passing $dialog_options[\'dialogClass\'] to OpenOffCanvasDialogCommand::__construct() is deprecated in drupal:10.3.0 and will be removed in drupal:12.0.0. Use $dialog_options[\'classes\'] instead. See https://www.drupal.org/node/3440844', E_USER_DEPRECATED);
$dialog_class = $dialog_options['dialogClass'];
}
if (isset($dialog_options['classes']['ui-dialog'])) {
$dialog_class = $dialog_options['classes']['ui-dialog'];
}
$dialog_options['classes']['ui-dialog'] = trim("$dialog_class ui-dialog-off-canvas ui-dialog-position-$position");
parent::__construct('#drupal-off-canvas', $title, $content, $dialog_options, $settings);
$this->dialogOptions['modal'] = FALSE;
$this->dialogOptions['autoResize'] = FALSE;
@ -45,9 +54,7 @@ class OpenOffCanvasDialogCommand extends OpenDialogCommand {
$this->dialogOptions['draggable'] = FALSE;
$this->dialogOptions['drupalAutoButtons'] = FALSE;
$this->dialogOptions['drupalOffCanvasPosition'] = $position;
if (empty($dialog_options['dialogClass'])) {
$this->dialogOptions['dialogClass'] = "ui-dialog-off-canvas ui-dialog-position-$position";
}
// Add CSS class to #drupal-off-canvas element. This enables developers to
// select previous versions of off-canvas styles by using custom selector:
// #drupal-off-canvas:not(.drupal-off-canvas-reset).

3
core/modules/ckeditor5/ckeditor5.ckeditor5.yml
View File

@ -820,8 +820,9 @@ media_library_mediaLibrary:
name: Drupal.ckeditor5.openDialog
invoke: false
dialogSettings:
classes:
ui-dialog: media-library-widget-modal
height: 75%
dialogClass: media-library-widget-modal
drupal:
label: Media Library
elements: false

4
core/modules/editor/js/editor.js
View File

@ -137,7 +137,9 @@
);
const confirmationDialog = Drupal.dialog(`<div>${message}</div>`, {
title: Drupal.t('Change text format?'),
dialogClass: 'editor-change-text-format-modal',
classes: {
'ui-dialog': 'editor-change-text-format-modal',
},
resizable: false,
buttons: [
{

4
core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
View File

@ -104,7 +104,9 @@ class EditorImageDialogTest extends EntityKernelTestBase {
],
'dialogOptions' => [
'title' => 'Edit Image',
'dialogClass' => 'editor-image-dialog',
'classes' => [
'ui-dialog' => 'editor-image-dialog',
],
'autoResize' => 'true',
],
'_drupal_ajax' => '1',

4
core/modules/media_library/src/MediaLibraryUiBuilder.php
View File

@ -89,7 +89,9 @@ class MediaLibraryUiBuilder {
*/
public static function dialogOptions() {
return [
'dialogClass' => 'media-library-widget-modal',
'classes' => [
'ui-dialog' => 'media-library-widget-modal',
],
'title' => t('Add or select media'),
'height' => '75%',
'width' => '75%',

4
core/modules/system/tests/modules/dialog_renderer_test/src/Controller/TestController.php
View File

@ -126,7 +126,9 @@ class TestController {
'class' => ['use-ajax'],
'data-dialog-type' => 'modal',
'data-dialog-options' => Json::encode([
'dialogClass' => 'no-close',
'classes' => [
'ui-dialog' => 'no-close',
],
]),
],
'#attached' => [

4
core/modules/system/tests/src/Functional/Ajax/OffCanvasDialogTest.php
View File

@ -40,6 +40,7 @@ class OffCanvasDialogTest extends BrowserTestBase {
// Set up variables for this test.
$dialog_renderable = AjaxTestController::dialogContents();
$dialog_contents = \Drupal::service('renderer')->renderRoot($dialog_renderable);
$dialog_class = 'ui-dialog-off-canvas ui-dialog-position-' . ($position ?: 'side');
$off_canvas_expected_response = [
'command' => 'openDialog',
'selector' => '#drupal-off-canvas',
@ -47,6 +48,7 @@ class OffCanvasDialogTest extends BrowserTestBase {
'data' => (string) $dialog_contents,
'dialogOptions' =>
[
'classes' => ['ui-dialog' => $dialog_class, 'ui-dialog-content' => 'drupal-off-canvas-reset'],
'title' => 'AJAX Dialog & contents',
'modal' => FALSE,
'autoResize' => FALSE,
@ -54,8 +56,6 @@ class OffCanvasDialogTest extends BrowserTestBase {
'draggable' => FALSE,
'drupalAutoButtons' => FALSE,
'drupalOffCanvasPosition' => $position ?: 'side',
'dialogClass' => 'ui-dialog-off-canvas ui-dialog-position-' . ($position ?: 'side'),
'classes' => ['ui-dialog-content' => 'drupal-off-canvas-reset'],
'width' => 300,
],
'effect' => 'fade',

4
core/modules/views/tests/modules/views_test_modal/src/Controller/TestController.php
View File

@ -22,7 +22,9 @@ class TestController extends ControllerBase {
'class' => ['use-ajax'],
'data-dialog-type' => 'modal',
'data-dialog-options' => Json::encode([
'dialogClass' => 'views-test-modal',
'classes' => [
'ui-dialog' => 'views-test-modal',
],
'height' => '50%',
'width' => '50%',
'title' => $this->t('Administer content'),

4
core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
View File

@ -244,7 +244,9 @@ abstract class ViewsFormBase extends FormBase implements ViewsFormInterface {
$display .= $output;
$options = [
'dialogClass' => 'views-ui-dialog js-views-ui-dialog',
'classes' => [
'ui-dialog' => 'views-ui-dialog js-views-ui-dialog',
],
'width' => '75%',
];

3
core/tests/Drupal/Tests/Core/Ajax/OpenOffCanvasDialogCommandTest.php
View File

@ -34,8 +34,7 @@ class OpenOffCanvasDialogCommandTest extends UnitTestCase {
'resizable' => 'w',
'draggable' => FALSE,
'drupalAutoButtons' => FALSE,
'dialogClass' => 'ui-dialog-off-canvas ui-dialog-position-' . $position,
'classes' => ['ui-dialog-content' => 'drupal-off-canvas-reset'],
'classes' => ['ui-dialog' => 'ui-dialog-off-canvas ui-dialog-position-' . $position, 'ui-dialog-content' => 'drupal-off-canvas-reset'],
'width' => 300,
'drupalOffCanvasPosition' => $position,
],