ele-admin-plus 1.2.1-beta.2 → 1.2.1-beta.3

package/es/ele-watermark/index.d.ts

@@ -1,4 +1,5 @@
 import { Ref } from 'vue';
+import { StyleValue } from '../ele-app/types';
 
 declare const _default: import('vue').DefineComponent<{
     width: NumberConstructor;
@@ -14,12 +15,12 @@ declare const _default: import('vue').DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    customStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    customStyle: import('vue').PropType<Exclude<StyleValue, string>>;
     fixed: BooleanConstructor;
     wrapPosition: {
         type: BooleanConstructor;
         default: boolean;
-    }; /** 根节点 */
+    };
     disabled: BooleanConstructor;
 }, {
     rootKey: Ref<number>;
@@ -40,12 +41,12 @@ declare const _default: import('vue').DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    customStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    customStyle: import('vue').PropType<Exclude<StyleValue, string>>;
     fixed: BooleanConstructor;
     wrapPosition: {
         type: BooleanConstructor;
         default: boolean;
-    }; /** 根节点 */
+    };
     disabled: BooleanConstructor;
 }>>, {
     lineGap: number;

package/es/ele-watermark/props.d.ts

@@ -1,4 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { StyleValue } from '../ele-app/types';
 import { WatermarkGap, WatermarkOffset, WatermarkFont } from './types';
 
 export declare const watermarkProps: {
@@ -26,7 +27,7 @@ export declare const watermarkProps: {
         default: number;
     };
     /** 自定义样式 */
-    customStyle: PropType<Partial<import('vue').CSSProperties>>;
+    customStyle: PropType<Exclude<StyleValue, string>>;
     /** 是否使用固定定位 */
     fixed: BooleanConstructor;
     /** 是否为外层添加定位样式 */

package/es/ele-xg-player/index.d.ts

@@ -1,9 +1,9 @@
 import { PropType } from 'vue';
-import { default as Player } from 'xgplayer';
+import { default as Player, IPlayerOptions } from 'xgplayer';
 
 declare const _default: import('vue').DefineComponent<{
     config: {
-        type: PropType<import('xgplayer/es/defaultConfig').IPlayerOptions>;
+        type: PropType<IPlayerOptions>;
         required: true;
     };
 }, {
@@ -13,7 +13,7 @@ declare const _default: import('vue').DefineComponent<{
     player: (_player: Player | null) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     config: {
-        type: PropType<import('xgplayer/es/defaultConfig').IPlayerOptions>;
+        type: PropType<IPlayerOptions>;
         required: true;
     };
 }>> & {

package/es/icons/SizeCompactOutlined.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+export default _default;

package/es/icons/SizeCompactOutlined.js

@@ -0,0 +1,34 @@
+import { defineComponent, openBlock, createElementBlock, createElementVNode } from "vue";
+const _sfc_main = defineComponent({
+  name: "SizeCompactOutlined"
+});
+const _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+const _hoisted_1 = {
+  viewBox: "0 0 48 48",
+  fill: "none",
+  stroke: "currentColor",
+  "stroke-width": "4"
+};
+const _hoisted_2 = /* @__PURE__ */ createElementVNode("path", { d: "M47 14L41 19L35 14M41 1V19M47 34L41 29L35 34M41 47V29" }, null, -1);
+const _hoisted_3 = /* @__PURE__ */ createElementVNode("path", { d: "M3 7H31" }, null, -1);
+const _hoisted_4 = /* @__PURE__ */ createElementVNode("path", { d: "M3 41H31" }, null, -1);
+const _hoisted_5 = /* @__PURE__ */ createElementVNode("path", { d: "M3 24H31" }, null, -1);
+const _hoisted_6 = [
+  _hoisted_2,
+  _hoisted_3,
+  _hoisted_4,
+  _hoisted_5
+];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createElementBlock("svg", _hoisted_1, _hoisted_6);
+}
+const SizeCompactOutlined = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export {
+  SizeCompactOutlined as default
+};

package/es/icons/SizeSlackOutlined.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+export default _default;

package/es/icons/SizeSlackOutlined.js

@@ -0,0 +1,34 @@
+import { defineComponent, openBlock, createElementBlock, createElementVNode } from "vue";
+const _sfc_main = defineComponent({
+  name: "SizeSlackOutlined"
+});
+const _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+const _hoisted_1 = {
+  viewBox: "0 0 48 48",
+  fill: "none",
+  stroke: "currentColor",
+  "stroke-width": "4"
+};
+const _hoisted_2 = /* @__PURE__ */ createElementVNode("path", { d: "M41 6V42M35 11L41 6L47 11M47 37L41 42L35 37" }, null, -1);
+const _hoisted_3 = /* @__PURE__ */ createElementVNode("path", { d: "M3 7H31" }, null, -1);
+const _hoisted_4 = /* @__PURE__ */ createElementVNode("path", { d: "M3 41H31" }, null, -1);
+const _hoisted_5 = /* @__PURE__ */ createElementVNode("path", { d: "M3 24H31" }, null, -1);
+const _hoisted_6 = [
+  _hoisted_2,
+  _hoisted_3,
+  _hoisted_4,
+  _hoisted_5
+];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createElementBlock("svg", _hoisted_1, _hoisted_6);
+}
+const SizeSlackOutlined = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export {
+  SizeSlackOutlined as default
+};

package/es/icons/index.d.ts

@@ -86,6 +86,8 @@ export { default as ResizeOutlined } from './ResizeOutlined';
 export { default as SearchOutlined } from './SearchOutlined';
 export { default as SettingOutlined } from './SettingOutlined';
 export { default as ShoppingOutlined } from './ShoppingOutlined';
+export { default as SizeCompactOutlined } from './SizeCompactOutlined';
+export { default as SizeSlackOutlined } from './SizeSlackOutlined';
 export { default as SortOutlined } from './SortOutlined';
 export { default as StarFilled } from './StarFilled';
 export { default as StepBackwardFilled } from './StepBackwardFilled';

package/es/icons/index.js

@@ -86,27 +86,29 @@ import { default as default86 } from "./ResizeOutlined";
 import { default as default87 } from "./SearchOutlined";
 import { default as default88 } from "./SettingOutlined";
 import { default as default89 } from "./ShoppingOutlined";
-import { default as default90 } from "./SortOutlined";
-import { default as default91 } from "./StarFilled";
-import { default as default92 } from "./StepBackwardFilled";
-import { default as default93 } from "./StepForwardFilled";
-import { default as default94 } from "./SuitcaseOutlined";
-import { default as default95 } from "./SunOutlined";
-import { default as default96 } from "./SwapOutlined";
-import { default as default97 } from "./SyncOutlined";
-import { default as default98 } from "./TableOutlined";
-import { default as default99 } from "./TagOutlined";
-import { default as default100 } from "./TimerOutlined";
-import { default as default101 } from "./UndoOutlined";
-import { default as default102 } from "./UnlockOutlined";
-import { default as default103 } from "./UploadOutlined";
-import { default as default104 } from "./UserOutlined";
-import { default as default105 } from "./VerticalAlignMiddleOutlined";
-import { default as default106 } from "./VerticalLeftOutlined";
-import { default as default107 } from "./VerticalRightOutlined";
-import { default as default108 } from "./WarningOutlined";
-import { default as default109 } from "./ZoomInOutlined";
-import { default as default110 } from "./ZoomOutOutlined";
+import { default as default90 } from "./SizeCompactOutlined";
+import { default as default91 } from "./SizeSlackOutlined";
+import { default as default92 } from "./SortOutlined";
+import { default as default93 } from "./StarFilled";
+import { default as default94 } from "./StepBackwardFilled";
+import { default as default95 } from "./StepForwardFilled";
+import { default as default96 } from "./SuitcaseOutlined";
+import { default as default97 } from "./SunOutlined";
+import { default as default98 } from "./SwapOutlined";
+import { default as default99 } from "./SyncOutlined";
+import { default as default100 } from "./TableOutlined";
+import { default as default101 } from "./TagOutlined";
+import { default as default102 } from "./TimerOutlined";
+import { default as default103 } from "./UndoOutlined";
+import { default as default104 } from "./UnlockOutlined";
+import { default as default105 } from "./UploadOutlined";
+import { default as default106 } from "./UserOutlined";
+import { default as default107 } from "./VerticalAlignMiddleOutlined";
+import { default as default108 } from "./VerticalLeftOutlined";
+import { default as default109 } from "./VerticalRightOutlined";
+import { default as default110 } from "./WarningOutlined";
+import { default as default111 } from "./ZoomInOutlined";
+import { default as default112 } from "./ZoomOutOutlined";
 export {
   default2 as AnalysisOutlined,
   default3 as ApplicationOutlined,
@@ -196,25 +198,27 @@ export {
   default87 as SearchOutlined,
   default88 as SettingOutlined,
   default89 as ShoppingOutlined,
-  default90 as SortOutlined,
-  default91 as StarFilled,
-  default92 as StepBackwardFilled,
-  default93 as StepForwardFilled,
-  default94 as SuitcaseOutlined,
-  default95 as SunOutlined,
-  default96 as SwapOutlined,
-  default97 as SyncOutlined,
-  default98 as TableOutlined,
-  default99 as TagOutlined,
-  default100 as TimerOutlined,
-  default101 as UndoOutlined,
-  default102 as UnlockOutlined,
-  default103 as UploadOutlined,
-  default104 as UserOutlined,
-  default105 as VerticalAlignMiddleOutlined,
-  default106 as VerticalLeftOutlined,
-  default107 as VerticalRightOutlined,
-  default108 as WarningOutlined,
-  default109 as ZoomInOutlined,
-  default110 as ZoomOutOutlined
+  default90 as SizeCompactOutlined,
+  default91 as SizeSlackOutlined,
+  default92 as SortOutlined,
+  default93 as StarFilled,
+  default94 as StepBackwardFilled,
+  default95 as StepForwardFilled,
+  default96 as SuitcaseOutlined,
+  default97 as SunOutlined,
+  default98 as SwapOutlined,
+  default99 as SyncOutlined,
+  default100 as TableOutlined,
+  default101 as TagOutlined,
+  default102 as TimerOutlined,
+  default103 as UndoOutlined,
+  default104 as UnlockOutlined,
+  default105 as UploadOutlined,
+  default106 as UserOutlined,
+  default107 as VerticalAlignMiddleOutlined,
+  default108 as VerticalLeftOutlined,
+  default109 as VerticalRightOutlined,
+  default110 as WarningOutlined,
+  default111 as ZoomInOutlined,
+  default112 as ZoomOutOutlined
 };

package/es/lang/en_US.js

@@ -46,6 +46,7 @@ const localeValues = {
     columnExpand: "Expand",
     columnFixedLeft: "Pin to left",
     columnFixedRight: "Pin to right",
+    columnWidth: "Width",
     exportOk: "Ok",
     exportCancel: "Cancel",
     exportFileName: "Filename",

package/es/lang/zh_CN.js

@@ -46,6 +46,7 @@ const localeValues = {
     columnExpand: "展开列",
     columnFixedLeft: "固定在左侧",
     columnFixedRight: "固定在右侧",
+    columnWidth: "列宽",
     exportOk: "确定",
     exportCancel: "取消",
     exportFileName: "文件名",

package/es/lang/zh_TW.js

@@ -46,6 +46,7 @@ const localeValues = {
     columnExpand: "展開列",
     columnFixedLeft: "固定在左側",
     columnFixedRight: "固定在右側",
+    columnWidth: "列寬",
     exportOk: "確認",
     exportCancel: "取消",
     exportFileName: "檔名",

package/es/style/themes/default.scss

@@ -505,7 +505,13 @@ $ele: map.deep-merge(
       'sm-radius': 24px,
       'sm-space': 4px,
       'sm-gap': 8px,
-      'sm-font-size': 14px
+      'sm-font-size': 14px,
+      'lg-height': 40px,
+      'lg-padding': 0 8px,
+      'lg-radius': 40px,
+      'lg-space': 8px,
+      'lg-gap': 8px 12px,
+      'lg-font-size': 14px
     ),
     'segmented': (
       // 分段器
@@ -714,15 +720,16 @@ $ele: map.deep-merge(
       // 高级表格列配置
       'width': 220px,
       'max-height': 480px,
-      'header-padding': 6px 16px 4px 12px,
+      'header-padding': 6px 14px 4px 14px,
       'header-border': 1px solid elVar('border-color', 'light'),
       'body-padding': 6px 0,
-      'item-padding': 12px,
+      'item-padding': 14px,
       'item-height': 28px,
       'item-hover-bg': elVar('color-primary', 'light-9'),
       'item-radius': 0,
-      'btn-space': 0,
-      'btn-padding': 3px,
+      'btn-space': 1px,
+      'btn-size': 18px,
+      'btn-offset': -6px,
       'btn-radius': elVar('border-radius', 'small'),
       'btn-color': elVar('text-color', 'placeholder'),
       'btn-hover-color': elVar('text-color', 'primary'),

package/es/style/themes/rounded.scss

@@ -109,7 +109,8 @@ $ele-rounded: map.deep-merge(
       'active-bg': none,
       'active-border': 1px solid elVar('color', 'primary'),
       'active-font-weight': bold,
-      'sm-radius': elVar('border-radius', 'base')
+      'sm-radius': elVar('border-radius', 'base'),
+      'lg-radius': $radius-large
     ),
     'segmented': (
       'radius': elVar('border-radius', 'small')
@@ -164,7 +165,7 @@ $ele-rounded: map.deep-merge(
     ),
     'tool-column': (
       'body-padding': 6px 4px,
-      'item-padding': 8px,
+      'item-padding': 10px,
       'item-radius': elVar('border-radius', 'small'),
       'btn-hover-bg': elVar('color-primary', 'light-8'),
       'btn-active-bg': elVar('color-primary', 'light-7')

package/es/utils/hook.d.ts

@@ -1,9 +1,12 @@
+import { Ref } from 'vue';
+
 /**
- * useTimer返回结果
+ * useTimer 返回结果
  */
 export type UseTimerResult = [
-    (callback: () => void, timeout?: number) => void,
-    () => void
+    (callback?: () => void, timeout?: number) => void,
+    () => void,
+    Ref<boolean>
 ];
 /**
  * 定时器
@@ -12,7 +15,7 @@ export type UseTimerResult = [
  */
 export declare function useTimer(ms?: number | (() => number), cb?: () => void): UseTimerResult;
 /**
- * useMediaQuery返回结果
+ * useMediaQuery 返回结果
  */
 export type UseMediaQueryResult = [MediaQueryList, () => void, () => void];
 /**
@@ -38,3 +41,71 @@ export declare function useCollapseAnim(): {
     handleLeave: (el: HTMLElement) => void;
     handleAfterLeave: (el: HTMLElement) => void;
 };
+/**
+ * 鼠标滚轮事件回调方法参数
+ */
+export interface UseMousewheelCallbackParam {
+    /** 事件对象 */
+    e: MouseEvent;
+    /** 方向 */
+    direction: 'up' | 'down';
+}
+/**
+ * 鼠标滚轮事件
+ * @param cb 回调
+ */
+export declare function useMousewheel(cb?: (p: UseMousewheelCallbackParam) => void): {
+    handleMousewheel: (e: MouseEvent) => void;
+    handleFirefoxMousewheel: (e: MouseEvent) => void;
+    bindMousewheel: (el: HTMLElement) => void;
+    unbindMousewheel: (el: HTMLElement) => void;
+};
+/**
+ * 触摸事件回调参数
+ */
+export interface UseTouchEventCallbackParam<T> {
+    /** 事件对象 */
+    e: T;
+    /** 开始横向位置 */
+    startX: number | null;
+    /** 开始纵向位置 */
+    startY: number | null;
+    /** 横向移动距离 */
+    distanceX?: number | null;
+    /** 纵向移动距离 */
+    distanceY?: number | null;
+}
+/**
+ * 触摸事件参数
+ */
+export interface UseTouchEventOption<T> {
+    /** 触摸开始的回调 */
+    start?: (param: UseTouchEventCallbackParam<T>) => void;
+    /** 触摸移动的回调 */
+    move?: (param: UseTouchEventCallbackParam<T>) => void;
+    /** 触摸结束的回调 */
+    end?: (param: UseTouchEventCallbackParam<T>) => void;
+}
+/**
+ * 触摸事件
+ * @param option 参数
+ */
+export declare function useTouchEvent(option?: UseTouchEventOption<TouchEvent>): {
+    handleTouchStart: (e: TouchEvent) => void;
+    handleTouchMove: (e: TouchEvent) => void;
+    handleTouchEnd: (e: TouchEvent) => void;
+    bindTouchEvent: (el: HTMLElement) => void;
+    unbindTouchEvent: (el: HTMLElement) => void;
+};
+/**
+ * 移动事件对象
+ */
+export type MoveEvent = MouseEvent | TouchEvent;
+/**
+ * 鼠标移动事件或触摸移动事件
+ * @param option 参数
+ */
+export declare function useMoveEvent(option?: UseTouchEventOption<MoveEvent>): {
+    handleMousedown: (e: MouseEvent) => void;
+    handleTouchstart: (e: TouchEvent) => void;
+};

package/es/utils/hook.js

@@ -1,23 +1,28 @@
-import { onBeforeUnmount } from "vue";
+import { ref, onBeforeUnmount } from "vue";
 function useTimer(ms, cb) {
   let timer = null;
+  const waiting = ref(false);
   const stopTimer = () => {
     if (timer != null) {
       clearTimeout(timer);
       timer = null;
     }
+    waiting.value = false;
   };
   const startTimer = (callback, timeout) => {
     stopTimer();
-    timer = setTimeout(
-      callback ?? cb,
-      timeout ?? (typeof ms === "function" ? ms() : ms)
-    );
+    waiting.value = true;
+    const to = timeout ?? (typeof ms === "function" ? ms() : ms);
+    timer = setTimeout(() => {
+      const func = callback ?? cb;
+      func && func();
+      waiting.value = false;
+    }, to);
   };
   onBeforeUnmount(() => {
     stopTimer();
   });
-  return [startTimer, stopTimer];
+  return [startTimer, stopTimer, waiting];
 }
 function useMediaQuery(query, onChange) {
   const mediaQuery = window.matchMedia(query);
@@ -103,9 +108,153 @@ function useCollapseAnim() {
     handleAfterLeave
   };
 }
+function useMousewheel(cb) {
+  const handleMousewheel = (e) => {
+    const delta = e.wheelDelta || e.detail;
+    cb && cb({ e, direction: delta > 0 ? "up" : "down" });
+  };
+  const handleFirefoxMousewheel = (e) => {
+    const delta = e.wheelDelta || e.detail;
+    cb && cb({ e, direction: delta < 0 ? "up" : "down" });
+  };
+  const bindMousewheel = (el) => {
+    el.addEventListener("mousewheel", handleMousewheel, { passive: false });
+    el.addEventListener("DOMMouseScroll", handleFirefoxMousewheel);
+  };
+  const unbindMousewheel = (el) => {
+    el.removeEventListener("mousewheel", handleMousewheel);
+    el.removeEventListener("DOMMouseScroll", handleFirefoxMousewheel);
+  };
+  return {
+    handleMousewheel,
+    handleFirefoxMousewheel,
+    bindMousewheel,
+    unbindMousewheel
+  };
+}
+function useTouchEvent(option) {
+  let startX = null;
+  let startY = null;
+  let distanceX = null;
+  let distanceY = null;
+  const handleTouchStart = (e) => {
+    startX = e.touches[0].clientX;
+    startY = e.touches[0].clientY;
+    if (option && option.start) {
+      option.start({ e, startX, startY });
+    }
+  };
+  const handleTouchMove = (e) => {
+    if (startX != null && startY != null) {
+      const currentX = e.touches[0].clientX;
+      const currentY = e.touches[0].clientY;
+      distanceX = currentX - startX;
+      distanceY = currentY - startY;
+      if (option && option.move) {
+        option.move({ e, startX, startY, distanceX, distanceY });
+      }
+    }
+  };
+  const handleTouchEnd = (e) => {
+    if (option && option.end) {
+      option.end({ e, startX, startY, distanceX, distanceY });
+    }
+    startX = null;
+    startY = null;
+    distanceX = null;
+    distanceY = null;
+  };
+  const bindTouchEvent = (el) => {
+    el.addEventListener("touchstart", handleTouchStart);
+    el.addEventListener("touchmove", handleTouchMove);
+    el.addEventListener("touchend", handleTouchEnd);
+  };
+  const unbindTouchEvent = (el) => {
+    el.removeEventListener("touchstart", handleTouchStart);
+    el.removeEventListener("touchmove", handleTouchMove);
+    el.removeEventListener("touchend", handleTouchEnd);
+  };
+  return {
+    handleTouchStart,
+    handleTouchMove,
+    handleTouchEnd,
+    bindTouchEvent,
+    unbindTouchEvent
+  };
+}
+function useMoveEvent(option) {
+  let startX = null;
+  let startY = null;
+  let distanceX = null;
+  let distanceY = null;
+  const unbindEvent = () => {
+    document.removeEventListener("mousemove", mousemoveFn);
+    document.removeEventListener("mouseup", mouseupFn);
+    document.removeEventListener("touchmove", touchmoveFn);
+    document.removeEventListener("touchend", touchendFn);
+  };
+  const emitStart = (clientX, clientY, e) => {
+    startX = clientX;
+    startY = clientY;
+    if (option && option.start) {
+      option.start({ e, startX, startY });
+    }
+  };
+  const emitMove = (currentX, currentY, e) => {
+    if (startX != null && startY != null) {
+      distanceX = currentX - startX;
+      distanceY = currentY - startY;
+      if (option && option.move) {
+        option.move({ e, startX, startY, distanceX, distanceY });
+      }
+    }
+  };
+  const emitEnd = (e) => {
+    unbindEvent();
+    if (option && option.end) {
+      option.end({ e, startX, startY, distanceX, distanceY });
+    }
+    startX = null;
+    startY = null;
+    distanceX = null;
+    distanceY = null;
+  };
+  const mousemoveFn = function(e) {
+    emitMove(e.clientX, e.clientY, e);
+  };
+  const touchmoveFn = function(e) {
+    emitMove(e.touches[0].clientX, e.touches[0].clientY, e);
+  };
+  const mouseupFn = (e) => {
+    emitEnd(e);
+  };
+  const touchendFn = (e) => {
+    emitEnd(e);
+  };
+  const handleMousedown = (e) => {
+    emitStart(e.clientX, e.clientY, e);
+    document.addEventListener("mousemove", mousemoveFn);
+    document.addEventListener("mouseup", mouseupFn);
+  };
+  const handleTouchstart = (e) => {
+    emitStart(e.touches[0].clientX, e.touches[0].clientY, e);
+    document.addEventListener("touchmove", touchmoveFn);
+    document.addEventListener("touchend", touchendFn);
+  };
+  onBeforeUnmount(() => {
+    unbindEvent();
+  });
+  return {
+    handleMousedown,
+    handleTouchstart
+  };
+}
 export {
   useCollapseAnim,
   useMediaQuery,
+  useMousewheel,
+  useMoveEvent,
   useTimer,
+  useTouchEvent,
   useWindowListener
 };