Feat: Handle multiselect filtering url issues (#322)

Co-authored-by: Niclas Norin <niclas.norin@helsingborg.se>
helsingborg-stad · Aug 25, 2023 · 58e51fd · 58e51fd
1 parent cb800ab
commit 58e51fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/source/php/Component/Select/Select.php b/source/php/Component/Select/Select.php
@@ -34,7 +34,7 @@ public function init()
         //Set general classes
         $this->data['classList'][] = $this->getBaseClass($size, true);
 
-        if ($multiple) {
+        if (!empty($multiple)) {
             $this->data['isMultiSelect'] = true;
             $this->data['classList'][] = $this->getBaseClass('multiselect', true);
 
@@ -48,7 +48,7 @@ public function init()
             ]; 
         }
 
-        if(!$multiple) {
+        if(empty($multiple)) {
             $this->data['isMultiSelect'] = false;
             $this->data['classList'][] = $this->getBaseClass('singleselect', true);
 
@@ -69,16 +69,16 @@ public function init()
             $this->data['intersection'] = array_intersect_key($options, $preselectedKeys);
         }
 
-        if ($name) {
-            $this->data['selectAttributeList']['name'] = $name;
+        if (!empty($name)) {
+            $this->data['selectAttributeList']['name'] = $name . (!empty($multiple) ? '[]' : '');
         }
 
-        if ($errorMessage) {
+        if (!empty($errorMessage)) {
             $this->data['data-invalid-message'] = $errorMessage;
             $this->data['classList'][] = "has-invalid-message";  
         }
 
-        if ($required) {
+        if (!empty($required)) {
             $this->data['selectAttributeList']['required'] = 'required';
             $this->data['selectAttributeList']['aria-hidden'] = 'true';
             $this->data['selectAttributeList']['data-required'] = '1';
@@ -93,7 +93,7 @@ public function init()
             $this->data['selectAttributeList']
         );
 
-        $this->data['clearButtonEnabled'] = !$multiple && !$required;
+        $this->data['clearButtonEnabled'] = empty($multiple) && empty($required);
 
         //Determine if this is selected
         $this->data['isSelected'] = function($key, $boolean = true)

diff --git a/source/php/Component/Select/select.blade.php b/source/php/Component/Select/select.blade.php
@@ -1,14 +1,14 @@
 <div class="c-field {{ $class }}" {!! $attribute !!}>
-    @if ($label && $hideLabel)
+    @if (!empty($label) && !empty($hideLabel))
         <label class="u-sr__only" for="select_{{ $id }}">
             {{ $label }}
         </label>
     @endif
 
-    @if ($label && !$hideLabel)
+    @if (!empty($label) && empty($hideLabel))
         <label class="c-field__label" for="select_{{ $id }}">
             {{ $label }}
-            @if ($required)
+            @if (!empty($required))
                 {{--
                     Field has aria attribute required, this will be read as required.
                     Aria hidden in place here, to avoid duplicate notations in screenreader.
@@ -34,7 +34,7 @@
 
         <select {!! $selectAttributes !!} class="{{ $baseClass }}__select-element" tabindex="-1">
 
-            @if ($preselected !== '' && !$isMultiSelect)
+            @if ($preselected !== '' && empty($isMultiSelect))
                 <option class="c-select__select-option" value="">{{$placeholder ? $placeholder : ""}}</option>
             @endif