From 92b396c7b401fc91b4060f815fdcddb9fcf53199 Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Tue, 14 Apr 2026 15:27:59 +0300
Subject: [PATCH 01/11] =?UTF-8?q?Bump=20version=20=E2=80=94>=20`2.0.0-SNAP?=
 =?UTF-8?q?SHOT.82`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dependencies.md    | 48 +++++++++++++++++++++++-----------------------
 pom.xml            |  4 ++--
 version.gradle.kts |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/dependencies.md b/dependencies.md
index 64836e57..738e0854 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -1,6 +1,6 @@
 
 
-# Dependencies of `io.spine.chords:spine-chords-client:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-client:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : cafe.adriel.voyager. **Name** : voyager-core. **Version** : 1.0.1.**No license information found**
@@ -121,7 +121,7 @@
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -244,7 +244,7 @@
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -774,7 +774,7 @@
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -1020,7 +1020,7 @@
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -1094,12 +1094,12 @@
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:25 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 12:03:18 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-codegen-tests:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-codegen-tests:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4.
@@ -1953,12 +1953,12 @@ This report was generated on **Mon May 19 05:01:25 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 12:03:18 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-core:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-core:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : cafe.adriel.voyager. **Name** : voyager-core. **Version** : 1.0.1.
@@ -2036,7 +2036,7 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -2158,7 +2158,7 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -2663,7 +2663,7 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -2908,7 +2908,7 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -2982,12 +2982,12 @@ This report was generated on **Mon May 19 05:01:27 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 12:03:19 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-proto:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-proto:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : cafe.adriel.voyager. **Name** : voyager-core. **Version** : 1.0.1.**No license information found**
@@ -3076,7 +3076,7 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -3195,7 +3195,7 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -3694,7 +3694,7 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-windows-x64. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.desktop. **Name** : desktop-jvm-macos-x64. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.foundation. **Name** : foundation-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -3936,7 +3936,7 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-windows-x64. **Version** : 0.7.85.4.
+1.  **Group** : org.jetbrains.skiko. **Name** : skiko-awt-runtime-macos-x64. **Version** : 0.7.85.4.
      * **Project URL:** [https://www.github.com/JetBrains/skiko](https://www.github.com/JetBrains/skiko)
      * **License:** [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -4010,12 +4010,12 @@ This report was generated on **Mon May 19 05:01:30 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:33 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 12:03:20 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-proto-values:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-proto-values:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -4809,12 +4809,12 @@ This report was generated on **Mon May 19 05:01:33 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:35 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 12:03:21 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.chords:spine-chords-runtime:2.0.0-SNAPSHOT.81`
+# Dependencies of `io.spine.chords:spine-chords-runtime:2.0.0-SNAPSHOT.82`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -5578,4 +5578,4 @@ This report was generated on **Mon May 19 05:01:35 EEST 2025** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Mon May 19 05:01:37 EEST 2025** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
+This report was generated on **Tue Apr 14 12:03:21 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7522c9e2..9050a753 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
  -->
 <groupId>io.spine.chords</groupId>
 <artifactId>Chords</artifactId>
-<version>2.0.0-SNAPSHOT.81</version>
+<version>2.0.0-SNAPSHOT.82</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -79,7 +79,7 @@ all modules and does not describe the project structure per-subproject.
   </dependency>
   <dependency>
     <groupId>org.jetbrains.compose.desktop</groupId>
-    <artifactId>desktop-jvm-windows-x64</artifactId>
+    <artifactId>desktop-jvm-macos-x64</artifactId>
     <version>1.5.12</version>
     <scope>compile</scope>
   </dependency>
diff --git a/version.gradle.kts b/version.gradle.kts
index 84c69ec7..d5e36a8b 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -27,4 +27,4 @@
 /**
  * The version of all Chords libraries.
  */
-val chordsVersion: String by extra("2.0.0-SNAPSHOT.81")
+val chordsVersion: String by extra("2.0.0-SNAPSHOT.82")

From 0db8a5c48f7415e3e8783b60acb5c28c57e36030 Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Tue, 14 Apr 2026 17:26:54 +0300
Subject: [PATCH 02/11] Support sorting.

---
 .idea/inspectionProfiles/Project_Default.xml  |   7 +
 core/build.gradle.kts                         |   1 +
 .../io/spine/chords/core/table/Table.kt       | 320 +++++++++++++++++-
 dependencies.md                               |  42 ++-
 pom.xml                                       |   6 +
 5 files changed, 364 insertions(+), 12 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 6ddfcc9d..21599fcb 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -340,6 +340,7 @@
     <inspection_tool class="JDBCExecuteWithNonConstantString" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JDBCPrepareStatementWithNonConstantString" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JUnit5Converter" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="JavaCollectionWithNullableTypeArgument" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="TOP_LEVEL_CLASS_OPTIONS">
         <value>
@@ -500,6 +501,12 @@
     <inspection_tool class="ModuleWithTooManyClasses" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="limit" value="100" />
     </inspection_tool>
+    <inspection_tool class="MultiplatformPreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="MultiplatformPreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="MultipleDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreForLoopDeclarations" value="true" />
     </inspection_tool>
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 47a649c4..37f7094d 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -37,6 +37,7 @@ dependencies {
     api(Voyager.navigator)
     implementation(Kotlin.reflect)
     implementation(compose.desktop.currentOs)
+    implementation(compose.materialIconsExtended)
     implementation(Material3.Desktop.lib)
     testImplementation(Kotest.runnerJUnit5)
 }
diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index 21d042ec..7bbae8eb 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, TeamDev. All rights reserved.
+ * Copyright 2026, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,8 @@ import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDownward
+import androidx.compose.material.icons.filled.ArrowUpward
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.Divider
 import androidx.compose.material3.DropdownMenu
@@ -84,6 +86,66 @@ import io.spine.chords.core.Component
  * Users can customize row behavior and style, specify column
  * configurations for displaying the data, and visual appearance of a table.
  *
+ * Example:
+ * ```kotlin
+ * class UsersTable : Table<User>() {
+ *
+ *     init {
+ *         sortingEnabled = false
+ *         columns = listOf(
+ *             TableColumn(name = "Name") { user ->
+ *                 Text(user.name)
+ *             },
+ *             TableColumn(name = "Email") { user ->
+ *                 Text(user.email)
+ *             }
+ *         )
+ *     }
+ *
+ *     override fun extractEntityId(entity: User): Any = entity.id
+ *
+ *     @Composable
+ *     override fun ColumnScope.EmptyTableContent() {
+ *         Text("No users")
+ *     }
+ * }
+ * ```
+ *
+ * Example with sorting:
+ * ```kotlin
+ * class UsersTable : Table<User>() {
+ *
+ *     init {
+ *         sortingEnabled = true
+ *         sortBy = compareBy(User::name)
+ *         columns = listOf(
+ *             TableColumn(
+ *                 name = "Name",
+ *                 sorting = TableColumnSorting(compareBy(User::name))
+ *             ) { user ->
+ *                 Text(user.name)
+ *             },
+ *             TableColumn(
+ *                 name = "Created",
+ *                 sorting = TableColumnSorting(
+ *                     comparator = compareBy(User::createdAt),
+ *                     initialDirection = TableSortDirection.Descending
+ *                 )
+ *             ) { user ->
+ *                 Text(user.createdAt.toString())
+ *             }
+ *         )
+ *     }
+ *
+ *     override fun extractEntityId(entity: User): Any = entity.id
+ *
+ *     @Composable
+ *     override fun ColumnScope.EmptyTableContent() {
+ *         Text("No users")
+ *     }
+ * }
+ * ```
+ *
  * @param E The type of entities represented in the table.
  */
 public abstract class Table<E> : Component() {
@@ -132,12 +194,33 @@ public abstract class Table<E> : Component() {
     protected var rowActions: RowActionsConfig<E>? by mutableStateOf(null)
 
     /**
-     * Defines the sorting logic for the entities displayed in the table.
+     * Defines the default sorting logic for the entities displayed in the table.
+     *
+     * This comparator is applied when [sortingEnabled] is `true` and the user
+     * has not selected a sortable header.
      *
      * By default, entities are displayed in their original order.
      */
     protected var sortBy: Comparator<E> by mutableStateOf(Comparator { _, _ -> 0 })
 
+    /**
+     * Enables or disables automatic sorting for table content.
+     *
+     * When enabled, the table applies [sortBy] by default and may switch to a column-specific
+     * comparator when the user clicks a sortable header.
+     *
+     * When disabled, entities are rendered in the original order from [entities].
+     */
+    protected var sortingEnabled: Boolean by mutableStateOf(true)
+
+    /**
+     * Stores the current interactive sorting state for the table.
+     *
+     * The state is separated into a dedicated object so that sorting rules and UI interactions
+     * remain encapsulated and reusable.
+     */
+    protected var sortingState: TableSortingState<E> by mutableStateOf(TableSortingState())
+
     /**
      * The padding applied to the entire content of the table.
      */
@@ -184,7 +267,7 @@ public abstract class Table<E> : Component() {
 
     @Composable
     override fun content() {
-        val sortedEntities = entities.sortedWith(sortBy)
+        val displayedEntities = displayedEntities()
         val tableColumns = columns.toMutableList()
         if (rowActions != null) {
             tableColumns.add(rowActionsColumn(rowActions!!))
@@ -194,15 +277,31 @@ public abstract class Table<E> : Component() {
                 .padding(contentPadding),
             verticalArrangement = Center,
         ) {
-            HeaderTableRow(tableColumns)
+            HeaderTableRow(
+                columns = tableColumns,
+                sortingEnabled = sortingEnabled,
+                sortingState = sortingState
+            )
             if (entities.isNotEmpty()) {
-                ContentList(sortedEntities, tableColumns)
+                ContentList(displayedEntities, tableColumns)
             } else {
                 EmptyContentList()
             }
         }
     }
 
+    /**
+     * Resolves the list of entities to render according to the current sorting configuration.
+     *
+     * @return The list of entities in the order that should be displayed.
+     */
+    private fun displayedEntities(): List<E> {
+        if (!sortingEnabled) {
+            return entities
+        }
+        return entities.sortedWith(sortingState.activeComparator(sortBy))
+    }
+
     /**
      * Displays the table content without a header.
      *
@@ -285,6 +384,10 @@ public abstract class Table<E> : Component() {
  *   meaning that if all columns have this `weight` value, their width is equal.
  * @param padding The padding values of each cell's content in this column.
  *   By default, no padding is applied.
+ * @param key A stable identifier of the column used to keep track of the sorting state.
+ *   By default, the column [name] is used.
+ * @param sorting Optional sorting configuration for this column.
+ *   If `null`, the header is rendered without interactive sorting support.
  * @param cellContent A callback that specifies what element to display
  *   inside each cell of this column.
  */
@@ -293,9 +396,151 @@ public data class TableColumn<E>(
     val horizontalArrangement: Horizontal = Center,
     val weight: Float = 1F,
     val padding: PaddingValues = PaddingValues(),
+    val key: Any = name,
+    val sorting: TableColumnSorting<E>? = null,
     val cellContent: @Composable (E) -> Unit
 )
 
+/**
+ * Defines sorting rules for a table column.
+ *
+ * @param comparator The comparator used as the base sorting logic for this column.
+ * @param initialDirection The direction applied the first time the column is activated.
+ */
+public data class TableColumnSorting<E>(
+    val comparator: Comparator<E>,
+    val initialDirection: TableSortDirection = TableSortDirection.Ascending
+)
+
+/**
+ * Sorting direction used by the table.
+ */
+public enum class TableSortDirection {
+
+    /**
+     * Sorts values from lower to higher according to the column comparator.
+     */
+    Ascending,
+
+    /**
+     * Sorts values from higher to lower according to the column comparator.
+     */
+    Descending;
+
+    /**
+     * Returns the opposite sorting direction.
+     *
+     * @return The reversed sorting direction.
+     */
+    public fun reverse(): TableSortDirection {
+        return when (this) {
+            Ascending -> Descending
+            Descending -> Ascending
+        }
+    }
+
+    /**
+     * Applies this direction to the given comparator.
+     *
+     * @param comparator The comparator to adjust.
+     * @return The original comparator for [Ascending] or the reversed comparator
+     *   for [Descending].
+     */
+    internal fun applyTo(comparator: Comparator<Any?>): Comparator<Any?> {
+        return when (this) {
+            Ascending -> comparator
+            Descending -> comparator.reversed()
+        }
+    }
+}
+
+/**
+ * A concrete sorting selection currently applied to the table.
+ *
+ * @param columnKey The key of the active column.
+ * @param direction The selected sorting direction.
+ * @param sorting The sorting definition associated with the column.
+ */
+public data class TableSorting<E>(
+    val columnKey: Any,
+    val direction: TableSortDirection,
+    val sorting: TableColumnSorting<E>
+) {
+    /**
+     * Produces a comparator for the current column and direction.
+     *
+     * @return The comparator that should be applied to table entities.
+     */
+    internal fun comparator(): Comparator<E> {
+        @Suppress("UNCHECKED_CAST")
+        return direction.applyTo(sorting.comparator as Comparator<Any?>) as Comparator<E>
+    }
+}
+
+/**
+ * Holds interactive sorting state for a [Table].
+ *
+ * This class encapsulates sorting transitions so that the table component stays focused on
+ * rendering, while sorting decisions remain centralized in one object.
+ *
+ * @param initialSort The initial sort selection, if any.
+ */
+public class TableSortingState<E>(
+    initialSort: TableSorting<E>? = null
+) {
+
+    /**
+     * The currently active sort selection.
+     */
+    public var activeSort: TableSorting<E>? by mutableStateOf(initialSort)
+        private set
+
+    /**
+     * Applies sorting for the given column or toggles the direction if the column is already active.
+     *
+     * If the column is not sortable, the state remains unchanged.
+     */
+    public fun toggle(column: TableColumn<E>) {
+        val columnSorting = column.sorting ?: return
+        val nextDirection = if (activeSort?.columnKey == column.key) {
+            activeSort!!.direction.reverse()
+        } else {
+            columnSorting.initialDirection
+        }
+        activeSort = TableSorting(column.key, nextDirection, columnSorting)
+    }
+
+    /**
+     * Returns `true` when the given column is the current sorting target.
+     *
+     * @param column The column to check.
+     * @return `true` if the column is active; otherwise `false`.
+     */
+    public fun isActive(column: TableColumn<E>): Boolean {
+        return activeSort?.columnKey == column.key
+    }
+
+    /**
+     * Returns the current sorting direction for the given column.
+     *
+     * @param column The column whose direction should be resolved.
+     * @return The active direction for the column, or `null` if the column is not active.
+     */
+    internal fun directionFor(column: TableColumn<E>): TableSortDirection? {
+        return activeSort?.takeIf { it.columnKey == column.key }?.direction
+    }
+
+    /**
+     * Returns the comparator that should currently be applied to table entities.
+     *
+     * @param fallback The default comparator to use when no interactive sort is active.
+     * @return The active column comparator or the fallback comparator.
+     */
+    internal fun activeComparator(fallback: Comparator<E>): Comparator<E> {
+        return activeSort?.comparator() ?: fallback
+    }
+}
+
 /**
  * Configuration object for row actions in a table.
  *
@@ -377,16 +622,75 @@ private fun VerticalScrollBar(
  *
  * @param columns A list of column configuration objects
  *   with information about headers.
+ * @param sortingEnabled Whether header-driven sorting is enabled.
+ * @param sortingState The current interactive sorting state of the table.
  */
 @Composable
 private fun <E> HeaderTableRow(
     columns: List<TableColumn<E>>,
+    sortingEnabled: Boolean,
+    sortingState: TableSortingState<E>,
 ) {
-    TableRow(columns = columns) { column ->
+    TableRow(
+        columns = columns,
+        cellModifier = { column ->
+            if (sortingEnabled && column.sorting != null) {
+                Modifier.clickable(
+                    interactionSource = MutableInteractionSource(),
+                    indication = null,
+                ) {
+                    sortingState.toggle(column)
+                }
+            } else {
+                Modifier
+            }
+        }
+    ) { column ->
+        HeaderCell(
+            column = column,
+            sortingEnabled = sortingEnabled,
+            sortingState = sortingState
+        )
+    }
+}
+
+/**
+ * Displays a single table header cell.
+ *
+ * @param column The column whose header content should be displayed.
+ * @param sortingEnabled Whether sorting indicators should be shown.
+ * @param sortingState The current interactive sorting state of the table.
+ */
+@Composable
+private fun <E> HeaderCell(
+    column: TableColumn<E>,
+    sortingEnabled: Boolean,
+    sortingState: TableSortingState<E>
+) {
+    Row(
+        horizontalArrangement = column.horizontalArrangement,
+        verticalAlignment = CenterVertically
+    ) {
         Text(
             text = column.name,
             style = typography.titleMedium
         )
+        val direction = if (sortingEnabled) {
+            sortingState.directionFor(column)
+        } else {
+            null
+        }
+        if (direction != null) {
+            Icon(
+                imageVector = when (direction) {
+                    TableSortDirection.Ascending -> Icons.Default.ArrowUpward
+                    TableSortDirection.Descending -> Icons.Default.ArrowDownward
+                },
+                contentDescription = null,
+                modifier = Modifier.padding(start = 4.dp).size(18.dp),
+                tint = colorScheme.onSurfaceVariant
+            )
+        }
     }
 }
 
@@ -421,6 +725,8 @@ private fun <E> ContentTableRow(
  *
  * @param columns A list of columns from which the row consists.
  * @param modifier The [Modifier] to be applied to this row.
+ * @param cellModifier A callback that provides an additional [Modifier]
+ *   for each individual cell.
  * @param cellContent A callback that specifies what element to display
  *   inside each cell of this column.
  */
@@ -428,6 +734,7 @@ private fun <E> ContentTableRow(
 private fun <E> TableRow(
     columns: List<TableColumn<E>>,
     modifier: Modifier = Modifier,
+    cellModifier: (TableColumn<E>) -> Modifier = { Modifier },
     cellContent: @Composable (TableColumn<E>) -> Unit
 ) {
     Row(
@@ -444,6 +751,7 @@ private fun <E> TableRow(
                 modifier = Modifier
                     .weight(column.weight)
                     .fillMaxHeight()
+                    .then(cellModifier(column))
                     .padding(column.padding),
                 horizontalArrangement = column.horizontalArrangement,
                 verticalAlignment = CenterVertically
diff --git a/dependencies.md b/dependencies.md
index 738e0854..177ebd26 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -142,6 +142,11 @@
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -795,6 +800,11 @@
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -1094,7 +1104,7 @@
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Tue Apr 14 12:03:18 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:11 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -1953,7 +1963,7 @@ This report was generated on **Tue Apr 14 12:03:18 EEST 2026** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Tue Apr 14 12:03:18 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:13 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -2057,6 +2067,11 @@ This report was generated on **Tue Apr 14 12:03:18 EEST 2026** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -2684,6 +2699,11 @@ This report was generated on **Tue Apr 14 12:03:18 EEST 2026** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -2982,7 +3002,7 @@ This report was generated on **Tue Apr 14 12:03:18 EEST 2026** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Tue Apr 14 12:03:19 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:14 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -3097,6 +3117,11 @@ This report was generated on **Tue Apr 14 12:03:19 EEST 2026** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -3715,6 +3740,11 @@ This report was generated on **Tue Apr 14 12:03:19 EEST 2026** using [Gradle-Lic
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
      * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended. **Version** : 1.5.12.**No license information found**
+1.  **Group** : org.jetbrains.compose.material. **Name** : material-icons-extended-desktop. **Version** : 1.5.12.
+     * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
+     * **License:** [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple. **Version** : 1.5.12.**No license information found**
 1.  **Group** : org.jetbrains.compose.material. **Name** : material-ripple-desktop. **Version** : 1.5.12.
      * **Project URL:** [https://github.com/JetBrains/compose-jb](https://github.com/JetBrains/compose-jb)
@@ -4010,7 +4040,7 @@ This report was generated on **Tue Apr 14 12:03:19 EEST 2026** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Tue Apr 14 12:03:20 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:15 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -4809,7 +4839,7 @@ This report was generated on **Tue Apr 14 12:03:20 EEST 2026** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Tue Apr 14 12:03:21 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Tue Apr 14 15:50:16 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
@@ -5578,4 +5608,4 @@ This report was generated on **Tue Apr 14 12:03:21 EEST 2026** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Tue Apr 14 12:03:21 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
+This report was generated on **Tue Apr 14 15:50:17 EEST 2026** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9050a753..0e5d1594 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,12 @@ all modules and does not describe the project structure per-subproject.
     <version>1.5.12</version>
     <scope>compile</scope>
   </dependency>
+  <dependency>
+    <groupId>org.jetbrains.compose.material</groupId>
+    <artifactId>material-icons-extended</artifactId>
+    <version>1.5.12</version>
+    <scope>compile</scope>
+  </dependency>
   <dependency>
     <groupId>org.jetbrains.compose.material3</groupId>
     <artifactId>material3-desktop</artifactId>

From 31fc1bc6fd23de0f584d731fa16a918b6e3fb9aa Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Tue, 14 Apr 2026 17:42:50 +0300
Subject: [PATCH 03/11] Support table sorting.

---
 .../io/spine/chords/core/table/Table.kt       | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index 7bbae8eb..f7ae3316 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -54,9 +54,10 @@ import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowDownward
-import androidx.compose.material.icons.filled.ArrowUpward
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.filled.ArrowDropUp
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.UnfoldMore
 import androidx.compose.material3.Divider
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -70,11 +71,14 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Alignment.Companion.CenterEnd
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.PointerIcon.Companion.Hand
+import androidx.compose.ui.input.pointer.pointerHoverIcon
 import androidx.compose.ui.unit.dp
 import io.spine.chords.core.Component
 
@@ -626,6 +630,7 @@ private fun VerticalScrollBar(
  * @param sortingState The current interactive sorting state of the table.
  */
 @Composable
+@OptIn(ExperimentalComposeUiApi::class)
 private fun <E> HeaderTableRow(
     columns: List<TableColumn<E>>,
     sortingEnabled: Boolean,
@@ -635,12 +640,14 @@ private fun <E> HeaderTableRow(
         columns = columns,
         cellModifier = { column ->
             if (sortingEnabled && column.sorting != null) {
-                Modifier.clickable(
-                    interactionSource = MutableInteractionSource(),
-                    indication = null,
-                ) {
-                    sortingState.toggle(column)
-                }
+                Modifier
+                    .pointerHoverIcon(Hand)
+                    .clickable(
+                        interactionSource = MutableInteractionSource(),
+                        indication = null,
+                    ) {
+                        sortingState.toggle(column)
+                    }
             } else {
                 Modifier
             }
@@ -667,6 +674,7 @@ private fun <E> HeaderCell(
     sortingEnabled: Boolean,
     sortingState: TableSortingState<E>
 ) {
+    val isSortable = sortingEnabled && column.sorting != null
     Row(
         horizontalArrangement = column.horizontalArrangement,
         verticalAlignment = CenterVertically
@@ -675,16 +683,17 @@ private fun <E> HeaderCell(
             text = column.name,
             style = typography.titleMedium
         )
-        val direction = if (sortingEnabled) {
+        val direction = if (isSortable) {
             sortingState.directionFor(column)
         } else {
             null
         }
-        if (direction != null) {
+        if (isSortable) {
             Icon(
                 imageVector = when (direction) {
-                    TableSortDirection.Ascending -> Icons.Default.ArrowUpward
-                    TableSortDirection.Descending -> Icons.Default.ArrowDownward
+                    TableSortDirection.Ascending -> Icons.Default.ArrowDropUp
+                    TableSortDirection.Descending -> Icons.Default.ArrowDropDown
+                    null -> Icons.Default.UnfoldMore
                 },
                 contentDescription = null,
                 modifier = Modifier.padding(start = 4.dp).size(18.dp),

From 67344501e41622df4f9a2bbdd888117c9d278512 Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Tue, 14 Apr 2026 22:12:45 +0300
Subject: [PATCH 04/11] Update docs.

---
 .../io/spine/chords/core/table/Table.kt       | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index f7ae3316..f66f1843 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -81,6 +81,8 @@ import androidx.compose.ui.input.pointer.PointerIcon.Companion.Hand
 import androidx.compose.ui.input.pointer.pointerHoverIcon
 import androidx.compose.ui.unit.dp
 import io.spine.chords.core.Component
+import io.spine.chords.core.table.TableSortingDirection.ASCENDING
+import io.spine.chords.core.table.TableSortingDirection.DESCENDING
 
 /**
  * A list of entities in a tabular format.
@@ -208,7 +210,7 @@ public abstract class Table<E> : Component() {
     protected var sortBy: Comparator<E> by mutableStateOf(Comparator { _, _ -> 0 })
 
     /**
-     * Enables or disables automatic sorting for table content.
+     * Enables or disables sorting for table content.
      *
      * When enabled, the table applies [sortBy] by default and may switch to a column-specific
      * comparator when the user clicks a sortable header.
@@ -295,7 +297,7 @@ public abstract class Table<E> : Component() {
     }
 
     /**
-     * Resolves the list of entities to render according to the current sorting configuration.
+     * Resolves the list of entities to render, according to the current sorting configuration.
      *
      * @return The list of entities in the order that should be displayed.
      */
@@ -388,7 +390,7 @@ public abstract class Table<E> : Component() {
  *   meaning that if all columns have this `weight` value, their width is equal.
  * @param padding The padding values of each cell's content in this column.
  *   By default, no padding is applied.
- * @param key A stable identifier of the column used to keep track of the sorting state.
+ * @param columnKey A stable identifier of the column used to keep track of the sorting state.
  *   By default, the column [name] is used.
  * @param sorting Optional sorting configuration for this column.
  *   If `null`, the header is rendered without interactive sorting support.
@@ -400,7 +402,7 @@ public data class TableColumn<E>(
     val horizontalArrangement: Horizontal = Center,
     val weight: Float = 1F,
     val padding: PaddingValues = PaddingValues(),
-    val key: Any = name,
+    val columnKey: Any = name,
     val sorting: TableColumnSorting<E>? = null,
     val cellContent: @Composable (E) -> Unit
 )
@@ -413,33 +415,33 @@ public data class TableColumn<E>(
  */
 public data class TableColumnSorting<E>(
     val comparator: Comparator<E>,
-    val initialDirection: TableSortDirection = TableSortDirection.Ascending
+    val initialDirection: TableSortingDirection = ASCENDING
 )
 
 /**
  * Sorting direction used by the table.
  */
-public enum class TableSortDirection {
+public enum class TableSortingDirection {
 
     /**
      * Sorts values from lower to higher according to the column comparator.
      */
-    Ascending,
+    ASCENDING,
 
     /**
      * Sorts values from higher to lower according to the column comparator.
      */
-    Descending;
+    DESCENDING;
 
     /**
      * Returns the opposite sorting direction.
      *
      * @return The reversed sorting direction.
      */
-    public fun reverse(): TableSortDirection {
+    public fun reverse(): TableSortingDirection {
         return when (this) {
-            Ascending -> Descending
-            Descending -> Ascending
+            ASCENDING -> DESCENDING
+            DESCENDING -> ASCENDING
         }
     }
 
@@ -447,13 +449,13 @@ public enum class TableSortDirection {
      * Applies this direction to the given comparator.
      *
      * @param comparator The comparator to adjust.
-     * @return The original comparator for [Ascending] or the reversed comparator
-     *   for [Descending].
+     * @return The original comparator for [ASCENDING] or the reversed comparator
+     *   for [DESCENDING].
      */
     internal fun applyTo(comparator: Comparator<Any?>): Comparator<Any?> {
         return when (this) {
-            Ascending -> comparator
-            Descending -> comparator.reversed()
+            ASCENDING -> comparator
+            DESCENDING -> comparator.reversed()
         }
     }
 }
@@ -467,7 +469,7 @@ public enum class TableSortDirection {
  */
 public data class TableSorting<E>(
     val columnKey: Any,
-    val direction: TableSortDirection,
+    val direction: TableSortingDirection,
     val sorting: TableColumnSorting<E>
 ) {
     /**
@@ -487,31 +489,31 @@ public data class TableSorting<E>(
  * This class encapsulates sorting transitions so that the table component stays focused on
  * rendering, while sorting decisions remain centralized in one object.
  *
- * @param initialSort The initial sort selection, if any.
+ * @param initialSorting The initial sorting state, if any.
  */
 public class TableSortingState<E>(
-    initialSort: TableSorting<E>? = null
+    initialSorting: TableSorting<E>? = null
 ) {
 
     /**
-     * The currently active sort selection.
+     * The currently active sorting state.
      */
-    public var activeSort: TableSorting<E>? by mutableStateOf(initialSort)
+    public var currentSorting: TableSorting<E>? by mutableStateOf(initialSorting)
         private set
 
     /**
-     * Applies sorting for the given column or toggles the direction if the column is already active.
+     * Applies sorting for the given column or toggles the direction if the column is already sorted.
      *
      * If the column is not sortable, the state remains unchanged.
      */
     public fun toggle(column: TableColumn<E>) {
         val columnSorting = column.sorting ?: return
-        val nextDirection = if (activeSort?.columnKey == column.key) {
-            activeSort!!.direction.reverse()
+        val nextDirection = if (currentSorting?.columnKey == column.columnKey) {
+            currentSorting!!.direction.reverse()
         } else {
             columnSorting.initialDirection
         }
-        activeSort = TableSorting(column.key, nextDirection, columnSorting)
+        currentSorting = TableSorting(column.columnKey, nextDirection, columnSorting)
     }
 
     /**
@@ -521,7 +523,7 @@ public class TableSortingState<E>(
      * @return `true` if the column is active; otherwise `false`.
      */
     public fun isActive(column: TableColumn<E>): Boolean {
-        return activeSort?.columnKey == column.key
+        return currentSorting?.columnKey == column.columnKey
     }
 
     /**
@@ -530,8 +532,8 @@ public class TableSortingState<E>(
      * @param column The column whose direction should be resolved.
      * @return The active direction for the column, or `null` if the column is not active.
      */
-    internal fun directionFor(column: TableColumn<E>): TableSortDirection? {
-        return activeSort?.takeIf { it.columnKey == column.key }?.direction
+    internal fun directionFor(column: TableColumn<E>): TableSortingDirection? {
+        return currentSorting?.takeIf { it.columnKey == column.columnKey }?.direction
     }
 
     /**
@@ -541,7 +543,7 @@ public class TableSortingState<E>(
      * @return The active column comparator or the fallback comparator.
      */
     internal fun activeComparator(fallback: Comparator<E>): Comparator<E> {
-        return activeSort?.comparator() ?: fallback
+        return currentSorting?.comparator() ?: fallback
     }
 }
 
@@ -691,8 +693,8 @@ private fun <E> HeaderCell(
         if (isSortable) {
             Icon(
                 imageVector = when (direction) {
-                    TableSortDirection.Ascending -> Icons.Default.ArrowDropUp
-                    TableSortDirection.Descending -> Icons.Default.ArrowDropDown
+                    ASCENDING -> Icons.Default.ArrowDropUp
+                    DESCENDING -> Icons.Default.ArrowDropDown
                     null -> Icons.Default.UnfoldMore
                 },
                 contentDescription = null,

From 38b873817345d7798c37bfe586d9abe724dc1537 Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Tue, 14 Apr 2026 22:24:09 +0300
Subject: [PATCH 05/11] Update table header hover behaviour.

---
 .../main/kotlin/io/spine/chords/core/table/Table.kt   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index f66f1843..04566f37 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -78,6 +78,9 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.PointerIcon.Companion.Hand
+import androidx.compose.ui.input.pointer.PointerEventType.Companion.Enter
+import androidx.compose.ui.input.pointer.PointerEventType.Companion.Exit
+import androidx.compose.ui.input.pointer.onPointerEvent
 import androidx.compose.ui.input.pointer.pointerHoverIcon
 import androidx.compose.ui.unit.dp
 import io.spine.chords.core.Component
@@ -671,13 +674,19 @@ private fun <E> HeaderTableRow(
  * @param sortingState The current interactive sorting state of the table.
  */
 @Composable
+@OptIn(ExperimentalComposeUiApi::class)
 private fun <E> HeaderCell(
     column: TableColumn<E>,
     sortingEnabled: Boolean,
     sortingState: TableSortingState<E>
 ) {
     val isSortable = sortingEnabled && column.sorting != null
+    var isHovered by remember { mutableStateOf(false) }
     Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .onPointerEvent(Enter) { isHovered = true }
+            .onPointerEvent(Exit) { isHovered = false },
         horizontalArrangement = column.horizontalArrangement,
         verticalAlignment = CenterVertically
     ) {
@@ -690,7 +699,7 @@ private fun <E> HeaderCell(
         } else {
             null
         }
-        if (isSortable) {
+        if (isSortable && (direction != null || isHovered)) {
             Icon(
                 imageVector = when (direction) {
                     ASCENDING -> Icons.Default.ArrowDropUp

From a35807f45d8c1b1de682214d1f8ca252eff068cb Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Tue, 14 Apr 2026 22:33:00 +0300
Subject: [PATCH 06/11] Update table header hover behaviour.

---
 core/src/main/kotlin/io/spine/chords/core/table/Table.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index 04566f37..8c49f8d4 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -76,6 +76,7 @@ import androidx.compose.ui.Alignment.Companion.CenterEnd
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.PointerIcon.Companion.Hand
 import androidx.compose.ui.input.pointer.PointerEventType.Companion.Enter
@@ -699,7 +700,7 @@ private fun <E> HeaderCell(
         } else {
             null
         }
-        if (isSortable && (direction != null || isHovered)) {
+        if (isSortable) {
             Icon(
                 imageVector = when (direction) {
                     ASCENDING -> Icons.Default.ArrowDropUp
@@ -707,7 +708,10 @@ private fun <E> HeaderCell(
                     null -> Icons.Default.UnfoldMore
                 },
                 contentDescription = null,
-                modifier = Modifier.padding(start = 4.dp).size(18.dp),
+                modifier = Modifier
+                    .padding(start = 4.dp)
+                    .size(18.dp)
+                    .alpha(if (direction != null || isHovered) 1f else 0f),
                 tint = colorScheme.onSurfaceVariant
             )
         }

From b6eac47e5fbdc7da51e7d5be483f03e501b3549d Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Tue, 14 Apr 2026 23:10:21 +0300
Subject: [PATCH 07/11] Clean up code.

---
 core/src/main/kotlin/io/spine/chords/core/table/Table.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index 8c49f8d4..b4ced48c 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -277,7 +277,7 @@ public abstract class Table<E> : Component() {
 
     @Composable
     override fun content() {
-        val displayedEntities = displayedEntities()
+        val sortedEntities = sortedEntities()
         val tableColumns = columns.toMutableList()
         if (rowActions != null) {
             tableColumns.add(rowActionsColumn(rowActions!!))
@@ -293,7 +293,7 @@ public abstract class Table<E> : Component() {
                 sortingState = sortingState
             )
             if (entities.isNotEmpty()) {
-                ContentList(displayedEntities, tableColumns)
+                ContentList(sortedEntities, tableColumns)
             } else {
                 EmptyContentList()
             }
@@ -303,9 +303,9 @@ public abstract class Table<E> : Component() {
     /**
      * Resolves the list of entities to render, according to the current sorting configuration.
      *
-     * @return The list of entities in the order that should be displayed.
+     * @return The list of entities in the order that should be rendered.
      */
-    private fun displayedEntities(): List<E> {
+    private fun sortedEntities(): List<E> {
         if (!sortingEnabled) {
             return entities
         }

From 9c4549351236a946a989795263f449134a06c886 Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Wed, 15 Apr 2026 12:35:23 +0300
Subject: [PATCH 08/11] Clean up code.

---
 .../io/spine/chords/core/table/Table.kt       | 45 +++++--------------
 1 file changed, 11 insertions(+), 34 deletions(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index b4ced48c..968c19cd 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -101,7 +101,7 @@ import io.spine.chords.core.table.TableSortingDirection.DESCENDING
  * class UsersTable : Table<User>() {
  *
  *     init {
- *         sortingEnabled = false
+ *         defaultComparator = compareBy(User::name)
  *         columns = listOf(
  *             TableColumn(name = "Name") { user ->
  *                 Text(user.name)
@@ -121,13 +121,11 @@ import io.spine.chords.core.table.TableSortingDirection.DESCENDING
  * }
  * ```
  *
- * Example with sorting:
+ * Example with column sorting:
  * ```kotlin
  * class UsersTable : Table<User>() {
  *
  *     init {
- *         sortingEnabled = true
- *         sortBy = compareBy(User::name)
  *         columns = listOf(
  *             TableColumn(
  *                 name = "Name",
@@ -175,9 +173,9 @@ public abstract class Table<E> : Component() {
     )
 
     /**
-     * A callback which is invoked whenever selected entity value is changed.
+     * A callback that is invoked whenever the selected entity value is changed.
      *
-     * The parameter of the lambda receives the new selected entity value.
+     * The parameter of the lambda receives the newly selected entity value.
      */
     public var onSelect: ((E) -> Unit)? = null
 
@@ -206,22 +204,10 @@ public abstract class Table<E> : Component() {
     /**
      * Defines the default sorting logic for the entities displayed in the table.
      *
-     * This comparator is applied when [sortingEnabled] is `true` and the user
-     * has not selected a sortable header.
-     *
-     * By default, entities are displayed in their original order.
+     * This comparator is applied when the user has not selected a sortable header,
+     * if one is available.
      */
-    protected var sortBy: Comparator<E> by mutableStateOf(Comparator { _, _ -> 0 })
-
-    /**
-     * Enables or disables sorting for table content.
-     *
-     * When enabled, the table applies [sortBy] by default and may switch to a column-specific
-     * comparator when the user clicks a sortable header.
-     *
-     * When disabled, entities are rendered in the original order from [entities].
-     */
-    protected var sortingEnabled: Boolean by mutableStateOf(true)
+    protected var defaultComparator: Comparator<E> by mutableStateOf(Comparator { _, _ -> 0 })
 
     /**
      * Stores the current interactive sorting state for the table.
@@ -256,7 +242,7 @@ public abstract class Table<E> : Component() {
      * ensuring that changes to mutable properties do not affect
      * entity identification.
      *
-     * The ID's equality is determined using structural equality operator (`==`).
+     * The ID's equality is determined to use structural equality operator (`==`).
      * Therefore, the returned identifier should be a type that supports
      * meaningful structural equality.
      *
@@ -289,7 +275,6 @@ public abstract class Table<E> : Component() {
         ) {
             HeaderTableRow(
                 columns = tableColumns,
-                sortingEnabled = sortingEnabled,
                 sortingState = sortingState
             )
             if (entities.isNotEmpty()) {
@@ -306,10 +291,7 @@ public abstract class Table<E> : Component() {
      * @return The list of entities in the order that should be rendered.
      */
     private fun sortedEntities(): List<E> {
-        if (!sortingEnabled) {
-            return entities
-        }
-        return entities.sortedWith(sortingState.activeComparator(sortBy))
+        return entities.sortedWith(sortingState.activeComparator(defaultComparator))
     }
 
     /**
@@ -632,20 +614,18 @@ private fun VerticalScrollBar(
  *
  * @param columns A list of column configuration objects
  *   with information about headers.
- * @param sortingEnabled Whether header-driven sorting is enabled.
  * @param sortingState The current interactive sorting state of the table.
  */
 @Composable
 @OptIn(ExperimentalComposeUiApi::class)
 private fun <E> HeaderTableRow(
     columns: List<TableColumn<E>>,
-    sortingEnabled: Boolean,
     sortingState: TableSortingState<E>,
 ) {
     TableRow(
         columns = columns,
         cellModifier = { column ->
-            if (sortingEnabled && column.sorting != null) {
+            if (column.sorting != null) {
                 Modifier
                     .pointerHoverIcon(Hand)
                     .clickable(
@@ -661,7 +641,6 @@ private fun <E> HeaderTableRow(
     ) { column ->
         HeaderCell(
             column = column,
-            sortingEnabled = sortingEnabled,
             sortingState = sortingState
         )
     }
@@ -671,17 +650,15 @@ private fun <E> HeaderTableRow(
  * Displays a single table header cell.
  *
  * @param column The column whose header content should be displayed.
- * @param sortingEnabled Whether sorting indicators should be shown.
  * @param sortingState The current interactive sorting state of the table.
  */
 @Composable
 @OptIn(ExperimentalComposeUiApi::class)
 private fun <E> HeaderCell(
     column: TableColumn<E>,
-    sortingEnabled: Boolean,
     sortingState: TableSortingState<E>
 ) {
-    val isSortable = sortingEnabled && column.sorting != null
+    val isSortable = column.sorting != null
     var isHovered by remember { mutableStateOf(false) }
     Row(
         modifier = Modifier

From 1c8a03d4b56a41e4b474c5a389a3506f02ab0d9b Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Wed, 15 Apr 2026 13:04:40 +0300
Subject: [PATCH 09/11] Review docs.

---
 .../io/spine/chords/core/table/Table.kt       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index 968c19cd..995c1c12 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -71,16 +71,16 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Alignment.Companion.CenterEnd
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.pointer.PointerIcon.Companion.Hand
 import androidx.compose.ui.input.pointer.PointerEventType.Companion.Enter
 import androidx.compose.ui.input.pointer.PointerEventType.Companion.Exit
+import androidx.compose.ui.input.pointer.PointerIcon.Companion.Hand
 import androidx.compose.ui.input.pointer.onPointerEvent
 import androidx.compose.ui.input.pointer.pointerHoverIcon
 import androidx.compose.ui.unit.dp
@@ -206,6 +206,8 @@ public abstract class Table<E> : Component() {
      *
      * This comparator is applied when the user has not selected a sortable header,
      * if one is available.
+     *
+     * By default, the entities are displayed in their original order.
      */
     protected var defaultComparator: Comparator<E> by mutableStateOf(Comparator { _, _ -> 0 })
 
@@ -242,7 +244,7 @@ public abstract class Table<E> : Component() {
      * ensuring that changes to mutable properties do not affect
      * entity identification.
      *
-     * The ID's equality is determined to use structural equality operator (`==`).
+     * The ID's equality is determined using structural equality operator (`==`).
      * Therefore, the returned identifier should be a type that supports
      * meaningful structural equality.
      *
@@ -438,7 +440,7 @@ public enum class TableSortingDirection {
      * @return The original comparator for [ASCENDING] or the reversed comparator
      *   for [DESCENDING].
      */
-    internal fun applyTo(comparator: Comparator<Any?>): Comparator<Any?> {
+    internal fun <T> applyTo(comparator: Comparator<T>): Comparator<T> {
         return when (this) {
             ASCENDING -> comparator
             DESCENDING -> comparator.reversed()
@@ -464,8 +466,7 @@ public data class TableSorting<E>(
      * @return The comparator that should be applied to table entities.
      */
     internal fun comparator(): Comparator<E> {
-        @Suppress("UNCHECKED_CAST")
-        return direction.applyTo(sorting.comparator as Comparator<Any?>) as Comparator<E>
+        return direction.applyTo(sorting.comparator)
     }
 }
 
@@ -616,8 +617,9 @@ private fun VerticalScrollBar(
  *   with information about headers.
  * @param sortingState The current interactive sorting state of the table.
  */
-@Composable
+// The Pointer Hover API is experimental in the current version of Compose (1.5.2).
 @OptIn(ExperimentalComposeUiApi::class)
+@Composable
 private fun <E> HeaderTableRow(
     columns: List<TableColumn<E>>,
     sortingState: TableSortingState<E>,
@@ -652,8 +654,9 @@ private fun <E> HeaderTableRow(
  * @param column The column whose header content should be displayed.
  * @param sortingState The current interactive sorting state of the table.
  */
-@Composable
+// The Pointer Hover API is experimental in the current version of Compose (1.5.2).
 @OptIn(ExperimentalComposeUiApi::class)
+@Composable
 private fun <E> HeaderCell(
     column: TableColumn<E>,
     sortingState: TableSortingState<E>

From ff2bb02adb82749de073ef7025c701b3180dc79d Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Wed, 15 Apr 2026 13:18:54 +0300
Subject: [PATCH 10/11] Review docs.

---
 core/src/main/kotlin/io/spine/chords/core/table/Table.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index 995c1c12..70cf3587 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -137,7 +137,7 @@ import io.spine.chords.core.table.TableSortingDirection.DESCENDING
  *                 name = "Created",
  *                 sorting = TableColumnSorting(
  *                     comparator = compareBy(User::createdAt),
- *                     initialDirection = TableSortDirection.Descending
+ *                     initialDirection = DESCENDING
  *                 )
  *             ) { user ->
  *                 Text(user.createdAt.toString())

From 70d630caaec5ae8f58c0dbdc8b1d90340afd6bb3 Mon Sep 17 00:00:00 2001
From: Oleg-Melnik <oleg.melnik@teamdev.com>
Date: Wed, 15 Apr 2026 13:53:51 +0300
Subject: [PATCH 11/11] Update docs.

---
 .../kotlin/io/spine/chords/core/table/Table.kt     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
index 70cf3587..bd829cbe 100644
--- a/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
+++ b/core/src/main/kotlin/io/spine/chords/core/table/Table.kt
@@ -213,9 +213,6 @@ public abstract class Table<E> : Component() {
 
     /**
      * Stores the current interactive sorting state for the table.
-     *
-     * The state is separated into a dedicated object so that sorting rules and UI interactions
-     * remain encapsulated and reusable.
      */
     protected var sortingState: TableSortingState<E> by mutableStateOf(TableSortingState())
 
@@ -473,9 +470,6 @@ public data class TableSorting<E>(
 /**
  * Holds interactive sorting state for a [Table].
  *
- * This class encapsulates sorting transitions so that the table component stays focused on
- * rendering, while sorting decisions remain centralized in one object.
- *
  * @param initialSorting The initial sorting state, if any.
  */
 public class TableSortingState<E>(
@@ -613,11 +607,13 @@ private fun VerticalScrollBar(
 /**
  * Table row with headers.
  *
+ * NOTE: the Pointer Hover API used in this method is experimental
+ * in the current version of Compose (1.5.12).
+ *
  * @param columns A list of column configuration objects
  *   with information about headers.
  * @param sortingState The current interactive sorting state of the table.
  */
-// The Pointer Hover API is experimental in the current version of Compose (1.5.2).
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun <E> HeaderTableRow(
@@ -651,10 +647,12 @@ private fun <E> HeaderTableRow(
 /**
  * Displays a single table header cell.
  *
+ * NOTE: the Pointer Hover API used in this method is experimental
+ * in the current version of Compose (1.5.12).
+ *
  * @param column The column whose header content should be displayed.
  * @param sortingState The current interactive sorting state of the table.
  */
-// The Pointer Hover API is experimental in the current version of Compose (1.5.2).
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun <E> HeaderCell(