Merge pull request #46 from duenyang/fix/type

fix(type): fix TNode type
TDesignOteam · Jun 19, 2024 · abf2f3f · abf2f3f
2 parents c46c790 + 94c23f1
commit abf2f3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/button/button.tsx b/src/button/button.tsx
@@ -1,5 +1,6 @@
-import { Component, tag, VNode } from 'omi';
+import { Component, tag } from 'omi';
 
+import { TNode } from '../common';
 import { classname, getClassPrefix } from '../utils';
 
 type Theme = 'default' | 'primary' | 'danger' | 'warning' | 'success';
@@ -11,7 +12,7 @@ export interface ButtonProps {
   block?: boolean;
   disabled?: boolean;
   ghost?: boolean;
-  icon?: VNode;
+  icon?: TNode;
   loading?: boolean;
   shape?: 'rectangle' | 'square' | 'round' | 'circle';
   size?: 'small' | 'medium' | 'large';

diff --git a/src/common.ts b/src/common.ts
@@ -1,7 +1,7 @@
 import { VNode, WeElement } from 'omi';
 
 export type TElement<T = undefined> = T extends undefined ? WeElement : (props: T) => WeElement;
-export type TNode<T = undefined> = T extends undefined ? VNode : VNode | ((props: T) => VNode);
+export type TNode<T = any> = VNode<T> | ((props: T) => VNode) | object | string | number | boolean | null;
 
 export type AttachNodeReturnValue = HTMLElement | Element | Document;
 export type AttachNode = CSSSelector | ((triggerNode?: HTMLElement) => AttachNodeReturnValue);