diff --git a/composer.json b/composer.json index 41dff5748b..3aed4fc4cb 100644 --- a/composer.json +++ b/composer.json @@ -228,7 +228,8 @@ "https://www.drupal.org/project/drupal/issues/1349080": "https://git.drupalcode.org/project/drupal/-/commit/c271adbb22f28a66ff4321b2fb7f86f20fe0c838.patch", "https://www.drupal.org/project/drupal/issues/3306916": "https://www.drupal.org/files/issues/2023-12-19/3306916-18.patch", "views form null fix": "patches/core-views.patch", - "CKEditor 5 headings plugin paragraph label change": "patches/ckeditor5-paragraph-rename.patch" + "CKEditor 5 headings plugin paragraph label change": "patches/ckeditor5-paragraph-rename.patch", + "Allow hs group blocks in layout_builder": "patches/layout_builder-allow-hs-blocks.patch" }, "drupal/gin": { "https://www.drupal.org/project/gin/issues/3342513": "https://www.drupal.org/files/issues/2024-02-02/3342513-entity-edit-form-update-ajax-ids-12.patch" diff --git a/composer.lock b/composer.lock index a18c3cba90..9fa5bc4dd2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0906dd6e41bba32224f151600617fcfc", + "content-hash": "b64fb2e68270728df32cb7eb2914818c", "packages": [ { "name": "acquia/blt", @@ -3175,12 +3175,8 @@ "role": "Maintainer" }, { - "name": "RenatoG", + "name": "renatog", "homepage": "https://www.drupal.org/user/3326031" - }, - { - "name": "Unsupported Projects", - "homepage": "https://www.drupal.org/user/291168" } ], "description": "A light-weight, customizable lightbox plugin for jQuery.", @@ -8949,7 +8945,7 @@ "extra": { "drupal": { "version": "8.x-1.0-rc7", - "datestamp": "1698848506", + "datestamp": "1709793226", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -9141,7 +9137,7 @@ "extra": { "drupal": { "version": "8.x-1.17", - "datestamp": "1705234146", + "datestamp": "1709804220", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -25415,5 +25411,5 @@ "php": ">=8.2" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/patches/layout_builder-allow-hs-blocks.patch b/patches/layout_builder-allow-hs-blocks.patch new file mode 100644 index 0000000000..55ce80d2d1 --- /dev/null +++ b/patches/layout_builder-allow-hs-blocks.patch @@ -0,0 +1,13 @@ +diff --git a/modules/layout_builder/js/layout-builder.js b/modules/layout_builder/js/layout-builder.js +index 76b751c6..9353579d 100644 +--- a/modules/layout_builder/js/layout-builder.js ++++ b/modules/layout_builder/js/layout-builder.js +@@ -460,7 +460,7 @@ + $(window).on('drupalContextualLinkAdded', (event, data) => { + const element = data.$el; + const contextualId = element.attr('data-contextual-id'); +- if (contextualId && !contextualId.startsWith('layout_builder_block:')) { ++ if (contextualId && !(contextualId.startsWith('layout_builder_block:') || contextualId.startsWith('hs_blocks_block:'))) { + element.remove(); + } + });