From 5e521f8ce6b7ab0b50113bcd07ad91c2e56099aa Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 20 Jul 2018 15:28:12 -0400
Subject: [PATCH] Revert "FIX: various select-kit corrections on mobile"

This reverts commit 78a2324c89b1865d34ec201457ef184ce723476a.
---
 .../select-kit/components/select-kit.js.es6          | 11 +++++++++++
 .../javascripts/select-kit/mixins/dom-helpers.js.es6 | 12 +++++++-----
 .../javascripts/select-kit/mixins/events.js.es6      |  8 ++++----
 .../stylesheets/common/select-kit/multi-select.scss  |  6 +++---
 .../mobile/select-kit/dropdown-select-box.scss       |  2 +-
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index b157e5d16d..18e45adfa9 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -92,6 +92,17 @@ export default Ember.Component.extend(
       this.set("computedContent", []);
       this.set("highlightedSelection", []);
 
+      if (this.site && this.site.isMobileDevice) {
+        this.setProperties({
+          filterable: isNone(this.get("filterable"))
+            ? false
+            : this.get("filterable"),
+          autoFilterable: isNone(this.get("autoFilterable"))
+            ? false
+            : this.get("filterable")
+        });
+      }
+
       if (this.get("nameChanges")) {
         this.addObserver(
           `content.@each.${this.get("nameProperty")}`,
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index a4dee3d4ac..347c2f7c4e 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -82,10 +82,8 @@ export default Ember.Mixin.create({
   },
 
   focus() {
-    Ember.run.next(() => {
-      Ember.run.schedule("afterRender", () => {
-        this.$filterInput().focus();
-      });
+    Ember.run.schedule("afterRender", () => {
+      this.$header().focus();
     });
   },
 
@@ -95,7 +93,11 @@ export default Ember.Mixin.create({
     // next so we are sure it finised expand/collapse
     Ember.run.next(() => {
       Ember.run.schedule("afterRender", () => {
-        if (!context.$filterInput() || !context.$filterInput().is(":visible")) {
+        if (
+          (this.site && this.site.isMobileDevice) ||
+          !context.$filterInput() ||
+          !context.$filterInput().is(":visible")
+        ) {
           context.$header().focus();
         } else {
           context.$filterInput().focus();
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 9f982e80a2..80c4762272 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -16,11 +16,11 @@ export default Ember.Mixin.create({
   },
 
   willDestroyElement() {
-    this._super(...arguments);
+    this._super();
 
     $(document).off("mousedown.select-kit");
 
-    if (this.$header().length) {
+    if (this.$header()) {
       this.$header()
         .off("blur.select-kit")
         .off("focus.select-kit")
@@ -28,7 +28,7 @@ export default Ember.Mixin.create({
         .off("keydown.select-kit");
     }
 
-    if (this.$filterInput().length) {
+    if (this.$filterInput()) {
       this.$filterInput()
         .off("change.select-kit")
         .off("keydown.select-kit")
@@ -37,7 +37,7 @@ export default Ember.Mixin.create({
   },
 
   didInsertElement() {
-    this._super(...arguments);
+    this._super();
 
     $(document).on("mousedown.select-kit", event => {
       if (!this.element || this.isDestroying || this.isDestroyed) {
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index 9b7e158aa9..5d0c270f79 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -64,9 +64,9 @@
     }
 
     .choices {
-      margin: 1px;
+      margin: 0;
       box-sizing: border-box;
-      display: flex;
+      display: inline-flex;
       justify-content: flex-start;
       flex-wrap: wrap;
 
@@ -79,7 +79,7 @@
         justify-content: space-between;
         flex-wrap: wrap;
         flex-direction: row;
-        margin: 1px;
+        margin: 2px;
       }
 
       .filter {
diff --git a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
index 5d4c46832b..1853c4e230 100644
--- a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
@@ -2,7 +2,7 @@
   &.dropdown-select-box {
     .select-kit-collection {
       max-height: 200px;
-      overflow-y: auto;
+      overflow-y: scroll;
     }
   }
 }