@lion/ui 0.11.2 → 0.11.4

package/components/combobox/src/LionCombobox.js

@@ -1134,7 +1134,7 @@ export class LionCombobox extends LocalizeMixin(OverlayMixin(CustomChoiceGroupMi
         }
         break;
       case 'Enter':
-        if (this.multipleChoice && this.opened) {
+        if (this.opened) {
           ev.preventDefault();
         }
 
@@ -1145,8 +1145,6 @@ export class LionCombobox extends LocalizeMixin(OverlayMixin(CustomChoiceGroupMi
             this.formElements[this.activeIndex].hasAttribute('aria-hidden') ||
             !this.opened)
         ) {
-          ev.preventDefault();
-
           this.modelValue = this.parser([...this.modelValue, this._inputNode.value]);
           this._inputNode.value = '';
           this.opened = false;

package/components/combobox/test/lion-combobox.test.js

@@ -985,6 +985,57 @@ describe('lion-combobox', () => {
       await el.updateComplete;
       expect(el.modelValue).to.eql(['Art']);
     });
+
+    it('submits form on [Enter] when listbox is closed', async () => {
+      const submitSpy = sinon.spy(e => e.preventDefault());
+      const el = /** @type {HTMLFormElement}  */ (
+        await fixture(html`
+          <form @submit=${submitSpy}>
+            <lion-combobox name="foo">
+              <lion-option .choiceValue="${'Artichoke'}">Artichoke</lion-option>
+              <lion-option .choiceValue="${'Chard'}">Chard</lion-option>
+              <lion-option .choiceValue="${'Chicory'}">Chicory</lion-option>
+              <lion-option .choiceValue="${'Victoria Plum'}">Victoria Plum</lion-option>
+            </lion-combobox>
+            <button type="submit">submit</button>
+          </form>
+        `)
+      );
+      const combobox = /** @type {LionCombobox} */ (el.querySelector('[name="foo"]'));
+      const { _inputNode } = getComboboxMembers(combobox);
+      await combobox.updateComplete;
+      _inputNode.focus();
+      await sendKeys({
+        press: 'Enter',
+      });
+      expect(submitSpy.callCount).to.equal(1);
+    });
+
+    it('does not submit form on [Enter] when listbox is opened', async () => {
+      const submitSpy = sinon.spy(e => e.preventDefault());
+      const el = /** @type {HTMLFormElement}  */ (
+        await fixture(html`
+          <form @submit=${submitSpy}>
+            <lion-combobox name="foo">
+              <lion-option .choiceValue="${'Artichoke'}">Artichoke</lion-option>
+              <lion-option .choiceValue="${'Chard'}">Chard</lion-option>
+              <lion-option .choiceValue="${'Chicory'}">Chicory</lion-option>
+              <lion-option .choiceValue="${'Victoria Plum'}">Victoria Plum</lion-option>
+            </lion-combobox>
+            <button type="submit">submit</button>
+          </form>
+        `)
+      );
+      const combobox = /** @type {LionCombobox} */ (el.querySelector('[name="foo"]'));
+      const { _inputNode } = getComboboxMembers(combobox);
+      combobox.opened = true;
+      await combobox.updateComplete;
+      _inputNode.focus();
+      await sendKeys({
+        press: 'Enter',
+      });
+      expect(submitSpy.callCount).to.equal(0);
+    });
   });
 
   describe('Overlay visibility', () => {

package/components/form-core/src/FormControlMixin.js

@@ -293,11 +293,11 @@ const FormControlMixinImplementation = superclass =>
         );
       }
 
-      if (changedProperties.has('label') && this._labelNode) {
+      if (changedProperties.has('label') && this.__label && this._labelNode) {
         this._labelNode.textContent = this.label;
       }
 
-      if (changedProperties.has('helpText') && this._helpTextNode) {
+      if (changedProperties.has('helpText') && this.__helpText && this._helpTextNode) {
         this._helpTextNode.textContent = this.helpText;
       }
 

package/components/form-core/test/FormControlMixin.test.js

@@ -52,11 +52,13 @@ describe('FormControlMixin', () => {
       const elElem = /** @type {FormControlMixinClass} */ (
         await fixture(html`
         <${tag}>
-          <label slot="label">Email address</label>
+          <label slot="label"><b>Email</b> address</label>
           ${inputSlot}
         </${tag}>`)
       );
       expect(elElem.label).to.equal('Email address', 'as an element');
+      // @ts-expect-error
+      expect(elElem._labelNode.innerHTML).to.equal('<b>Email</b> address', 'html as an element');
     });
 
     it('has a label that supports inner html', async () => {
@@ -68,6 +70,8 @@ describe('FormControlMixin', () => {
         </${tag}>`)
       );
       expect(el.label).to.equal('Email address');
+      // @ts-expect-error
+      expect(el._labelNode.innerHTML).to.equal('Email <span>address</span>');
     });
 
     it('only takes label of direct child', async () => {
@@ -139,11 +143,13 @@ describe('FormControlMixin', () => {
       const elElem = /** @type {FormControlMixinClass} */ (
         await fixture(html`
         <${tag}>
-          <div slot="help-text">We will not send you any spam</div>
+          <div slot="help-text">We will <b>not</b> send you any spam</div>
           ${inputSlot}
         </${tag}>`)
       );
       expect(elElem.helpText).to.equal('We will not send you any spam', 'as an element');
+      // @ts-expect-error
+      expect(elElem._helpTextNode.innerHTML).to.equal('We will <b>not</b> send you any spam');
     });
 
     it('can have a help-text that supports inner html', async () => {
@@ -155,6 +161,8 @@ describe('FormControlMixin', () => {
         </${tag}>`)
       );
       expect(el.helpText).to.equal('We will not send you any spam');
+      // @ts-expect-error
+      expect(el._helpTextNode.innerHTML).to.equal('We will not send you any <span>spam</span>');
     });
 
     it('only takes help-text of direct child', async () => {

package/custom-elements.json

@@ -2100,6 +2100,36 @@
         }
       ]
     },
+    {
+      "kind": "javascript-module",
+      "path": "exports/define-helpers/sb-action-logger.js",
+      "declarations": [],
+      "exports": [
+        {
+          "kind": "custom-element-definition",
+          "name": "sb-action-logger",
+          "declaration": {
+            "name": "SbActionLogger",
+            "module": "/exports/helpers.js"
+          }
+        }
+      ]
+    },
+    {
+      "kind": "javascript-module",
+      "path": "exports/define-helpers/sb-locale-switcher.js",
+      "declarations": [],
+      "exports": [
+        {
+          "kind": "custom-element-definition",
+          "name": "sb-locale-switcher",
+          "declaration": {
+            "name": "SbLocaleSwitcher",
+            "module": "/exports/helpers.js"
+          }
+        }
+      ]
+    },
     {
       "kind": "javascript-module",
       "path": "exports/define/lion-accordion.js",
@@ -2790,36 +2820,6 @@
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "exports/define-helpers/sb-action-logger.js",
-      "declarations": [],
-      "exports": [
-        {
-          "kind": "custom-element-definition",
-          "name": "sb-action-logger",
-          "declaration": {
-            "name": "SbActionLogger",
-            "module": "/exports/helpers.js"
-          }
-        }
-      ]
-    },
-    {
-      "kind": "javascript-module",
-      "path": "exports/define-helpers/sb-locale-switcher.js",
-      "declarations": [],
-      "exports": [
-        {
-          "kind": "custom-element-definition",
-          "name": "sb-locale-switcher",
-          "declaration": {
-            "name": "SbLocaleSwitcher",
-            "module": "/exports/helpers.js"
-          }
-        }
-      ]
-    },
     {
       "kind": "javascript-module",
       "path": "components/accordion/src/LionAccordion.js",
@@ -146520,7 +146520,12 @@
         },
         {
           "kind": "variable",
-          "name": "y"
+          "name": "m"
+        },
+        {
+          "kind": "variable",
+          "name": "i",
+          "default": "t"
         },
         {
           "kind": "class",
@@ -146548,6 +146553,25 @@
               ],
               "privacy": "public"
             },
+            {
+              "kind": "method",
+              "name": "C",
+              "parameters": [
+                {
+                  "name": "t"
+                },
+                {
+                  "name": "s"
+                },
+                {
+                  "name": "{useDefault:i,reflect:e,wrapped:h}"
+                },
+                {
+                  "name": "r"
+                }
+              ],
+              "privacy": "public"
+            },
             {
               "kind": "method",
               "name": "createProperty",
@@ -146558,7 +146582,7 @@
                 },
                 {
                   "name": "s",
-                  "default": "m"
+                  "default": "y"
                 }
               ],
               "privacy": "public"
@@ -146641,22 +146665,6 @@
               "default": "!1",
               "privacy": "public"
             },
-            {
-              "kind": "method",
-              "name": "P",
-              "parameters": [
-                {
-                  "name": "t"
-                },
-                {
-                  "name": "s"
-                },
-                {
-                  "name": "i"
-                }
-              ],
-              "privacy": "public"
-            },
             {
               "kind": "method",
               "name": "removeController",
@@ -146698,21 +146706,13 @@
             },
             {
               "kind": "method",
-              "name": "_$EC",
-              "parameters": [
-                {
-                  "name": "t"
-                },
-                {
-                  "name": "s"
-                }
-              ],
+              "name": "_$Ei",
+              "static": true,
               "privacy": "protected"
             },
             {
               "kind": "method",
-              "name": "_$Ei",
-              "static": true,
+              "name": "_$EM",
               "privacy": "protected"
             },
             {
@@ -146724,6 +146724,11 @@
               "default": "null",
               "privacy": "protected"
             },
+            {
+              "kind": "method",
+              "name": "_$EP",
+              "privacy": "protected"
+            },
             {
               "kind": "field",
               "name": "_$Ep",
@@ -146733,6 +146738,14 @@
             {
               "kind": "method",
               "name": "_$ET",
+              "parameters": [
+                {
+                  "name": "t"
+                },
+                {
+                  "name": "s"
+                }
+              ],
               "privacy": "protected"
             },
             {
@@ -146749,11 +146762,6 @@
               ],
               "privacy": "protected"
             },
-            {
-              "kind": "method",
-              "name": "_$EU",
-              "privacy": "protected"
-            },
             {
               "kind": "method",
               "name": "_$Ev",
@@ -146768,6 +146776,10 @@
           "superclass": {
             "module": "../../node_modules/@lit/reactive-element/node/reactive-element.js"
           }
+        },
+        {
+          "kind": "variable",
+          "name": "e"
         }
       ],
       "exports": [
@@ -146779,14 +146791,6 @@
             "module": "\"./css-tag.js\""
           }
         },
-        {
-          "kind": "js",
-          "name": "adoptStyles",
-          "declaration": {
-            "name": "adoptStyles",
-            "module": "\"./css-tag.js\""
-          }
-        },
         {
           "kind": "js",
           "name": "css",
@@ -146795,14 +146799,6 @@
             "module": "\"./css-tag.js\""
           }
         },
-        {
-          "kind": "js",
-          "name": "getCompatibleStyle",
-          "declaration": {
-            "name": "getCompatibleStyle",
-            "module": "\"./css-tag.js\""
-          }
-        },
         {
           "kind": "js",
           "name": "supportsAdoptingStyleSheets",
@@ -146827,6 +146823,14 @@
             "module": "../../node_modules/@lit/reactive-element/node/reactive-element.js"
           }
         },
+        {
+          "kind": "js",
+          "name": "adoptStyles",
+          "declaration": {
+            "name": "e",
+            "module": "../../node_modules/@lit/reactive-element/node/reactive-element.js"
+          }
+        },
         {
           "kind": "js",
           "name": "defaultConverter",
@@ -146835,11 +146839,19 @@
             "module": "../../node_modules/@lit/reactive-element/node/reactive-element.js"
           }
         },
+        {
+          "kind": "js",
+          "name": "getCompatibleStyle",
+          "declaration": {
+            "name": "i",
+            "module": "../../node_modules/@lit/reactive-element/node/reactive-element.js"
+          }
+        },
         {
           "kind": "js",
           "name": "notEqual",
           "declaration": {
-            "name": "y",
+            "name": "m",
             "module": "../../node_modules/@lit/reactive-element/node/reactive-element.js"
           }
         }

package/dist-types/components/combobox/src/LionCombobox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LionCombobox.d.ts","sourceRoot":"","sources":["../../../../components/combobox/src/LionCombobox.js"],"names":[],"mappings":";AAgBA;;;;;;;;;GASG;AAEH;;;GAGG;AACH;IACE,kBAAkB;IAClB,6BAoBC;IAED,wFAgCC;IAuGD,4BAA4B;IAC5B,uBASC;IAtBD;;;;;;;OAOG;IACH,oBAEC;IAOG,iCAAiC;IACjC,SADW,MAAM,GAAG,SAAS,CACL;IAe5B;;OAEG;IACH,uCAcC;IAED;;;OAGG;IAEH,2EAOC;IAED;;OAEG;IAEH,0EAWC;IAED;;;OAGG;IACH,oEAEC;IAsDD;;;;OAIG;IACH,2CAEC;IAED;;;OAGG;IACH,sGAEC;IAED;;;;;OAKG;IACH,6CAOC;IAED;;;OAGG;IACH,4FAEC;IAED;;;OAGG;IACH,sDAEC;IAED;;;OAGG;IACH,sDAEC;IAaD;;;OAGG;IACH,6DAEC;IASD;;OAEG;IACH,qCAEC;IAZD;;OAEG;IACH,kCAEC;IAWC;;;;OAIG;IACH,cAFU,MAAM,GAAC,MAAM,GAAC,QAAQ,GAAC,MAAM,CAEb;IAC1B;;;;;;;OAOG;IACH,WAFU,OAAO,GAAC,KAAK,CAED;IACtB;;;OAGG;IACH,wBAA2B;IAM3B;;OAEG;IACH,kCAAoC;IACpC;;OAEG;IACH,+BAAiC;IAEjC;;;;OAIG;IACH,wBAHU,KAAK,GAAC,KAAK,CAG0C;IAW/D;;OAEG;IACH,mCAAoC;IACpC;;OAEG;IACH,wBAAyB;IACzB;;;OAGG;IACH,uCAA2C;IAC3C;;;OAGG;IACH,gCAAoC;IA0wBtC;;;OAGG;IACH,yDAMC;IAED;;;OAGG;IAEH,6DAEC;IA5jBD;;;OAGG;IAEH,8BAJW,KAAK,QAOf;IAED;;;OAGG;IAEH,gCAJW,aAAa,QAUvB;IAlOD,0BAKC;IAED;;;;;OAKG;IACH,oDAJW,OAAO,sEAEL,IAAI,CAmBhB;IAED;;;;;OAKG;IACH,uBAHW,MAAM,GAAC,MAAM,EAAE,OAazB;IAED;;;OAGG;IACH,oDASC;IAED;;OAEG;IACH,2BAFW,OAAO,KAAK,EAAE,cAAc,QA0CtC;IAPG,oDAA2C;IAS/C;;;;;;;OAOG;IACH,uBAHW,UAAU,gBACV,MAAM,WAahB;IAED;;;;;;;;;;;;;;;;;;;;;;OAsBG;IAGH,6CANW;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAEzC,OAAO,CAuBnB;IAED;;;;;OAKG;IAEH,mCAJW,UAAU,GACR,MAAM,CAWlB;IAoDD;;;OAGG;IACH,8BAHW,MAAM,QAQhB;IAED;;OAEG;IACH,yBAeC;IAqBD;;;;;OAKG;IACH,iCAJW,UAAU,GAAG;QAAC,mBAAmB,CAAC,EAAC,MAAM,CAAA;KAAC,kBAC1C,MAAM,QAQhB;IAED;;;;;OAKG;IAEH,0CALW,OAAO,kBACP,MAAM,QAyBhB;IAED;;;;;;OAMG;IAEH,mCANW,UAAU,GAAG;QAAC,mBAAmB,CAAC,EAAC,MAAM,CAAA;KAAC,uEAWpD;IAED;;;;OAIG;IAEH,4CAJW,OAAO,QAUjB;IAGD;;;;OAIG;IAEH,qCAWC;IAID;;;;;;;;;;;OAWG;IACH,wCA4HC;IARC,gDACiE;IASnE;;OAEG;IACH,gCAUC;IAED;;;;;;OAMG;IACH,0CAEC;IAwHD;;;;;;OAMG;IAEH,8CANW,MAAM,GAAC,MAAM,EAAE,iBACf,MAAM,GAAC,MAAM,EAAE,cACf;QAAC,KAAK,CAAC,EAAC,MAAM,CAAA;KAAC,WAQzB;IAED;;;;;;OAMG;IAEH,6CALW,MAAM,EAAE,kBACR,MAAM,EAAE,QAalB;IAYD;;OAEG;IACH,yCAKC;IAED;;OAEG;IACH,wBAqBC;IAED;;OAEG;IACH,2BAIC;IAuBD,cAIC;CACF;yBAlvCY,OAAO,qBAAqB,EAAE,UAAU;0BACxC,OAAO,qBAAqB,EAAE,WAAW;4BACzC,OAAO,4BAA4B,EAAE,aAAa;uBAClD,OAAO,wBAAwB,EAAE,QAAQ;8BACzC,OAAO,6BAA6B,EAAE,eAAe;8BACrD,OAAO,6BAA6B,EAAE,eAAe;+BACrD,OAAO,8BAA8B,EAAE,gBAAgB;iCACvD,UAAU,GAAG;IAAE,eAAe,CAAC,WAAU;IAAC,aAAa,CAAC,WAAS;CAAE"}
+{"version":3,"file":"LionCombobox.d.ts","sourceRoot":"","sources":["../../../../components/combobox/src/LionCombobox.js"],"names":[],"mappings":"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"}