-
Notifications
You must be signed in to change notification settings - Fork 420
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
75a0f38
commit c24fe37
Showing
3 changed files
with
125 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import { Dispatch, SetStateAction } from 'react' | ||
| import CodeMirrorMerge from 'react-codemirror-merge' | ||
| import CodeMirror from '@uiw/react-codemirror' | ||
| import { dracula } from '@uiw/codemirror-theme-dracula' | ||
| import { EditorView } from 'codemirror' | ||
| import { StatefulCodeSuggestion } from '@/lib/types' | ||
| import { languageMapping } from '@/lib/language_mapping' | ||
| import { dracula } from '@/lib/theme' | ||
| import { debounce } from '@/lib/utils' | ||
|
|
||
| const Original = CodeMirrorMerge.Original | ||
| const Modified = CodeMirrorMerge.Modified | ||
|
|
||
| export default function CodeMirrorEditor({ | ||
| suggestion, | ||
| index, | ||
| setSuggestedChanges, | ||
| }: { | ||
| suggestion: StatefulCodeSuggestion | ||
| index: number | ||
| setSuggestedChanges: Dispatch<SetStateAction<StatefulCodeSuggestion[]>> | ||
| }) { | ||
| const fileExtension = suggestion.filePath.split('.').pop() | ||
| // default to javascript | ||
| let languageExtension = languageMapping['js'] | ||
| if (fileExtension) { | ||
| languageExtension = languageMapping[fileExtension] | ||
| } | ||
|
|
||
| if (suggestion.originalCode.length === 0) { | ||
| return ( | ||
| <CodeMirror | ||
| theme={dracula} | ||
| autoFocus={false} | ||
| key={JSON.stringify(suggestion)} | ||
| value={suggestion.newCode} | ||
| readOnly={!(suggestion.state == 'done' || suggestion.state == 'error')} | ||
| extensions={[ | ||
| EditorView.editable.of( | ||
| suggestion.state == 'done' || suggestion.state == 'error' | ||
| ), | ||
| ...(languageExtension ? [languageExtension] : []), | ||
| ]} | ||
| onChange={debounce((value: string) => { | ||
| setSuggestedChanges((suggestedChanges) => | ||
| suggestedChanges.map((suggestion, i) => | ||
| i == index ? { ...suggestion, newCode: value } : suggestion | ||
| ) | ||
| ) | ||
| }, 1000)} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| return ( | ||
| <CodeMirrorMerge | ||
| theme={dracula} | ||
| revertControls={'a-to-b'} | ||
| collapseUnchanged={{ | ||
| margin: 3, | ||
| minSize: 4, | ||
| }} | ||
| autoFocus={false} | ||
| key={JSON.stringify(suggestion)} | ||
| > | ||
| <Original | ||
| value={suggestion.originalCode} | ||
| readOnly={true} | ||
| extensions={[ | ||
| EditorView.editable.of(false), | ||
| ...(languageExtension ? [languageExtension] : []), | ||
| ]} | ||
| /> | ||
| <Modified | ||
| value={suggestion.newCode} | ||
| readOnly={!(suggestion.state == 'done' || suggestion.state == 'error')} | ||
| extensions={[ | ||
| EditorView.editable.of( | ||
| suggestion.state == 'done' || suggestion.state == 'error' | ||
| ), | ||
| ...(languageExtension ? [languageExtension] : []), | ||
| ]} | ||
| onChange={debounce((value: string) => { | ||
| setSuggestedChanges((suggestedChanges) => | ||
| suggestedChanges.map((suggestion, i) => | ||
| i == index ? { ...suggestion, newCode: value } : suggestion | ||
| ) | ||
| ) | ||
| }, 1000)} | ||
| /> | ||
| </CodeMirrorMerge> | ||
| ) | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { useEffect, useRef } from 'react' | ||
|
|
||
| import { ScrollArea } from '@/components/ui/scroll-area' | ||
|
|
||
| export default function AutoScrollArea({ | ||
| children, | ||
| className = '', | ||
| threshold = Infinity, | ||
| }: { | ||
| children: React.ReactNode | ||
| className?: string | ||
| threshold?: number | ||
| }) { | ||
| const scrollAreaRef = useRef<HTMLDivElement>(null) | ||
| useEffect(() => { | ||
| if (scrollAreaRef.current && scrollAreaRef.current.scrollHeight > 0) { | ||
| const { scrollTop, scrollHeight, clientHeight } = scrollAreaRef.current | ||
| if (scrollHeight - scrollTop - clientHeight < threshold) { | ||
| scrollAreaRef.current.scrollTop = scrollAreaRef.current.scrollHeight | ||
| } | ||
| } | ||
| }, [children]) | ||
| return ( | ||
| <ScrollArea ref={scrollAreaRef} className={className}> | ||
| {children} | ||
| </ScrollArea> | ||
| ) | ||
| } | ||
|
|