@autobusal/common 1.35.0 → 1.36.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.36.0 (2026-08-29)
+
+- Editors offer Save & Close alongside Save & Stay, so correcting a record no longer bounces you back to its list every time (opt-in per page, editing only). The pair is driven from here (Viewer + Actions).
+
 ## 1.35.0 (2026-08-29)
 
 - RouteFeature's compact chip draws a real tooltip on hover AND on focus, so a tap reveals the amenity name; `title` alone was invisible on touch and slow on desktop.

package/Viewer/Actions.tsx

@@ -19,6 +19,25 @@ interface Props {
 const Actions = ({ id, available, pending, confirm, t, onDelete }: Props): JSX.Element => {
   const options: ActionData[] = [];
 
+  /**
+   * Edited: Claude - Date: 2026-08-29
+   *
+   * Two ways to save, when the page asks for them (actions={['save',
+   * 'save_stay', ...]}): one that returns to the list this record came
+   * from, one that keeps it open for another edit. Saving used to always
+   * throw you back to the list, so correcting three fields on one record
+   * meant three round trips through it.
+   *
+   * Opt-in per page, because "close" has to mean something: the brand
+   * settings, the ticket editors and the notification preferences have no
+   * list to go back to and keep their single Save.
+   *
+   * ONLY WHEN EDITING. On a create form there is nothing to stay on - the
+   * record has no id yet, so the form would sit there still full, and the
+   * obvious next click would file a duplicate.
+   */
+  const paired = available.includes('save_stay') && id > 0;
+
   const onAskDelete = (): void => {
     if (window.confirm(confirm ?? t('table.confirm', { ns: 'common' }))) {
       if (onDelete) {
@@ -37,7 +56,9 @@ const Actions = ({ id, available, pending, confirm, t, onDelete }: Props): JSX.E
 
   if (available.includes('save')) {
     options.push({
-      label: t('table.actions.save', { ns: 'common' }),
+      // with a second save button beside it, "Save" no longer says what
+      // THIS one does
+      label: t(paired ? 'table.actions.save_close' : 'table.actions.save', { ns: 'common' }),
       icon: <RiSave2Line />,
       type: 'submit'
     });
@@ -68,12 +89,24 @@ const Actions = ({ id, available, pending, confirm, t, onDelete }: Props): JSX.E
 
   if (available.includes('update')) {
     options.push({
-      label: t('table.actions.update', { ns: 'common' }),
+      label: t(paired ? 'table.actions.save_close' : 'table.actions.update', { ns: 'common' }),
       icon: <BiEditAlt />,
       type: 'submit'
     });
   }
 
+  // second, so the first submit button - the one Enter presses - stays the
+  // one that has always been there
+  if (paired) {
+    options.push({
+      label: t('table.actions.save_stay', { ns: 'common' }),
+      icon: <RiSave2Line />,
+      type: 'submit',
+      name: 'intent',
+      value: 'stay'
+    });
+  }
+
   if (available.includes('approve')) {
     options.push({
       label: t('table.actions.approve', { ns: 'common' }),

package/Viewer/Viewer.tsx

@@ -21,7 +21,15 @@ interface Props {
    */
   confirm?: string
   t: TFunction<'common'>
-  onSave?: (data: any) => void
+  /**
+   * Edited: Claude - Date: 2026-08-29
+   *
+   * `stay` is true when the editor was saved with "Save & Stay" rather than
+   * "Save & Close" - the page keeps the record open instead of returning to
+   * its list. Optional, so a form that never navigates anyway (the brand
+   * settings, the ticket editors) needs no change and offers one button.
+   */
+  onSave?: (data: any, stay?: boolean) => void
   onDelete?: (data?: any) => void
   // Edited: Ferjolt Ozuni - Date: 2026-07-31
   // Optional second submit-type action (actions={['save', 'test']}) - e.g.
@@ -62,7 +70,10 @@ const Viewer = ({ id, type, data, fetching, pending, actions, confirm, t, onSave
     }
 
     if (onSave !== undefined) {
-      onSave(data);
+      // 'stay' is set by the second save button (see Actions.tsx); every
+      // other submitter - including plain Enter, which fires the FIRST
+      // button - leaves it undefined and the page closes as it always has
+      onSave(data, submitter?.value === 'stay');
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/common",
-  "version": "1.35.0",
+  "version": "1.36.0",
   "author": "Ferjolt Ozuni",
   "type": "module",
   "main": "index.ts"