@ray-js/components 1.5.0-beta.11 → 1.5.0

package/lib/Button/Button.thing.js

@@ -26,7 +26,7 @@ const Button = props => {
     onClick: event => {
       if (disabled) return;
       if (loading) return;
-      onClick === null || onClick === void 0 ? void 0 : onClick(event);
+      onClick === null || onClick === void 0 || onClick(event);
     },
     disabled: disabled,
     size: size,

package/lib/Button/Button.wechat.js

@@ -28,7 +28,7 @@ const Button = props => {
     onClick: event => {
       if (disabled) return;
       if (loading) return;
-      onClick === null || onClick === void 0 ? void 0 : onClick(event);
+      onClick === null || onClick === void 0 || onClick(event);
     },
     disabled: disabled,
     formType: formType,

package/lib/Camera/Camera.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-declare const Camera: () => React.JSX.Element;
+import { CameraProps } from '@ray-js/adapter';
+declare const Camera: React.FC<CameraProps>;
 export default Camera;

package/lib/Camera/Camera.js

@@ -1,7 +1,5 @@
 import React from 'react';
-
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 const Camera = () => {
-  return /*#__PURE__*/React.createElement("div", null, "web\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement("div", null, "The web side is not implemented yet.");
 };
 export default Camera;

package/lib/Camera/Camera.wechat.js

@@ -3,6 +3,6 @@ import { View } from '@ray-js/components';
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function Camera() {
-  return /*#__PURE__*/React.createElement(View, null, "\u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement(View, null, "Wechat mini program side has not been implemented");
 }
 export default Camera;

package/lib/CheckboxGroup/CheckboxGroup.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import * as React from 'react';
 import handleProps from '../utils/handleProps';
 import Label from '../Label';
@@ -15,11 +16,11 @@ const CheckboxGroup = props => {
   const currentNode = React.useRef(null);
   useEventListener('clickoverlay', e => {
     var _props$onChange;
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, {
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, _objectSpread(_objectSpread({}, e), {}, {
       type: e.type,
       value: e.detail.value,
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });

package/lib/CheckboxGroup/props.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { BaseProps } from '../types';
 import { CheckboxProps } from '../Checkbox/props';
+import { GenericEvent } from '@ray-js/adapter';
 export type CheckboxGroupOption = CheckboxProps & {
     label: string;
 };
@@ -31,9 +32,11 @@ export interface BaseCheckboxGroupProps extends Omit<BaseProps, 'children'> {
      * @description.zh 选中项发生改变时触发 change 事件
      * @default null
      */
-    onChange?: (event: {
+    onChange?: (event: GenericEvent<{
+        value: any;
+    } & {
         type: string;
         value: string[];
         origin: any;
-    }) => void;
+    }>) => void;
 }

package/lib/CoverView/CoverView.js

@@ -1,5 +1,5 @@
 import React from 'react';
 const CoverView = () => {
-  return /*#__PURE__*/React.createElement("div", null, "web\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement("div", null, "The web side is not implemented yet.");
 };
 export default CoverView;

package/lib/CoverView/CoverView.wechat.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { View } from '@ray-js/components';
 function CoverView() {
-  return /*#__PURE__*/React.createElement(View, null, "\u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement(View, null, "Wechat mini program side has not been implemented");
 }
 export default CoverView;

package/lib/Icon/Icon.js

@@ -8,10 +8,11 @@ const Icon = props => {
     type,
     size,
     color,
-    style
+    style,
+    className
   } = props;
   return /*#__PURE__*/React.createElement(Text, {
-    className: "iconfont ".concat(type),
+    className: "ray_iconfont ".concat(type, " ").concat(className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       color: "".concat(color),
       fontSize: "".concat(size, "px")

package/lib/Icon/Icon.thing.js

@@ -7,10 +7,11 @@ const Icon = props => {
     type,
     size,
     color,
-    style
+    style,
+    className
   } = props;
   return /*#__PURE__*/React.createElement(Text, {
-    className: "iconfont ".concat(type),
+    className: "ray_iconfont ".concat(type, " ").concat(className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       color: "".concat(color),
       fontSize: "".concat(size, "px")

package/lib/Icon/Icon.wechat.js

@@ -8,10 +8,11 @@ const Icon = props => {
     type,
     size,
     color,
-    style
+    style,
+    className
   } = props;
   return /*#__PURE__*/React.createElement(Text, {
-    className: "iconfont ".concat(type),
+    className: "ray_iconfont ".concat(type, " ").concat(className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       color: "".concat(color),
       fontSize: "".concat(size, "px")

package/lib/Icon/iconfont/iconfont.css

@@ -1,5 +1,5 @@
 @font-face {
-  font-family: 'iconfont';
+  font-family: 'ray_iconfont';
   /* Project id 3149224 这里需要转成base64，否则微信会编译找不到iconfont文件
     见issue https://github.com/NervJS/taro-ui/issues/202
   */
@@ -11,8 +11,8 @@
       format('truetype');
 }
 
-.iconfont {
-  font-family: 'iconfont' !important;
+.ray_iconfont {
+  font-family: 'ray_iconfont' !important;
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;

package/lib/Icon/iconfont/iconfont.json

@@ -1,7 +1,7 @@
 {
   "id": "3149224",
   "name": "智能小程序",
-  "font_family": "iconfont",
+  "font_family": "ray_iconfont",
   "css_prefix_text": "icon-",
   "description": "icon",
   "glyphs": [

package/lib/Iframe/Iframe.js

@@ -2,6 +2,6 @@ import React from 'react';
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 const Iframe = () => {
-  return /*#__PURE__*/React.createElement("div", null, "web \u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement("div", null, "The web side is not implemented yet");
 };
 export default Iframe;

package/lib/Image/Image.js

@@ -7,7 +7,7 @@ const Image = /*#__PURE__*/React.forwardRef((props, ref) => {
   const currentNode = ref || React.useRef(null);
   useEventListener('load', e => {
     var _props$onLoad;
-    (_props$onLoad = props.onLoad) === null || _props$onLoad === void 0 ? void 0 : _props$onLoad.call(props, _objectSpread(_objectSpread({
+    (_props$onLoad = props.onLoad) === null || _props$onLoad === void 0 || _props$onLoad.call(props, _objectSpread(_objectSpread({
       type: e.type
     }, e.detail), {}, {
       origin
@@ -17,7 +17,7 @@ const Image = /*#__PURE__*/React.forwardRef((props, ref) => {
   });
   useEventListener('error', e => {
     var _props$onError;
-    (_props$onError = props.onError) === null || _props$onError === void 0 ? void 0 : _props$onError.call(props, _objectSpread(_objectSpread({
+    (_props$onError = props.onError) === null || _props$onError === void 0 || _props$onError.call(props, _objectSpread(_objectSpread({
       type: e.type
     }, e.detail), {}, {
       origin

package/lib/Image/Image.wechat.js

@@ -34,7 +34,7 @@ const Image = props => {
     className: clsx('ray-image', className),
     mode: mode,
     onLoad: e => {
-      onLoad === null || onLoad === void 0 ? void 0 : onLoad({
+      onLoad === null || onLoad === void 0 || onLoad({
         width: e.detail.width,
         height: e.detail.height,
         origin: e

package/lib/Input/Input.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 const _excluded = ["placeholderStyle", "className", "maxLength", "onBlur", "onFocus", "onConfirm"];
 import "core-js/modules/web.dom-collections.iterator.js";
@@ -22,11 +23,11 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
   const [placeholderStyleClassName] = useStylesheet(inlineStyle(placeholderStyle));
   const currentNode = ref || React.useRef(null);
   useEventListener('focus', e => {
-    onFocus === null || onFocus === void 0 ? void 0 : onFocus({
+    onFocus === null || onFocus === void 0 || onFocus(_objectSpread(_objectSpread({}, e), {}, {
       type: 'focus',
       value: e.detail.value,
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
@@ -34,11 +35,11 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
     const {
       value
     } = e.target;
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur({
+    onBlur === null || onBlur === void 0 || onBlur(_objectSpread(_objectSpread({}, e), {}, {
       type: 'blur',
       value,
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
@@ -46,11 +47,11 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
     const {
       value
     } = e.target;
-    onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm({
+    onConfirm === null || onConfirm === void 0 || onConfirm(_objectSpread(_objectSpread({}, e), {}, {
       type: 'confirm',
       value,
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
@@ -64,11 +65,11 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
         const {
           value
         } = e.target;
-        (_props$onInput = props.onInput) === null || _props$onInput === void 0 ? void 0 : _props$onInput.call(props, {
+        (_props$onInput = props.onInput) === null || _props$onInput === void 0 || _props$onInput.call(props, _objectSpread(_objectSpread({}, e), {}, {
           type: 'input',
           value,
           origin: e
-        });
+        }));
       },
       class: clsx('ray-input', styles.input, className, placeholderStyleClassName),
       ref: currentNode

package/lib/Input/Input.thing.js

@@ -66,7 +66,7 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
       // 内部 value 管控
       bufferValue.current = value;
       event.value = value;
-      onInput === null || onInput === void 0 ? void 0 : onInput(event);
+      onInput === null || onInput === void 0 || onInput(event);
     },
     onBlur: onBlur,
     onConfirm: function (event) {
@@ -74,7 +74,7 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
         value = ''
       } = event.detail;
       setInternalValue(value);
-      onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm(event);
+      onConfirm === null || onConfirm === void 0 || onConfirm(event);
     },
     onFocus: onFocus,
     value: internalValue

package/lib/Input/Input.wechat.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 const _excluded = ["name", "id", "className", "style", "disabled", "type", "value", "focus", "maxLength", "onBlur", "onConfirm", "onFocus", "onInput", "password", "placeholder", "placeholderStyle"];
 import "core-js/modules/web.dom-collections.iterator.js";
@@ -66,28 +67,28 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
       } = event.detail;
       // 内部 value 管控
       bufferValue.current = value;
-      onInput === null || onInput === void 0 ? void 0 : onInput({
+      onInput === null || onInput === void 0 || onInput(_objectSpread(_objectSpread({}, event), {}, {
         type: 'input',
         value,
         origin: event
-      });
+      }));
     },
     onBlur: function (event) {
       const {
         value = ''
       } = event.detail;
-      onBlur === null || onBlur === void 0 ? void 0 : onBlur({
+      onBlur === null || onBlur === void 0 || onBlur(_objectSpread(_objectSpread({}, event), {}, {
         type: 'blur',
         value,
         origin: event
-      });
+      }));
     },
     onConfirm: function (event) {
       const {
         value = ''
       } = event.detail;
       setInternalValue(value);
-      onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm(event);
+      onConfirm === null || onConfirm === void 0 || onConfirm(event);
     },
     onFocus: function (event) {
       const {
@@ -95,12 +96,12 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
         height = 0
       } = event.detail;
       setInternalValue(value);
-      onFocus === null || onFocus === void 0 ? void 0 : onFocus({
+      onFocus === null || onFocus === void 0 || onFocus(_objectSpread(_objectSpread({}, event), {}, {
         type: 'focus',
         value,
         height,
         origin: event
-      });
+      }));
     },
     value: internalValue
   }, selection, restProps));

package/lib/Input/props.d.ts

@@ -1,5 +1,5 @@
+import { GenericEvent } from '@ray-js/adapter';
 import { BaseProps } from '../types';
-import { GenericEvent as WxEvent } from '@ray-core/wechat';
 export type InputType = 'text' | 'number' | 'digit' | 'idcard';
 export interface InputProps extends BaseProps {
     /**
@@ -63,66 +63,32 @@ export interface InputProps extends BaseProps {
      * @description.zh 输入事件
      * @default undefined
      */
-    onInput?: (event: {
-        /**
-         * @description.en type
-         * @description.zh 类型
-         * @default undefined
-         */
-        type: string;
-        /**
-         * @description.en value
-         * @description.zh 价值
-         * @default undefined
-         */
-        value: string;
-        origin: WxEvent | Event;
-    }) => void;
+    onInput?: (event: GenericEvent<{
+        value: any;
+    }>) => void;
     /**
      * @description.en onConfirm
      * @description.zh 确认事件
      * @default undefined
      */
-    onConfirm?: (event: any) => void;
+    onConfirm?: (event: GenericEvent<{
+        value: any;
+    }>) => void;
     /**
      * @description.en onFocus
      * @description.zh 焦点事件
      * @default undefined
      */
-    onFocus?: (event: {
-        /**
-         * @description.en type
-         * @description.zh 类型
-         * @default undefined
-         */
-        type: string;
-        /**
-         * @description.en value
-         * @description.zh 价值
-         * @default undefined
-         */
-        value: string;
-        origin: WxEvent | FocusEvent;
-    }) => void;
+    onFocus?: (event: GenericEvent<{
+        value: any;
+    }>) => void;
     /**
      * @description.en onBlur
      * @description.zh 丢焦事件
      * @default undefined
      */
-    onBlur?: (event: {
-        /**
-         * @description.en type
-         * @description.zh 类型
-         * @default undefined
-         */
-        type: string;
-        /**
-         * @description.en value
-         * @description.zh 价值
-         * @default undefined
-         */
-        value: string;
-        origin: WxEvent | FocusEvent;
-    }) => void;
+    onBlur?: (event: GenericEvent<{
+        value: any;
+    }>) => void;
 }
 export declare const defaultInputProps: Partial<InputProps>;

package/lib/IpcPlayer/IpcPlayer.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-declare const IpcPlayer: () => React.JSX.Element;
+import { IpcPlayerProps } from '@ray-js/adapter';
+declare const IpcPlayer: React.FC<IpcPlayerProps>;
 export default IpcPlayer;

package/lib/IpcPlayer/IpcPlayer.js

@@ -1,7 +1,5 @@
 import React from 'react';
-
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 const IpcPlayer = () => {
-  return /*#__PURE__*/React.createElement("div", null, "web\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement("div", null, "The web side is not implemented yet.");
 };
 export default IpcPlayer;

package/lib/IpcPlayer/IpcPlayer.wechat.js

@@ -3,6 +3,6 @@ import { View } from '@ray-js/components';
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function IpcPlayer() {
-  return /*#__PURE__*/React.createElement(View, null, "\u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement(View, null, "Wechat mini program side has not been implemented");
 }
 export default IpcPlayer;

package/lib/Map/Map.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
 const Map = () => {
-  return /*#__PURE__*/React.createElement("div", null, "web\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement("div", null, "The web side is not implemented yet.");
 };
 export default Map;

package/lib/MovableView/MovableView.js

@@ -14,7 +14,7 @@ export const MovableView = props => {
     restProps = _objectWithoutProperties(props, _excluded);
   const currentNode = React.useRef(null);
   useEventListener('change', e => {
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread(_objectSpread({
+    onChange === null || onChange === void 0 || onChange(_objectSpread(_objectSpread({
       type: 'change'
     }, e.detail), {}, {
       origin: e
@@ -23,7 +23,7 @@ export const MovableView = props => {
     target: currentNode
   });
   useEventListener('scale', e => {
-    onScale === null || onScale === void 0 ? void 0 : onScale(_objectSpread(_objectSpread({
+    onScale === null || onScale === void 0 || onScale(_objectSpread(_objectSpread({
       type: 'scale'
     }, e.detail), {}, {
       origin: e

package/lib/NativeVideo/NativeVideo.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-declare const NativeVideo: () => React.JSX.Element;
+import { NativeVideoProps } from '@ray-js/adapter';
+declare const NativeVideo: React.FC<NativeVideoProps>;
 export default NativeVideo;

package/lib/NativeVideo/NativeVideo.js

@@ -1,7 +1,5 @@
 import React from 'react';
-
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 const NativeVideo = () => {
-  return /*#__PURE__*/React.createElement("div", null, "web\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement("div", null, "The web side is not implemented yet.");
 };
 export default NativeVideo;

package/lib/NativeVideo/NativeVideo.wechat.js

@@ -3,6 +3,6 @@ import { View } from '@ray-js/components';
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function NativeVideo() {
-  return /*#__PURE__*/React.createElement(View, null, "\u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u7AEF\u6682\u672A\u5B9E\u73B0");
+  return /*#__PURE__*/React.createElement(View, null, "Wechat mini program side has not been implemented");
 }
 export default NativeVideo;

package/lib/PageContainer/PageContainer.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useRef } from 'react';
 import { useEventListener } from 'ahooks';
 import { defaultPageContainerProps } from './props';
@@ -10,64 +11,64 @@ const PageContainer = props => {
   const currentNode = useRef(null);
   useEventListener('clickoverlay', e => {
     var _props$onClickOverlay;
-    (_props$onClickOverlay = props.onClickOverlay) === null || _props$onClickOverlay === void 0 ? void 0 : _props$onClickOverlay.call(props, {
+    (_props$onClickOverlay = props.onClickOverlay) === null || _props$onClickOverlay === void 0 || _props$onClickOverlay.call(props, _objectSpread(_objectSpread({}, e), {}, {
       type: 'clickoverlay',
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
   useEventListener('beforeenter', e => {
     var _props$onBeforeEnter;
-    (_props$onBeforeEnter = props.onBeforeEnter) === null || _props$onBeforeEnter === void 0 ? void 0 : _props$onBeforeEnter.call(props, {
+    (_props$onBeforeEnter = props.onBeforeEnter) === null || _props$onBeforeEnter === void 0 || _props$onBeforeEnter.call(props, _objectSpread(_objectSpread({}, e), {}, {
       type: 'beforeenter',
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
   useEventListener('enter', e => {
     var _props$onEnter;
-    (_props$onEnter = props.onEnter) === null || _props$onEnter === void 0 ? void 0 : _props$onEnter.call(props, {
+    (_props$onEnter = props.onEnter) === null || _props$onEnter === void 0 || _props$onEnter.call(props, _objectSpread(_objectSpread({}, e), {}, {
       type: 'enter',
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
   useEventListener('afterenter', e => {
     var _props$onAfterEnter;
-    (_props$onAfterEnter = props.onAfterEnter) === null || _props$onAfterEnter === void 0 ? void 0 : _props$onAfterEnter.call(props, {
+    (_props$onAfterEnter = props.onAfterEnter) === null || _props$onAfterEnter === void 0 || _props$onAfterEnter.call(props, _objectSpread(_objectSpread({}, e), {}, {
       type: 'afterenter',
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
   useEventListener('beforeleave', e => {
     var _props$onBeforeLeave;
-    (_props$onBeforeLeave = props.onBeforeLeave) === null || _props$onBeforeLeave === void 0 ? void 0 : _props$onBeforeLeave.call(props, {
+    (_props$onBeforeLeave = props.onBeforeLeave) === null || _props$onBeforeLeave === void 0 || _props$onBeforeLeave.call(props, _objectSpread(_objectSpread({}, e), {}, {
       type: 'beforeleave',
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
   useEventListener('leave', e => {
     var _props$onLeave;
-    (_props$onLeave = props.onLeave) === null || _props$onLeave === void 0 ? void 0 : _props$onLeave.call(props, {
+    (_props$onLeave = props.onLeave) === null || _props$onLeave === void 0 || _props$onLeave.call(props, _objectSpread(_objectSpread({}, e), {}, {
       type: 'leave',
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });
   useEventListener('afterleave', e => {
     var _props$onAfterLeave;
-    (_props$onAfterLeave = props.onAfterLeave) === null || _props$onAfterLeave === void 0 ? void 0 : _props$onAfterLeave.call(props, {
+    (_props$onAfterLeave = props.onAfterLeave) === null || _props$onAfterLeave === void 0 || _props$onAfterLeave.call(props, _objectSpread(_objectSpread({}, e), {}, {
       type: 'afterleave',
       origin: e
-    });
+    }));
   }, {
     target: currentNode
   });

package/lib/PageContainer/props.d.ts

@@ -1,11 +1,9 @@
 import { BaseProps } from '../types';
 import * as React from 'react';
-import { BaseEvent } from '@ray-js/adapter/esm/types/component';
-export type PageContainerEventType = {
-    type: string;
-    value?: any;
-    origin: BaseEvent;
-};
+import { GenericEvent } from '@ray-js/adapter';
+export type PageContainerEventType = GenericEvent<{
+    value: any;
+}>;
 export type PageContainerProps = BaseProps & {
     /** 文本是否可选 */
     show?: boolean;