优化ts声明

asurance · Jul 7, 2024 · 37cd300 · 37cd300
1 parent 7499ae5
commit 37cd300
Show file tree

Hide file tree

Showing 19 changed files with 305 additions and 234 deletions.
diff --git a/demos/ant-design.tsx b/demos/ant-design.tsx
@@ -5,8 +5,13 @@ import { Button, Drawer, DrawerProps, Modal, ModalProps, Space } from 'antd';
 type OpenModalProps = OpenableProps<void> &
   Omit<ModalProps, 'open' | 'onOk' | 'onCancel' | 'afterClose'>;
 
-const openModal = openify<void, OpenModalProps, ModalProps>(Modal, {
-  transformProps({ visible, onClose, afterClose, ...restProps }) {
+const openModal = openify(Modal, {
+  transformProps({
+    visible,
+    onClose,
+    afterClose,
+    ...restProps
+  }: OpenModalProps) {
     return {
       ...restProps,
       open: visible,
@@ -20,8 +25,13 @@ const openModal = openify<void, OpenModalProps, ModalProps>(Modal, {
 type OpenDrawerProps = OpenableProps<void> &
   Omit<DrawerProps, 'open' | 'onClose' | 'afterOpenChange'>;
 
-const openDrawer = openify<void, OpenDrawerProps, DrawerProps>(Drawer, {
-  transformProps({ visible, onClose, afterClose, ...restProps }) {
+const openDrawer = openify(Drawer, {
+  transformProps({
+    visible,
+    onClose,
+    afterClose,
+    ...restProps
+  }: OpenDrawerProps) {
     return {
       ...restProps,
       open: visible,

diff --git a/demos/arco-design.tsx b/demos/arco-design.tsx
@@ -14,8 +14,13 @@ import '@arco-design/web-react/dist/css/arco.css';
 type OpenModalProps = OpenableProps<void> &
   Omit<ModalProps, 'visible' | 'onOk' | 'onCancel' | 'afterClose'>;
 
-const openModal = openify<void, OpenModalProps, ModalProps>(Modal, {
-  transformProps({ visible, onClose, afterClose, ...restProps }) {
+const openModal = openify(Modal, {
+  transformProps({
+    visible,
+    onClose,
+    afterClose,
+    ...restProps
+  }: OpenModalProps) {
     return {
       ...restProps,
       visible,
@@ -29,8 +34,13 @@ const openModal = openify<void, OpenModalProps, ModalProps>(Modal, {
 type OpenDrawerProps = OpenableProps<void> &
   Omit<DrawerProps, 'visible' | 'onOk' | 'onCancel' | 'afterClose'>;
 
-const openDrawer = openify<void, OpenDrawerProps, DrawerProps>(Drawer, {
-  transformProps({ visible, onClose, afterClose, ...restProps }) {
+const openDrawer = openify(Drawer, {
+  transformProps({
+    visible,
+    onClose,
+    afterClose,
+    ...restProps
+  }: OpenDrawerProps) {
     return {
       ...restProps,
       visible,

diff --git a/demos/close-by-ref.tsx b/demos/close-by-ref.tsx
@@ -1,9 +1,4 @@
-import React, {
-  RefAttributes,
-  createRef,
-  forwardRef,
-  useImperativeHandle,
-} from 'react';
+import React, { createRef, forwardRef, useImperativeHandle } from 'react';
 import { Button, Modal, Space } from '@douyinfe/semi-ui';
 import { OpenableProps, openify } from 'openify';
 
@@ -39,11 +34,7 @@ const MyModal = forwardRef<MyModalRef, MyModalProps>(
   },
 );
 
-const openMyModal = openify<
-  void,
-  MyModalProps & RefAttributes<MyModalRef>,
-  MyModalProps
->(MyModal);
+const openMyModal = openify(MyModal);
 
 export default () => (
   <Space>

diff --git a/demos/context.tsx b/demos/context.tsx
@@ -23,18 +23,15 @@ const MyModal = ({ visible, onClose, afterClose, title }: MyModalProps) => {
   );
 };
 
-const openMyModalDefault = openify<void, MyModalProps, MyModalProps>(MyModal);
+const openMyModalDefault = openify(MyModal);
 
-const openMyModalWithRenderHook = openify<void, MyModalProps, MyModalProps>(
-  MyModal,
-  {
-    renderHook: node => {
-      return (
-        <myContext.Provider value="context提供内容">{node}</myContext.Provider>
-      );
-    },
+const openMyModalWithRenderHook = openify(MyModal, {
+  renderHook: node => {
+    return (
+      <myContext.Provider value="context提供内容">{node}</myContext.Provider>
+    );
   },
-);
+});
 
 export default () => (
   <myContext.Provider value="context提供内容">

diff --git a/demos/error.tsx b/demos/error.tsx
@@ -27,7 +27,7 @@ const MyModal = ({ visible, onClose, afterClose }: MyModalProps) => {
   );
 };
 
-const openModal = openify<void, MyModalProps, MyModalProps>(MyModal);
+const openModal = openify(MyModal);
 
 export default () => (
   <Button onClick={() => openModal({ title: '自定义弹窗' })}>自定义弹窗</Button>

diff --git a/demos/mydrawer.tsx b/demos/mydrawer.tsx
@@ -25,10 +25,6 @@ const MyAsyncModal = ({
   );
 };
 
-export const openMyAsyncModal = openify<
-  void,
-  MyAsyncModalProps,
-  MyAsyncModalProps
->(MyAsyncModal);
+export const openMyAsyncModal = openify(MyAsyncModal);
 
 export default MyAsyncModal;
diff --git a/demos/promisify.tsx b/demos/promisify.tsx
@@ -32,7 +32,7 @@ const MyModal = ({ visible, onClose, afterClose, id }: MyModalProps) => {
   );
 };
 
-const openMyModal = openify<Value, MyModalProps, MyModalProps>(MyModal);
+const openMyModal = openify(MyModal);
 
 export default () => {
   const [taskId, setTaskId] = useState('');

diff --git a/demos/semi-design.tsx b/demos/semi-design.tsx
@@ -7,41 +7,45 @@ import { SideSheetReactProps } from '@douyinfe/semi-ui/lib/es/sideSheet';
 type OpenModalProps = OpenableProps<void> &
   Omit<ModalReactProps, 'visible' | 'onOk' | 'onCancel' | 'afterClose'>;
 
-const openModal = openify<void, OpenModalProps, ModalReactProps>(
-  Modal as ComponentType<ModalReactProps>,
-  {
-    transformProps({ visible, onClose, afterClose, ...restProps }) {
-      return {
-        ...restProps,
-        visible,
-        onOk: onClose,
-        onCancel: onClose,
-        afterClose,
-      };
-    },
+const openModal = openify(Modal as ComponentType<ModalReactProps>, {
+  transformProps({
+    visible,
+    onClose,
+    afterClose,
+    ...restProps
+  }: OpenModalProps) {
+    return {
+      ...restProps,
+      visible,
+      onOk: onClose,
+      onCancel: onClose,
+      afterClose,
+    };
   },
-);
+});
 
 type OpenSideSheetProps = OpenableProps<void> &
   Omit<SideSheetReactProps, 'visible' | 'onCancel' | 'afterVisibleChange'>;
 
-const openSideSheet = openify<void, OpenSideSheetProps, SideSheetReactProps>(
-  SideSheet as ComponentType<SideSheetReactProps>,
-  {
-    transformProps({ visible, onClose, afterClose, ...restProps }) {
-      return {
-        ...restProps,
-        visible,
-        onCancel: onClose,
-        afterVisibleChange: isVisible => {
-          if (!isVisible) {
-            afterClose();
-          }
-        },
-      };
-    },
+const openSideSheet = openify(SideSheet as ComponentType<SideSheetReactProps>, {
+  transformProps({
+    visible,
+    onClose,
+    afterClose,
+    ...restProps
+  }: OpenSideSheetProps) {
+    return {
+      ...restProps,
+      visible,
+      onCancel: onClose,
+      afterVisibleChange: isVisible => {
+        if (!isVisible) {
+          afterClose();
+        }
+      },
+    };
   },
-);
+});
 
 export default () => (
   <Space>

diff --git a/demos/static-call.tsx b/demos/static-call.tsx
@@ -20,7 +20,7 @@ const MyModal = ({ visible, onClose, afterClose, title }: MyModalProps) => {
   );
 };
 
-const openMyModal = openify<void, MyModalProps, MyModalProps>(MyModal);
+const openMyModal = openify(MyModal);
 
 export default () => (
   <Space>

diff --git a/docs/guide/Q&A/close-by-ref.mdx b/docs/guide/Q&A/close-by-ref.mdx
@@ -1,12 +1,7 @@
 # 如果由外部主动关闭
 
 ```tsx
-import React, {
-  RefAttributes,
-  createRef,
-  forwardRef,
-  useImperativeHandle,
-} from 'react';
+import React, { createRef, forwardRef, useImperativeHandle } from 'react';
 import { Button, Modal, Space } from '@douyinfe/semi-ui';
 import { OpenableProps, openify } from 'openify';
 
@@ -42,11 +37,7 @@ const MyModal = forwardRef<MyModalRef, MyModalProps>(
   },
 );
 
-const openMyModal = openify<
-  void,
-  MyModalProps & RefAttributes<MyModalRef>,
-  MyModalProps
->(MyModal);
+const openMyModal = openify(MyModal);
 
 export default () => (
   <Space>

diff --git a/docs/guide/Q&A/context.mdx b/docs/guide/Q&A/context.mdx
@@ -26,18 +26,15 @@ const MyModal = ({ visible, onClose, afterClose, title }: MyModalProps) => {
   );
 };
 
-const openMyModalDefault = openify<void, MyModalProps, MyModalProps>(MyModal);
+const openMyModalDefault = openify(MyModal);
 
-const openMyModalWithRenderHook = openify<void, MyModalProps, MyModalProps>(
-  MyModal,
-  {
-    renderHook: node => {
-      return (
-        <myContext.Provider value="context提供内容">{node}</myContext.Provider>
-      );
-    },
+const openMyModalWithRenderHook = openify(MyModal, {
+  renderHook: node => {
+    return (
+      <myContext.Provider value="context提供内容">{node}</myContext.Provider>
+    );
   },
-);
+});
 
 export default () => (
   <myContext.Provider value="context提供内容">

diff --git a/docs/guide/feature/error.mdx b/docs/guide/feature/error.mdx
@@ -30,7 +30,7 @@ const MyModal = ({ visible, onClose, afterClose }: MyModalProps) => {
   );
 };
 
-const openModal = openify<void, MyModalProps, MyModalProps>(MyModal);
+const openModal = openify(MyModal);
 
 export default () => (
   <Button onClick={() => openModal({ title: '自定义弹窗' })}>自定义弹窗</Button>
-Original file line number
+Diff line change
@@ Expand Up @@
       );
     };
-    const openMyModal = openify<void, MyModalProps, MyModalProps>(MyModal);
+    const openMyModal = openify(MyModal);
     export default () => (
       <Space>
@@ Expand Down @@