Merge branch '3432244-split-tablesort' into '11.x'

Resolve #3432244 "Split tablesort"

See merge request !11445

core/core.libraries.yml

@@ -730,6 +730,21 @@ drupal.tableselect:
     - core/jquery
     - core/once
 
+drupal.tablesort:
+  version: VERSION
+  css:
+    component:
+      misc/components/tablesort.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/tablesort.module.css:
+            base: misc/components/tablesort.module.css
+
 drupal.time-diff:
   version: VERSION
   js:

core/includes/theme.inc

@@ -1287,6 +1287,15 @@ function theme_get_suggestions($args, $base, $delimiter = '__') {
   return $suggestions;
 }
 
+/**
+ * Prepares variables for tablesort indicators.
+ *
+ * Default template: tablesort-indicator.html.twig.
+ */
+function template_preprocess_tablesort_indicator(&$variables): void {
+  $variables['#attached']['library'][] = 'core/drupal.tablesort';
+}
+
 /**
  * Prepares variables for maintenance page templates.
  *

core/modules/system/css/components/tablesort.module.css → core/misc/components/tablesort.module.css

@@ -12,8 +12,8 @@
   background-size: 100%;
 }
 .tablesort--asc {
-  background-image: url(../../../../misc/icons/787878/twistie-down.svg);
+  background-image: url(../icons/787878/twistie-down.svg);
 }
 .tablesort--desc {
-  background-image: url(../../../../misc/icons/787878/twistie-up.svg);
+  background-image: url(../icons/787878/twistie-up.svg);
 }

core/modules/system/system.libraries.yml

@@ -12,7 +12,6 @@ base:
       css/components/nowrap.module.css: { weight: -10 }
       css/components/position-container.module.css: { weight: -10 }
       css/components/reset-appearance.module.css: { weight: -10 }
-      css/components/tablesort.module.css: { weight: -10 }
 
 admin:
   version: VERSION

core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php

@@ -30,7 +30,7 @@ public function testFrontAndRecipesPages(): void {
       'ScriptCount' => 1,
       'ScriptBytes' => 11700,
       'StylesheetCount' => 6,
-      'StylesheetBytes' => 120500,
+      'StylesheetBytes' => 119600,
     ];
     $this->assertMetrics($expected, $performance_data);
   }
@@ -50,7 +50,7 @@ public function testFrontAndRecipesPagesAuthenticated(): void {
       'ScriptCount' => 3,
       'ScriptBytes' => 170500,
       'StylesheetCount' => 5,
-      'StylesheetBytes' => 86650,
+      'StylesheetBytes' => 85600,
     ];
     $this->assertMetrics($expected, $performance_data);
   }
@@ -71,7 +71,7 @@ public function testFrontAndRecipesPagesEditor(): void {
       'ScriptCount' => 5,
       'ScriptBytes' => 338200,
       'StylesheetCount' => 5,
-      'StylesheetBytes' => 206750,
+      'StylesheetBytes' => 205700,
     ];
     $this->assertMetrics($expected, $performance_data);
   }

core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php

@@ -275,7 +275,7 @@ protected function testAnonymous(): void {
         ['config:user.role.anonymous'],
       ],
       'StylesheetCount' => 1,
-      'StylesheetBytes' => 2100,
+      'StylesheetBytes' => 1750,
     ];
     $this->assertMetrics($expected, $performance_data);
 

core/themes/claro/claro.info.yml

@@ -123,6 +123,8 @@ libraries-extend:
     - claro/claro.tabledrag
   core/drupal.tableselect:
     - claro/tableselect
+  core/drupal.tablesort:
+    - claro/drupal.tablesort
   core/drupal.vertical-tabs:
     - claro/vertical-tabs
   file/drupal.file:

core/themes/claro/claro.libraries.yml

@@ -17,7 +17,6 @@ global-styling:
       css/classy/components/links.css: {}
       css/classy/components/menu.css: {}
       css/classy/components/more-link.css: {}
-      css/classy/components/tablesort.css: {}
       css/classy/components/textarea.css: {}
       css/classy/components/ui-dialog.css: {}
       css/components/accordion.css: {}
@@ -50,7 +49,6 @@ global-styling:
       css/components/tables.css: {}
       css/components/table--file-multiple-widget.css: {}
       css/components/search-admin-settings.css: {}
-      css/components/tablesort-indicator.css: {}
       css/components/tableselect.css: {}
       css/components/tabs.css: {}
     theme:
@@ -135,6 +133,13 @@ drupal.node.preview:
     theme:
       css/components/node-preview.css: {}
 
+drupal.tablesort:
+  version: VERSION
+  css:
+    component:
+      css/classy/components/tablesort.css: {}
+      css/components/tablesort-indicator.css: {}
+
 media-form:
   version: VERSION
   css:

core/themes/stable9/stable9.info.yml

@@ -94,6 +94,11 @@ libraries-override:
       component:
         misc/components/sticky-header.module.css: css/core/components/sticky-header.module.css
 
+  core/drupal.tablesort:
+    css:
+      component:
+        misc/components/tablesort.module.css: css/core/components/tablesort.module.css
+
   core/drupal.vertical-tabs:
     css:
       component:
@@ -238,7 +243,6 @@ libraries-override:
         css/components/nowrap.module.css: css/system/components/nowrap.module.css
         css/components/position-container.module.css: css/system/components/position-container.module.css
         css/components/reset-appearance.module.css: css/system/components/reset-appearance.module.css
-        css/components/tablesort.module.css: css/system/components/tablesort.module.css
   system/admin:
     css:
       theme:

core/themes/starterkit_theme/starterkit_theme.info.yml

@@ -18,3 +18,5 @@ libraries-extend:
     - starterkit_theme/file
   core/drupal.progress:
     - starterkit_theme/progress
+  core/drupal.tablesort:
+    - starterkit_theme/drupal.tablesort

core/themes/starterkit_theme/starterkit_theme.libraries.yml

@@ -38,8 +38,6 @@ base:
         weight: -10
       css/components/tableselect.css:
         weight: -10
-      css/components/tablesort.css:
-        weight: -10
       css/components/tabs.css:
         weight: -10
       css/components/textarea.css:
@@ -92,6 +90,14 @@ progress:
     component:
       css/components/progress.css:
         weight: -10
+
+drupal.tablesort:
+  version: VERSION
+  css:
+    component:
+      css/components/tablesort.css:
+        weight: -10
+
 search-results:
   version: VERSION
   css: