the first commit is the right commit...

home-assistant · Jul 10, 2024 · 390618f · 390618f
1 parent f299360
commit 390618f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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);
           }
         }