Skip to content

Commit 5b3c91d

Browse files
kartik-vkartik-v
committed
Fix kartik-v#338: Enhancements to support Bootstrap v5.x
1 parent b30936d commit 5b3c91d

22 files changed

+46
-36
lines changed

‎CHANGE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Change Log: `yii2-widget-select2`
22
=================================
33

4+
## Version 2.2.2
5+
6+
**Date:** 02-Sep-2021
7+
8+
- (enh #338): Enhancements to support Bootstrap v5.x.
9+
410
## Version 2.2.1
511

612
**Date:** 09-Jun-2021

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
],
1515
"require": {
16-
"kartik-v/yii2-krajee-base": ">=1.9",
16+
"kartik-v/yii2-krajee-base": ">=3.0",
1717
"select2/select2": ">=4.0"
1818
},
1919
"autoload": {

‎src/Select2.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;
@@ -25,7 +25,7 @@
2525
/**
2626
* Select2 widget is a Yii2 wrapper for the Select2 jQuery plugin. This input widget is a jQuery based replacement for
2727
* select boxes. It supports searching, remote data sets, and infinite scrolling of results. The widget is specially
28-
* styled for Bootstrap 3.x and Bootstrap 4.x.
28+
* styled for all major Bootstrap releases 3.x, 4.x & 5.x.
2929
*
3030
* @author Kartik Visweswaran <[email protected]>
3131
* @since 1.0
@@ -89,7 +89,7 @@ class Select2 extends InputWidget
8989
/**
9090
* @var string the theme name to be used for styling the Select2. If not set this will default to:
9191
* - [[THEME_KRAJEE]] if [[bsVersion]] is set to '3.x'
92-
* - [[THEME_KRAJEE_BS4]] if [[bsVersion]] is set to '4.x'
92+
* - [[THEME_KRAJEE_BS4]] if [[bsVersion]] is set to '4.x' or '5.x'
9393
*/
9494
public $theme;
9595

@@ -218,7 +218,8 @@ public function run()
218218
public function renderWidget()
219219
{
220220
if (!isset($this->theme)) {
221-
$this->theme = $this->isBs4() ? self::THEME_KRAJEE_BS4 : self::THEME_KRAJEE;
221+
$ver = $this->getBsVer();
222+
$this->theme = $ver === 3 ? self::THEME_KRAJEE : self::THEME_KRAJEE_BS4;
222223
}
223224
$this->initI18N(__DIR__);
224225
$this->pluginOptions['theme'] = $this->theme;
@@ -280,7 +281,7 @@ protected function renderToggleAll()
280281
}
281282
$unchecked = '<i class="glyphicon glyphicon-unchecked"></i>';
282283
$checked = '<i class="glyphicon glyphicon-check"></i>';
283-
if ($this->isBs4()) {
284+
if (!$this->isBs(3)) {
284285
$unchecked = '<i class="far fa-square"></i>';
285286
$checked = '<i class="far fa-check-square"></i>';
286287
}
@@ -350,7 +351,7 @@ protected function embedAddon($input)
350351
if (empty($this->addon)) {
351352
return $input;
352353
}
353-
$isBs4 = $this->isBs4();
354+
$notBs3 = !$this->isBs(3);
354355
$group = ArrayHelper::getValue($this->addon, 'groupOptions', []);
355356
$css = ['input-group', 's2-input-group'];
356357
if (isset($this->size)) {
@@ -361,12 +362,12 @@ protected function embedAddon($input)
361362
Html::addCssClass($group, 'kv-input-group-hide');
362363
Html::addCssClass($group, 'group-' . $this->options['id']);
363364
}
364-
$prepend = $this->getAddonContent('prepend', $isBs4);
365-
$append = $this->getAddonContent('append', $isBs4);
366-
if (!$isBs4 && isset($this->addon['prepend']) && is_array($this->addon['prepend'])) {
365+
$prepend = $this->getAddonContent('prepend');
366+
$append = $this->getAddonContent('append');
367+
if (!$notBs3 && isset($this->addon['prepend']) && is_array($this->addon['prepend'])) {
367368
Html::addCssClass($group, 'select2-bootstrap-prepend');
368369
}
369-
if (!$isBs4 && isset($this->addon['append']) && is_array($this->addon['append'])) {
370+
if (!$notBs3 && isset($this->addon['append']) && is_array($this->addon['append'])) {
370371
Html::addCssClass($group, 'select2-bootstrap-append');
371372
}
372373
$addonText = $prepend . $input . $append;

‎src/Select2Asset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;

‎src/Select2KrajeeAsset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeAsset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeBootstrapAsset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeClassicAsset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeDefaultAsset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeKrajeeAsset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeKrajeeBs4Asset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeMaterialAsset.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.2.1
7+
* @version 2.2.2
88
*/
99

1010
namespace kartik\select2;
@@ -14,7 +14,7 @@
1414
*
1515
* @author Mohamad Faeez <[email protected]>
1616
* @modified Kartik Visweswaran <[email protected]>
17-
* @since 2.2.1
17+
* @since 2.2.2
1818
*/
1919
class ThemeMaterialAsset extends ThemeAsset
2020
{

‎src/assets/css/select2-addl.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
3-
* @version 2.2.1
3+
* @version 2.2.2
44
*
55
* Additional CSS for Select2 for extra functionalities added by Krajee
66
*

‎src/assets/css/select2-addl.min.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
3-
* @version 2.2.1
3+
* @version 2.2.2
44
*
55
* Additional CSS for Select2 for extra functionalities added by Krajee
66
*

‎src/assets/css/select2-krajee-bs4.css

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
3-
* @version 2.2.1
3+
* @version 2.2.2
44
*
55
* Krajee Bootstrap 4.x Theme for Select2
66
*
@@ -424,7 +424,6 @@ select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
424424
.input-group > .select2-container--krajee-bs4:focus {
425425
z-index: 3;
426426
}
427-
428427
.input-group > .select2-container--krajee-bs4:not(:last-child),
429428
.input-group > .select2-container--krajee-bs4:not(:last-child) .select2-selection {
430429
border-top-right-radius: 0;
@@ -641,4 +640,8 @@ select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
641640

642641
.select2-container--krajee-bs4 .select2-dropdown[dir="rtl"] .select2-results__option {
643642
text-align: right;
643+
}
644+
645+
.select2-container--krajee-bs4 > .select2-dropdown {
646+
z-index: 1056;
644647
}

‎src/assets/css/select2-krajee-bs4.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/css/select2-krajee.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
3-
* @version 2.2.1
3+
* @version 2.2.2
44
*
55
* Krajee Bootstrap 3.x Theme for Select2
66
*
@@ -359,7 +359,7 @@
359359

360360
.select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field {
361361
background: transparent;
362-
padding: 0 3px;
362+
padding: 6px;
363363
height: 32px;
364364
line-height: 1.428571429;
365365
margin-top: 0;
@@ -493,7 +493,7 @@
493493

494494
.input-sm.select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field,
495495
.input-group-sm .select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field {
496-
padding: 0 10px;
496+
padding: 6px;
497497
font-size: 12px;
498498
height: 28px;
499499
line-height: 1.5;
@@ -524,7 +524,7 @@
524524

525525
.input-lg.select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field,
526526
.input-group-lg .select2-container--krajee .select2-selection--multiple .select2-search--inline .select2-search__field {
527-
padding: 0 10px;
527+
padding: 12px 6px;
528528
font-size: 18px;
529529
height: 44px;
530530
line-height: 1.3333333;

‎src/assets/css/select2-krajee.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/css/select2-material.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
3-
* @version 2.2.1
3+
* @version 2.2.2
44
*
55
* Material Theme for Select2
66
*

‎src/assets/css/select2-material.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/js/select2-krajee.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
3-
* @version 2.2.1
3+
* @version 2.2.2
44
*
55
* Additional enhancements for Select2 widget extension for Yii 2.0.
66
*

‎src/assets/js/select2-krajee.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)