Merge "mw.htmlform: Fields hidden with 'hide-if' should be disabled"

diff --combined includes/htmlform/fields/HTMLFormFieldCloner.php
index a871584,d8de890..abb50d0
--- 1/includes/htmlform/fields/HTMLFormFieldCloner.php
--- 2/includes/htmlform/fields/HTMLFormFieldCloner.php
+++ b/includes/htmlform/fields/HTMLFormFieldCloner.php
@@@ -96,6 -96,17 +96,17 @@@ class HTMLFormFieldCloner extends HTMLF
                        } else {
                                $info['id'] = Sanitizer::escapeId( "{$this->mID}--$key--$fieldname" );
                        }
+                       // Copy the hide-if rules to "child" fields, so that the JavaScript code handling them
+                       // (resources/src/mediawiki/htmlform/hide-if.js) doesn't have to handle nested fields.
+                       if ( $this->mHideIf ) {
+                               if ( isset( $info['hide-if'] ) ) {
+                                       // Hide child field if either its rules say it's hidden, or parent's rules say it's hidden
+                                       $info['hide-if'] = [ 'OR', $info['hide-if'], $this->mHideIf ];
+                               } else {
+                                       // Hide child field if parent's rules say it's hidden
+                                       $info['hide-if'] = $this->mHideIf;
+                               }
+                       }
                        $field = HTMLForm::loadInputFromParameters( $name, $info, $this->mParent );
                        $fields[$fieldname] = $field;
                }
@@@ -224,7 -235,7 +235,7 @@@
                        && $this->mParams['required'] !== false
                        && !$values
                ) {
 -                      return $this->msg( 'htmlform-cloner-required' )->parseAsBlock();
 +                      return $this->msg( 'htmlform-cloner-required' );
                }
  
                if ( isset( $values['nonjs'] ) ) {