From 1d9caffdd56de297ba680d9c8bd59747c4774efe Mon Sep 17 00:00:00 2001
From: Maximilian Oswald <maxi.osw@outlook.com>
Date: Sat, 18 May 2024 21:38:42 +0200
Subject: [PATCH] Fixes hidden toggleable column being shown in column toggle
 dropdown

---
 packages/tables/src/Concerns/CanToggleColumns.php       | 2 +-
 packages/tables/src/Table/Concerns/CanToggleColumns.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tables/src/Concerns/CanToggleColumns.php b/packages/tables/src/Concerns/CanToggleColumns.php
index f719729450a..2638721d1e8 100644
--- a/packages/tables/src/Concerns/CanToggleColumns.php
+++ b/packages/tables/src/Concerns/CanToggleColumns.php
@@ -62,7 +62,7 @@ protected function getTableColumnToggleFormSchema(): array
         $schema = [];
 
         foreach ($this->getTable()->getColumns() as $column) {
-            if (! $column->isToggleable()) {
+            if (! $column->isToggleable() || $column->isHidden()) {
                 continue;
             }
 
diff --git a/packages/tables/src/Table/Concerns/CanToggleColumns.php b/packages/tables/src/Table/Concerns/CanToggleColumns.php
index 52746c376dc..fc3983318d8 100644
--- a/packages/tables/src/Table/Concerns/CanToggleColumns.php
+++ b/packages/tables/src/Table/Concerns/CanToggleColumns.php
@@ -107,7 +107,7 @@ public function getColumnToggleFormWidth(): MaxWidth | string | null
     public function hasToggleableColumns(): bool
     {
         foreach ($this->getColumns() as $column) {
-            if (! $column->isToggleable()) {
+            if (! $column->isToggleable() || $column->isHidden()) {
                 continue;
             }