aloha-vue 1.2.86 → 1.2.87

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.86",
+  "version": "1.2.87",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/ui/ASelect/ASelect.js

@@ -5,6 +5,7 @@ import {
 } from "vue";
 
 import AButton from "../../AButton/AButton";
+import ACloak from "../../ACloak/ACloak";
 import ACheckboxRadioGroup from "../ACheckboxRadioGroups/ACheckboxRadioGroups";
 import AErrorsText from "../AErrorsText/AErrorsText";
 import AFormHelpText from "../AFormHelpText/AFormHelpText";
@@ -719,7 +720,6 @@ export default {
                             type: "submit",
                             iconLeft: "Search",
                             loadingAlign: "left",
-                            loading: this.loadingSearchApi,
                           }),
                         ]),
                       ]),
@@ -778,6 +778,9 @@ export default {
                         class: "a_select__divider",
                         ariaHidden: true,
                       }),
+                      (this.loadingLocal || this.loadingSearchApi) ?
+                        h(ACloak) :
+                        "",
                       this.hasDataExtra && h("div", {}, [
                         ...this.dataExtraLocal.map((item, itemIndex) => {
                           return h(ASelectElement, {

package/src/ui/compositionApi/UiDataFromServerAPI.js

@@ -153,7 +153,7 @@ export default function UiDataFromServerAPI(props, {
       url: url.value,
       params: {
         ...(urlParams.value || {}),
-        searchApiKey: search,
+        [searchApiKey.value]: search,
       },
     }).then(
       response => {
@@ -174,6 +174,7 @@ export default function UiDataFromServerAPI(props, {
       !modelArrayWithoutDataExtra.value.length) {
       return;
     }
+    loadingDataFromServer.value = true;
     const URL_PARAMS = {
       ...urlParams.value,
       ...{
@@ -188,7 +189,9 @@ export default function UiDataFromServerAPI(props, {
       response => {
         dataFromServer.value = response || [];
       }
-    );
+    ).finally(() => {
+      loadingDataFromServer.value = false;
+    });
   };
 
   return {