Kaynağa Gözat

no optional

reiji-h 2 yıl önce
ebeveyn
işleme
782c0c2609

+ 2 - 2
packages/editor/src/components/CodeMirrorEditor/CodeMirrorEditor.tsx

@@ -22,18 +22,18 @@ const CodeMirrorEditorContainer = forwardRef<HTMLDivElement>((props, ref) => {
 
 type Props = {
   editorKey: string | GlobalCodeMirrorEditorKey,
+  acceptedFileType: AcceptedUploadFileType,
   onChange?: (value: string) => void,
   onUpload?: (files: File[]) => void,
-  acceptedFileType?: AcceptedUploadFileType,
   indentSize?: number,
 }
 
 export const CodeMirrorEditor = (props: Props): JSX.Element => {
   const {
     editorKey,
+    acceptedFileType,
     onChange,
     onUpload,
-    acceptedFileType,
     indentSize,
   } = props;
 

+ 1 - 1
packages/editor/src/components/CodeMirrorEditor/Toolbar/AttachmentsButton.tsx

@@ -6,7 +6,7 @@ import { AcceptedUploadFileType } from '../../../consts/accepted-upload-file-typ
 
 type Props = {
   onFileOpen: () => void,
-  acceptedFileType?: AcceptedUploadFileType,
+  acceptedFileType: AcceptedUploadFileType,
 }
 
 export const AttachmentsButton = (props: Props): JSX.Element => {

+ 1 - 1
packages/editor/src/components/CodeMirrorEditor/Toolbar/AttachmentsDropup.tsx

@@ -12,7 +12,7 @@ import { AttachmentsButton } from './AttachmentsButton';
 
 type Props = {
   onFileOpen: () => void,
-  acceptedFileType?: AcceptedUploadFileType,
+  acceptedFileType: AcceptedUploadFileType,
 }
 
 export const AttachmentsDropup = (props: Props): JSX.Element => {

+ 1 - 1
packages/editor/src/components/CodeMirrorEditor/Toolbar/Toolbar.tsx

@@ -13,7 +13,7 @@ import styles from './Toolbar.module.scss';
 
 type Props = {
   onFileOpen: () => void,
-  acceptedFileType?: AcceptedUploadFileType
+  acceptedFileType: AcceptedUploadFileType
 }
 
 export const Toolbar = memo((props: Props): JSX.Element => {

+ 2 - 1
packages/editor/src/components/CodeMirrorEditorComment.tsx

@@ -26,6 +26,7 @@ export const CodeMirrorEditorComment = (props: Props): JSX.Element => {
   } = props;
 
   const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(GlobalCodeMirrorEditorKey.COMMENT);
+  const acceptedFileTypeNoOpt = acceptedFileType ?? AcceptedUploadFileType.NONE;
 
   // setup additional extensions
   useEffect(() => {
@@ -61,7 +62,7 @@ export const CodeMirrorEditorComment = (props: Props): JSX.Element => {
     <CodeMirrorEditor
       editorKey={GlobalCodeMirrorEditorKey.COMMENT}
       onChange={onChange}
-      acceptedFileType={acceptedFileType}
+      acceptedFileType={acceptedFileTypeNoOpt}
     />
   );
 };

+ 2 - 1
packages/editor/src/components/CodeMirrorEditorMain.tsx

@@ -28,6 +28,7 @@ export const CodeMirrorEditorMain = (props: Props): JSX.Element => {
   } = props;
 
   const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(GlobalCodeMirrorEditorKey.MAIN);
+  const acceptedFileTypeNoOpt = acceptedFileType ?? AcceptedUploadFileType.NONE;
 
   // setup additional extensions
   useEffect(() => {
@@ -64,7 +65,7 @@ export const CodeMirrorEditorMain = (props: Props): JSX.Element => {
       editorKey={GlobalCodeMirrorEditorKey.MAIN}
       onChange={onChange}
       onUpload={onUpload}
-      acceptedFileType={acceptedFileType}
+      acceptedFileType={acceptedFileTypeNoOpt}
       indentSize={indentSize}
     />
   );

+ 1 - 1
packages/editor/src/consts/accepted-upload-file-type.ts

@@ -1,6 +1,6 @@
 export const AcceptedUploadFileType = {
   ALL: '*',
   IMAGE: 'image/*',
-  NONE: null,
+  NONE: '',
 } as const;
 export type AcceptedUploadFileType = typeof AcceptedUploadFileType[keyof typeof AcceptedUploadFileType];

+ 3 - 3
packages/editor/src/services/file-dropzone/use-file-dropzone.ts

@@ -7,7 +7,7 @@ import { AcceptedUploadFileType } from 'src/consts';
 
 type DropzoneEditor = {
   onUpload?: (files: File[]) => void,
-  acceptedFileType?: AcceptedUploadFileType,
+  acceptedFileType: AcceptedUploadFileType,
 }
 
 export const useFileDropzone = (props: DropzoneEditor): DropzoneState => {
@@ -22,9 +22,9 @@ export const useFileDropzone = (props: DropzoneEditor): DropzoneState => {
   }, [onUpload]);
 
   const accept: Accept = {};
-  accept[(acceptedFileType ?? '')] = [];
+  accept[(acceptedFileType)] = [];
 
-  const disabled = acceptedFileType == null;
+  const disabled = acceptedFileType == acceptedFileType.NONE;
 
   return useDropzone({
     noKeyboard: true,