perf(renderer): reset dialog state during render instead of in effects (#38803)

Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
This commit is contained in:
OrcaWin
2026-11-05 19:41:23 -08:00
committed by GitHub
co-authored by OrcaWin
parent b44e533d05
commit 5eaedd7957
12 changed files with 78 additions and 77 deletions
@@ -137,11 +137,9 @@ export function AgentDashboardDrawer({
close()
}, [close])
// Store-driven closes bypass close(); clear menu state for sidebar collapse and workspace-board exclusivity too.
useEffect(() => {
if (!open) {
setMenuOpen(false)
}
}, [open])
if (!open && menuOpen) {
setMenuOpen(false)
}
const handleSheetOpenChange = useCallback(
(nextOpen: boolean) => {
// Radix can request coordinate-free dismissal; allow only the drawer’s guarded Escape/outside/close paths.
@@ -1,4 +1,4 @@
import { useCallback, useEffect, useMemo, useState } from 'react'
import { useCallback, useMemo, useState } from 'react'
import { ArrowUpRight, Plus, Save, Settings } from 'lucide-react'
import { toast } from 'sonner'
import { Button } from '@/components/ui/button'
@@ -108,13 +108,11 @@ export function SetupScriptAction(): React.JSX.Element {
const canConfigure = repo !== null
const [setupScript, setSetupScript] = useState('pnpm install')
useEffect(() => {
if (!canConfigure) {
setSetupScript('pnpm install')
return
}
setSetupScript(repo.hookSettings?.scripts?.setup?.trim() || 'pnpm install')
}, [canConfigure, repo])
const [seededFromRepo, setSeededFromRepo] = useState<typeof repo | undefined>(undefined)
if (seededFromRepo !== repo) {
setSeededFromRepo(repo)
setSetupScript(repo?.hookSettings?.scripts?.setup?.trim() || 'pnpm install')
}
const openLocalCommandSettings = useCallback(() => {
if (!repo || !isGitRepoKind(repo)) {
@@ -1,6 +1,6 @@
import { jiraCredentialStorageCopy } from './jira-credential-storage-copy'
import { taskProviderErrorMessage, taskProviderErrorText } from '@/lib/task-provider-error-copy'
import { useId, useLayoutEffect, useState } from 'react'
import { useId, useState } from 'react'
import { LoaderCircle, Lock } from 'lucide-react'
import { useAppStore } from '@/store'
import { useMountedRef } from '@/hooks/useMountedRef'
@@ -69,18 +69,19 @@ export function JiraConnectDialog({
const [connectError, setConnectError] = useState<string | null>(null)
// Clear secrets, modes and errors before paint on each open so prior credentials cannot flash or persist.
useLayoutEffect(() => {
if (!open) {
return
const [prevOpen, setPrevOpen] = useState(open)
if (prevOpen !== open) {
setPrevOpen(open)
if (open) {
setInstanceType('cloud')
setServerAuthMethod('pat')
setSiteUrl('')
setEmail('')
setApiToken('')
setConnectState('idle')
setConnectError(null)
}
setInstanceType('cloud')
setServerAuthMethod('pat')
setSiteUrl('')
setEmail('')
setApiToken('')
setConnectState('idle')
setConnectError(null)
}, [open])
}
const isServer = instanceType === 'server'
// Cloud email and Server Basic username share the identity slot; PAT auth has no identity.
@@ -1,4 +1,4 @@
import { useEffect, useState } from 'react'
import { useState } from 'react'
import { useAppStore } from '@/store'
import {
resolveMobilePairingConnectionMode,
@@ -15,8 +15,13 @@ export function useMobilePairingConnectionMode(): [
const [connectionMode, setConnectionMode] = useState<MobilePairingConnectionMode>(() =>
resolveMobilePairingConnectionMode(savedConnectionMode, { signedIn })
)
useEffect(() => {
const [resolvedFrom, setResolvedFrom] = useState({ savedConnectionMode, signedIn })
if (
resolvedFrom.savedConnectionMode !== savedConnectionMode ||
resolvedFrom.signedIn !== signedIn
) {
setResolvedFrom({ savedConnectionMode, signedIn })
setConnectionMode(resolveMobilePairingConnectionMode(savedConnectionMode, { signedIn }))
}, [savedConnectionMode, signedIn])
}
return [connectionMode, setConnectionMode]
}
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react'
import React, { useState } from 'react'
import {
Dialog,
DialogContent,
@@ -51,11 +51,13 @@ export function CustomAddressDialog({
const [confirmationFailed, setConfirmationFailed] = useState(false)
// Reset on open so canceled edits cannot leak into later visits.
useEffect(() => {
const [seededFor, setSeededFor] = useState({ open, initialValue })
if (seededFor.open !== open || seededFor.initialValue !== initialValue) {
setSeededFor({ open, initialValue })
if (open) {
setValue(initialValue ?? '')
}
}, [open, initialValue])
}
const close = (): void => {
setSubmitting(false)
@@ -1,4 +1,4 @@
import { useEffect, useRef, useState } from 'react'
import { useRef, useState } from 'react'
import { Loader2, RefreshCw, Trash2 } from 'lucide-react'
import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api-types'
import { translate } from '@/i18n/i18n'
@@ -39,12 +39,14 @@ export function PluginMarketplaceSourceDialog({
const [busyAction, setBusyAction] = useState<string | null>(null)
const [error, setError] = useState<string | null>(null)
useEffect(() => {
const [prevOpen, setPrevOpen] = useState(open)
if (prevOpen !== open) {
setPrevOpen(open)
if (!open) {
setBusyAction(null)
setError(null)
}
}, [open])
}
const add = async (): Promise<void> => {
if (!url.trim() || !gitRef.trim() || busyAction) {
@@ -1,10 +1,4 @@
import {
useEffect,
useState,
type Dispatch,
type MutableRefObject,
type SetStateAction
} from 'react'
import { useState, type Dispatch, type MutableRefObject, type SetStateAction } from 'react'
import type { PluginHostListEntry } from '../../../../../preload/api-types'
import { translate } from '@/i18n/i18n'
import { pluginNeedsReview } from '../presentation/plugin-status-presentation'
@@ -41,12 +35,13 @@ export function usePluginMarketplaceLifecycle({
const [rollbackError, setRollbackError] = useState<string | null>(null)
const rollbackPlugin = plugins.find((plugin) => plugin.pluginKey === rollbackPluginId) ?? null
useEffect(() => {
if (!mounted || (rollbackPluginId && !rollbackPlugin)) {
setRollbackPluginId(null)
setRollbackError(null)
}
}, [mounted, rollbackPlugin, rollbackPluginId])
if (
(!mounted || (rollbackPluginId && !rollbackPlugin)) &&
(rollbackPluginId !== null || rollbackError !== null)
) {
setRollbackPluginId(null)
setRollbackError(null)
}
const reloadAfterMutation = async (pluginKeys: string | readonly string[]): Promise<void> => {
const changed = new Set(typeof pluginKeys === 'string' ? [pluginKeys] : pluginKeys)
@@ -69,24 +69,18 @@ export function AutoRenameBranchFromWorkSetting({
config.actions,
'branchName'
)
const persistedBranchNameTemplateRef = useRef(persistedBranchNameTemplate)
persistedBranchNameTemplateRef.current = persistedBranchNameTemplate
const [branchNameTemplateDraft, setBranchNameTemplateDraft] = useState(
persistedBranchNameTemplate
)
const [isSavingPrompt, setIsSavingPrompt] = useState(false)
const branchNamePromptDirty = branchNameTemplateDraft !== persistedBranchNameTemplate
useEffect(() => {
if (!branchNamePromptDirty) {
setBranchNameTemplateDraft(persistedBranchNameTemplate)
}
}, [branchNamePromptDirty, persistedBranchNameTemplate])
useEffect(() => {
setBranchNameTemplateDraft(persistedBranchNameTemplateRef.current)
// Settings owns discard confirmation; keep the draft here for row-specific save/discard controls.
}, [branchPromptDiscardSignal])
// Settings owns discard confirmation; keep the draft here for row-specific save/discard controls.
const [seenDiscardSignal, setSeenDiscardSignal] = useState(branchPromptDiscardSignal)
if (seenDiscardSignal !== branchPromptDiscardSignal) {
setSeenDiscardSignal(branchPromptDiscardSignal)
setBranchNameTemplateDraft(persistedBranchNameTemplate)
}
useEffect(() => {
onBranchPromptDirtyChange?.(branchNamePromptDirty)
@@ -4,7 +4,7 @@ import {
type ActionArgumentChoices
} from '../../../../../shared/source-control/ai/recipes/source-control-action-argument-document'
import { liftActionPermissionArgs } from '../../../../../shared/source-control/ai/recipes/source-control-action-permission-lift'
import { useEffect, useMemo, useRef, useState, type SetStateAction } from 'react'
import { useEffect, useMemo, useState, type SetStateAction } from 'react'
import type {
SourceControlAiSettings,
SourceControlAiModelChoice,
@@ -74,8 +74,6 @@ export function useSourceControlActionRecipeDraftState({
writeConfig
}: UseSourceControlActionRecipeDraftStateArgs) {
const persistedActionRecipeValues = useMemo(() => readActionRecipeInputValues(config), [config])
const persistedActionRecipeValuesRef = useRef(persistedActionRecipeValues)
persistedActionRecipeValuesRef.current = persistedActionRecipeValues
const [storedDraftState, setActionRecipeDraftState] = useState<ActionRecipeDraftState>(() => ({
values: persistedActionRecipeValues,
baseValues: persistedActionRecipeValues
@@ -93,6 +91,15 @@ export function useSourceControlActionRecipeDraftState({
followPersistedRecipeValues(current, persistedActionRecipeValues)
)
}
const [seenDiscardSignal, setSeenDiscardSignal] = useState(customPromptDiscardSignal)
if (seenDiscardSignal !== customPromptDiscardSignal) {
actionRecipeDraftState = {
values: persistedActionRecipeValues,
baseValues: persistedActionRecipeValues
}
setSeenDiscardSignal(customPromptDiscardSignal)
setActionRecipeDraftState(actionRecipeDraftState)
}
const [savingActionTemplateIds, setSavingActionTemplateIds] = useState<
Partial<Record<SourceControlActionId, boolean>>
>({})
@@ -106,13 +113,6 @@ export function useSourceControlActionRecipeDraftState({
)
const actionTemplateDirty = actionRecipeDraftSerialized !== actionRecipeBaseSerialized
useEffect(() => {
setActionRecipeDraftState({
values: persistedActionRecipeValuesRef.current,
baseValues: persistedActionRecipeValuesRef.current
})
}, [customPromptDiscardSignal])
useEffect(() => {
onCustomPromptDirtyChange?.(actionTemplateDirty)
}, [actionTemplateDirty, onCustomPromptDirtyChange])
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react'
import React, { useState } from 'react'
import {
Dialog,
DialogContent,
@@ -35,11 +35,13 @@ export function HostRenameDialog({
const [value, setValue] = useState(currentOverride ?? '')
// Seed persisted names on every open so canceled drafts cannot reappear.
useEffect(() => {
const [seededFor, setSeededFor] = useState({ open, currentOverride })
if (seededFor.open !== open || seededFor.currentOverride !== currentOverride) {
setSeededFor({ open, currentOverride })
if (open) {
setValue(currentOverride ?? '')
}
}, [open, currentOverride])
}
const submit = (): void => {
void updateSettings({ hostSettingOverrides: applyHostRename(settings, hostId, value) })
@@ -1,4 +1,4 @@
import { useEffect, useId, useState, type Dispatch, type SetStateAction } from 'react'
import { useId, useState, type Dispatch, type SetStateAction } from 'react'
import { CircleStop, Loader2 } from 'lucide-react'
import { DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'
import { Button } from '@/components/ui/button'
@@ -46,11 +46,13 @@ export function AddRepoNestedImportStep({
const showSeparateSpinner = isAdding && pendingImportMode === 'separate'
const showGroupSpinner = isAdding && pendingImportMode === 'group'
useEffect(() => {
const [prevIsAdding, setPrevIsAdding] = useState(isAdding)
if (prevIsAdding !== isAdding) {
setPrevIsAdding(isAdding)
if (!isAdding) {
setPendingImportMode(null)
}
}, [isAdding])
}
const handleImport = (mode: 'group' | 'separate'): void => {
setPendingImportMode(mode)
@@ -267,11 +267,13 @@ export function useTabBarCreateMenuController({
window.addEventListener('blur', dismiss)
return () => window.removeEventListener('blur', dismiss)
}, [newTabMenuOpen])
useEffect(() => {
const [prevNewTabMenuOpen, setPrevNewTabMenuOpen] = useState(newTabMenuOpen)
if (prevNewTabMenuOpen !== newTabMenuOpen) {
setPrevNewTabMenuOpen(newTabMenuOpen)
if (!newTabMenuOpen) {
setCreateMenuQuery('')
}
}, [newTabMenuOpen])
}
return {
agentMenu,
agentPickerInventory,