@varlet/ui 2.9.0-alpha.1678431541952 → 2.9.0

package/es/bottom-navigation/provide.mjs

@@ -1,14 +1,11 @@
-import { useAtChildrenCounter, useChildren } from '../utils/components.mjs';
+import { useChildren } from '@varlet/use';
 export var BOTTOM_NAVIGATION_BIND_BOTTOM_NAVIGATION_ITEM_KEY = Symbol('BOTTOM_NAVIGATION_BIND_BOTTOM_NAVIGATION_ITEM_KEY');
-export var BOTTOM_NAVIGATION_COUNT_BOTTOM_NAVIGATION_ITEM_KEY = Symbol('BOTTOM_NAVIGATION_COUNT_BOTTOM_NAVIGATION_ITEM_KEY');
 export function useBottomNavigationItems() {
   var {
     childProviders,
+    length,
     bindChildren
   } = useChildren(BOTTOM_NAVIGATION_BIND_BOTTOM_NAVIGATION_ITEM_KEY);
-  var {
-    length
-  } = useAtChildrenCounter(BOTTOM_NAVIGATION_COUNT_BOTTOM_NAVIGATION_ITEM_KEY);
   return {
     length,
     bottomNavigationItems: childProviders,

package/es/bottom-navigation-item/provide.mjs

@@ -1,15 +1,13 @@
-import { useAtParentIndex, useParent } from '../utils/components.mjs';
-import { BOTTOM_NAVIGATION_BIND_BOTTOM_NAVIGATION_ITEM_KEY, BOTTOM_NAVIGATION_COUNT_BOTTOM_NAVIGATION_ITEM_KEY } from '../bottom-navigation/provide.mjs';
+import { useParent } from '@varlet/use';
+import { BOTTOM_NAVIGATION_BIND_BOTTOM_NAVIGATION_ITEM_KEY } from '../bottom-navigation/provide.mjs';
 export function useBottomNavigation() {
   var {
     parentProvider,
+    index,
     bindParent
   } = useParent(BOTTOM_NAVIGATION_BIND_BOTTOM_NAVIGATION_ITEM_KEY);
-  var {
-    index
-  } = useAtParentIndex(BOTTOM_NAVIGATION_COUNT_BOTTOM_NAVIGATION_ITEM_KEY);
 
-  if (!parentProvider || !bindParent || !index) {
+  if (!bindParent) {
     throw Error('<var-bottom-navigation-item/> must in <var-bottom-navigation/>');
   }
 

package/es/form/Form.mjs

@@ -34,7 +34,7 @@ var __sfc__ = defineComponent({
       bindFormItems
     } = useFormItems();
 
-    var scroll = (errorIndex, formItemElement) => {
+    var scroll = formItemElement => {
       // wait form-details animation end
       setTimeout(() => {
         var scroller = getParentScroller(formItemElement);
@@ -65,7 +65,7 @@ var __sfc__ = defineComponent({
             var _formItems$errorIndex;
 
             var formItemElement = (_formItems$errorIndex = formItems[errorIndex].instance.proxy) == null ? void 0 : _formItems$errorIndex.$el;
-            scroll(errorIndex, formItemElement);
+            scroll(formItemElement);
           }
 
           return !hasError;

package/es/form/provide.mjs

@@ -1,12 +1,13 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+import { useChildren, useParent } from '@varlet/use';
 import { getCurrentInstance } from 'vue';
-import { useChildren, useParent } from '../utils/components.mjs';
 export var FORM_BIND_FORM_ITEM_KEY = Symbol('FORM_BIND_FORM_ITEM_KEY');
 export function useForm() {
   var {
-    bindParent,
-    parentProvider
+    parentProvider,
+    index,
+    bindParent
   } = useParent(FORM_BIND_FORM_ITEM_KEY);
   var instance = getCurrentInstance();
   var bindForm = bindParent ? formItemProvider => {
@@ -15,16 +16,19 @@ export function useForm() {
     }));
   } : null;
   return {
-    bindForm,
-    form: parentProvider
+    index,
+    form: parentProvider,
+    bindForm
   };
 }
 export function useFormItems() {
   var {
-    bindChildren,
-    childProviders
+    childProviders,
+    length,
+    bindChildren
   } = useChildren(FORM_BIND_FORM_ITEM_KEY);
   return {
+    length,
     formItems: childProviders,
     bindFormItems: bindChildren
   };

package/es/index-anchor/provide.mjs

@@ -1,15 +1,13 @@
-import { useAtParentIndex, useParent } from '../utils/components.mjs';
-import { INDEX_BAR_BIND_INDEX_ANCHOR_KEY, INDEX_BAR_COUNT_INDEX_ANCHOR_KEY } from '../index-bar/provide.mjs';
+import { useParent } from '@varlet/use';
+import { INDEX_BAR_BIND_INDEX_ANCHOR_KEY } from '../index-bar/provide.mjs';
 export function useIndexBar() {
   var {
     parentProvider,
+    index,
     bindParent
   } = useParent(INDEX_BAR_BIND_INDEX_ANCHOR_KEY);
-  var {
-    index
-  } = useAtParentIndex(INDEX_BAR_COUNT_INDEX_ANCHOR_KEY);
 
-  if (!parentProvider || !bindParent) {
+  if (!bindParent) {
     throw Error('[Varlet] IndexAnchor: You should use this component in "IndexBar"');
   }
 

package/es/index-bar/provide.mjs

@@ -1,14 +1,11 @@
-import { useAtChildrenCounter, useChildren } from '../utils/components.mjs';
+import { useChildren } from '@varlet/use';
 export var INDEX_BAR_BIND_INDEX_ANCHOR_KEY = Symbol('INDEX_BAR_BIND_INDEX_ANCHOR_KEY');
-export var INDEX_BAR_COUNT_INDEX_ANCHOR_KEY = Symbol('INDEX_BAR_COUNT_INDEX_ANCHOR_KEY');
 export function useIndexAnchors() {
   var {
     bindChildren,
+    length,
     childProviders
   } = useChildren(INDEX_BAR_BIND_INDEX_ANCHOR_KEY);
-  var {
-    length
-  } = useAtChildrenCounter(INDEX_BAR_COUNT_INDEX_ANCHOR_KEY);
   return {
     length,
     indexAnchors: childProviders,

package/es/index.bundle.mjs

@@ -238,7 +238,7 @@ import './time-picker/style/index.mjs'
 import './tooltip/style/index.mjs'
 import './uploader/style/index.mjs'
 
-const version = '2.9.0-alpha.1678431541952'
+const version = '2.9.0'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/index.mjs

@@ -158,7 +158,7 @@ export * from './time-picker/index.mjs'
 export * from './tooltip/index.mjs'
 export * from './uploader/index.mjs'
 
-const version = '2.9.0-alpha.1678431541952'
+const version = '2.9.0'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/loading-bar/index.mjs

@@ -1,7 +1,10 @@
 import LoadingBarComponent from './LoadingBar.mjs';
 import { reactive } from 'vue';
 import { mountInstance } from '../utils/components.mjs';
-var timer;
+var valueTimer;
+var errorTimer;
+var opacityTimer;
+var finishTimer;
 var isMount;
 var setOptions = {};
 var internalProps = {
@@ -28,47 +31,66 @@ var resetDefaultOptions = () => {
   });
 };
 
-var changeValue = () => {
-  timer = window.setTimeout(() => {
+var mount = () => {
+  if (!isMount) {
+    isMount = true;
+    mountInstance(LoadingBarComponent, props);
+  }
+};
+
+var tickValue = () => {
+  valueTimer = window.setTimeout(() => {
     if (props.value >= 95) return;
     var num = Math.random();
     if (props.value < 70) num = Math.round(5 * Math.random());
     props.value += num;
-    changeValue();
+    tickValue();
   }, 200);
 };
 
-var start = () => {
-  if (!isMount) {
-    isMount = true;
-    mountInstance(LoadingBarComponent, props);
-  }
-
-  if (!props.error || props.value === 100) {
-    props.value = 0;
-  }
+var clearTimer = () => {
+  window.clearTimeout(errorTimer);
+  window.clearTimeout(valueTimer);
+  window.clearTimeout(opacityTimer);
+  window.clearTimeout(finishTimer);
+};
 
-  setTimeout(() => {
+var start = () => {
+  clearTimer();
+  props.error = false;
+  props.value = 0;
+  mount();
+  opacityTimer = window.setTimeout(() => {
     props.opacity = 1;
   }, 200);
-  changeValue();
+  tickValue();
 };
 
 var finish = () => {
+  clearTimer();
   props.value = 100;
-  setTimeout(() => {
+  opacityTimer = window.setTimeout(() => {
     props.opacity = 0;
-    setTimeout(() => {
+    errorTimer = window.setTimeout(() => {
       props.error = false;
     }, 250);
   }, 300);
-  window.clearTimeout(timer);
 };
 
 var error = () => {
+  clearTimer();
   props.error = true;
-  LoadingBar.start();
-  setTimeout(LoadingBar.finish, 300);
+
+  if (props.value === 100) {
+    props.value = 0;
+  }
+
+  mount();
+  opacityTimer = window.setTimeout(() => {
+    props.opacity = 1;
+  }, 200);
+  tickValue();
+  finishTimer = window.setTimeout(finish, 300);
 };
 
 var LoadingBar = {

package/es/option/provide.mjs

@@ -1,15 +1,13 @@
-import { useAtParentIndex, useParent } from '../utils/components.mjs';
-import { SELECT_BIND_OPTION_KEY, SELECT_COUNT_OPTION_KEY } from '../select/provide.mjs';
+import { useParent } from '@varlet/use';
+import { SELECT_BIND_OPTION_KEY } from '../select/provide.mjs';
 export function useSelect() {
   var {
-    bindParent,
-    parentProvider
+    index,
+    parentProvider,
+    bindParent
   } = useParent(SELECT_BIND_OPTION_KEY);
-  var {
-    index
-  } = useAtParentIndex(SELECT_COUNT_OPTION_KEY);
 
-  if (!bindParent || !parentProvider) {
+  if (!bindParent) {
     throw Error('<var-option/> must in <var-select/>');
   }
 

package/es/select/provide.mjs

@@ -1,14 +1,11 @@
-import { useAtChildrenCounter, useChildren } from '../utils/components.mjs';
+import { useChildren } from '@varlet/use';
 export var SELECT_BIND_OPTION_KEY = Symbol('SELECT_BIND_OPTION_KEY');
-export var SELECT_COUNT_OPTION_KEY = Symbol('SELECT_COUNT_OPTION_KEY');
 export function useOptions() {
   var {
-    bindChildren,
-    childProviders
+    length,
+    childProviders,
+    bindChildren
   } = useChildren(SELECT_BIND_OPTION_KEY);
-  var {
-    length
-  } = useAtChildrenCounter(SELECT_COUNT_OPTION_KEY);
   return {
     length,
     options: childProviders,

package/es/snackbar/style/index.mjs

@@ -1,8 +1,8 @@
 import '../../styles/common.css'
+import '../SnackbarSfc.css'
 import '../../styles/elevation.css'
 import '../../loading/loading.css'
 import '../../button/button.css'
 import '../../icon/icon.css'
 import '../snackbar.css'
 import '../coreSfc.css'
-import '../SnackbarSfc.css'

package/es/step/provide.mjs

@@ -1,15 +1,13 @@
-import { useAtParentIndex, useParent } from '../utils/components.mjs';
-import { STEPS_BIND_STEP_KEY, STEPS_COUNT_STEP_KEY } from '../steps/provide.mjs';
+import { useParent } from '@varlet/use';
+import { STEPS_BIND_STEP_KEY } from '../steps/provide.mjs';
 export function useSteps() {
   var {
     parentProvider,
+    index,
     bindParent
   } = useParent(STEPS_BIND_STEP_KEY);
-  var {
-    index
-  } = useAtParentIndex(STEPS_COUNT_STEP_KEY);
 
-  if (!parentProvider || !bindParent || !index) {
+  if (!bindParent) {
     throw Error('[Varlet] Steps: <step/> must in <steps>');
   }
 

package/es/steps/provide.mjs

@@ -1,14 +1,11 @@
-import { useAtChildrenCounter, useChildren } from '../utils/components.mjs';
+import { useChildren } from '@varlet/use';
 export var STEPS_BIND_STEP_KEY = Symbol('STEPS_BIND_STEP_KEY');
-export var STEPS_COUNT_STEP_KEY = Symbol('STEPS_COUNT_STEP_KEY');
 export function useStep() {
   var {
     bindChildren,
+    length,
     childProviders
   } = useChildren(STEPS_BIND_STEP_KEY);
-  var {
-    length
-  } = useAtChildrenCounter(STEPS_COUNT_STEP_KEY);
   return {
     length,
     step: childProviders,

package/es/swipe/provide.mjs

@@ -1,14 +1,11 @@
-import { useAtChildrenCounter, useChildren } from '../utils/components.mjs';
+import { useChildren } from '@varlet/use';
 export var SWIPE_BIND_SWIPE_ITEM_KEY = Symbol('SWIPE_BIND_SWIPE_ITEM_KEY');
-export var SWIPE_COUNT_SWIPE_ITEM_KEY = Symbol('SWIPE_COUNT_SWIPE_ITEM_KEY');
 export function useSwipeItems() {
   var {
     childProviders,
+    length,
     bindChildren
   } = useChildren(SWIPE_BIND_SWIPE_ITEM_KEY);
-  var {
-    length
-  } = useAtChildrenCounter(SWIPE_COUNT_SWIPE_ITEM_KEY);
   return {
     length,
     swipeItems: childProviders,

package/es/swipe-item/provide.mjs

@@ -1,15 +1,13 @@
-import { useAtParentIndex, useParent } from '../utils/components.mjs';
-import { SWIPE_BIND_SWIPE_ITEM_KEY, SWIPE_COUNT_SWIPE_ITEM_KEY } from '../swipe/provide.mjs';
+import { useParent } from '@varlet/use';
+import { SWIPE_BIND_SWIPE_ITEM_KEY } from '../swipe/provide.mjs';
 export function useSwipe() {
   var {
     bindParent,
+    index,
     parentProvider
   } = useParent(SWIPE_BIND_SWIPE_ITEM_KEY);
-  var {
-    index
-  } = useAtParentIndex(SWIPE_COUNT_SWIPE_ITEM_KEY);
 
-  if (!bindParent || !parentProvider || !index) {
+  if (!bindParent) {
     throw Error('<var-swipe-item/> must in <var-swipe/>');
   }
 

package/es/utils/components.mjs

@@ -1,16 +1,12 @@
-var _excluded = ["collect", "clear"];
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import { useEventListener } from '@varlet/use';
-import { createApp, h, getCurrentInstance, inject, onUnmounted, computed, provide, reactive, isVNode, onMounted, onBeforeUnmount, nextTick, ref, onActivated, onDeactivated, Comment, Fragment } from 'vue';
-import { isArray, removeItem } from '@varlet/shared';
+import { createApp, h, getCurrentInstance, isVNode, ref, onActivated, onDeactivated, Comment, Fragment } from 'vue';
+import { isArray } from '@varlet/shared';
 export function pickProps(props, propsKey) {
   return Array.isArray(propsKey) ? propsKey.reduce((pickedProps, key) => {
     pickedProps[key] = props[key];
@@ -93,110 +89,6 @@ export function flatVNodes(subTree) {
   flat(subTree);
   return vNodes;
 }
-export function useAtChildrenCounter(key) {
-  var instances = reactive([]);
-  var parentInstance = getCurrentInstance();
-
-  var sortInstances = () => {
-    var vNodes = flatVNodes(parentInstance.subTree);
-    instances.sort((a, b) => {
-      return vNodes.indexOf(a.vnode) - vNodes.indexOf(b.vnode);
-    });
-  };
-
-  var collect = instance => {
-    instances.push(instance);
-    sortInstances();
-  };
-
-  var clear = instance => {
-    removeItem(instances, instance);
-  };
-
-  provide(key, {
-    collect,
-    clear,
-    instances
-  });
-  var length = computed(() => instances.length);
-  return {
-    length
-  };
-}
-export function useAtParentIndex(key) {
-  if (!keyInProvides(key)) {
-    return {
-      index: null
-    };
-  }
-
-  var childrenCounter = inject(key);
-  var {
-    collect,
-    clear,
-    instances
-  } = childrenCounter;
-  var instance = getCurrentInstance();
-  onMounted(() => {
-    nextTick().then(() => collect(instance));
-  });
-  onUnmounted(() => {
-    nextTick().then(() => clear(instance));
-  });
-  var index = computed(() => instances.indexOf(instance));
-  return {
-    index
-  };
-}
-export function useChildren(key) {
-  var childProviders = [];
-
-  var collect = childProvider => {
-    childProviders.push(childProvider);
-  };
-
-  var clear = childProvider => {
-    removeItem(childProviders, childProvider);
-  };
-
-  var bindChildren = parentProvider => {
-    provide(key, _extends({
-      collect,
-      clear
-    }, parentProvider));
-  };
-
-  return {
-    childProviders,
-    bindChildren
-  };
-}
-export function useParent(key) {
-  if (!keyInProvides(key)) {
-    return {
-      parentProvider: null,
-      bindParent: null
-    };
-  }
-
-  var rawParentProvider = inject(key);
-
-  var {
-    collect,
-    clear
-  } = rawParentProvider,
-      parentProvider = _objectWithoutPropertiesLoose(rawParentProvider, _excluded);
-
-  var bindParent = childProvider => {
-    onMounted(() => collect(childProvider));
-    onBeforeUnmount(() => clear(childProvider));
-  };
-
-  return {
-    parentProvider,
-    bindParent
-  };
-}
 export function keyInProvides(key) {
   var instance = getCurrentInstance();
   return key in instance.provides;