From 69468d34c8811d0fad6875b448b8d8cf414aafb6 Mon Sep 17 00:00:00 2001 From: Chris Holland Date: Sat, 12 Oct 2024 13:55:13 -0700 Subject: [PATCH] refactor/fix: lift file select logic into its own component block --- .../Extensions/Image/ImageBlockComponent.tsx | 62 ++---------- .../Extensions/PDF/PDFBlockComponent.tsx | 50 ++-------- .../Extensions/Video/VideoBlockComponent.tsx | 56 ++--------- .../Objects/Editor/FileUploadBlock.tsx | 99 +++++++++++++++++++ 4 files changed, 124 insertions(+), 143 deletions(-) create mode 100644 apps/web/components/Objects/Editor/FileUploadBlock.tsx diff --git a/apps/web/components/Objects/Editor/Extensions/Image/ImageBlockComponent.tsx b/apps/web/components/Objects/Editor/Extensions/Image/ImageBlockComponent.tsx index 778802fe..7a60cc19 100644 --- a/apps/web/components/Objects/Editor/Extensions/Image/ImageBlockComponent.tsx +++ b/apps/web/components/Objects/Editor/Extensions/Image/ImageBlockComponent.tsx @@ -1,15 +1,14 @@ import { NodeViewWrapper } from '@tiptap/react' import React, { useEffect } from 'react' -import styled from 'styled-components' import { Resizable } from 're-resizable' -import { AlertTriangle, Image, Loader } from 'lucide-react' +import { AlertTriangle, Image } from 'lucide-react' import { uploadNewImageFile } from '../../../../../services/blocks/Image/images' -import { UploadIcon } from '@radix-ui/react-icons' import { getActivityBlockMediaDirectory } from '@services/media/media' import { useOrg } from '@components/Contexts/OrgContext' import { useCourse } from '@components/Contexts/CourseContext' import { useEditorProvider } from '@components/Contexts/Editor/EditorContext' import { useLHSession } from '@components/Contexts/LHSessionContext' +import { FileUploadBlock, FileUploadBlockButton, FileUploadBlockInput } from '../../FileUploadBlock' function ImageBlockComponent(props: any) { const org = useOrg() as any @@ -53,39 +52,11 @@ function ImageBlockComponent(props: any) { return ( - {!blockObject && isEditable && ( - - {isLoading ? ( - - ) : ( - <> -
- -
- - - - )} -
- )} + + + + + {blockObject && ( - {!blockObject && ( - - {isLoading ? ( - - ) : ( - <> -
- -
- - - - )} -
- )} + + + + + {blockObject && (