github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-20 10:59:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: [code-1316]: add video support in comment box (#965)

Browse Source
This commit is contained in:
Calvin Lee 2024-01-13 00:34:41 +00:00 committed by Harness
parent 123267c918
commit 634a70a833
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/components/Editor/Editor.tsx
View File

@ -79,6 +79,7 @@ export const Editor = React.memo(function CodeMirrorReactEditor({
const { getString } = useStrings() const { getString } = useStrings()
const view = useRef<EditorView>() const view = useRef<EditorView>()
const ref = useRef<HTMLDivElement>() const ref = useRef<HTMLDivElement>()
const [fileData, setFile] = useState<File>()
const languageConfig = useMemo(() => new Compartment(), []) const languageConfig = useMemo(() => new Compartment(), [])
const [markdownContent, setMarkdownContent] = useState('') const [markdownContent, setMarkdownContent] = useState('')
@ -103,7 +104,7 @@ export const Editor = React.memo(function CodeMirrorReactEditor({
const updateContentWithoutStateChange = () => { const updateContentWithoutStateChange = () => {
setUploading(true) setUploading(true)
if (view.current && markdownContent && !inGitBlame) { if (view.current && markdownContent && !inGitBlame) {
const markdownInsert = `![image](${markdownContent})` const markdownInsert = fileData?.type.startsWith('image/') ? `![image](${markdownContent})` : `${markdownContent}`
const range = view.current.state.selection.main const range = view.current.state.selection.main
const cursorPos = range.from const cursorPos = range.from
const newCursorPos = cursorPos + markdownInsert.length const newCursorPos = cursorPos + markdownInsert.length
@ -206,6 +207,7 @@ export const Editor = React.memo(function CodeMirrorReactEditor({
}, [filename, forMarkdown, view, languageConfig, markdownLanguageSupport]) }, [filename, forMarkdown, view, languageConfig, markdownLanguageSupport])
const handleUploadCallback = (file: File) => { const handleUploadCallback = (file: File) => {
if (!inGitBlame) { if (!inGitBlame) {
setFile(file)
handleUpload(file, setMarkdownContent, repoMetadata, showError, standalone, routingId) handleUpload(file, setMarkdownContent, repoMetadata, showError, standalone, routingId)
} }
} }

4
web/src/components/MarkdownEditorWithPreview/MarkdownEditorWithPreview.tsx
View File

@ -169,6 +169,7 @@ export function MarkdownEditorWithPreview({
} }
case ToolbarAction.UPLOAD: { case ToolbarAction.UPLOAD: {
setFile(undefined)
setOpen(true) setOpen(true)
break break
@ -303,7 +304,7 @@ export function MarkdownEditorWithPreview({
useEffect(() => { useEffect(() => {
const view = viewRef.current const view = viewRef.current
if (markdownContent && view) { if (markdownContent && view) {
const insertText = `![image](${markdownContent})` const insertText = file?.type.startsWith('image/') ? `![image](${markdownContent})` : `${markdownContent}`
view.dispatch( view.dispatch(
view.state.changeByRange(range => ({ view.state.changeByRange(range => ({
changes: [{ from: range.from, insert: insertText }], changes: [{ from: range.from, insert: insertText }],
@ -384,7 +385,6 @@ export function MarkdownEditorWithPreview({
onClick={() => { onClick={() => {
handleUpload(file as File, setMarkdownContent, repoMetadata, showError, standalone, routingId) handleUpload(file as File, setMarkdownContent, repoMetadata, showError, standalone, routingId)
setOpen(false) setOpen(false)
setFile(undefined)
}} }}
/> />
<Button <Button

2
web/src/i18n/strings.en.yaml
View File

@ -852,7 +852,7 @@ enterBitbucketPlaceholder: https://bitbucket.org/
changeRepoVis: Change repository visibility changeRepoVis: Change repository visibility
changeRepoVisContent: Are you sure you want to make this repository {repoVis}? {repoText} changeRepoVisContent: Are you sure you want to make this repository {repoVis}? {repoText}
repoVisibility: Repository Visibility repoVisibility: Repository Visibility
attachText: Attach images by dragging & dropping, selecting or pasting them. attachText: Attach images & videos by dragging & dropping, selecting or pasting them.
key: Key key: Key
setting: Setting setting: Setting
mergeCommit: Merge commit mergeCommit: Merge commit

2
web/src/utils/Utils.ts
View File

@ -258,7 +258,7 @@ export const handlePaste = (event: { preventDefault: () => void; clipboardData:
if (items.length > 0) { if (items.length > 0) {
const firstItem = items[0] const firstItem = items[0]
if (firstItem.type.startsWith('image/')) { if (firstItem.type.startsWith('image/') || firstItem.type.startsWith('video/')) {
const blob = firstItem.getAsFile() const blob = firstItem.getAsFile()
callback(blob) callback(blob)
} }