@webinex/chatify 2.0.1-alpha1 → 2.0.2-alpha2

package/src/ui/Conversation/ConversationHeader.tsx

@@ -1,23 +1,23 @@
-import { Col, Row } from 'antd';
-import { customize, useCustomize } from '../customize';
-import { ConversationName } from './ConversationName';
-import { ConversationActions } from './ConversationActions';
-
-export const ConversationHeader = customize('ConversationHeader', () => {
-  const Actions = useCustomize(ConversationActions);
-
-  return (
-    <div className="wxchtf-conversation-header">
-      <Row justify="space-between" align="middle">
-        <Col>
-          <ConversationName />
-        </Col>
-        {Actions && (
-          <Col className="wxchtf-conversation-actions">
-            <Actions />
-          </Col>
-        )}
-      </Row>
-    </div>
-  );
-});
+import { Col, Row } from 'antd';
+import { customize, useCustomize } from '../customize';
+import { ConversationName } from './ConversationName';
+import { ConversationActions } from './ConversationActions';
+
+export const ConversationHeader = customize('ConversationHeader', () => {
+  const Actions = useCustomize(ConversationActions);
+
+  return (
+    <div className="wxchtf-conversation-header">
+      <Row justify="space-between" align="middle">
+        <Col>
+          <ConversationName />
+        </Col>
+        {Actions && (
+          <Col className="wxchtf-conversation-actions">
+            <Actions />
+          </Col>
+        )}
+      </Row>
+    </div>
+  );
+});

package/src/ui/Conversation/ConversationName.tsx

@@ -1,7 +1,7 @@
-import { customize } from '../customize';
-import { useConversation } from './ConversationContext';
-
-export const ConversationName = customize('ConversationName', () => {
-  const { name } = useConversation();
-  return <span className="wxchtf-conversation-name">{name}</span>;
-});
+import { customize } from '../customize';
+import { useConversation } from './ConversationContext';
+
+export const ConversationName = customize('ConversationName', () => {
+  const { name } = useConversation();
+  return <span className="wxchtf-conversation-name">{name}</span>;
+});

package/src/ui/Conversation/InputBox/InputBox.tsx

@@ -1,40 +1,113 @@
-import { useCallback, useLayoutEffect, useRef, useState } from 'react';
-import { InputFilesBox } from './InputFilesBox';
-import { InputTextBox } from './InputTextBox';
-import { customize } from '../../customize';
-import { InputSubmitButtonBox } from './InputSubmitButtonBox';
-import { useConversation } from '../ConversationContext';
-
-function useFormState() {
-  const { onSend } = useConversation();
-  const [text, setText] = useState('');
-
-  const onSubmit = useCallback(() => {
-    if (text.length === 0) {
-      return;
-    }
-
-    setText('');
-    Promise.resolve(onSend({ text, files: [] })).catch(() => setText(text));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [text, onSend]);
-
-  return [onSubmit, { text, setText }] as const;
-}
-
-export const InputBox = customize('InputBox', () => {
-  const [onSend, { text, setText }] = useFormState();
-  const inputRef = useRef<HTMLTextAreaElement>(null);
-
-  useLayoutEffect(() => inputRef.current?.focus(), []);
-
-  return (
-    <div className="wxchtf-input-form">
-      <div className="wxchtf-input-box">
-        <InputFilesBox />
-        <InputTextBox value={text} onSend={onSend} onChange={setText} inputRef={inputRef} />
-        <InputSubmitButtonBox onSubmit={onSend} />
-      </div>
-    </div>
-  );
-});
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { InputFilesBox } from './InputFilesBox';
+import { File } from '../../../core';
+import { InputTextBox } from './InputTextBox';
+import { customize, useCustomizeContext } from '../../customize';
+import { InputSubmitButtonBox } from './InputSubmitButtonBox';
+import { useConversation } from '../ConversationContext';
+import { ConversationCustomizeValue } from '../Conversation';
+import { InputBoxFileList } from './InputBoxFileList';
+
+function useFormState() {
+  const { onSend } = useConversation();
+  const [text, setText] = useState('');
+  const [sending, setSending] = useState(false);
+  const { onUpload, files, loading, setFiles, showFileBox, onDeleteFile } = useFlippoInputFileBox();
+
+  const onSubmit = useCallback(() => {
+    if (text.length === 0 || loading) {
+      return;
+    }
+
+    setSending(true);
+    Promise.resolve(onSend({ text, files }))
+      .finally(() => setSending(false))
+      .then(() => {
+        setFiles([]);
+        setText('');
+      });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [text, onSend, files, setFiles, loading]);
+
+  return [onSubmit, { text, setText, files, onUpload, loading, showFileBox, onDeleteFile, sending }] as const;
+}
+
+function useFlippoInputFileBox() {
+  const [loading, setLoading] = useState(false);
+  const [files, setFiles] = useState<File[]>([]);
+  const { flippo } = useCustomizeContext<ConversationCustomizeValue>();
+
+  const onUpload = useCallback(
+    (files: globalThis.File[]) => {
+      if (!flippo) return;
+
+      setLoading(true);
+      Promise.all(files.map((file) => flippo.store(file)))
+        .then((references) =>
+          setFiles((prev) => [
+            ...prev,
+            ...references.map((reference, index) => ({
+              name: files[index].name,
+              ref: reference,
+              bytes: files[index].size,
+            })),
+          ]),
+        )
+        .finally(() => setLoading(false));
+    },
+    [flippo],
+  );
+
+  const onDeleteFile = useCallback((file: File) => {
+    setFiles((prev) => prev.filter((f) => f !== file));
+  }, []);
+
+  return { onUpload, files, loading, setFiles, showFileBox: !!flippo, onDeleteFile };
+}
+
+export const InputBox = customize('InputBox', () => {
+  const [onSend, { text, setText, files, loading, onUpload, showFileBox, onDeleteFile, sending }] =
+    useFormState();
+  const inputRef = useRef<HTMLTextAreaElement>(null);
+  const [showFileList, setShowFileList] = useState(false);
+  const toggleShowFileList = useCallback(() => setShowFileList((prev) => !prev), []);
+
+  useLayoutEffect(() => inputRef.current?.focus(), []);
+
+  useEffect(() => {
+    if (files.length === 0 && showFileList) {
+      setShowFileList(false);
+    }
+  }, [files, showFileList]);
+
+  return (
+    <div className="wxchtf-input-form">
+      <div className="wxchtf-input-box">
+        {showFileList && (
+          <div className="wxchtf-file-list-box">
+            <InputBoxFileList files={files} onDelete={onDeleteFile} disabled={sending} />
+          </div>
+        )}
+        <div className="wxchtf-input-box-row">
+          {showFileBox && (
+            <InputFilesBox
+              onAddedClick={toggleShowFileList}
+              onUpload={onUpload}
+              value={files}
+              loading={loading}
+              disabled={sending}
+            />
+          )}
+          <InputTextBox
+            value={text}
+            onSend={onSend}
+            onChange={setText}
+            disabled={sending}
+            inputRef={inputRef}
+          />
+          <InputSubmitButtonBox onSubmit={onSend} disabled={loading} loading={sending} />
+        </div>
+      </div>
+    </div>
+  );
+});

package/src/ui/Conversation/InputBox/InputBoxFile.tsx

@@ -0,0 +1,38 @@
+import { Button } from 'antd';
+import { File } from '../../../core';
+import { Icon } from '../../common';
+import { useCallback } from 'react';
+import { useFormatter } from '../../useFormatter';
+import { customize } from '../../customize';
+
+export interface InputBoxFileProps {
+  file: File;
+  disabled?: boolean;
+  onDelete: (file: File) => void;
+}
+
+export const InputBoxFile = customize('InputBoxFile', (props: InputBoxFileProps) => {
+  const { file, disabled, onDelete } = props;
+  const formatter = useFormatter();
+  const onDeleteClick = useCallback(() => onDelete(file), [file, onDelete]);
+
+  return (
+    <div className="wxchtf-file">
+      <div className="wxchtf-file-info">
+        <div className="wxchtf-file-name" title={file.name}>
+          {file.name}
+        </div>
+        <div className="wxchtf-file-size">{formatter.size(file.bytes)}</div>
+      </div>
+      <div className="wxchtf-file-actions">
+        <Button
+          disabled={disabled}
+          className="wxchtf-delete"
+          type="link"
+          icon={<Icon type="delete-file" />}
+          onClick={onDeleteClick}
+        />
+      </div>
+    </div>
+  );
+});

package/src/ui/Conversation/InputBox/InputBoxFileList.tsx

@@ -0,0 +1,21 @@
+import { File } from '../../../core';
+import { customize } from '../../customize';
+import { InputBoxFile } from './InputBoxFile';
+
+export interface InputBoxFileListProps {
+  files: File[];
+  disabled?: boolean;
+  onDelete: (file: File) => void;
+}
+
+export const InputBoxFileList = customize('InputBoxFileList', (props: InputBoxFileListProps) => {
+  const { files, onDelete, disabled } = props;
+
+  return (
+    <div className="wxchtf-file-list">
+      {files.map((file) => (
+        <InputBoxFile key={file.ref} file={file} onDelete={onDelete} disabled={disabled} />
+      ))}
+    </div>
+  );
+});

package/src/ui/Conversation/InputBox/InputFilesBox.tsx

@@ -1,9 +1,78 @@
-import { Button } from 'antd';
-import { customize } from '../../customize';
-import { Icon } from '../../common/Icon';
-
-export const InputFilesBox = customize('InputFilesBox', () => (
-  <div className="wxchtf-add-files-box">
-    <Button type="link" icon={<Icon type="attach" />} className="wxchtf-add-files-btn" />
-  </div>
-));
+import { Button } from 'antd';
+import { customize } from '../../customize';
+import { Icon } from '../../common/Icon';
+import { File } from '../../../core';
+import { useCallback, useEffect, useRef } from 'react';
+
+export interface InputFilesBoxProps {
+  value: File[];
+  accept?: string;
+  loading?: boolean;
+  disabled?: boolean;
+  onAddedClick?: () => void;
+  onUpload: (value: globalThis.File[]) => void;
+}
+
+export const InputFileButton = customize('InputFileButton', (props: InputFilesBoxProps) => {
+  const { onUpload, onAddedClick, accept, loading, value, disabled } = props;
+  const inputRef = useRef<HTMLInputElement | null>(null);
+  const onClick = useCallback(() => inputRef.current?.click(), []);
+  const countButtonRef = useRef<HTMLButtonElement | null>(null);
+
+  useEffect(() => {
+    countButtonRef.current?.classList.add('active');
+  }, [value]);
+
+  const onCountButtonAnimationEnd = useCallback(() => {
+    countButtonRef.current?.classList.remove('active');
+  }, []);
+
+  const onInputChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const files = e.target.files;
+      files && files.length > 0 && onUpload(Array.from(files));
+    },
+    [onUpload],
+  );
+
+  return (
+    <>
+      <Button
+        loading={loading}
+        onClick={onClick}
+        type="link"
+        disabled={disabled}
+        icon={<Icon type="attach" />}
+        className="wxchtf-add-files-btn"
+      />
+      {value.length > 0 && (
+        <Button
+          ref={countButtonRef}
+          className="wxchtf-add-files-added-btn"
+          onAnimationIteration={onCountButtonAnimationEnd}
+          onClick={onAddedClick}
+          type="link"
+          disabled={disabled}
+          icon={<>+{value.length}</>}
+        />
+      )}
+      <input
+        value=""
+        accept={accept}
+        onChange={onInputChange}
+        ref={inputRef}
+        type="file"
+        multiple
+        style={{ display: 'none' }}
+      />
+    </>
+  );
+});
+
+export const InputFilesBox = customize('InputFilesBox', (props: InputFilesBoxProps) => {
+  return (
+    <div className="wxchtf-add-files-box">
+      <InputFileButton {...props} />
+    </div>
+  );
+});

package/src/ui/Conversation/InputBox/InputSubmitButtonBox.tsx

@@ -1,17 +1,26 @@
-import { Button } from 'antd';
-import { customize } from '../../customize';
-import { Icon } from '../../common/Icon';
-
-export interface InputSubmitButtonBoxProps {
-  onSubmit: () => void;
-}
-
-export const InputSubmitButtonBox = customize('InputSubmitButtonBox', (props: InputSubmitButtonBoxProps) => {
-  const { onSubmit } = props;
-
-  return (
-    <div className="wxchtf-submit-btn-box">
-      <Button onClick={onSubmit} type="link" icon={<Icon type="send" />} className="wxchtf-submit-btn" />
-    </div>
-  );
-});
+import { Button } from 'antd';
+import { customize } from '../../customize';
+import { Icon } from '../../common/Icon';
+
+export interface InputSubmitButtonBoxProps {
+  onSubmit: () => void;
+  disabled?: boolean;
+  loading?: boolean;
+}
+
+export const InputSubmitButtonBox = customize('InputSubmitButtonBox', (props: InputSubmitButtonBoxProps) => {
+  const { onSubmit, disabled, loading } = props;
+
+  return (
+    <div className="wxchtf-submit-btn-box">
+      <Button
+        onClick={onSubmit}
+        type="link"
+        icon={<Icon type="send" />}
+        className="wxchtf-submit-btn"
+        disabled={disabled}
+        loading={loading}
+      />
+    </div>
+  );
+});

package/src/ui/Conversation/InputBox/InputTextBox.tsx

@@ -1,53 +1,55 @@
-import { Input } from 'antd';
-import { customize } from '../../customize';
-import isHotkey from 'is-hotkey';
-import { RefObject, memo, useCallback } from 'react';
-import { useLocalizer } from '../../localizer';
-import { TextAreaProps } from 'antd/es/input';
-
-export interface TextInputBoxProps {
-  value: string;
-  onChange: (value: string) => void;
-  onSend: (value: string) => void;
-  inputRef?: RefObject<HTMLTextAreaElement>;
-}
-
-const isSend = isHotkey('ctrl+enter');
-
-const AUTO_SIZE: TextAreaProps['autoSize'] = { maxRows: 5, minRows: 1 };
-
-export const InputTextBox = customize(
-  'InputTextBox',
-  memo((props: TextInputBoxProps) => {
-    const { value, onChange, onSend, inputRef } = props;
-    const localizer = useLocalizer();
-
-    const onInputChange = useCallback(
-      (e: React.ChangeEvent<HTMLTextAreaElement>) => onChange(e.target.value),
-      [onChange],
-    );
-
-    const onKeyDown = useCallback(
-      (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-        if (isSend(e)) {
-          onSend(value);
-        }
-      },
-      [onSend, value],
-    );
-
-    return (
-      <div className="wxchtf-text-input-box">
-        <Input.TextArea
-          ref={inputRef}
-          value={value}
-          onChange={onInputChange}
-          autoSize={AUTO_SIZE}
-          className="wxchtf-text-input-textarea"
-          placeholder={localizer.input.placeholder()}
-          onKeyDown={onKeyDown}
-        />
-      </div>
-    );
-  }),
-);
+import { Input } from 'antd';
+import { customize } from '../../customize';
+import isHotkey from 'is-hotkey';
+import { RefObject, memo, useCallback } from 'react';
+import { useLocalizer } from '../../localizer';
+import { TextAreaProps } from 'antd/es/input';
+
+export interface TextInputBoxProps {
+  value: string;
+  onChange: (value: string) => void;
+  onSend: (value: string) => void;
+  disabled?: boolean;
+  inputRef?: RefObject<HTMLTextAreaElement>;
+}
+
+const isSend = isHotkey('ctrl+enter');
+
+const AUTO_SIZE: TextAreaProps['autoSize'] = { maxRows: 5, minRows: 1 };
+
+export const InputTextBox = customize(
+  'InputTextBox',
+  memo((props: TextInputBoxProps) => {
+    const { value, onChange, onSend, disabled, inputRef } = props;
+    const localizer = useLocalizer();
+
+    const onInputChange = useCallback(
+      (e: React.ChangeEvent<HTMLTextAreaElement>) => onChange(e.target.value),
+      [onChange],
+    );
+
+    const onKeyDown = useCallback(
+      (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+        if (isSend(e)) {
+          onSend(value);
+        }
+      },
+      [onSend, value],
+    );
+
+    return (
+      <div className="wxchtf-text-input-box">
+        <Input.TextArea
+          ref={inputRef}
+          value={value}
+          onChange={onInputChange}
+          autoSize={AUTO_SIZE}
+          className="wxchtf-text-input-textarea"
+          placeholder={localizer.input.placeholder()}
+          onKeyDown={onKeyDown}
+          disabled={disabled}
+        />
+      </div>
+    );
+  }),
+);

package/src/ui/Conversation/InputBox/index.ts

@@ -1,16 +1,23 @@
-import { InputBox } from './InputBox';
-import { InputFilesBox } from './InputFilesBox';
-import { InputSubmitButtonBox } from './InputSubmitButtonBox';
-import { InputTextBox } from './InputTextBox';
-
-export * from './InputBox';
-export * from './InputFilesBox';
-export * from './InputSubmitButtonBox';
-export * from './InputTextBox';
-
-export interface InputBoxCustomizeValue {
-  InputBox?: typeof InputBox.Component | null;
-  InputTextBox?: typeof InputTextBox.Component | null;
-  InputFilesBox?: typeof InputFilesBox.Component | null;
-  InputSubmitButtonBox?: typeof InputSubmitButtonBox.Component | null;
-}
+import { InputBox } from './InputBox';
+import { InputBoxFile } from './InputBoxFile';
+import { InputBoxFileList } from './InputBoxFileList';
+import { InputFileButton, InputFilesBox } from './InputFilesBox';
+import { InputSubmitButtonBox } from './InputSubmitButtonBox';
+import { InputTextBox } from './InputTextBox';
+
+export * from './InputBox';
+export * from './InputFilesBox';
+export * from './InputSubmitButtonBox';
+export * from './InputTextBox';
+export * from './InputBoxFileList';
+export * from './InputBoxFile';
+
+export interface InputBoxCustomizeValue {
+  InputBox?: typeof InputBox.Component | null;
+  InputTextBox?: typeof InputTextBox.Component | null;
+  InputFilesBox?: typeof InputFilesBox.Component | null;
+  InputSubmitButtonBox?: typeof InputSubmitButtonBox.Component | null;
+  InputBoxFileList?: typeof InputBoxFileList.Component | null;
+  InputBoxFile?: typeof InputBoxFile.Component | null;
+  InputFileButton?: typeof InputFileButton.Component | null;
+}

package/src/ui/Conversation/Message/MessageAuthor.tsx

@@ -1,13 +1,13 @@
-import { customize } from '../../customize';
-import { Avatar } from '../../common/Avatar';
-import type { MessageBoxProps } from './MessageBox';
-
-export const MessageAuthor = customize('MessageAuthor', (props: MessageBoxProps) => {
-  const { sentBy } = props.message;
-
-  return (
-    <div className="wxchtf-message-author">
-      <Avatar account={sentBy} />
-    </div>
-  );
-});
+import { customize } from '../../customize';
+import { Avatar } from '../../common/Avatar';
+import type { MessageBoxProps } from './MessageBox';
+
+export const MessageAuthor = customize('MessageAuthor', (props: MessageBoxProps) => {
+  const { sentBy } = props.message;
+
+  return (
+    <div className="wxchtf-message-author">
+      <Avatar account={sentBy} />
+    </div>
+  );
+});

package/src/ui/Conversation/Message/MessageBox.tsx

@@ -1,20 +1,20 @@
-import { useRef } from 'react';
-import { customize } from '../../customize';
-import { MessageReadObserver } from '../ReadObserver';
-import { MessageRow } from './MessageRow';
-import { MessageBase } from '../../../core';
-
-export interface MessageBoxProps {
-  message: MessageBase;
-}
-
-export const MessageBox = customize('MessageBox', (props: MessageBoxProps) => {
-  const ref = useRef<HTMLDivElement | null>(null);
-
-  return (
-    <>
-      <MessageReadObserver messageRef={ref} {...props} />
-      <MessageRow containerRef={ref} {...props} />
-    </>
-  );
-});
+import { useRef } from 'react';
+import { customize } from '../../customize';
+import { MessageReadObserver } from '../ReadObserver';
+import { MessageRow } from './MessageRow';
+import { MessageBase } from '../../../core';
+
+export interface MessageBoxProps {
+  message: MessageBase;
+}
+
+export const MessageBox = customize('MessageBox', (props: MessageBoxProps) => {
+  const ref = useRef<HTMLDivElement | null>(null);
+
+  return (
+    <>
+      <MessageReadObserver messageRef={ref} {...props} />
+      <MessageRow containerRef={ref} {...props} />
+    </>
+  );
+});

package/src/ui/Conversation/Message/MessageContent.tsx

@@ -1,11 +1,15 @@
-import { customize } from '../../customize';
-import { MessageText } from './MessageText';
-import type { MessageBoxProps } from './MessageBox';
-
-export const MessageContent = customize('MessageContent', (props: MessageBoxProps) => {
-  return (
-    <div className="wxchtf-message-content">
-      <MessageText {...props} />
-    </div>
-  );
-});
+import { customize } from '../../customize';
+import { MessageText } from './MessageText';
+import type { MessageBoxProps } from './MessageBox';
+import { MessageFileList } from './MessageFileList';
+
+export const MessageContent = customize('MessageContent', (props: MessageBoxProps) => {
+  const { files } = props.message;
+
+  return (
+    <div className="wxchtf-message-content">
+      <MessageText {...props} />
+      {files.length > 0 && <MessageFileList {...props} />}
+    </div>
+  );
+});