From cd4937b53984f9215766b4cc0cb3f8a08c10903c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 10 Jul 2024 14:58:26 +0200
Subject: [PATCH] Fix unhiding default hidden columns (#21354)

* Fix unhiding default hidden columns

* Update dialog-data-table-settings.ts
---
 src/components/data-table/dialog-data-table-settings.ts | 5 +++--
 1 file changed, 3 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 dd8a6f2888..29c99762ee 100644
--- a/src/components/data-table/dialog-data-table-settings.ts
+++ b/src/components/data-table/dialog-data-table-settings.ts
@@ -193,6 +193,7 @@ export class DialogDataTableSettings extends LitElement {
           .filter(([_key, col]) => col.defaultHidden)
           .map(([key]) => key)),
     ];
+
     if (wasHidden && hidden.includes(column)) {
       hidden.splice(hidden.indexOf(column), 1);
     } else if (!wasHidden) {
@@ -235,14 +236,14 @@ export class DialogDataTableSettings extends LitElement {
       }
 
       columns.forEach((col) => {
-        if (!newOrder.includes(col.key)) {
+        if (col.key !== column && !newOrder.includes(col.key)) {
           if (col.moveable === false) {
             newOrder.unshift(col.key);
           } else {
             newOrder.splice(lastMoveable + 1, 0, col.key);
           }
 
-          if (col.defaultHidden) {
+          if (col.defaultHidden && !hidden.includes(col.key)) {
             hidden.push(col.key);
           }
         }