Commit e32e8f3a authored by Eduard Reñé Claramunt's avatar Eduard Reñé Claramunt Committed by John
Browse files

Issue #3127943 by edurenye: Modal not resizing for narrow screens

parent f15f9f01

config/install/layout_builder_modal.settings.yml

+3 −3
Original line number Diff line number Diff line 
modal_width: 768

modal_height: auto

modal_width: '768'

modal_height: 'auto'

modal_autoresize: true

theme_display: default_theme
 
theme_display: 'default_theme'

config/schema/layout_builder_modal.schema.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ layout_builder_modal.settings: 
  label: 'Layout Builder Modal settings'

  mapping:

    modal_width:

      type: integer

      type: string

      label: 'Modal width'

    modal_height:

      type: string

src/Form/LayoutBuilderModalSettingsForm.php

+13 −3
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ class LayoutBuilderModalSettingsForm extends ConfigFormBase { 
      '#title' => $this->t('Options'),

    ];

    $form['options']['modal_width'] = [

      '#type' => 'number',

      '#type' => 'textfield',

      '#title' => $this->t('Width'),

      '#default_value' => $config->get('modal_width'),

      '#description' => $this->t(

        'Width in pixels with no units (e.g. "<code>768</code>"). See <a href=":link">the jQuery Dialog documentation</a> for more details.',

        'Width in pixels with no units (e.g. "<code>768</code>"), or use percentage (e.g. "<code>80%</code>"). See <a href=":link">the jQuery Dialog documentation</a> for more details.',

        [':link' => 'https://api.jqueryui.com/dialog/#option-width']

      ),

      '#min' => 1,

      '#size' => 20,

      '#required' => TRUE,

    ];

    $form['options']['modal_height'] = [
@@ -84,6 +84,16 @@ class LayoutBuilderModalSettingsForm extends ConfigFormBase { 
   * {@inheritdoc}

   */

  public function validateForm(array &$form, FormStateInterface $form_state) {

    $width = $form_state->getValue('modal_width');

    if (substr_count($width, '%') == 1 && $width[strlen($width) - 1] == '%') {

      $percentage_value = substr($width,0,-1);

      if (!is_numeric($percentage_value) || $percentage_value < 1 || $percentage_value > 100) {

        $form_state->setErrorByName('modal_width', $this->t('Width must be a positive number or a percentage.'));

      }

    }

    elseif ((!is_numeric($width) || $width < 1)) {

      $form_state->setErrorByName('modal_width', $this->t('Width must be a positive number or a percentage.'));

    }

    $height = $form_state->getValue('modal_height');

    if ((!is_numeric($height) || $height < 1) && $height !== 'auto') {

      $form_state->setErrorByName('modal_height', $this->t('Height must be a positive number or "auto".'));

tests/src/FunctionalJavascript/LayoutBuilderModalTest.php

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class LayoutBuilderModalTest extends WebDriverTestBase { 
  /**

   * {@inheritdoc}

   */

  protected function setUp() {

  protected function setUp(): void {

    parent::setUp();



    $this->drupalPlaceBlock('local_tasks_block');