From 4b08061bc9de73eee8414191ae288a451fd92d11 Mon Sep 17 00:00:00 2001
From: Kartik Visweswaran <kartikv2@gmail.com>
Date: Mon, 24 Jul 2023 07:42:25 +0530
Subject: [PATCH] Fix #1071: Enhance default dropdown filters styling for
 Bootstrap 5.x

---
 CHANGE.md           | 2 +-
 src/ColumnTrait.php | 6 +++++-
 src/DataColumn.php  | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGE.md b/CHANGE.md
index c829627a..e8425ec7 100755
--- a/CHANGE.md
+++ b/CHANGE.md
@@ -6,7 +6,7 @@ Change Log: `yii2-grid`
 **Date:** _Under development_
 
 - (enh #1070): Enhance grid header styling for use without panel.
-
+- (enh #1071): Enhance default dropdown filters styling for Bootstrap 5.x.
 
 ## Version 3.5.1
 
diff --git a/src/ColumnTrait.php b/src/ColumnTrait.php
index a8d53f06..28ca03e4 100644
--- a/src/ColumnTrait.php
+++ b/src/ColumnTrait.php
@@ -28,7 +28,7 @@
 trait ColumnTrait
 {
     /**
-     * @var string an unique identifier for the Column. If not set, it will be automatically generated.
+     * @var string unique identifier for the Column. If not set, it will be automatically generated.
      */
     public $columnKey;
 
@@ -185,6 +185,10 @@ public function initColumnSettings($settings = [])
             }
         }
         $this->initColumnKey();
+
+        if (!empty($this->filter) && empty($this->filterType) && $this->grid->isBs(5)) {
+            Html::addCssClass($this->filterInputOptions, 'form-select');
+        }
     }
 
     /**
diff --git a/src/DataColumn.php b/src/DataColumn.php
index 15717dc8..81f9bad5 100644
--- a/src/DataColumn.php
+++ b/src/DataColumn.php
@@ -21,6 +21,8 @@
  * The DataColumn is the default column type for the [[GridView]] widget and extends the [[YiiDataColumn]] with various
  * enhancements.
  *
+ * @property GridView $grid
+ *
  * @author Kartik Visweswaran <kartikv2@gmail.com>
  * @since  1.0
  */