Skip to content

[playground] fix compile hotkey combo adds extra symbol to the code #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ukorvl merged 1 commit into from
Mar 12, 2025
Merged

[playground] fix compile hotkey combo adds extra symbol to the code #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions explorer_frontend/src/features/code/Code.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import {
} from "./model";
import "./init";
import { type Diagnostic, linter } from "@codemirror/lint";
import type { EditorView } from "@codemirror/view";
import { Prec } from "@codemirror/state";
import { type EditorView, keymap } from "@codemirror/view";
import { useStyletron } from "baseui";
import { expandProperty } from "inline-style-expand-shorthand";
import { type ReactNode, memo, useMemo } from "react";
Expand Down Expand Up @@ -45,6 +46,20 @@ export const Code = ({ extraMobileButton, extraToolbarButton }: CodeProps) => {
const [css] = useStyletron();
const compilerVersionButton =
extraToolbarButton === undefined ? <CompilerVersionButton disabled={isDownloading} /> : null;
const btnTextContent = useCompileButton();

const preventNewlineOnCmdEnter = useMemo(
() =>
Prec.highest(
keymap.of([
{
key: "Mod-Enter",
run: () => true,
},
]),
),
[],
);

const codemirrorExtensions = useMemo(() => {
const solidityLinter = (view: EditorView) => {
Expand All @@ -69,11 +84,10 @@ export const Code = ({ extraMobileButton, extraToolbarButton }: CodeProps) => {
return [...displayErrors, ...displayWarnings];
};

return [linter(solidityLinter)];
}, [errors, warnings]);
return [preventNewlineOnCmdEnter, linter(solidityLinter)];
}, [errors, warnings, preventNewlineOnCmdEnter]);

const noCode = code.trim().length === 0;
const btnContent = useCompileButton();
return (
<Card
overrides={{
Expand Down Expand Up @@ -152,7 +166,7 @@ export const Code = ({ extraMobileButton, extraToolbarButton }: CodeProps) => {
}}
data-testid="compile-button"
>
{btnContent}
{btnTextContent}
</Button>
)}
{!isMobile && extraToolbarButton && extraToolbarButton}
Expand Down Expand Up @@ -229,7 +243,7 @@ export const Code = ({ extraMobileButton, extraToolbarButton }: CodeProps) => {
}}
data-testid="compile-button"
>
{btnContent}
{btnTextContent}
</Button>
<Button
overrides={{
Expand Down
2 changes: 1 addition & 1 deletion explorer_frontend/src/features/code/hooks/useCompileButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const getBtnContent = (css: (style: StyleObject) => string) => {
export const useCompileButton = () => {
const [css] = useStyletron();

const hotKey = os === "windows" ? "Ctrl+Enter" : os === "mac" ? "Meta+Enter" : "Ctrl+Enter";
const hotKey = os === "mac" ? "Meta+Enter" : "Ctrl+Enter";
const btnContent = useMemo(() => getBtnContent(css), [css]);

useHotkeys(
Expand Down