From c447964cf2e72d89eb0cdca66f6806209b0830a8 Mon Sep 17 00:00:00 2001
From: Awilum <sergey.romanenko@flextype.org>
Date: Thu, 20 May 2021 22:08:02 +0300
Subject: [PATCH] feat(blocks): update block `InputSelect` #18

---
 blocks/blocks/InputSelect/block.html | 19 ++++----
 blocks/blocks/InputSelect/block.js   |  1 -
 blocks/blocks/InputSelect/block.scss | 68 ----------------------------
 3 files changed, 10 insertions(+), 78 deletions(-)
 delete mode 100644 blocks/blocks/InputSelect/block.js
 delete mode 100644 blocks/blocks/InputSelect/block.scss

diff --git a/blocks/blocks/InputSelect/block.html b/blocks/blocks/InputSelect/block.html
index 29d9103..63c799e 100644
--- a/blocks/blocks/InputSelect/block.html
+++ b/blocks/blocks/InputSelect/block.html
@@ -1,27 +1,28 @@
-{% import "plugins/blueprints/blocks/macros/grid.html" as grid %}
 {% import "plugins/blueprints/blocks/macros/attr.html" as attr %}   
 {% if block.properties.label %}
     <label for="{{ block.properties.id }}" 
         {{ include(template_from_string(attr.class(['form-label', block.properties.label.class]))) }}
         {{ include(template_from_string(attr.style(block.properties.label.style))) }}>{{ include(template_from_string(block.properties.label.title)) }}</label>
 {% endif %} 
-
 <select {{ include(template_from_string(attr.id(block.properties.id))) }}
         {{ include(template_from_string(attr.name(block.properties.name))) }}
-        {{ include(template_from_string(attr.class(['form-control', 'js-select', block.properties.class]))) }}
+        {{ include(template_from_string(attr.class(['form-control', block.properties.class]))) }}
         {{ include(template_from_string(attr.data(block.properties.data))) }}
-        {{ include(template_from_string(attr.style(block.properties.style))) }} 
+        {{ include(template_from_string(attr.style(block.properties.style))) }}
+        {{ include(template_from_string(attr.disabled(block.properties.disabled))) }} 
         {{ include(template_from_string(attr.events(block.properties.events, ['onkeyup', 'onmousedown', 'onmousemove', 'onmouseout',
                                             'onmouseover', 'onmouseup', 'onkeypress', 'onclick', 'ondblclick',
                                             'onkeydown', 'onblur']))) }}>
 
-    {% if block.properties.options is iterable %}
-        {% set options = block.properties.options %}
-    {% else %}
-        {% set options = flextype.serializers.json.decode(raw(include(template_from_string(block.properties.options)))) %}
+    {% if block.properties.items %}
+        {% if block.properties.items is iterable %}
+            {% set items = block.properties.items %}
+        {% else %}
+            {% set items = flextype.serializers.json.decode(raw(include(template_from_string(block.properties.items)))) %}
+        {% endif %}
     {% endif %}
 
-    {% for key, value in options %}
+    {% for key, value in items %}
         <option value="{{ key }}" {% if key == attr.value(block.properties.name, values, block.properties.value) %} selected="selected" {% endif %}>{{ include(template_from_string(value)) }}</option>
     {% endfor %}
 </select>
diff --git a/blocks/blocks/InputSelect/block.js b/blocks/blocks/InputSelect/block.js
deleted file mode 100644
index 0e840ba..0000000
--- a/blocks/blocks/InputSelect/block.js
+++ /dev/null
@@ -1 +0,0 @@
-$('.js-select').select2();
diff --git a/blocks/blocks/InputSelect/block.scss b/blocks/blocks/InputSelect/block.scss
deleted file mode 100644
index 0c44828..0000000
--- a/blocks/blocks/InputSelect/block.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-input[type="search"] {
-  -webkit-appearance: textfield;
-}
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance:none;
-}
-
-.select2-container
-{
-  outline: none;
-  display: block;
-}
-
-.select2-dropdown
-{
-    width: 100%;
-}
-
-.select2-container--default .select2-results__option--highlighted[aria-selected],
-.select2-container--default .select2-results__option[aria-selected=true] {
-    background-color: $gray-400;
-    color: $primary;
-}
-
-.select2-container--default .select2-search--dropdown .select2-search__field {
-    border-color: $primary;
-}
-
-.select2-container--open .select2-dropdown,
-.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple,
-.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,
-.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple,
-.select2-container--default.select2-container--open.select2-container--below .select2-selection--single {
-    border-color: $primary;
-}
-
-.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b,
-.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
-    border-color: transparent transparent $primary;
-}
-
-
-.select2-container--classic .select2-selection--single .select2-selection__arrow b,
-.select2-container--default .select2-selection--single .select2-selection__arrow b {
-    border-color: $gray-400 transparent transparent;
-}
-
-.select2-container--default .select2-selection--single .select2-selection__arrow {
-    height: 34px;
-}
-
-.select2-container .select2-selection--single {
-    height: 34px;
-    border-radius: $border-radius;
-    border-color: $gray-400
-}
-
-.select2-container--default .select2-search--dropdown .select2-search__field,
-.select2-container .select2-selection--single:focus {
-    outline: none;
-}
-
-.select2-container--default .select2-selection--single .select2-selection__rendered {
-    color: $primary;
-    line-height: 34px;
-}