Skip to content

fix(prompts): revert to vscodetextarea to prevent race condition #3343

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
merged 2 commits into from
May 9, 2025
Merged

fix(prompts): revert to vscodetextarea to prevent race condition #3343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22f337f
fix(prompts): save on blur to prevent race condition
elianiva May 8, 2025
8c33204
fix(prompts): revert back to vscode textarea
elianiva May 8, 2025
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
21 changes: 10 additions & 11 deletions webview-ui/src/components/prompts/PromptsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect, useMemo, useCallback, useRef } from "react"
import { Button } from "@/components/ui/button"
import { VSCodeCheckbox, VSCodeRadioGroup, VSCodeRadio } from "@vscode/webview-ui-toolkit/react"
import { VSCodeCheckbox, VSCodeRadioGroup, VSCodeRadio, VSCodeTextArea } from "@vscode/webview-ui-toolkit/react"

import { useExtensionState } from "@src/context/ExtensionStateContext"
import {
Expand All @@ -27,7 +27,6 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
Textarea,
Popover,
PopoverContent,
PopoverTrigger,
Expand Down Expand Up @@ -666,7 +665,7 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
<div className="text-sm text-vscode-descriptionForeground mb-2">
{t("prompts:roleDefinition.description")}
</div>
<Textarea
<VSCodeTextArea
value={(() => {
const customMode = findModeBySlug(visualMode, customModes)
const prompt = customModePrompts?.[visualMode] as PromptComponent
Expand Down Expand Up @@ -848,7 +847,7 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
modeName: getCurrentMode()?.name || "Code",
})}
</div>
<Textarea
<VSCodeTextArea
value={(() => {
const customMode = findModeBySlug(visualMode, customModes)
const prompt = customModePrompts?.[visualMode] as PromptComponent
Expand Down Expand Up @@ -1002,7 +1001,7 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
language: i18next.language,
})}
</div>
<Textarea
<VSCodeTextArea
value={customInstructions}
onChange={(e) => {
const value =
Expand Down Expand Up @@ -1080,7 +1079,7 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
</Button>
</div>

<Textarea
<VSCodeTextArea
value={getSupportPromptValue(activeSupportOption)}
onChange={(e) => {
const value =
Expand Down Expand Up @@ -1140,7 +1139,7 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
</div>

<div className="mt-4">
<Textarea
<VSCodeTextArea
value={testPrompt}
onChange={(e) => setTestPrompt((e.target as HTMLTextAreaElement).value)}
placeholder={t("prompts:supportPrompts.enhance.testPromptPlaceholder")}
Expand Down Expand Up @@ -1245,10 +1244,10 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
}}>
{t("prompts:createModeDialog.roleDefinition.description")}
</div>
<Textarea
<VSCodeTextArea
value={newModeRoleDefinition}
onChange={(e) => {
setNewModeRoleDefinition(e.target.value)
setNewModeRoleDefinition((e.target as HTMLTextAreaElement).value)
}}
rows={4}
className="w-full resize-y"
Expand Down Expand Up @@ -1296,10 +1295,10 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
<div className="text-[13px] text-vscode-descriptionForeground mb-2">
{t("prompts:createModeDialog.customInstructions.description")}
</div>
<Textarea
<VSCodeTextArea
value={newModeCustomInstructions}
onChange={(e) => {
setNewModeCustomInstructions(e.target.value)
setNewModeCustomInstructions((e.target as HTMLTextAreaElement).value)
}}
rows={4}
className="w-full resize-y"
Expand Down
2 changes: 2 additions & 0 deletions webview-ui/src/components/prompts/__tests__/PromptsView.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// npx jest src/components/prompts/__tests__/PromptsView.test.tsx

import { render, screen, fireEvent, waitFor } from "@testing-library/react"
import PromptsView from "../PromptsView"
import { ExtensionStateContext } from "@src/context/ExtensionStateContext"
Expand Down