@fusion.dev/helix-core 0.177.1 → 0.177.2

package/custom-elements.json

@@ -21390,7 +21390,7 @@
               "kind": "field",
               "name": "handleTriggerClick",
               "type": {
-                "text": "() => void"
+                "text": "(event?: Event) => void"
               },
               "privacy": "protected",
               "readonly": true,
@@ -21648,6 +21648,17 @@
               "readonly": true,
               "description": "Escape and Tab pressed inside the panel, which `handleKeydown` never\nhears.\n\nA family binds `handleKeydown` on the field, and the surface is the\nfield's sibling, so a key pressed in the grid or the list went past it to\nthe document, where the dismissal closed the panel and left focus on a\ncell that was no longer shown. Measured: focus fell to the body. Here the\nkey is taken on the host, and focus goes back to the text.\n\n**Tab stays in the panel**, which is the APG date picker dialog and\nReact Aria's popover: the panel is a dialog, so Tab from its last control\ngoes to its first and Shift+Tab from its first goes to its last. Tab from\nthe grid left the dialog for the page behind it while the dialog stayed\nopen. Escape, a pick, or a press outside leaves it."
             },
+            {
+              "kind": "method",
+              "name": "dismiss",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "void"
+                }
+              },
+              "description": "Escape's close, which hands focus back to the control that opened the\npanel: the trigger after its press, which is the APG date picker\ndialog's rule, and the field otherwise.\n\n**Here rather than in each family.** Color Input had the rule alone, and\nDate Input and Time Input, on the same code, put focus in the text after\nthe trigger's press: one control before where the reader had been."
+            },
             {
               "kind": "field",
               "name": "handleFocusOut",
@@ -21672,6 +21683,16 @@
               "default": "false",
               "description": "Whether the trigger opened the panel, so focus moves into the picker."
             },
+            {
+              "kind": "field",
+              "name": "pressedOpen",
+              "type": {
+                "text": "boolean"
+              },
+              "privacy": "private",
+              "default": "false",
+              "description": "Whether the trigger's press opened the panel that is open now, so Escape returns there."
+            },
             {
               "kind": "field",
               "name": "handleKeypress",
@@ -33958,7 +33979,7 @@
           "type": {
             "text": "string"
           },
-          "default": "'0.177.1'",
+          "default": "'0.177.2'",
           "description": "The version of the package this file ships in.\n\n**Written by `fusion/scripts/version.mjs`** wherever it writes the package's\n`package.json`, and stamped back into the repository beside it after a\nrelease, so the two never disagree; a spec beside this holds them to it.\nNothing else in the running code knows which release it is."
         }
       ],
@@ -34594,6 +34615,6 @@
   ],
   "helix": {
     "package": "@fusion.dev/helix-core",
-    "version": "0.177.1"
+    "version": "0.177.2"
   }
 }

package/dist/mixins/mixin-picker-field/mixin-picker-field.d.ts

@@ -56,7 +56,7 @@ export declare class MixinPickerFieldInterface {
      * The trigger's press: opens the panel with focus in the picker, or closes
      * it.
      */
-    protected readonly handleTriggerClick: () => void;
+    protected readonly handleTriggerClick: (event?: Event) => void;
     /** Enter in the text submits the form, as it does in a native text field. */
     protected readonly handleKeypress: (event: KeyboardEvent) => void;
     /**

package/dist/mixins/mixin-picker-field/mixin-picker-field.js

@@ -30,8 +30,7 @@ export const MixinPickerField = (Base) => {
             this.handleKeydown = (event) => {
                 if (event.key === 'Escape' && this.open) {
                     event.stopPropagation();
-                    this.requestOpen(false);
-                    this.returnFocus();
+                    this.dismiss();
                     return;
                 }
                 const fromText = event.composedPath()[0] === this.control;
@@ -73,8 +72,7 @@ export const MixinPickerField = (Base) => {
                 }
                 event.stopPropagation();
                 event.preventDefault();
-                this.requestOpen(false);
-                this.returnFocus();
+                this.dismiss();
             };
             this.handleFocusOut = (event) => {
                 const to = event.relatedTarget;
@@ -91,14 +89,17 @@ export const MixinPickerField = (Base) => {
                 this.announceChange();
             };
             this.fromTrigger = false;
+            this.pressedOpen = false;
             this.handleKeypress = (event) => {
                 if (event.key === 'Enter' && !event.defaultPrevented) {
                     submitImplicitly(this.form);
                 }
             };
-            this.handleTriggerClick = () => {
-                this.fromTrigger = !this.open;
+            this.handleTriggerClick = (event) => {
+                const opening = !this.open;
+                this.fromTrigger = opening;
                 this.toggleOpen();
+                this.pressedOpen = event !== undefined && opening && this.open;
             };
             this.returning = false;
         }
@@ -147,6 +148,18 @@ export const MixinPickerField = (Base) => {
             }
             this.refreshFeedback();
         }
+        dismiss() {
+            const trigger = this.pressedOpen ? this.partNamed('trigger') : null;
+            this.pressedOpen = false;
+            this.requestOpen(false);
+            if (trigger) {
+                this.returning = true;
+                trigger.focus();
+                this.returning = false;
+                return;
+            }
+            this.returnFocus();
+        }
         get blocksImplicitSubmission() {
             return this.control !== null;
         }
@@ -186,6 +199,9 @@ export const MixinPickerField = (Base) => {
                     this.partNamed('picker')?.focus();
                 }
                 this.fromTrigger = false;
+                if (!this.open) {
+                    this.pressedOpen = false;
+                }
             }
             this.sync();
         }

package/dist/version.d.ts

@@ -6,4 +6,4 @@
  * release, so the two never disagree; a spec beside this holds them to it.
  * Nothing else in the running code knows which release it is.
  */
-export declare const VERSION = "0.177.1";
+export declare const VERSION = "0.177.2";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.177.1';
+export const VERSION = '0.177.2';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fusion.dev/helix-core",
   "description": "Helix element primitives: base classes, mixins, decorators, utilities.",
-  "version": "0.177.1",
+  "version": "0.177.2",
   "license": "MIT",
   "author": "Ross Sheppard <ross.sheppard@fusion.dev>",
   "repository": {
@@ -68,11 +68,11 @@
   "bugs": "https://github.com/project-fusion/fusion/issues",
   "dependencies": {
     "@floating-ui/dom": "^1.8.0",
-    "@fusion.dev/helix-icons": "0.177.1"
+    "@fusion.dev/helix-icons": "0.177.2"
   },
   "devDependencies": {
-    "@fusion.dev/helix-cem": "0.177.1",
-    "@fusion.dev/helix-testing": "0.177.1",
+    "@fusion.dev/helix-cem": "0.177.2",
+    "@fusion.dev/helix-testing": "0.177.2",
     "@lit-labs/ssr": "^4.1.0",
     "lit": "^3.2.1"
   },