chenx221/yii2-bootstrap5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update BaseHtml

Browse Source 
Replace PHPDoc of `BaseHtml::$normalizeClassAttribute`
Add inline mode in `BaseHtml::checkboxList()`
Add inline mode in `BaseHtml::radioList()`
This commit is contained in:
Anton 2022-04-23 02:47:47 +03:00 committed by GitHub
parent 8cbb0f3a43
commit e4582bdde9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/BaseHtml.php
View File

@ -28,14 +28,10 @@ abstract class BaseHtml extends \yii\helpers\Html
*/ */
public static $autoIdPrefix = 'i'; public static $autoIdPrefix = 'i';
/** /**
* @var bool whether to removes duplicate class names in tag attribute `class` (fix strange yii2 behavior since 2.0.44) * @inheritDoc
* @see mergeCssClasses()
* @see renderTagAttributes()
* @since 2.0.3
*/ */
public static $normalizeClassAttribute = true; public static $normalizeClassAttribute = true;
/** /**
* Renders Bootstrap static form control. * Renders Bootstrap static form control.
* *
@ -56,6 +52,7 @@ abstract class BaseHtml extends \yii\helpers\Html
/** /**
* Generates a Bootstrap static form control for the given model attribute. * Generates a Bootstrap static form control for the given model attribute.
*
* @param Model $model the model object. * @param Model $model the model object.
* @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
* about attribute expression. * about attribute expression.
@ -76,24 +73,33 @@ abstract class BaseHtml extends \yii\helpers\Html
} }
/** /**
* {@inheritDoc} * {@inheritdoc}
* Pass `true` in `$options['inline']` to generate {@see https://getbootstrap.com/docs/5.1/forms/checks-radios/#inline inline list}.
*/ */
public static function radioList($name, $selection = null, $items = [], $options = []): string public static function radioList($name, $selection = null, $items = [], $options = []): string
{ {
$inline = ArrayHelper::remove($options, 'inline', false);
if (!isset($options['item'])) { if (!isset($options['item'])) {
$itemOptions = ArrayHelper::remove($options, 'itemOptions', []); $itemOptions = ArrayHelper::remove($options, 'itemOptions', []);
$encode = ArrayHelper::getValue($options, 'encode', true); static::addCssClass($itemOptions, ['bootstrap' => 'form-check-input']);
$options['item'] = function ($index, $label, $name, $checked, $value) use ($itemOptions, $encode) { if (!isset($itemOptions['labelOptions'])) {
unset($index); $itemOptions['labelOptions'] = ['class' => 'form-check-label'];
$options = array_merge( } else {
[ static::addCssClass($itemOptions['labelOptions'], ['bootstrap' => 'form-check-label']);
'class' => 'form-check-input', }
'label' => $encode ? static::encode($label) : $label,
'labelOptions' => ['class' => 'form-check-label'],
'value' => $value,
], $itemOptions);
return '<div class="form-check">' . static::radio($name, $checked, $options) . '</div>'; $wrapperOptions = $inline ? ['class' => 'form-check form-check-inline'] : ['class' => 'form-check'];
$encode = ArrayHelper::getValue($options, 'encode', true);
$options['item'] = function ($index, $label, $name, $checked, $value) use ($itemOptions, $wrapperOptions, $encode) {
$itemOptions['value'] = $value;
if (!isset($itemOptions['label'])) {
$itemOptions['label'] = $encode ? static::encode($label) : $label;
}
return static::tag('div', static::radio($name, $checked, $itemOptions), $wrapperOptions);
}; };
} }
@ -102,23 +108,32 @@ abstract class BaseHtml extends \yii\helpers\Html
/** /**
* {@inheritdoc} * {@inheritdoc}
* Pass `true` in `$options['inline']` to generate {@see https://getbootstrap.com/docs/5.1/forms/checks-radios/#inline inline list}.
*/ */
public static function checkboxList($name, $selection = null, $items = [], $options = []): string public static function checkboxList($name, $selection = null, $items = [], $options = []): string
{ {
$inline = ArrayHelper::remove($options, 'inline', false);
if (!isset($options['item'])) { if (!isset($options['item'])) {
$itemOptions = ArrayHelper::remove($options, 'itemOptions', []); $itemOptions = ArrayHelper::remove($options, 'itemOptions', []);
$encode = ArrayHelper::getValue($options, 'encode', true); static::addCssClass($itemOptions, 'form-check-input');
$options['item'] = function ($index, $label, $name, $checked, $value) use ($itemOptions, $encode) { if (!isset($itemOptions['labelOptions'])) {
unset($index); $itemOptions['labelOptions'] = ['class' => 'form-check-label'];
$options = array_merge( } else {
[ static::addCssClass($itemOptions['labelOptions'], 'form-check-label');
'class' => 'form-check-input', }
'label' => $encode ? static::encode($label) : $label,
'labelOptions' => ['class' => 'form-check-label'],
'value' => $value,
], $itemOptions);
return '<div class="form-check">' . Html::checkbox($name, $checked, $options) . '</div>'; $wrapperOptions = $inline ? ['class' => 'form-check form-check-inline'] : ['class' => 'form-check'];
$encode = ArrayHelper::getValue($options, 'encode', true);
$options['item'] = function ($index, $label, $name, $checked, $value) use ($itemOptions, $wrapperOptions, $encode) {
$itemOptions['value'] = $value;
if (!isset($itemOptions['label'])) {
$itemOptions['label'] = $encode ? static::encode($label) : $label;
}
return static::tag('div', static::checkbox($name, $checked, $itemOptions), $wrapperOptions);
}; };
} }
@ -130,15 +145,13 @@ abstract class BaseHtml extends \yii\helpers\Html
*/ */
public static function error($model, $attribute, $options = []): string public static function error($model, $attribute, $options = []): string
{ {
if (!array_key_exists('class', $options)) { static::addCssClass($options, 'invalid-feedback');
$options['class'] = ['invalid-feedback'];
}
return parent::error($model, $attribute, $options); return parent::error($model, $attribute, $options);
} }
/** /**
* @inheritdoc * {@inheritdoc}
*/ */
protected static function booleanInput($type, $name, $checked = false, $options = []): string protected static function booleanInput($type, $name, $checked = false, $options = []): string
{ {