@vueuse/integrations 10.3.0 → 10.4.0

package/useSortable/component.mjs

@@ -1,65 +1,42 @@
-import { nextTick, defineComponent, ref, reactive, h } from 'vue-demi';
+import { isRef, nextTick, defineComponent, ref, reactive, h } from 'vue-demi';
 import { tryOnMounted, tryOnScopeDispose, unrefElement, defaultDocument, toValue, useVModel } from '@vueuse/core';
 import Sortable from 'sortablejs';
 
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 function useSortable(el, list, options = {}) {
   let sortable;
-  const _a = options, { document = defaultDocument } = _a, resetOptions = __objRest(_a, ["document"]);
+  const { document = defaultDocument, ...resetOptions } = options;
   const defaultOptions = {
     onUpdate: (e) => {
       moveArrayElement(list, e.oldIndex, e.newIndex);
     }
   };
   const start = () => {
-    const target = typeof el === "string" ? document == null ? void 0 : document.querySelector(el) : unrefElement(el);
+    const target = typeof el === "string" ? document?.querySelector(el) : unrefElement(el);
     if (!target)
       return;
-    sortable = new Sortable(target, __spreadValues(__spreadValues({}, defaultOptions), resetOptions));
+    sortable = new Sortable(target, { ...defaultOptions, ...resetOptions });
   };
-  const stop = () => sortable == null ? void 0 : sortable.destroy();
+  const stop = () => sortable?.destroy();
   const option = (name, value) => {
     if (value !== void 0)
-      sortable == null ? void 0 : sortable.option(name, value);
+      sortable?.option(name, value);
     else
-      return sortable == null ? void 0 : sortable.option(name);
+      return sortable?.option(name);
   };
   tryOnMounted(start);
   tryOnScopeDispose(stop);
   return { stop, start, option };
 }
 function moveArrayElement(list, from, to) {
-  const array = toValue(list);
+  const _valueIsRef = isRef(list);
+  const array = _valueIsRef ? [...toValue(list)] : toValue(list);
   if (to >= 0 && to < array.length) {
     const element = array.splice(from, 1)[0];
-    nextTick(() => array.splice(to, 0, element));
+    nextTick(() => {
+      array.splice(to, 0, element);
+      if (_valueIsRef)
+        list.value = array;
+    });
   }
 }
 

package/useSortable.cjs

@@ -4,64 +4,41 @@ var core = require('@vueuse/core');
 var Sortable = require('sortablejs');
 var vueDemi = require('vue-demi');
 
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 function useSortable(el, list, options = {}) {
   let sortable;
-  const _a = options, { document = core.defaultDocument } = _a, resetOptions = __objRest(_a, ["document"]);
+  const { document = core.defaultDocument, ...resetOptions } = options;
   const defaultOptions = {
     onUpdate: (e) => {
       moveArrayElement(list, e.oldIndex, e.newIndex);
     }
   };
   const start = () => {
-    const target = typeof el === "string" ? document == null ? void 0 : document.querySelector(el) : core.unrefElement(el);
+    const target = typeof el === "string" ? document?.querySelector(el) : core.unrefElement(el);
     if (!target)
       return;
-    sortable = new Sortable(target, __spreadValues(__spreadValues({}, defaultOptions), resetOptions));
+    sortable = new Sortable(target, { ...defaultOptions, ...resetOptions });
   };
-  const stop = () => sortable == null ? void 0 : sortable.destroy();
+  const stop = () => sortable?.destroy();
   const option = (name, value) => {
     if (value !== void 0)
-      sortable == null ? void 0 : sortable.option(name, value);
+      sortable?.option(name, value);
     else
-      return sortable == null ? void 0 : sortable.option(name);
+      return sortable?.option(name);
   };
   core.tryOnMounted(start);
   core.tryOnScopeDispose(stop);
   return { stop, start, option };
 }
 function moveArrayElement(list, from, to) {
-  const array = core.toValue(list);
+  const _valueIsRef = vueDemi.isRef(list);
+  const array = _valueIsRef ? [...core.toValue(list)] : core.toValue(list);
   if (to >= 0 && to < array.length) {
     const element = array.splice(from, 1)[0];
-    vueDemi.nextTick(() => array.splice(to, 0, element));
+    vueDemi.nextTick(() => {
+      array.splice(to, 0, element);
+      if (_valueIsRef)
+        list.value = array;
+    });
   }
 }
 

package/useSortable.d.cts

@@ -23,4 +23,4 @@ declare function useSortable<T>(selector: string, list: MaybeRefOrGetter<T[]>, o
 declare function useSortable<T>(el: MaybeRefOrGetter<HTMLElement | null | undefined>, list: MaybeRefOrGetter<T[]>, options?: UseSortableOptions): UseSortableReturn;
 declare function moveArrayElement<T>(list: MaybeRefOrGetter<T[]>, from: number, to: number): void;
 
-export { UseSortableOptions, UseSortableReturn, moveArrayElement, useSortable };
+export { type UseSortableOptions, type UseSortableReturn, moveArrayElement, useSortable };

package/useSortable.d.mts

@@ -23,4 +23,4 @@ declare function useSortable<T>(selector: string, list: MaybeRefOrGetter<T[]>, o
 declare function useSortable<T>(el: MaybeRefOrGetter<HTMLElement | null | undefined>, list: MaybeRefOrGetter<T[]>, options?: UseSortableOptions): UseSortableReturn;
 declare function moveArrayElement<T>(list: MaybeRefOrGetter<T[]>, from: number, to: number): void;
 
-export { UseSortableOptions, UseSortableReturn, moveArrayElement, useSortable };
+export { type UseSortableOptions, type UseSortableReturn, moveArrayElement, useSortable };

package/useSortable.d.ts

@@ -23,4 +23,4 @@ declare function useSortable<T>(selector: string, list: MaybeRefOrGetter<T[]>, o
 declare function useSortable<T>(el: MaybeRefOrGetter<HTMLElement | null | undefined>, list: MaybeRefOrGetter<T[]>, options?: UseSortableOptions): UseSortableReturn;
 declare function moveArrayElement<T>(list: MaybeRefOrGetter<T[]>, from: number, to: number): void;
 
-export { UseSortableOptions, UseSortableReturn, moveArrayElement, useSortable };
+export { type UseSortableOptions, type UseSortableReturn, moveArrayElement, useSortable };

package/useSortable.iife.js

@@ -117,64 +117,41 @@ var VueDemi = (function (VueDemi, Vue, VueCompositionAPI) {
 ;(function (exports, core, Sortable, vueDemi) {
   'use strict';
 
-  var __defProp = Object.defineProperty;
-  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-  var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __propIsEnum = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    if (__getOwnPropSymbols)
-      for (var prop of __getOwnPropSymbols(b)) {
-        if (__propIsEnum.call(b, prop))
-          __defNormalProp(a, prop, b[prop]);
-      }
-    return a;
-  };
-  var __objRest = (source, exclude) => {
-    var target = {};
-    for (var prop in source)
-      if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-        target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols)
-      for (var prop of __getOwnPropSymbols(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-          target[prop] = source[prop];
-      }
-    return target;
-  };
   function useSortable(el, list, options = {}) {
     let sortable;
-    const _a = options, { document = core.defaultDocument } = _a, resetOptions = __objRest(_a, ["document"]);
+    const { document = core.defaultDocument, ...resetOptions } = options;
     const defaultOptions = {
       onUpdate: (e) => {
         moveArrayElement(list, e.oldIndex, e.newIndex);
       }
     };
     const start = () => {
-      const target = typeof el === "string" ? document == null ? void 0 : document.querySelector(el) : core.unrefElement(el);
+      const target = typeof el === "string" ? document?.querySelector(el) : core.unrefElement(el);
       if (!target)
         return;
-      sortable = new Sortable(target, __spreadValues(__spreadValues({}, defaultOptions), resetOptions));
+      sortable = new Sortable(target, { ...defaultOptions, ...resetOptions });
     };
-    const stop = () => sortable == null ? void 0 : sortable.destroy();
+    const stop = () => sortable?.destroy();
     const option = (name, value) => {
       if (value !== void 0)
-        sortable == null ? void 0 : sortable.option(name, value);
+        sortable?.option(name, value);
       else
-        return sortable == null ? void 0 : sortable.option(name);
+        return sortable?.option(name);
     };
     core.tryOnMounted(start);
     core.tryOnScopeDispose(stop);
     return { stop, start, option };
   }
   function moveArrayElement(list, from, to) {
-    const array = core.toValue(list);
+    const _valueIsRef = vueDemi.isRef(list);
+    const array = _valueIsRef ? [...core.toValue(list)] : core.toValue(list);
     if (to >= 0 && to < array.length) {
       const element = array.splice(from, 1)[0];
-      vueDemi.nextTick(() => array.splice(to, 0, element));
+      vueDemi.nextTick(() => {
+        array.splice(to, 0, element);
+        if (_valueIsRef)
+          list.value = array;
+      });
     }
   }
 

package/useSortable.iife.min.js

@@ -1 +1 @@
-var VueDemi=function(n,t,u){if(n.install)return n;if(!t)return console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`."),n;if(t.version.slice(0,4)==="2.7."){let s=function(f,c){var l,y={},b={config:t.config,use:t.use.bind(t),mixin:t.mixin.bind(t),component:t.component.bind(t),provide:function(p,d){return y[p]=d,this},directive:function(p,d){return d?(t.directive(p,d),b):t.directive(p)},mount:function(p,d){return l||(l=new t(Object.assign({propsData:c},f,{provide:Object.assign(y,f.provide)})),l.$mount(p,d),l)},unmount:function(){l&&(l.$destroy(),l=void 0)}};return b};var h=s;for(var a in t)n[a]=t[a];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=t,n.Vue2=t,n.version=t.version,n.warn=t.util.warn,n.hasInjectionContext=()=>!!n.getCurrentInstance(),n.createApp=s}else if(t.version.slice(0,2)==="2.")if(u){for(var a in u)n[a]=u[a];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=t,n.Vue2=t,n.version=t.version,n.hasInjectionContext=()=>!!n.getCurrentInstance()}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.");else if(t.version.slice(0,2)==="3."){for(var a in t)n[a]=t[a];n.isVue2=!1,n.isVue3=!0,n.install=function(){},n.Vue=t,n.Vue2=void 0,n.version=t.version,n.set=function(s,f,c){return Array.isArray(s)?(s.length=Math.max(s.length,f),s.splice(f,1,c),c):(s[f]=c,c)},n.del=function(s,f){if(Array.isArray(s)){s.splice(f,1);return}delete s[f]}}else console.error("[vue-demi] Vue version "+t.version+" is unsupported.");return n}(this.VueDemi=this.VueDemi||(typeof VueDemi<"u"?VueDemi:{}),this.Vue||(typeof Vue<"u"?Vue:void 0),this.VueCompositionAPI||(typeof VueCompositionAPI<"u"?VueCompositionAPI:void 0));(function(n,t,u,a){"use strict";var h=Object.defineProperty,s=Object.getOwnPropertySymbols,f=Object.prototype.hasOwnProperty,c=Object.prototype.propertyIsEnumerable,l=(r,i,o)=>i in r?h(r,i,{enumerable:!0,configurable:!0,writable:!0,value:o}):r[i]=o,y=(r,i)=>{for(var o in i||(i={}))f.call(i,o)&&l(r,o,i[o]);if(s)for(var o of s(i))c.call(i,o)&&l(r,o,i[o]);return r},b=(r,i)=>{var o={};for(var e in r)f.call(r,e)&&i.indexOf(e)<0&&(o[e]=r[e]);if(r!=null&&s)for(var e of s(r))i.indexOf(e)<0&&c.call(r,e)&&(o[e]=r[e]);return o};function p(r,i,o={}){let e;const O=o,{document:_=t.defaultDocument}=O,A=b(O,["document"]),P={onUpdate:v=>{d(i,v.oldIndex,v.newIndex)}},w=()=>{const v=typeof r=="string"?_?.querySelector(r):t.unrefElement(r);v&&(e=new u(v,y(y({},P),A)))},I=()=>e?.destroy(),x=(v,g)=>{if(g!==void 0)e?.option(v,g);else return e?.option(v)};return t.tryOnMounted(w),t.tryOnScopeDispose(I),{stop:I,start:w,option:x}}function d(r,i,o){const e=t.toValue(r);if(o>=0&&o<e.length){const O=e.splice(i,1)[0];a.nextTick(()=>e.splice(o,0,O))}}n.moveArrayElement=d,n.useSortable=p})(this.VueUse=this.VueUse||{},VueUse,Sortable,VueDemi);
+var VueDemi=function(n,t,u){if(n.install)return n;if(!t)return console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`."),n;if(t.version.slice(0,4)==="2.7."){let o=function(e,i){var r,f={},d={config:t.config,use:t.use.bind(t),mixin:t.mixin.bind(t),component:t.component.bind(t),provide:function(c,l){return f[c]=l,this},directive:function(c,l){return l?(t.directive(c,l),d):t.directive(c)},mount:function(c,l){return r||(r=new t(Object.assign({propsData:i},e,{provide:Object.assign(f,e.provide)})),r.$mount(c,l),r)},unmount:function(){r&&(r.$destroy(),r=void 0)}};return d};var p=o;for(var s in t)n[s]=t[s];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=t,n.Vue2=t,n.version=t.version,n.warn=t.util.warn,n.hasInjectionContext=()=>!!n.getCurrentInstance(),n.createApp=o}else if(t.version.slice(0,2)==="2.")if(u){for(var s in u)n[s]=u[s];n.isVue2=!0,n.isVue3=!1,n.install=function(){},n.Vue=t,n.Vue2=t,n.version=t.version,n.hasInjectionContext=()=>!!n.getCurrentInstance()}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.");else if(t.version.slice(0,2)==="3."){for(var s in t)n[s]=t[s];n.isVue2=!1,n.isVue3=!0,n.install=function(){},n.Vue=t,n.Vue2=void 0,n.version=t.version,n.set=function(o,e,i){return Array.isArray(o)?(o.length=Math.max(o.length,e),o.splice(e,1,i),i):(o[e]=i,i)},n.del=function(o,e){if(Array.isArray(o)){o.splice(e,1);return}delete o[e]}}else console.error("[vue-demi] Vue version "+t.version+" is unsupported.");return n}(this.VueDemi=this.VueDemi||(typeof VueDemi<"u"?VueDemi:{}),this.Vue||(typeof Vue<"u"?Vue:void 0),this.VueCompositionAPI||(typeof VueCompositionAPI<"u"?VueCompositionAPI:void 0));(function(n,t,u,s){"use strict";function p(e,i,r={}){let f;const{document:d=t.defaultDocument,...c}=r,l={onUpdate:a=>{o(i,a.oldIndex,a.newIndex)}},v=()=>{const a=typeof e=="string"?d?.querySelector(e):t.unrefElement(e);a&&(f=new u(a,{...l,...c}))},y=()=>f?.destroy(),h=(a,b)=>{if(b!==void 0)f?.option(a,b);else return f?.option(a)};return t.tryOnMounted(v),t.tryOnScopeDispose(y),{stop:y,start:v,option:h}}function o(e,i,r){const f=s.isRef(e),d=f?[...t.toValue(e)]:t.toValue(e);if(r>=0&&r<d.length){const c=d.splice(i,1)[0];s.nextTick(()=>{d.splice(r,0,c),f&&(e.value=d)})}}n.moveArrayElement=o,n.useSortable=p})(this.VueUse=this.VueUse||{},VueUse,Sortable,VueDemi);

package/useSortable.mjs

@@ -1,65 +1,42 @@
 import { tryOnMounted, tryOnScopeDispose, toValue, unrefElement, defaultDocument } from '@vueuse/core';
 import Sortable from 'sortablejs';
-import { nextTick } from 'vue-demi';
+import { isRef, nextTick } from 'vue-demi';
 
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 function useSortable(el, list, options = {}) {
   let sortable;
-  const _a = options, { document = defaultDocument } = _a, resetOptions = __objRest(_a, ["document"]);
+  const { document = defaultDocument, ...resetOptions } = options;
   const defaultOptions = {
     onUpdate: (e) => {
       moveArrayElement(list, e.oldIndex, e.newIndex);
     }
   };
   const start = () => {
-    const target = typeof el === "string" ? document == null ? void 0 : document.querySelector(el) : unrefElement(el);
+    const target = typeof el === "string" ? document?.querySelector(el) : unrefElement(el);
     if (!target)
       return;
-    sortable = new Sortable(target, __spreadValues(__spreadValues({}, defaultOptions), resetOptions));
+    sortable = new Sortable(target, { ...defaultOptions, ...resetOptions });
   };
-  const stop = () => sortable == null ? void 0 : sortable.destroy();
+  const stop = () => sortable?.destroy();
   const option = (name, value) => {
     if (value !== void 0)
-      sortable == null ? void 0 : sortable.option(name, value);
+      sortable?.option(name, value);
     else
-      return sortable == null ? void 0 : sortable.option(name);
+      return sortable?.option(name);
   };
   tryOnMounted(start);
   tryOnScopeDispose(stop);
   return { stop, start, option };
 }
 function moveArrayElement(list, from, to) {
-  const array = toValue(list);
+  const _valueIsRef = isRef(list);
+  const array = _valueIsRef ? [...toValue(list)] : toValue(list);
   if (to >= 0 && to < array.length) {
     const element = array.splice(from, 1)[0];
-    nextTick(() => array.splice(to, 0, element));
+    nextTick(() => {
+      array.splice(to, 0, element);
+      if (_valueIsRef)
+        list.value = array;
+    });
   }
 }