Skip to content

fix(plugin-form): guard modal/drawer against accidental discard of unsaved input - #2028

Merged
os-zhuang merged 2 commits into
mainfrom
claude/distracted-saha-8131e1
Jun 28, 2026
Merged

fix(plugin-form): guard modal/drawer against accidental discard of unsaved input#2028
os-zhuang merged 2 commits into
mainfrom
claude/distracted-saha-8131e1

Conversation

@baozhoutao

Copy link
Copy Markdown
Contributor

Problem

Create/edit forms shown as a modal or right-side drawer let users wipe their input by closing mid-entry — a backdrop click, Escape, or the X silently dropped everything they'd typed. (用户反馈:弹窗/抽屉表单很容易误触关闭,导致已输入的数据丢失。)

Behavior now

  • Accidental close (backdrop / Escape / X) on a dirty form first asks "Discard changes? / 放弃更改?"Keep editing / Discard. Input is never lost without confirmation.
  • The explicit Cancel button is treated as an intentional discard and closes immediately — no redundant prompt (per the agreed design: 取消按钮直接关闭,误触关闭才弹确认).
  • Opt out per-form with confirmOnDiscard: false.

How it works

  • Dirty state is computed in the form renderer via a normalized comparison (empty-ish values treated as equal), surfaced through a new onDirtyChange callback — instead of react-hook-form's identity-based isDirty, which false-positived on fields that self-normalize their empty value on mount (a pristine create form would otherwise prompt on close).
  • Both overlays render their action buttons in a sticky footer and route Cancel through the guard directly. The renderer's built-in Cancel did a form.reset() before onCancel, which emptied the form before the prompt could appear — so "Keep editing" kept an already-wiped form.
  • The discard AlertDialog is nested inside the Dialog/Sheet content so Radix stacks the layers correctly and its buttons receive clicks (as a sibling, the still-open overlay swallowed them and "Keep editing" did nothing).
  • Discard-guard strings localized (en/zh) via createSafeTranslation.

Tests

Adds discardGuard.test.tsx covering both overlays:

  • Cancel closes directly even when dirty (no prompt)
  • Accidental close (the X) prompts when dirty
  • Keep editing preserves input and stays open
  • Discard closes
  • confirmOnDiscard: false closes immediately

All 148 plugin-form tests pass. Manually verified in a browser repro (modal + drawer): Cancel closes directly, Escape/X prompt when dirty, Keep editing preserves the typed value.

…saved input

Create/edit forms shown as a modal or right-side drawer let users wipe
their input by closing mid-entry — a backdrop click, Escape, or the X
silently dropped everything they'd typed.

Now an *accidental* close (backdrop / Escape / X) on a dirty form first
asks "Discard changes?" (Keep editing / Discard), so input is never lost
without confirmation. The explicit Cancel button is treated as an
intentional discard and still closes immediately — no redundant prompt.
Opt out per-form with `confirmOnDiscard: false`.

Details:
- Dirty state is computed in the form renderer via a normalized comparison
  (empty-ish values treated as equal) surfaced through a new
  `onDirtyChange` callback, instead of react-hook-form's identity-based
  `isDirty`, which false-positived on fields that self-normalize their
  empty value on mount (a pristine create form would otherwise prompt).
- Both overlays render their action buttons in a sticky footer and route
  Cancel through the guard directly; the renderer's built-in Cancel did a
  `form.reset()` before onCancel, which emptied the form before the prompt
  could appear — so "Keep editing" kept an already-wiped form.
- The discard AlertDialog is nested inside the Dialog/Sheet content so
  Radix stacks the layers correctly and its buttons receive clicks.
- Discard-guard strings localized (en/zh) via createSafeTranslation.

Adds discardGuard.test.tsx covering both overlays: Cancel closes directly
even when dirty; accidental close prompts; Keep editing preserves input;
Discard closes; confirmOnDiscard:false closes immediately.
@vercel

vercel Bot commented Jun 27, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment
Project Deployment Actions Updated (UTC)
objectui Ignored Ignored Jun 27, 2026 3:35pm

Request Review

@github-actions

Copy link
Copy Markdown
Contributor

✅ Console Performance Budget

Metric Value Budget
Main entry (gzip) 59.0 KB 350 KB
Entry file index-Ck2N6bRC.js
Status PASS

📦 Bundle Size Report

Package Size Gzipped
app-shell (index.js) 6.87KB 2.47KB
app-shell (runtime-config.js) 4.72KB 1.69KB
app-shell (types.js) 0.01KB 0.04KB
auth (AuthContext.js) 0.31KB 0.24KB
auth (AuthGuard.js) 1.17KB 0.53KB
auth (AuthProvider.js) 17.16KB 3.44KB
auth (AuthShell.js) 3.49KB 1.40KB
auth (ForgotPasswordForm.js) 4.79KB 1.88KB
auth (LoginForm.js) 9.55KB 3.36KB
auth (PreviewBanner.js) 0.90KB 0.50KB
auth (RegisterForm.js) 6.63KB 2.15KB
auth (SocialSignInButtons.js) 8.89KB 3.61KB
auth (UserMenu.js) 3.40KB 1.22KB
auth (authStyles.js) 5.04KB 1.72KB
auth (createAuthClient.js) 24.74KB 6.00KB
auth (createAuthenticatedFetch.js) 3.33KB 1.32KB
auth (index.js) 1.75KB 0.76KB
auth (types.js) 0.59KB 0.35KB
auth (useAuth.js) 4.01KB 0.79KB
auth (useIsWorkspaceAdmin.js) 1.61KB 0.85KB
collaboration (CommentThread.js) 18.38KB 4.49KB
collaboration (LiveCursors.js) 3.17KB 1.27KB
collaboration (PresenceAvatars.js) 3.65KB 1.42KB
collaboration (PresenceProvider.js) 2.42KB 0.96KB
collaboration (index.js) 1.25KB 0.53KB
collaboration (useCommentSearch.js) 1.98KB 0.88KB
collaboration (useConflictResolution.js) 7.75KB 1.86KB
collaboration (useMentionNotifications.js) 1.81KB 0.68KB
collaboration (usePresence.js) 6.33KB 1.84KB
collaboration (useRealtimeSubscription.js) 7.91KB 2.01KB
components (index.js) 422.92KB 90.01KB
core (index.js) 1.52KB 0.55KB
create-plugin (index.js) 9.28KB 2.98KB
data-objectstack (index.js) 99.69KB 24.89KB
fields (index.js) 164.60KB 39.84KB
i18n (LocalizationContext.js) 1.76KB 0.96KB
i18n (currency.js) 1.22KB 0.64KB
i18n (i18n.js) 4.32KB 1.77KB
i18n (index.js) 2.46KB 0.96KB
i18n (pickLocalized.js) 1.31KB 0.67KB
i18n (provider.js) 5.37KB 1.72KB
i18n (useObjectLabel.js) 21.15KB 4.68KB
i18n (useSafeTranslation.js) 2.68KB 0.98KB
layout (index.js) 36.30KB 10.04KB
mobile (MobileProvider.js) 0.92KB 0.49KB
mobile (ResponsiveContainer.js) 0.94KB 0.38KB
mobile (breakpoints.js) 1.51KB 0.70KB
mobile (createOfflineDataSource.js) 5.61KB 1.74KB
mobile (index.js) 1.50KB 0.62KB
mobile (offlineQueue.js) 3.91KB 1.35KB
mobile (pwa.js) 0.97KB 0.49KB
mobile (serviceWorker.js) 1.48KB 0.62KB
mobile (serviceWorkerSource.js) 3.41KB 1.48KB
mobile (useBreakpoint.js) 1.54KB 0.65KB
mobile (useGesture.js) 4.42KB 1.27KB
mobile (useOfflineSync.js) 1.99KB 0.72KB
mobile (usePullToRefresh.js) 2.53KB 0.85KB
mobile (useResponsive.js) 0.71KB 0.42KB
mobile (useResponsiveConfig.js) 1.36KB 0.63KB
mobile (useSpecGesture.js) 1.77KB 0.77KB
mobile (useTouchTarget.js) 1.01KB 0.54KB
permissions (MePermissionsProvider.js) 5.09KB 1.84KB
permissions (PermissionContext.js) 0.31KB 0.25KB
permissions (PermissionGuard.js) 0.89KB 0.45KB
permissions (PermissionProvider.js) 3.46KB 1.03KB
permissions (evaluator.js) 4.00KB 1.23KB
permissions (index.js) 0.91KB 0.41KB
permissions (store.js) 0.91KB 0.42KB
permissions (useFieldPermissions.js) 1.28KB 0.52KB
permissions (usePermissions.js) 1.50KB 0.70KB
plugin-ai (index.js) 15.71KB 3.79KB
plugin-calendar (index.js) 45.98KB 12.65KB
plugin-charts (index.js) 45.46KB 12.78KB
plugin-chatbot (index.js) 159.77KB 38.54KB
plugin-dashboard (index.js) 107.36KB 26.65KB
plugin-designer (index.js) 213.42KB 42.94KB
plugin-detail (index.js) 198.30KB 47.91KB
plugin-editor (index.js) 2.38KB 1.06KB
plugin-form (index.js) 96.62KB 23.40KB
plugin-gantt (index.js) 136.68KB 33.88KB
plugin-grid (index.js) 121.64KB 32.95KB
plugin-kanban (index.js) 48.82KB 13.13KB
plugin-list (index.js) 94.53KB 22.32KB
plugin-map (index.js) 16.02KB 4.98KB
plugin-markdown (index.js) 13.58KB 4.64KB
plugin-report (index.js) 37.83KB 9.97KB
plugin-timeline (index.js) 25.37KB 7.20KB
plugin-tree (index.js) 8.21KB 2.76KB
plugin-view (index.js) 84.45KB 20.36KB
providers (DataSourceProvider.js) 0.75KB 0.39KB
providers (MetadataProvider.js) 1.37KB 0.59KB
providers (ThemeProvider.js) 1.55KB 0.67KB
providers (UploadProvider.js) 11.71KB 3.53KB
providers (index.js) 0.44KB 0.22KB
providers (types.js) 0.01KB 0.04KB
react (LazyPluginLoader.js) 3.77KB 1.33KB
react (SchemaRenderer.js) 18.23KB 5.97KB
react (index.js) 0.76KB 0.42KB
tenant (TenantContext.js) 0.31KB 0.25KB
tenant (TenantGuard.js) 1.04KB 0.43KB
tenant (TenantProvider.js) 2.76KB 0.98KB
tenant (TenantScopedQuery.js) 0.77KB 0.44KB
tenant (index.js) 0.75KB 0.38KB
tenant (resolver.js) 2.64KB 0.76KB
tenant (useTenant.js) 0.50KB 0.32KB
tenant (useTenantBranding.js) 0.62KB 0.39KB
types (ai.js) 0.20KB 0.17KB
types (api-types.js) 0.20KB 0.18KB
types (app.js) 2.87KB 0.99KB
types (base.js) 0.20KB 0.18KB
types (blocks.js) 0.20KB 0.18KB
types (complex.js) 0.20KB 0.18KB
types (crud.js) 0.20KB 0.18KB
types (data-display.js) 0.20KB 0.18KB
types (data-protocol.js) 0.20KB 0.19KB
types (data.js) 0.20KB 0.18KB
types (designer.js) 0.77KB 0.41KB
types (disclosure.js) 0.20KB 0.18KB
types (feedback.js) 0.20KB 0.18KB
types (field-types.js) 0.20KB 0.18KB
types (form.js) 0.20KB 0.18KB
types (index.js) 1.54KB 0.68KB
types (layout.js) 0.20KB 0.18KB
types (mobile.js) 0.20KB 0.18KB
types (navigation.js) 0.20KB 0.18KB
types (objectql.js) 0.20KB 0.18KB
types (overlay.js) 0.20KB 0.18KB
types (permissions.js) 0.20KB 0.18KB
types (plugin-scope.js) 0.20KB 0.18KB
types (record-components.js) 0.20KB 0.19KB
types (registry.js) 0.20KB 0.18KB
types (reports.js) 0.20KB 0.18KB
types (spec-report.js) 5.26KB 1.96KB
types (tenant.js) 0.20KB 0.18KB
types (theme.js) 0.20KB 0.18KB
types (ui-action.js) 0.75KB 0.46KB
types (views.js) 0.20KB 0.18KB
types (widget.js) 0.20KB 0.18KB

Size Limits

  • ✅ Core packages should be < 50KB gzipped
  • ✅ Component packages should be < 100KB gzipped
  • ⚠️ Plugin packages should be < 150KB gzipped

PageView.test.tsx transitively imports ObjectForm -> Drawer/ModalForm,
which now build their discard-guard strings via createSafeTranslation.
The test's full i18n module mock didn't export it, so the suite failed to
load. Add a faithful stub that echoes the supplied English defaults.
@github-actions

Copy link
Copy Markdown
Contributor

✅ Console Performance Budget

Metric Value Budget
Main entry (gzip) 59.0 KB 350 KB
Entry file index-B5ddJt-5.js
Status PASS

📦 Bundle Size Report

Package Size Gzipped
app-shell (index.js) 6.87KB 2.47KB
app-shell (runtime-config.js) 4.72KB 1.69KB
app-shell (types.js) 0.01KB 0.04KB
auth (AuthContext.js) 0.31KB 0.24KB
auth (AuthGuard.js) 1.17KB 0.53KB
auth (AuthProvider.js) 17.16KB 3.44KB
auth (AuthShell.js) 3.49KB 1.40KB
auth (ForgotPasswordForm.js) 4.79KB 1.88KB
auth (LoginForm.js) 9.55KB 3.36KB
auth (PreviewBanner.js) 0.90KB 0.50KB
auth (RegisterForm.js) 6.63KB 2.15KB
auth (SocialSignInButtons.js) 8.89KB 3.61KB
auth (UserMenu.js) 3.40KB 1.22KB
auth (authStyles.js) 5.04KB 1.72KB
auth (createAuthClient.js) 24.74KB 6.00KB
auth (createAuthenticatedFetch.js) 3.33KB 1.32KB
auth (index.js) 1.75KB 0.76KB
auth (types.js) 0.59KB 0.35KB
auth (useAuth.js) 4.01KB 0.79KB
auth (useIsWorkspaceAdmin.js) 1.61KB 0.85KB
collaboration (CommentThread.js) 18.38KB 4.49KB
collaboration (LiveCursors.js) 3.17KB 1.27KB
collaboration (PresenceAvatars.js) 3.65KB 1.42KB
collaboration (PresenceProvider.js) 2.42KB 0.96KB
collaboration (index.js) 1.25KB 0.53KB
collaboration (useCommentSearch.js) 1.98KB 0.88KB
collaboration (useConflictResolution.js) 7.75KB 1.86KB
collaboration (useMentionNotifications.js) 1.81KB 0.68KB
collaboration (usePresence.js) 6.33KB 1.84KB
collaboration (useRealtimeSubscription.js) 7.91KB 2.01KB
components (index.js) 422.92KB 90.01KB
core (index.js) 1.52KB 0.55KB
create-plugin (index.js) 9.28KB 2.98KB
data-objectstack (index.js) 99.69KB 24.89KB
fields (index.js) 164.60KB 39.84KB
i18n (LocalizationContext.js) 1.76KB 0.96KB
i18n (currency.js) 1.22KB 0.64KB
i18n (i18n.js) 4.32KB 1.77KB
i18n (index.js) 2.46KB 0.96KB
i18n (pickLocalized.js) 1.31KB 0.67KB
i18n (provider.js) 5.37KB 1.72KB
i18n (useObjectLabel.js) 21.15KB 4.68KB
i18n (useSafeTranslation.js) 2.68KB 0.98KB
layout (index.js) 36.30KB 10.04KB
mobile (MobileProvider.js) 0.92KB 0.49KB
mobile (ResponsiveContainer.js) 0.94KB 0.38KB
mobile (breakpoints.js) 1.51KB 0.70KB
mobile (createOfflineDataSource.js) 5.61KB 1.74KB
mobile (index.js) 1.50KB 0.62KB
mobile (offlineQueue.js) 3.91KB 1.35KB
mobile (pwa.js) 0.97KB 0.49KB
mobile (serviceWorker.js) 1.48KB 0.62KB
mobile (serviceWorkerSource.js) 3.41KB 1.48KB
mobile (useBreakpoint.js) 1.54KB 0.65KB
mobile (useGesture.js) 4.42KB 1.27KB
mobile (useOfflineSync.js) 1.99KB 0.72KB
mobile (usePullToRefresh.js) 2.53KB 0.85KB
mobile (useResponsive.js) 0.71KB 0.42KB
mobile (useResponsiveConfig.js) 1.36KB 0.63KB
mobile (useSpecGesture.js) 1.77KB 0.77KB
mobile (useTouchTarget.js) 1.01KB 0.54KB
permissions (MePermissionsProvider.js) 5.09KB 1.84KB
permissions (PermissionContext.js) 0.31KB 0.25KB
permissions (PermissionGuard.js) 0.89KB 0.45KB
permissions (PermissionProvider.js) 3.46KB 1.03KB
permissions (evaluator.js) 4.00KB 1.23KB
permissions (index.js) 0.91KB 0.41KB
permissions (store.js) 0.91KB 0.42KB
permissions (useFieldPermissions.js) 1.28KB 0.52KB
permissions (usePermissions.js) 1.50KB 0.70KB
plugin-ai (index.js) 15.71KB 3.79KB
plugin-calendar (index.js) 45.98KB 12.65KB
plugin-charts (index.js) 45.46KB 12.78KB
plugin-chatbot (index.js) 159.77KB 38.54KB
plugin-dashboard (index.js) 107.36KB 26.65KB
plugin-designer (index.js) 213.42KB 42.94KB
plugin-detail (index.js) 198.30KB 47.91KB
plugin-editor (index.js) 2.38KB 1.06KB
plugin-form (index.js) 96.62KB 23.40KB
plugin-gantt (index.js) 136.68KB 33.88KB
plugin-grid (index.js) 121.64KB 32.95KB
plugin-kanban (index.js) 48.82KB 13.13KB
plugin-list (index.js) 94.53KB 22.32KB
plugin-map (index.js) 16.02KB 4.98KB
plugin-markdown (index.js) 13.58KB 4.64KB
plugin-report (index.js) 37.83KB 9.97KB
plugin-timeline (index.js) 25.37KB 7.20KB
plugin-tree (index.js) 8.21KB 2.76KB
plugin-view (index.js) 84.45KB 20.36KB
providers (DataSourceProvider.js) 0.75KB 0.39KB
providers (MetadataProvider.js) 1.37KB 0.59KB
providers (ThemeProvider.js) 1.55KB 0.67KB
providers (UploadProvider.js) 11.71KB 3.53KB
providers (index.js) 0.44KB 0.22KB
providers (types.js) 0.01KB 0.04KB
react (LazyPluginLoader.js) 3.77KB 1.33KB
react (SchemaRenderer.js) 18.23KB 5.97KB
react (index.js) 0.76KB 0.42KB
tenant (TenantContext.js) 0.31KB 0.25KB
tenant (TenantGuard.js) 1.04KB 0.43KB
tenant (TenantProvider.js) 2.76KB 0.98KB
tenant (TenantScopedQuery.js) 0.77KB 0.44KB
tenant (index.js) 0.75KB 0.38KB
tenant (resolver.js) 2.64KB 0.76KB
tenant (useTenant.js) 0.50KB 0.32KB
tenant (useTenantBranding.js) 0.62KB 0.39KB
types (ai.js) 0.20KB 0.17KB
types (api-types.js) 0.20KB 0.18KB
types (app.js) 2.87KB 0.99KB
types (base.js) 0.20KB 0.18KB
types (blocks.js) 0.20KB 0.18KB
types (complex.js) 0.20KB 0.18KB
types (crud.js) 0.20KB 0.18KB
types (data-display.js) 0.20KB 0.18KB
types (data-protocol.js) 0.20KB 0.19KB
types (data.js) 0.20KB 0.18KB
types (designer.js) 0.77KB 0.41KB
types (disclosure.js) 0.20KB 0.18KB
types (feedback.js) 0.20KB 0.18KB
types (field-types.js) 0.20KB 0.18KB
types (form.js) 0.20KB 0.18KB
types (index.js) 1.54KB 0.68KB
types (layout.js) 0.20KB 0.18KB
types (mobile.js) 0.20KB 0.18KB
types (navigation.js) 0.20KB 0.18KB
types (objectql.js) 0.20KB 0.18KB
types (overlay.js) 0.20KB 0.18KB
types (permissions.js) 0.20KB 0.18KB
types (plugin-scope.js) 0.20KB 0.18KB
types (record-components.js) 0.20KB 0.19KB
types (registry.js) 0.20KB 0.18KB
types (reports.js) 0.20KB 0.18KB
types (spec-report.js) 5.26KB 1.96KB
types (tenant.js) 0.20KB 0.18KB
types (theme.js) 0.20KB 0.18KB
types (ui-action.js) 0.75KB 0.46KB
types (views.js) 0.20KB 0.18KB
types (widget.js) 0.20KB 0.18KB

Size Limits

  • ✅ Core packages should be < 50KB gzipped
  • ✅ Component packages should be < 100KB gzipped
  • ⚠️ Plugin packages should be < 150KB gzipped

@os-zhuang
os-zhuang merged commit 50fd513 into main Jun 28, 2026
10 checks passed
@os-zhuang
os-zhuang deleted the claude/distracted-saha-8131e1 branch June 28, 2026 07:24
baozhoutao added a commit that referenced this pull request Jul 30, 2026
…aved input (#2998)

The in-app discard guard (#2028) only intercepts Radix close paths —
backdrop, Escape, the X. A browser refresh or tab close never reaches
them: beforeunload fired with nobody calling preventDefault, so a dirty
create/edit overlay silently lost everything the user had typed (the
dialog itself is even restored afterwards via the ?recordId= URL param,
but empty).

Register a beforeunload listener while the overlay is open and dirty
(and confirmOnDiscard hasn't been opted out), mirroring the existing
StudioDesignSurface pillar guard.

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants