Updates to release v1.6.3 fixes #136 fixes #137 fixes #138

Author: kartik-v

CHANGE.md

@@ -1,6 +1,14 @@
 Change Log: `yii2-widget-activeform`
 ====================================
 
+## Version 1.6.3
+
+**Date**: 28-Jul-2023
+
+- (enh #138): Enhance required star for bootstrap 5 floating labels.
+- (enh #137): Overflowing labels in CheckboxList don't break correctly with Bootstrap 4.
+- (enh #136): Enhance ActiveForm to dynamically configure `enabled`, `readonly` and `staticOnly` flags.
+
 ## Version 1.6.2
 
 **Date**: 27-Feb-2022

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2015 - 2022, Kartik Visweswaran  
+Copyright (c) 2015 - 2023, Kartik Visweswaran  
 Krajee.com  
 All rights reserved.  
 

src/ActiveField.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright  Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
+ * @copyright  Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2023
  * @package    yii2-widgets
  * @subpackage yii2-widget-activeform
- * @version    1.6.2
+ * @version    1.6.3
  */
 
 namespace kartik\form;
@@ -643,11 +643,13 @@ public function hint($content, $options = [])
     {
         if ($this->getConfigParam('showHints') === false) {
             $this->parts['{hint}'] = '';
+
             return $this;
         }
         if ($this->_isHintSpecial) {
             Html::addCssClass($options, 'kv-hint-block');
         }
+
         return parent::hint($this->generateHint($content), $options);
     }
 
@@ -864,8 +866,11 @@ public function render($content = null)
             }
             $this->template = Lib::strtr($this->template, ['{hint}' => $this->_settings['hint']]);
         }
-
-        if ($this->form->staticOnly === true) {
+        $staticOnly = $this->form->staticOnly;
+        if (is_callable($staticOnly)) {
+            $staticOnly = call_user_func($staticOnly, [$this->model, $this]);
+        }
+        if ($staticOnly === true) {
             $this->buildTemplate();
             $this->staticInput();
         } else {
@@ -925,7 +930,8 @@ public function widget($class, $config = [])
      */
     public function staticInput($options = [])
     {
-        $content = isset($this->staticValue) ? $this->staticValue : Html::getAttributeValue($this->model, $this->attribute);
+        $content = isset($this->staticValue) ? $this->staticValue : Html::getAttributeValue($this->model,
+            $this->attribute);
         $this->form->addCssClass($options, ActiveForm::BS_FORM_CONTROL_STATIC);
         $this->parts['{input}'] = Html::tag('div', $content, $options);
         $this->_isStatic = true;
@@ -1141,19 +1147,35 @@ protected function getToggleField($type = self::TYPE_CHECKBOX, $options = [], $e
         return parent::$type($options, false);
     }
 
+    /**
+     * Parses the form flag (for disabled/readonly).
+     *
+     * @param  string  $flag
+     * @param  array  $options
+     * @return void
+     */
+    protected function parseFormFlag($flag, &$options)
+    {
+        if (!property_exists($this->form, $flag)) {
+            return;
+        }
+        $action = $this->form->$flag;
+        if ($action && is_callable($action)) {
+            $options[$flag] = call_user_func_array($action, [$this->model, $this]);
+        } else {
+            $options[$flag] = $action;
+        }
+    }
+
     /**
      * Validates and sets disabled or readonly inputs
      *
      * @param  array  $options  the HTML attributes for the input
      */
     protected function initDisability(&$options)
     {
-        if ($this->form->disabled && !isset($options['disabled'])) {
-            $options['disabled'] = true;
-        }
-        if ($this->form->readonly && !isset($options['readonly'])) {
-            $options['readonly'] = true;
-        }
+        $this->parseFormFlag('disabled', $options);
+        $this->parseFormFlag('readonly', $options);
     }
 
     /**
@@ -1739,7 +1761,12 @@ protected function getToggleFieldList($type, $items, $options = [], $asBtnGrp =
         $disabled = ArrayHelper::remove($options, 'disabledItems', []);
         $readonly = ArrayHelper::remove($options, 'readonlyItems', []);
         $cust = $this->isCustomControl($options);
-        $pre = $cust ? ($isBs5 ? 'form-check' : 'custom-control') : ($notBs3 ? "me-1 mr-1 bs-{$type}" : '');
+        if ($isBs5) {
+            $pre = ($cust ? '' : ' bs5-form-check ').'form-check';
+        } else {
+            $pre = $cust ? 'custom-control' : 'form-check';
+        }
+
         if ($asBtnGrp) {
             $css = ['btn-group'];
             if (!$isBs5) {

src/ActiveForm.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright  Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
+ * @copyright  Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2023
  * @package    yii2-widgets
  * @subpackage yii2-widget-activeform
- * @version    1.6.2
+ * @version    1.6.3
  */
 
 namespace kartik\form;
@@ -151,17 +151,42 @@ class ActiveForm extends YiiActiveForm implements BootstrapInterface
     public $inlineFormCssClass;
 
     /**
-     * @var boolean whether all data in form are to be static inputs
+     * @var boolean|Closure whether all inputs in form are to be rendered as bootstrap 5 static text inputs. For
+     * advanced configuration (e.g. dynamically setting different flags for different fields), this can be setup as a
+     * Closure callback. When setup as a Closure callback, you can receive the model instance and the active field
+     * object instance as parameters. For example:
+     *
+     * ```
+     * 'staticOnly' => function ($model, $field) {
+     *     return in_array($field->attribute, $model->staticOnlyAttributes());
+     * }
+     * ```
      */
     public $staticOnly = false;
 
     /**
-     * @var boolean whether all inputs in form are to be disabled
+     * @var boolean|Closure whether all inputs in form are to be disabled. For advanced configuration (e.g. dynamically
+     * setting different flags for different fields), this can be setup as a Closure callback. When setup as a Closure
+     * callback, you can receive the model instance and the active field object instance as parameters. For example:
+     *
+     * ```
+     * 'disabled' => function ($model, $field) {
+     *     return in_array($field->attribute, $model->disabledAttributes());
+     * }
+     * ```
      */
     public $disabled = false;
 
     /**
-     * @var boolean whether all inputs in form are to be readonly.
+     * @var boolean|Closure whether all inputs in form are to be readonly. For advanced configuration (e.g. dynamically
+     * setting different flags for different fields), this can be setup as a Closure callback. When setup as a Closure
+     * callback, you can receive the model instance and the active field object instance as parameters. For example:
+     *
+     * ```
+     * 'readonly' => function ($model, $field) {
+     *     return in_array($field->attribute, $model->readonlyAttributes());
+     * }
+     * ```
      */
     public $readonly = false;
 

src/ActiveFormAsset.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright  Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
+ * @copyright  Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2023
  * @package    yii2-widgets
  * @subpackage yii2-widget-activeform
- * @version    1.6.2
+ * @version    1.6.3
  */
 
 namespace kartik\form;

src/Bs4CustomFileInputAsset.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright  Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2022
+ * @copyright  Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2023
  * @package    yii2-widgets
  * @subpackage yii2-widget-activeform
- * @version    1.6.2
+ * @version    1.6.3
  */
 
 namespace kartik\form;