sprintify-ui 0.8.68 → 0.8.69

package/src/components/BaseDataIterator.vue

@@ -453,6 +453,7 @@ function updateFilterQueryValue(key: string, value: any) {
   let newQuery = cloneDeep(query.value);
   newQuery = set(newQuery, key, value);
   newQuery = set(newQuery, 'page', 1);
+
   updateQuery(newQuery);
 }
 
@@ -635,6 +636,22 @@ function onRouteChange() {
 |--------------------------------------------------------------------------
 */
 
+const fullQuery = computed(() => {
+
+  const urlSplit = (url.value + '').split(/[?#]/);
+  const urlQueryString = urlSplit[1] ?? null;
+  const urlQuery = config.parseQueryString(urlQueryString);
+
+  // Ordered by priority
+  const allParams = merge(
+    cloneDeep(query.value),
+    cloneDeep(props.urlQuery),
+    cloneDeep(urlQuery)
+  );
+
+  return allParams;
+});
+
 function fetchWithLoading(force = false) {
   fetch(force, true);
 }
@@ -653,22 +670,12 @@ function fetch(force = false, showLoading = true) {
     return;
   }
 
-  const urlSplit = url.value.split(/[?#]/);
+  const fullQueryInternal = fullQuery.value;
+  const fullQueryString = config.formatQueryString(fullQueryInternal);
 
+  const urlSplit = url.value.split(/[?#]/);
   const baseUrl = urlSplit[0];
-  const urlQueryString = urlSplit[1] ?? null;
-  const urlQuery = config.parseQueryString(urlQueryString);
-
-  // Ordered by priority
-  const allParams = merge(
-    cloneDeep(query.value),
-    cloneDeep(props.urlQuery),
-    cloneDeep(urlQuery)
-  );
-
-  const queryString = config.formatQueryString(allParams);
-
-  const fullUrl = baseUrl + '?' + queryString;
+  const fullUrl = baseUrl + '?' + fullQueryString;
 
   if (lastUrl == fullUrl && !force) {
     return;
@@ -956,7 +963,7 @@ defineExpose({
   fetchWithLoading: () => fetchWithLoading(true),
   fetchWithoutLoading: () => fetchWithoutLoading(true),
   scrollIntoView: scrollIntoViewAction,
-  query,
+  query: computed(() => fullQuery.value),
   data: computed(() => dataInternal.value),
 });
 </script>

package/src/components/BaseDraggable.vue

@@ -40,26 +40,34 @@ onMounted(() => {
     handle: props.handle,
     disabled: props.disabled,
     onEnd: (event) => {
-      if (event.oldIndex !== undefined && event.newIndex !== undefined) {
-        const modelValue = cloneDeep(props.modelValue);
 
-        const modelValueUpdated = arrayMove(
-          modelValue,
-          event.oldIndex,
-          event.newIndex
-        );
+      if (event.oldIndex === undefined || event.newIndex === undefined) {
+        return;
+      }
+
+      const modelValue = props.modelValue;
+
+      const modelValueUpdated = arrayMove(
+        modelValue,
+        event.oldIndex,
+        event.newIndex
+      );
 
+      nextTick(() => {
         emit('update:modelValue', modelValueUpdated);
-      }
+      });
     },
   });
 });
 
 function arrayMove(array: any[], fromIndex: number, toIndex: number): any[] {
-  const element = array[fromIndex];
-  array.splice(fromIndex, 1);
-  array.splice(toIndex, 0, element);
-  return array;
+  // without mutating the original array
+
+  const newArray = [...array];
+  const item = newArray.splice(fromIndex, 1)[0];
+  newArray.splice(toIndex, 0, item);
+
+  return newArray;
 }
 
 onBeforeUnmount(() => {