Skip to content

Commit

Permalink
add autocompletion extension from useMemo
Browse files Browse the repository at this point in the history
  • Loading branch information
roipoussiere committed Jun 9, 2023
1 parent 8e69094 commit 5e09c3c
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions packages/react/src/components/CodeMirror6.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,24 @@ export default function CodeMirror({
);

const extensions = useMemo(() => {
let _extensions = [...staticExtensions];
let bindings = {
vim,
emacs,
};

if (bindings[keybindings]) {
return [...staticExtensions, bindings[keybindings]()];
_extensions.push(bindings[keybindings]());
}

if (isAutoCompletionEnabled) {
_extensions.push(javascriptLanguage.data.of({ autocomplete: strudelAutocomplete }));
} else {
_extensions.push(autocompletion({ override: [] }));
}
return staticExtensions;
}, [keybindings]);

const setAutoCompletion = (isAutoCompletionEnabled) =>
isAutoCompletionEnabled
? javascriptLanguage.data.of({ autocomplete: strudelAutocomplete })
: autocompletion({ override: [] });
return _extensions;
}, [keybindings, isAutoCompletionEnabled]);

return (
<div style={{ fontSize, fontFamily }} className="w-full">
Expand All @@ -156,7 +160,7 @@ export default function CodeMirror({
onChange={handleOnChange}
onCreateEditor={handleOnCreateEditor}
onUpdate={handleOnUpdate}
extensions={[...extensions, setAutoCompletion(isAutoCompletionEnabled)]}
extensions={extensions}
basicSetup={{ lineNumbers: isLineNumbersDisplayed }}
/>
</div>
Expand Down

0 comments on commit 5e09c3c

Please sign in to comment.