fix(typings): base components props intersection with html components…

… props
chatscope · Jun 15, 2022 · 6637245 · 6637245
1 parent 4511c3e
commit 6637245
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/components/Message/Message.d.ts b/src/components/Message/Message.d.ts
@@ -69,8 +69,7 @@ declare const Message: {
     TextContent: typeof MessageTextContent;
     ImageContent: typeof MessageImageContent;
     CustomContent: typeof MessageCustomContent;
-   Footer:typeof MessageFooter;
-
+    Footer:typeof MessageFooter;
 };
 
 export {

diff --git a/src/components/MessageInput/MessageInput.d.ts b/src/components/MessageInput/MessageInput.d.ts
@@ -10,12 +10,12 @@ export interface MessageInputProps {
   fancyScroll?: boolean;
   activateAfterChange?: boolean;
   autoFocus?: boolean;
-  onChange: (innerHtml: string, textContent: string, innerText: string, nodes: NodeList) => void;
-  onSend: (innerHtml: string, textContent: string, innerText: string, nodes: NodeList) => void;
+  onChange?: (innerHtml: string, textContent: string, innerText: string, nodes: NodeList) => void;
+  onSend?: (innerHtml: string, textContent: string, innerText: string, nodes: NodeList) => void;
   sendButton?: boolean;
   attachButton?: boolean;
   attachDisabled?: boolean;
-  onAttachClick: (evt: MouseEvent<HTMLButtonElement>) => void;
+  onAttachClick?: (evt: MouseEvent<HTMLButtonElement>) => void;
 }
 
 export declare const MessageInput: (props: ChatComponentPropsRef<MessageInputProps, "div">) => ReactElement;

diff --git a/src/types/index.d.ts b/src/types/index.d.ts
@@ -6,14 +6,16 @@ import type {
 /* eslint-disable @typescript-eslint/no-explicit-any */
 export type EmptyProps = Record<never, any>;
 
-type ElementTypeOrHTMLElement = ElementType | HTMLElement;
-export type ChatComponentProps<P,T extends ElementTypeOrHTMLElement> = P & (T extends ElementType ? Omit<ComponentPropsWithoutRef<T>, "children"> : Omit<HTMLAttributes<T>, "children">);
+export type ElementTypeOrHTMLElement = ElementType | HTMLElement;
+export type ChatComponentProps<P,T extends ElementTypeOrHTMLElement> = 
+  P & (T extends ElementType ? Omit<ComponentPropsWithoutRef<T>, "children" | keyof P> : Omit<HTMLAttributes<T>, "children" | keyof P>);
 
-export type ChatComponentPropsRef<P,T extends ElementTypeOrHTMLElement> = P  & (T extends ElementType ? Omit<ComponentPropsWithRef<T>, "children"> : Omit<DetailedHTMLProps<HTMLAttributes<T>,T>, "children">);
+export type ChatComponentPropsRef<P,T extends ElementTypeOrHTMLElement> = 
+  P & (T extends ElementType ? Omit<ComponentPropsWithRef<T>, "children" | keyof P > : Omit<DetailedHTMLProps<HTMLAttributes<T>,T>, "children" | keyof P>);
 
 export type ChatComponentPropsChildren<P,T extends ElementTypeOrHTMLElement> = PropsWithChildren<ChatComponentProps<P,T>>;
 
-export type ChatComponentPropsChildrenRef<P,T extends ElementTypeOrHTMLElement> =  PropsWithChildren<ChatComponentPropsRef<P,T>>;
+export type ChatComponentPropsChildrenRef<P,T extends ElementTypeOrHTMLElement> = PropsWithChildren<ChatComponentPropsRef<P,T>>;
 
 export {Size, UserStatus, MessageType} from "./unions";
 export * from "../components/Avatar/Avatar";