Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix: Dashboard crash when saving with browser translation on (#14983)
Damian Legawiece22669b5ac1b
diff --git a/.changeset/translated-button-spinner-crash.md b/.changeset/translated-button-spinner-crash.mdnew file mode 100644index 0000000000..43bf41f30a--- /dev/null+++ b/.changeset/translated-button-spinner-crash.md@@ -0,0 +1,7 @@+---+"@spree/dashboard": patch+"@spree/dashboard-core": patch+"@spree/dashboard-ui": patch+---++Fixed the dashboard crashing when a Save button started saving while the browser was translating the page.diff --git a/packages/dashboard-core/src/components/media-picker-sheet.tsx b/packages/dashboard-core/src/components/media-picker-sheet.tsxindex 949f666583..64d14f1d64 100644--- a/packages/dashboard-core/src/components/media-picker-sheet.tsx+++ b/packages/dashboard-core/src/components/media-picker-sheet.tsx@@ -214,7 +214,7 @@ export function MediaPickerSheet<T extends MediaPickerOption>({) : (<UploadIcon className="size-4" />)}- {t('admin.media_picker.upload')}+ <span>{t('admin.media_picker.upload')}</span></Button></>)}@@ -297,7 +297,7 @@ export function MediaPickerSheet<T extends MediaPickerOption>({onClick={() => submit(Array.from(staged.values()))}>{submitting && <Loader2Icon className="size-4 animate-spin" />}- {confirmLabel ?? t('admin.media_picker.confirm')}+ <span>{confirmLabel ?? t('admin.media_picker.confirm')}</span></Button></SheetFooter>)}diff --git a/packages/dashboard-core/src/components/resource-picker-sheet.tsx b/packages/dashboard-core/src/components/resource-picker-sheet.tsxindex 229a12050d..b589e181dc 100644--- a/packages/dashboard-core/src/components/resource-picker-sheet.tsx+++ b/packages/dashboard-core/src/components/resource-picker-sheet.tsx@@ -300,7 +300,9 @@ export function ResourcePickerSheet<T extends PickerOption>({onClick={selectAllMatching}>{selectingAll && <Loader2Icon className="size-3.5 animate-spin" />}- {t('admin.resource_picker.select_all_matching', { count: matchCount })}+ <span>+ {t('admin.resource_picker.select_all_matching', { count: matchCount })}+ </span></Button>) : null}</div>@@ -354,7 +356,7 @@ export function ResourcePickerSheet<T extends PickerOption>({onClick={() => fetchNextPage()}>{loadingMore && <Loader2Icon className="size-4 animate-spin" />}- {t('admin.resource_picker.load_more')}+ <span>{t('admin.resource_picker.load_more')}</span></Button></div>)}@@ -368,7 +370,9 @@ export function ResourcePickerSheet<T extends PickerOption>({</Button><Button type="button" onClick={confirm} disabled={staged.size === 0 || submitting}>{submitting && <Loader2Icon className="size-4 animate-spin" />}- {confirmLabel ?? t('admin.resource_picker.add_count', { count: staged.size })}+ <span>+ {confirmLabel ?? t('admin.resource_picker.add_count', { count: staged.size })}+ </span></Button></SheetFooter></SheetContent>diff --git a/packages/dashboard-ui/src/spree/form-actions.tsx b/packages/dashboard-ui/src/spree/form-actions.tsxindex 33360110b3..c206b8cbb6 100644--- a/packages/dashboard-ui/src/spree/form-actions.tsx+++ b/packages/dashboard-ui/src/spree/form-actions.tsx@@ -39,9 +39,11 @@ export function FormSaveButton<TFieldValues extends FieldValues>({return (<Button type="submit" disabled={!(isDirty || dirty) || isSubmitting}>{isSubmitting && <Loader2Icon className="animate-spin" />}- {isSubmitting- ? (savingLabel ?? t('admin.actions.saving'))- : (label ?? t('admin.actions.save'))}+ <span>+ {isSubmitting+ ? (savingLabel ?? t('admin.actions.saving'))+ : (label ?? t('admin.actions.save'))}+ </span></Button>)}diff --git a/packages/dashboard/src/components/spree/custom-fields/custom-fields-inline.tsx b/packages/dashboard/src/components/spree/custom-fields/custom-fields-inline.tsxindex 9d4c51addb..308ec777ff 100644--- a/packages/dashboard/src/components/spree/custom-fields/custom-fields-inline.tsx+++ b/packages/dashboard/src/components/spree/custom-fields/custom-fields-inline.tsx@@ -703,7 +703,7 @@ function EditableHeaderActions() {</Button><Button type="button" size="sm" onClick={mode.save} disabled={mode.saving}>{mode.saving && <Loader2Icon className="size-4 animate-spin" />}- {t('admin.actions.save')}+ <span>{t('admin.actions.save')}</span></Button></div>)@@ -942,7 +942,7 @@ function CreateDefinitionSheet({</Button><Button type="submit" disabled={create.isPending}>{create.isPending && <Loader2Icon className="size-4 animate-spin" />}- {t('admin.custom_field_definitions.create_label')}+ <span>{t('admin.custom_field_definitions.create_label')}</span></Button></SheetFooter></form>diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/media.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/media.tsxindex 7b4905dc5c..562b889b97 100644--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/media.tsx+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/media.tsx@@ -249,7 +249,7 @@ function MediaLibraryPage() {) : (<UploadIcon className="size-4" />)}- {t('admin.media_library.upload')}+ <span>{t('admin.media_library.upload')}</span></Button></Can>}@@ -665,7 +665,7 @@ function MediaDetailSheet({</Button><Button type="submit" disabled={!isDirty || form.formState.isSubmitting}>{form.formState.isSubmitting && <Loader2Icon className="size-4 animate-spin" />}- {t('admin.actions.save')}+ <span>{t('admin.actions.save')}</span></Button></SheetFooter>)}