From fae1be9039106fc3cad70a94f5d90bf939ec9839 Mon Sep 17 00:00:00 2001
From: nod_ <nod_@598310.no-reply.drupal.org>
Date: Mon, 17 Mar 2025 10:41:22 +0100
Subject: [PATCH] Issue #3512236 by catch, smustgrave: Move fieldgroup CSS to
its own library
---
core/core.libraries.yml | 15 +++++++++++++++
.../lib/Drupal/Core/Render/Element/Fieldgroup.php | 15 ++++++++++++---
.../css => misc}/components/fieldgroup.module.css | 0
core/modules/system/system.libraries.yml | 1 -
.../components/fieldgroup.module.css | 0
core/themes/stable9/stable9.info.yml | 6 +++++-
6 files changed, 32 insertions(+), 5 deletions(-)
rename core/{modules/system/css => misc}/components/fieldgroup.module.css (100%)
rename core/themes/stable9/css/{system => core}/components/fieldgroup.module.css (100%)
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index ee5987c51685..770bcf7c9ec9 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -589,6 +589,21 @@ drupal.entity-form:
dependencies:
- core/drupal.form
+drupal.fieldgroup:
+ version: VERSION
+ css:
+ component:
+ misc/components/fieldgroup.module.css: { weight: -10 }
+ moved_files:
+ system/base:
+ deprecation_version: 11.2.0
+ removed_version: 12.0.0
+ deprecation_link: https://www.drupal.org/node/3432346
+ css:
+ component:
+ css/components/fieldgroup.module.css:
+ base: core/misc/components/fieldgroup.module.css
+
drupal.form:
version: VERSION
js:
diff --git a/core/lib/Drupal/Core/Render/Element/Fieldgroup.php b/core/lib/Drupal/Core/Render/Element/Fieldgroup.php
index 9958645197ce..28ca74b46015 100644
--- a/core/lib/Drupal/Core/Render/Element/Fieldgroup.php
+++ b/core/lib/Drupal/Core/Render/Element/Fieldgroup.php
@@ -20,9 +20,18 @@
class Fieldgroup extends Fieldset {
public function getInfo() {
- return [
- '#attributes' => ['class' => ['fieldgroup']],
- ] + parent::getInfo();
+ $info = parent::getInfo();
+ $info['#attributes']['class'] = ['fieldgroup'];
+ $info['#pre_render'][] = [static::class, 'preRenderAttachments'];
+ return $info;
+ }
+
+ /**
+ * Adds the fieldgroup library.
+ */
+ public static function preRenderAttachments($element): array {
+ $element['#attached']['library'][] = 'core/drupal.fieldgroup';
+ return $element;
}
}
diff --git a/core/modules/system/css/components/fieldgroup.module.css b/core/misc/components/fieldgroup.module.css
similarity index 100%
rename from core/modules/system/css/components/fieldgroup.module.css
rename to core/misc/components/fieldgroup.module.css
diff --git a/core/modules/system/system.libraries.yml b/core/modules/system/system.libraries.yml
index 3f3c00951be0..12017369189e 100644
--- a/core/modules/system/system.libraries.yml
+++ b/core/modules/system/system.libraries.yml
@@ -4,7 +4,6 @@ base:
# Adjust the weights to load these early.
component:
css/components/align.module.css: { weight: -10 }
- css/components/fieldgroup.module.css: { weight: -10 }
css/components/container-inline.module.css: { weight: -10 }
css/components/clearfix.module.css: { weight: -10 }
css/components/details.module.css: { weight: -10 }
diff --git a/core/themes/stable9/css/system/components/fieldgroup.module.css b/core/themes/stable9/css/core/components/fieldgroup.module.css
similarity index 100%
rename from core/themes/stable9/css/system/components/fieldgroup.module.css
rename to core/themes/stable9/css/core/components/fieldgroup.module.css
diff --git a/core/themes/stable9/stable9.info.yml b/core/themes/stable9/stable9.info.yml
index 745ceffab040..a8fb889436a9 100644
--- a/core/themes/stable9/stable9.info.yml
+++ b/core/themes/stable9/stable9.info.yml
@@ -68,6 +68,11 @@ libraries-override:
component:
misc/dropbutton/dropbutton.css: css/core/dropbutton/dropbutton.css
+ core/drupal.fieldgroup:
+ css:
+ component:
+ misc/components/fieldgroup.module.css: css/core/components/fieldgroup.module.css
+
core/drupal.progress:
css:
component:
@@ -220,7 +225,6 @@ libraries-override:
css:
component:
css/components/align.module.css: css/system/components/align.module.css
- css/components/fieldgroup.module.css: css/system/components/fieldgroup.module.css
css/components/container-inline.module.css: css/system/components/container-inline.module.css
css/components/clearfix.module.css: css/system/components/clearfix.module.css
css/components/details.module.css: css/system/components/details.module.css
--
GitLab