Fix #338: Enhancements to support Bootstrap v5.x

kartik-v · Sep 2, 2021 · 5b3c91d · 5b3c91d
1 parent b30936d
commit 5b3c91d
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 36 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,12 @@
 Change Log: `yii2-widget-select2`
 =================================
 
+## Version 2.2.2
+
+**Date:** 02-Sep-2021
+
+- (enh #338): Enhancements to support Bootstrap v5.x.
+
 ## Version 2.2.1
 
 **Date:** 09-Jun-2021

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "kartik-v/yii2-krajee-base": ">=1.9",
+        "kartik-v/yii2-krajee-base": ">=3.0",
         "select2/select2": ">=4.0"
     },
     "autoload": {

diff --git a/src/Select2.php b/src/Select2.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;
@@ -25,7 +25,7 @@
 /**
  * Select2 widget is a Yii2 wrapper for the Select2 jQuery plugin. This input widget is a jQuery based replacement for
  * select boxes. It supports searching, remote data sets, and infinite scrolling of results. The widget is specially
- * styled for Bootstrap 3.x and Bootstrap 4.x.
+ * styled for all major Bootstrap releases 3.x, 4.x & 5.x.
  *
  * @author Kartik Visweswaran <[email protected]>
  * @since 1.0
@@ -89,7 +89,7 @@ class Select2 extends InputWidget
     /**
      * @var string the theme name to be used for styling the Select2. If not set this will default to:
      * - [[THEME_KRAJEE]] if [[bsVersion]] is set to '3.x'
-     * - [[THEME_KRAJEE_BS4]] if [[bsVersion]] is set to '4.x'
+     * - [[THEME_KRAJEE_BS4]] if [[bsVersion]] is set to '4.x' or '5.x'
      */
     public $theme;
 
@@ -218,7 +218,8 @@ public function run()
     public function renderWidget()
     {
         if (!isset($this->theme)) {
-            $this->theme = $this->isBs4() ? self::THEME_KRAJEE_BS4 : self::THEME_KRAJEE;
+            $ver = $this->getBsVer();
+            $this->theme = $ver === 3 ? self::THEME_KRAJEE : self::THEME_KRAJEE_BS4;
         }
         $this->initI18N(__DIR__);
         $this->pluginOptions['theme'] = $this->theme;
@@ -280,7 +281,7 @@ protected function renderToggleAll()
         }
         $unchecked = '<i class="glyphicon glyphicon-unchecked"></i>';
         $checked = '<i class="glyphicon glyphicon-check"></i>';
-        if ($this->isBs4()) {
+        if (!$this->isBs(3)) {
             $unchecked = '<i class="far fa-square"></i>';
             $checked = '<i class="far fa-check-square"></i>';
         }
@@ -350,7 +351,7 @@ protected function embedAddon($input)
         if (empty($this->addon)) {
             return $input;
         }
-        $isBs4 = $this->isBs4();
+        $notBs3 = !$this->isBs(3);
         $group = ArrayHelper::getValue($this->addon, 'groupOptions', []);
         $css = ['input-group', 's2-input-group'];
         if (isset($this->size)) {
@@ -361,12 +362,12 @@ protected function embedAddon($input)
             Html::addCssClass($group, 'kv-input-group-hide');
             Html::addCssClass($group, 'group-' . $this->options['id']);
         }
-        $prepend = $this->getAddonContent('prepend', $isBs4);
-        $append = $this->getAddonContent('append', $isBs4);
-        if (!$isBs4 && isset($this->addon['prepend']) && is_array($this->addon['prepend'])) {
+        $prepend = $this->getAddonContent('prepend');
+        $append = $this->getAddonContent('append');
+        if (!$notBs3 && isset($this->addon['prepend']) && is_array($this->addon['prepend'])) {
             Html::addCssClass($group, 'select2-bootstrap-prepend');
         }
-        if (!$isBs4 && isset($this->addon['append']) && is_array($this->addon['append'])) {
+        if (!$notBs3 && isset($this->addon['append']) && is_array($this->addon['append'])) {
             Html::addCssClass($group, 'select2-bootstrap-append');
         }
         $addonText = $prepend . $input . $append;

diff --git a/src/Select2Asset.php b/src/Select2Asset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;

diff --git a/src/Select2KrajeeAsset.php b/src/Select2KrajeeAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeAsset.php b/src/ThemeAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeBootstrapAsset.php b/src/ThemeBootstrapAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeClassicAsset.php b/src/ThemeClassicAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeDefaultAsset.php b/src/ThemeDefaultAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeKrajeeAsset.php b/src/ThemeKrajeeAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeKrajeeBs4Asset.php b/src/ThemeKrajeeBs4Asset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeMaterialAsset.php b/src/ThemeMaterialAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 namespace kartik\select2;
@@ -14,7 +14,7 @@
  *
  * @author Mohamad Faeez <[email protected]>
  * @modified Kartik Visweswaran <[email protected]>
- * @since 2.2.1
+ * @since 2.2.2
  */
 class ThemeMaterialAsset extends ThemeAsset
 {

diff --git a/src/assets/css/select2-addl.css b/src/assets/css/select2-addl.css
@@ -1,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
- * @version 2.2.1
+ * @version 2.2.2
  *
  * Additional CSS for Select2 for extra functionalities added by Krajee
  *

diff --git a/src/assets/css/select2-addl.min.css b/src/assets/css/select2-addl.min.css
@@ -1,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
- * @version 2.2.1
+ * @version 2.2.2
  *
  * Additional CSS for Select2 for extra functionalities added by Krajee
  *

diff --git a/src/assets/css/select2-krajee-bs4.css b/src/assets/css/select2-krajee-bs4.css
@@ -1,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
- * @version 2.2.1
+ * @version 2.2.2
  *
  * Krajee Bootstrap 4.x Theme for Select2
  *
@@ -424,7 +424,6 @@ select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
 .input-group > .select2-container--krajee-bs4:focus {
     z-index: 3;
 }
-
 .input-group > .select2-container--krajee-bs4:not(:last-child),
 .input-group > .select2-container--krajee-bs4:not(:last-child) .select2-selection {
     border-top-right-radius: 0;
@@ -641,4 +640,8 @@ select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
 
 .select2-container--krajee-bs4 .select2-dropdown[dir="rtl"] .select2-results__option {
     text-align: right;
+}
+
+.select2-container--krajee-bs4 > .select2-dropdown {
+    z-index: 1056;
 }
diff --git a/src/assets/css/select2-krajee-bs4.min.css b/src/assets/css/select2-krajee-bs4.min.css
diff --git a/src/assets/css/select2-krajee.css b/src/assets/css/select2-krajee.css
@@ -1,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
- * @version 2.2.1
+ * @version 2.2.2
  *
  * Krajee Bootstrap 3.x Theme for Select2
  *
@@ -359,7 +359,7 @@
 
 .select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field {
     background: transparent;
-    padding: 0 3px;
+    padding: 6px;
     height: 32px;
     line-height: 1.428571429;
     margin-top: 0;
@@ -493,7 +493,7 @@
 
 .input-sm.select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field,
 .input-group-sm .select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field {
-    padding: 0 10px;
+    padding: 6px;
     font-size: 12px;
     height: 28px;
     line-height: 1.5;
@@ -524,7 +524,7 @@
 
 .input-lg.select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field,
 .input-group-lg .select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field {
-    padding: 0 10px;
+    padding: 12px 6px;
     font-size: 18px;
     height: 44px;
     line-height: 1.3333333;

diff --git a/src/assets/css/select2-krajee.min.css b/src/assets/css/select2-krajee.min.css
diff --git a/src/assets/css/select2-material.css b/src/assets/css/select2-material.css
@@ -1,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
- * @version 2.2.1
+ * @version 2.2.2
  *
  * Material Theme for Select2
  *

diff --git a/src/assets/css/select2-material.min.css b/src/assets/css/select2-material.min.css
diff --git a/src/assets/js/select2-krajee.js b/src/assets/js/select2-krajee.js
@@ -1,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
- * @version 2.2.1
+ * @version 2.2.2
  *
  * Additional enhancements for Select2 widget extension for Yii 2.0.
  *

diff --git a/src/assets/js/select2-krajee.min.js b/src/assets/js/select2-krajee.min.js