From 5ead5ed058150336987f7a2ca300b4ecb40b1e3f Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 10 Jul 2024 18:25:57 +0200
Subject: [PATCH] Fix unhiding default hidden column (#21358)

the first commit is the right commit...
---
 src/components/data-table/dialog-data-table-settings.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/data-table/dialog-data-table-settings.ts b/src/components/data-table/dialog-data-table-settings.ts
index 29c99762ee..b3f8c51087 100644
--- a/src/components/data-table/dialog-data-table-settings.ts
+++ b/src/components/data-table/dialog-data-table-settings.ts
@@ -236,14 +236,18 @@ export class DialogDataTableSettings extends LitElement {
       }
 
       columns.forEach((col) => {
-        if (col.key !== column && !newOrder.includes(col.key)) {
+        if (!newOrder.includes(col.key)) {
           if (col.moveable === false) {
             newOrder.unshift(col.key);
           } else {
             newOrder.splice(lastMoveable + 1, 0, col.key);
           }
 
-          if (col.defaultHidden && !hidden.includes(col.key)) {
+          if (
+            col.key !== column &&
+            col.defaultHidden &&
+            !hidden.includes(col.key)
+          ) {
             hidden.push(col.key);
           }
         }