@ukic/web-components 3.26.0 → 3.27.0

package/dist/cjs/ic-section-container.cjs.entry.js.map

@@ -1 +1 @@
-{"file":"ic-section-container.entry.cjs.js","mappings":";;;;;;AAAA,MAAM,qBAAqB,GAAG,+0HAA+0H,CAAC;AAC92H,iCAAe,qBAAqB;;MCOvB,gBAAgB;IAL7B;;;;;QASU,YAAO,GAAiB,MAAM,CAAC;;;;QAK/B,eAAU,GAAa,KAAK,CAAC;KAiBtC;IAfC,MAAM;QACJ,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QACrC,QACEA,QAACC,UAAI,qDACH,KAAK,EAAE;gBACL,CAAC,cAAc,GAAG,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,IAAI;gBACxD,CAAC,gBAAgB,GAAG,OAAO,KAAK,QAAQ;gBACxC,CAAC,oBAAoB,GAAG,OAAO,KAAK,YAAY;gBAChD,CAAC,qBAAqB,GAAG,CAAC,CAAC,UAAU;aACtC,IAEDD,oEAAa,CACR,EACP;KACH;;;;;;","names":["h","Host"],"sources":["src/components/ic-section-container/ic-section-container.css?tag=ic-section-container&encapsulation=shadow","src/components/ic-section-container/ic-section-container.tsx"],"sourcesContent":["@import \"../../global/normalize.css\";\n\n@media only screen and (max-width: 576px) {\n  :host {\n    --section-container-margin: var(--ic-space-xs);\n    --section-container-max-width: var(--ic-breakpoint-sm);\n  }\n}\n\n@media only screen and (min-width: 577px) {\n  :host {\n    --section-container-margin: var(--ic-space-md);\n    --section-container-max-width: var(--ic-breakpoint-md);\n  }\n}\n\n@media only screen and (min-width: 769px) {\n  :host {\n    --section-container-margin: var(--ic-space-md);\n    --section-container-max-width: var(--ic-breakpoint-lg);\n  }\n}\n\n@media only screen and (min-width: 993px) {\n  :host {\n    --section-container-margin: var(--ic-space-md);\n    --section-container-max-width: var(--ic-breakpoint-xl);\n  }\n}\n\n@media only screen and (min-width: 1201px) {\n  :host {\n    --section-container-margin: var(--ic-space-lg);\n    --section-container-max-width: var(--ic-breakpoint-xl);\n  }\n}\n\n:host {\n  display: block;\n  padding-top: var(--ic-space-md);\n  padding-bottom: var(--ic-space-md);\n  box-sizing: border-box;\n}\n\n:host(.aligned-center) {\n  max-width: var(--section-container-max-width);\n  margin-left: auto;\n  margin-right: auto;\n  padding-left: var(--section-container-margin);\n  padding-right: var(--section-container-margin);\n}\n\n:host(.aligned-left) {\n  max-width: var(--section-container-max-width);\n  margin-left: var(--section-container-margin);\n  margin-right: auto;\n  padding-right: var(--section-container-margin);\n}\n\n:host(.aligned-full-width) {\n  margin-left: var(--section-container-margin);\n  margin-right: var(--section-container-margin);\n}\n\n:host(.vertical-padding) {\n  padding-top: var(--ic-space-md);\n  padding-bottom: var(--ic-space-md);\n}\n\n:host(.no-vertical-padding) {\n  padding-top: 0;\n  padding-bottom: 0;\n}\n","import { Component, Prop, Host, h } from \"@stencil/core\";\nimport { IcAlignment } from \"../../utils/types\";\n\n@Component({\n  tag: \"ic-section-container\",\n  styleUrl: \"ic-section-container.css\",\n  shadow: true,\n})\nexport class SectionContainer {\n  /**\n   * The alignment of the container.\n   */\n  @Prop() aligned?: IcAlignment = \"left\";\n\n  /**\n   * If `true`, the standard vertical padding from the container will be removed.\n   */\n  @Prop() fullHeight?: boolean = false;\n\n  render() {\n    const { aligned, fullHeight } = this;\n    return (\n      <Host\n        class={{\n          [\"aligned-left\"]: aligned === \"left\" || aligned === null,\n          [\"aligned-center\"]: aligned === \"center\",\n          [\"aligned-full-width\"]: aligned === \"full-width\",\n          [\"no-vertical-padding\"]: !!fullHeight,\n        }}\n      >\n        <slot></slot>\n      </Host>\n    );\n  }\n}\n"],"version":3}
+{"file":"ic-section-container.entry.cjs.js","mappings":";;;;;;AAAA,MAAM,qBAAqB,GAAG,+0HAA+0H,CAAC;AAC92H,iCAAe,qBAAqB;;MCOvB,gBAAgB;IAL7B;;;;;QASU,YAAO,GAAiB,MAAM,CAAC;;;;QAK/B,eAAU,GAAa,KAAK,CAAC;KAiBtC;IAfC,MAAM;QACJ,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QACrC,QACEA,QAACC,UAAI,qDACH,KAAK,EAAE;gBACL,CAAC,cAAc,GAAG,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,IAAI;gBACxD,CAAC,gBAAgB,GAAG,OAAO,KAAK,QAAQ;gBACxC,CAAC,oBAAoB,GAAG,OAAO,KAAK,YAAY;gBAChD,CAAC,qBAAqB,GAAG,CAAC,CAAC,UAAU;aACtC,IAEDD,oEAAa,CACR,EACP;KACH;;;;;;","names":["h","Host"],"sources":["src/components/ic-section-container/ic-section-container.css?tag=ic-section-container&encapsulation=shadow","src/components/ic-section-container/ic-section-container.tsx"],"sourcesContent":["/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */\n\n/* Document\n   ========================================================================== */\n\n/**\n * 1. Correct the line height in all browsers.\n * 2. Prevent adjustments of font size after orientation changes in iOS.\n */\n\nhtml {\n  line-height: 1.15; /* 1 */\n  -webkit-text-size-adjust: 100%; /* 2 */\n}\n\n/* Sections\n     ========================================================================== */\n\n/**\n   * Remove the margin in all browsers.\n   */\n\nbody {\n  margin: 0;\n}\n\n/**\n   * Render the `main` element consistently in IE.\n   */\n\nmain {\n  display: block;\n}\n\n/**\n   * Correct the font size and margin on `h1` elements within `section` and\n   * `article` contexts in Chrome, Firefox, and Safari.\n   */\n\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0;\n}\n\n/* Grouping content\n     ========================================================================== */\n\n/**\n   * 1. Add the correct box sizing in Firefox.\n   * 2. Show the overflow in Edge and IE.\n   */\n\nhr {\n  box-sizing: content-box; /* 1 */\n  height: 0; /* 1 */\n  overflow: visible; /* 2 */\n}\n\n/**\n   * 1. Correct the inheritance and scaling of font size in all browsers.\n   * 2. Correct the odd `em` font sizing in all browsers.\n   */\n\npre {\n  font-family: monospace, monospace; /* 1 */\n  font-size: 1em; /* 2 */\n}\n\n/* Text-level semantics\n     ========================================================================== */\n\n/**\n   * Remove the gray background on active links in IE 10.\n   */\n\na {\n  background-color: transparent;\n}\n\n/**\n   * 1. Remove the bottom border in Chrome 57-\n   * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n   */\n\nabbr[title] {\n  border-bottom: none; /* 1 */\n  text-decoration: underline; /* 2 */\n  -webkit-text-decoration: underline dotted;\n          text-decoration: underline dotted; /* 2 */\n}\n\n/**\n   * Add the correct font weight in Chrome, Edge, and Safari.\n   */\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\n/**\n   * 1. Correct the inheritance and scaling of font size in all browsers.\n   * 2. Correct the odd `em` font sizing in all browsers.\n   */\n\ncode,\nkbd,\nsamp {\n  font-family: monospace, monospace; /* 1 */\n  font-size: 1em; /* 2 */\n}\n\n/**\n   * Add the correct font size in all browsers.\n   */\n\nsmall {\n  font-size: 80%;\n}\n\n/**\n   * Prevent `sub` and `sup` elements from affecting the line height in\n   * all browsers.\n   */\n\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\nsup {\n  top: -0.5em;\n}\n\n/* Embedded content\n     ========================================================================== */\n\n/**\n   * Remove the border on images inside links in IE 10.\n   */\n\nimg {\n  border-style: none;\n}\n\n/* Forms\n     ========================================================================== */\n\n/**\n   * 1. Change the font styles in all browsers.\n   * 2. Remove the margin in Firefox and Safari.\n   */\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  font-family: inherit; /* 1 */\n  font-size: 100%; /* 1 */\n  line-height: 1.15; /* 1 */\n  margin: 0; /* 2 */\n}\n\n/**\n   * Show the overflow in IE.\n   * 1. Show the overflow in Edge.\n   */\n\nbutton,\ninput {\n  /* 1 */\n  overflow: visible;\n}\n\n/**\n   * Remove the inheritance of text transform in Edge, Firefox, and IE.\n   * 1. Remove the inheritance of text transform in Firefox.\n   */\n\nbutton,\nselect {\n  /* 1 */\n  text-transform: none;\n}\n\n/**\n   * Correct the inability to style clickable types in iOS and Safari.\n   */\n\nbutton,\n[type=\"button\"],\n[type=\"reset\"],\n[type=\"submit\"] {\n  -webkit-appearance: button;\n}\n\n/**\n   * Remove the inner border and padding in Firefox.\n   */\n\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n  border-style: none;\n  padding: 0;\n}\n\n/**\n   * Restore the focus styles unset by the previous rule.\n   */\n\nbutton:-moz-focusring,\n[type=\"button\"]:-moz-focusring,\n[type=\"reset\"]:-moz-focusring,\n[type=\"submit\"]:-moz-focusring {\n  outline: 1px dotted ButtonText;\n}\n\n/**\n   * Correct the padding in Firefox.\n   */\n\nfieldset {\n  padding: 0.35em 0.75em 0.625em;\n}\n\n/**\n   * 1. Correct the text wrapping in Edge and IE.\n   * 2. Correct the color inheritance from `fieldset` elements in IE.\n   * 3. Remove the padding so developers are not caught out when they zero out\n   *    `fieldset` elements in all browsers.\n   */\n\nlegend {\n  box-sizing: border-box; /* 1 */\n  color: inherit; /* 2 */\n  display: table; /* 1 */\n  max-width: 100%; /* 1 */\n  padding: 0; /* 3 */\n  white-space: normal; /* 1 */\n}\n\n/**\n   * Add the correct vertical alignment in Chrome, Firefox, and Opera.\n   */\n\nprogress {\n  vertical-align: baseline;\n}\n\n/**\n   * Remove the default vertical scrollbar in IE 10+.\n   */\n\ntextarea {\n  overflow: auto;\n}\n\n/**\n   * 1. Add the correct box sizing in IE 10.\n   * 2. Remove the padding in IE 10.\n   */\n\n[type=\"checkbox\"],\n[type=\"radio\"] {\n  box-sizing: border-box; /* 1 */\n  padding: 0; /* 2 */\n}\n\n/**\n   * Correct the cursor style of increment and decrement buttons in Chrome.\n   */\n\n[type=\"number\"]::-webkit-inner-spin-button,\n[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n/**\n   * 1. Correct the odd appearance in Chrome and Safari.\n   * 2. Correct the outline style in Safari.\n   */\n\n[type=\"search\"] {\n  -webkit-appearance: textfield; /* 1 */\n  outline-offset: -2px; /* 2 */\n}\n\n/**\n   * Remove the inner padding in Chrome and Safari on macOS.\n   */\n\n[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n/**\n   * 1. Correct the inability to style clickable types in iOS and Safari.\n   * 2. Change font properties to `inherit` in Safari.\n   */\n\n::-webkit-file-upload-button {\n  -webkit-appearance: button; /* 1 */\n  font: inherit; /* 2 */\n}\n\n/* Interactive\n     ========================================================================== */\n\n/*\n   * Add the correct display in Edge, IE 10+, and Firefox.\n   */\n\ndetails {\n  display: block;\n}\n\n/*\n   * Add the correct display in all browsers.\n   */\n\nsummary {\n  display: list-item;\n}\n\n/* Misc\n     ========================================================================== */\n\n/**\n   * Add the correct display in IE 10+.\n   */\n\ntemplate {\n  display: none;\n}\n\n/**\n   * Add the correct display in IE 10.\n   */\n\n[hidden] {\n  display: none;\n}\n\nhtml,\nbody,\ndiv,\nspan,\napplet,\nobject,\niframe,\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np,\nblockquote,\npre,\na,\nabbr,\nacronym,\naddress,\nbig,\ncite,\ncode,\ndel,\ndfn,\nem,\nimg,\nins,\nkbd,\nq,\ns,\nsamp,\nsmall,\nstrike,\nstrong,\nsub,\nsup,\ntt,\nvar,\nb,\nu,\ni,\ncenter,\ndl,\ndt,\ndd,\nol,\nul,\nli,\nfieldset,\nform,\nlabel,\nlegend,\ntable,\ncaption,\ntbody,\ntfoot,\nthead,\ntr,\nth,\ntd,\narticle,\naside,\ncanvas,\ndetails,\nembed,\nfigure,\nfigcaption,\nfooter,\nheader,\nhgroup,\nmenu,\nnav,\noutput,\nruby,\nsection,\nsummary,\ntime,\nmark,\naudio,\nvideo {\n  margin: 0;\n  padding: 0;\n  border: 0;\n  font-size: 100%;\n  font-style: inherit;\n  vertical-align: baseline;\n}\n\n\n@media only screen and (max-width: 576px) {\n  :host {\n    --section-container-margin: var(--ic-space-xs);\n    --section-container-max-width: var(--ic-breakpoint-sm);\n  }\n}\n\n@media only screen and (min-width: 577px) {\n  :host {\n    --section-container-margin: var(--ic-space-md);\n    --section-container-max-width: var(--ic-breakpoint-md);\n  }\n}\n\n@media only screen and (min-width: 769px) {\n  :host {\n    --section-container-margin: var(--ic-space-md);\n    --section-container-max-width: var(--ic-breakpoint-lg);\n  }\n}\n\n@media only screen and (min-width: 993px) {\n  :host {\n    --section-container-margin: var(--ic-space-md);\n    --section-container-max-width: var(--ic-breakpoint-xl);\n  }\n}\n\n@media only screen and (min-width: 1201px) {\n  :host {\n    --section-container-margin: var(--ic-space-lg);\n    --section-container-max-width: var(--ic-breakpoint-xl);\n  }\n}\n\n:host {\n  display: block;\n  padding-top: var(--ic-space-md);\n  padding-bottom: var(--ic-space-md);\n  box-sizing: border-box;\n}\n\n:host(.aligned-center) {\n  max-width: var(--section-container-max-width);\n  margin-left: auto;\n  margin-right: auto;\n  padding-left: var(--section-container-margin);\n  padding-right: var(--section-container-margin);\n}\n\n:host(.aligned-left) {\n  max-width: var(--section-container-max-width);\n  margin-left: var(--section-container-margin);\n  margin-right: auto;\n  padding-right: var(--section-container-margin);\n}\n\n:host(.aligned-full-width) {\n  margin-left: var(--section-container-margin);\n  margin-right: var(--section-container-margin);\n}\n\n:host(.vertical-padding) {\n  padding-top: var(--ic-space-md);\n  padding-bottom: var(--ic-space-md);\n}\n\n:host(.no-vertical-padding) {\n  padding-top: 0;\n  padding-bottom: 0;\n}\n","import { Component, Prop, Host, h } from \"@stencil/core\";\nimport { IcAlignment } from \"../../utils/types\";\n\n@Component({\n  tag: \"ic-section-container\",\n  styleUrl: \"ic-section-container.css\",\n  shadow: true,\n})\nexport class SectionContainer {\n  /**\n   * The alignment of the container.\n   */\n  @Prop() aligned?: IcAlignment = \"left\";\n\n  /**\n   * If `true`, the standard vertical padding from the container will be removed.\n   */\n  @Prop() fullHeight?: boolean = false;\n\n  render() {\n    const { aligned, fullHeight } = this;\n    return (\n      <Host\n        class={{\n          [\"aligned-left\"]: aligned === \"left\" || aligned === null,\n          [\"aligned-center\"]: aligned === \"center\",\n          [\"aligned-full-width\"]: aligned === \"full-width\",\n          [\"no-vertical-padding\"]: !!fullHeight,\n        }}\n      >\n        <slot></slot>\n      </Host>\n    );\n  }\n}\n"],"version":3}

package/dist/collection/components/ic-menu/ic-menu.css

@@ -687,6 +687,25 @@ video {
   pointer-events: none;
 }
 
+.focus-border {
+  border-radius: var(--ic-border-radius);
+  padding: var(--ic-space-xxs);
+  border: var(--ic-space-xxxs) dashed transparent;
+  border-color: var(--ic-popover-menu-border);
+  background-color: var(--ic-color-focus-inner) !important;
+
+  --icon-height: auto;
+}
+
+.focus-disabled {
+  background-color: var(--ic-color-focus-inner) !important;
+  padding: calc(var(--ic-space-xs) - var(--ic-space-xxxs) - var(--ic-space-xxs))
+    calc(
+      var(--ic-space-xs) - var(--ic-space-1px) - var(--ic-space-xxxs) -
+        var(--ic-space-xxs)
+    );
+}
+
 .focused-option,
 .focused-option .option-description {
   background-color: var(--ic-color-focus-inner) !important;

package/dist/collection/components/ic-menu/ic-menu.js

@@ -121,30 +121,34 @@ export class Menu {
             }
         };
         this.setNextOptionValue = (selectedOptionIndex) => {
-            if (this.ungroupedOptions[selectedOptionIndex + 1]) {
-                this.menuOptionSelect.emit({
-                    value: this.ungroupedOptions[selectedOptionIndex + 1][this.valueField],
-                    optionId: this.getOptionId(this.ungroupedOptions[selectedOptionIndex + 1][this.valueField]),
+            const nextIndex = selectedOptionIndex % this.ungroupedOptions.length;
+            const nextOption = this.ungroupedOptions[nextIndex];
+            this.setHighlightedOption(nextIndex);
+            if (nextOption.disabled) {
+                this.menuOptionId.emit({
+                    optionId: this.getOptionId(nextOption[this.valueField]),
                 });
             }
             else {
                 this.menuOptionSelect.emit({
-                    value: this.ungroupedOptions[0][this.valueField],
-                    optionId: this.getOptionId(this.ungroupedOptions[0][this.valueField]),
+                    value: nextOption[this.valueField],
+                    optionId: this.getOptionId(nextOption[this.valueField]),
                 });
             }
         };
         this.setPreviousOptionValue = (selectedOptionIndex) => {
-            if (this.ungroupedOptions[selectedOptionIndex - 1]) {
-                this.menuOptionSelect.emit({
-                    value: this.ungroupedOptions[selectedOptionIndex - 1][this.valueField],
-                    optionId: this.getOptionId(this.ungroupedOptions[selectedOptionIndex - 1][this.valueField]),
+            const prevIndex = selectedOptionIndex % this.ungroupedOptions.length;
+            const prevOption = this.ungroupedOptions[prevIndex];
+            this.setHighlightedOption(prevIndex);
+            if (prevOption.disabled) {
+                this.menuOptionId.emit({
+                    optionId: this.getOptionId(prevOption[this.valueField]),
                 });
             }
             else {
                 this.menuOptionSelect.emit({
-                    value: this.ungroupedOptions[this.ungroupedOptions.length - 1][this.valueField],
-                    optionId: this.getOptionId(this.ungroupedOptions[this.ungroupedOptions.length - 1][this.valueField]),
+                    value: prevOption[this.valueField],
+                    optionId: this.getOptionId(prevOption[this.valueField]),
                 });
             }
         };
@@ -175,7 +179,7 @@ export class Menu {
                     const nextIndex = selectedOptionIndex < this.ungroupedOptions.length - 1
                         ? selectedOptionIndex + 1
                         : 0;
-                    this.setNextOptionValue(selectedOptionIndex);
+                    this.setNextOptionValue(nextIndex);
                     this.emitOptionId(nextIndex);
                     break;
                 }
@@ -185,7 +189,7 @@ export class Menu {
                     const prevIndex = selectedOptionIndex > 0
                         ? selectedOptionIndex - 1
                         : this.ungroupedOptions.length - 1;
-                    this.setPreviousOptionValue(selectedOptionIndex);
+                    this.setPreviousOptionValue(prevIndex);
                     this.emitOptionId(prevIndex);
                     break;
                 }
@@ -224,6 +228,7 @@ export class Menu {
                         if (this.searchBar &&
                             options[highlightedOptionIndex].disabled === true) {
                             this.disabledOptionSelected = true;
+                            this.optionHighlighted = undefined;
                         }
                         else {
                             this.setInputValue(highlightedOptionIndex);
@@ -449,14 +454,15 @@ export class Menu {
         };
         this.setInputValue = (highlightedOptionIndex) => {
             const menuOptions = this.getMenuOptions();
-            if (menuOptions[highlightedOptionIndex] !== undefined) {
+            if (menuOptions[highlightedOptionIndex] !== undefined &&
+                !menuOptions[highlightedOptionIndex].disabled) {
                 this.menuOptionSelect.emit({
                     value: menuOptions[highlightedOptionIndex][this.valueField],
                 });
-                if (this.closeOnSelect) {
-                    this.optionHighlighted = undefined;
-                    this.menuOptionId.emit({ optionId: undefined });
-                }
+            }
+            if (this.closeOnSelect) {
+                this.optionHighlighted = undefined;
+                this.menuOptionId.emit({ optionId: undefined });
             }
             if (this.closeOnSelect) {
                 if (!this.hasTimedOut) {
@@ -613,11 +619,12 @@ export class Menu {
             var _a, _b;
             // Select all if there is either no value or not all options are selected
             // 'true' means select all, 'false' means clear all
+            const enabledOptionsCount = this.ungroupedOptions.filter((option) => !option.disabled).length;
             this.menuOptionSelectAll.emit({
-                select: !this.value || !(((_a = this.value) === null || _a === void 0 ? void 0 : _a.length) === this.ungroupedOptions.length),
+                select: !this.value || !(((_a = this.value) === null || _a === void 0 ? void 0 : _a.length) === enabledOptionsCount),
             });
-            // Emit clear event if all options are selected
-            if (((_b = this.value) === null || _b === void 0 ? void 0 : _b.length) === this.ungroupedOptions.length) {
+            // Emit clear event if all non-disabled options are selected
+            if (((_b = this.value) === null || _b === void 0 ? void 0 : _b.length) === enabledOptionsCount) {
                 this.icClear.emit();
             }
         };
@@ -630,7 +637,10 @@ export class Menu {
         this.autoSetValueOnMenuKeyDown = (event) => {
             var _a;
             event.cancelBubble = true;
-            const selectedOptionIndex = this.ungroupedOptions.findIndex((option) => option[this.valueField] === this.value);
+            const highlightedOptionIndex = this.getOptionHighlightedIndex();
+            const selectedOptionIndex = highlightedOptionIndex >= 0
+                ? highlightedOptionIndex
+                : this.ungroupedOptions.findIndex((option) => option[this.valueField] === this.value);
             const isSearchableSelect = !!this.inputEl && this.inputEl.tagName === "INPUT";
             this.keyboardNav = false;
             switch (event.key) {
@@ -640,20 +650,22 @@ export class Menu {
                 case "ArrowUp":
                     if (!this.hasTimedOut) {
                         event.preventDefault();
-                        this.setPreviousOptionValue(selectedOptionIndex);
-                        this.emitOptionId(selectedOptionIndex > 0
+                        const prevIndex = selectedOptionIndex > 0
                             ? selectedOptionIndex - 1
-                            : this.ungroupedOptions.length - 1);
+                            : this.ungroupedOptions.length - 1;
+                        this.setPreviousOptionValue(prevIndex);
+                        this.emitOptionId(prevIndex);
                         this.keyboardNav = true;
                     }
                     break;
                 case "ArrowDown":
                     if (!this.hasTimedOut) {
                         event.preventDefault();
-                        this.setNextOptionValue(selectedOptionIndex);
-                        this.emitOptionId(selectedOptionIndex < this.ungroupedOptions.length - 1
+                        const nextIndex = selectedOptionIndex < this.ungroupedOptions.length - 1
                             ? selectedOptionIndex + 1
-                            : 0);
+                            : 0;
+                        this.setNextOptionValue(nextIndex);
+                        this.emitOptionId(nextIndex);
                         this.keyboardNav = true;
                     }
                     break;
@@ -754,7 +766,7 @@ export class Menu {
                     if (option.children) {
                         option.children.map((option) => !option.disabled && this.ungroupedOptions.push(option));
                     }
-                    else if (!option.disabled) {
+                    else {
                         this.ungroupedOptions.push(option);
                     }
                 });
@@ -784,6 +796,9 @@ export class Menu {
             return (h(Fragment, null, option.loading && h("ic-loading-indicator", { size: "icon" }), h("div", { class: {
                     "option-text-container": true,
                     "show-check-icon": showCheckIcon,
+                    "focus-border": (this.keyboardNav || this.initialOptionsListRender) &&
+                        option[this.valueField] === this.optionHighlighted &&
+                        !!option.disabled,
                 } }, (option.icon || !option.hideLabel) && (h("div", { class: "option-label" }, option.icon && (h("div", { class: "option-icon", innerHTML: sanitizeHTMLIconString(option.icon), "aria-hidden": "true" })), !option.hideLabel && (h("ic-typography", { variant: "body", "aria-hidden": "true" }, option[this.labelField])))), option.description && (h("ic-typography", { id: `${this.getOptionId(option[this.valueField])}-description`, class: "option-description", variant: "caption", "aria-hidden": "true" }, h("p", null, option.description))), option.element && (h("div", { class: {
                     "option-element": option.icon || !option.hideLabel || option.description,
                 }, innerHTML: sanitizeHTMLString(option.element.component), "aria-hidden": "true" }))), showCheckIcon && (h("span", { class: "check-icon", innerHTML: Check, "aria-hidden": "true" }))));
@@ -795,8 +810,18 @@ export class Menu {
                     option: true,
                     "focused-option": isManualMode
                         ? (keyboardNav || initialOptionsListRender) &&
-                            option[this.valueField] === optionHighlighted
-                        : keyboardNav && selected,
+                            option[this.valueField] === optionHighlighted &&
+                            !option.disabled
+                        : keyboardNav &&
+                            option[this.valueField] === optionHighlighted &&
+                            !option.disabled,
+                    "focus-disabled": isManualMode
+                        ? (keyboardNav || initialOptionsListRender) &&
+                            option[this.valueField] === optionHighlighted &&
+                            !!option.disabled
+                        : keyboardNav &&
+                            option[this.valueField] === optionHighlighted &&
+                            !!option.disabled,
                     "last-recommended-option": !!(option.recommended &&
                         options[index + 1] &&
                         !options[index + 1].recommended),
@@ -990,9 +1015,10 @@ export class Menu {
     }
     render() {
         const { inputLabel, options, menuId, value, fullWidth, hasTimedOut, isLoading, size, open, inputEl, keyboardNav, parentEl, SEARCH_BAR_TAG, multiSelect, } = this;
-        const selectAllButtonText = `${(value === null || value === void 0 ? void 0 : value.length) === this.ungroupedOptions.length ? "Clear" : "Select"} all`;
+        const enabledOptionsCount = this.ungroupedOptions.filter((option) => !option.disabled).length;
+        const selectAllButtonText = `${(value === null || value === void 0 ? void 0 : value.length) === enabledOptionsCount ? "Clear" : "Select"} all`;
         const hasNoResults = this.host.classList.contains("no-results");
-        return (h(Host, { key: 'c8002b0985f20231f9e24b2e446a67cf3230be7e', class: {
+        return (h(Host, { key: 'f2126f99757d13606827ea1eac7c08b023b97bae', class: {
                 "ic-menu-full-width": !!fullWidth,
                 "ic-menu-no-focus": ((inputEl === null || inputEl === void 0 ? void 0 : inputEl.tagName) === "INPUT" &&
                     (parentEl === null || parentEl === void 0 ? void 0 : parentEl.tagName) !== SEARCH_BAR_TAG) ||
@@ -1001,7 +1027,7 @@ export class Menu {
                 [`ic-menu-${size}`]: true,
                 "ic-menu-open": open && options.length !== 0,
                 "ic-menu-multiple": multiSelect,
-            } }, options.length !== 0 && (h("ul", { key: 'c7f0134bd0f14aae16fc4f2f0ba20f72553e4af5', id: menuId, class: "menu", role: "listbox", "aria-label": `${inputLabel} pop-up`, "aria-multiselectable": multiSelect ? "true" : "false", "aria-activedescendant": this.optionHighlighted
+            } }, options.length !== 0 && (h("ul", { key: '9b41a2c0ab9d6b08dca829db341614b248675050', id: menuId, class: "menu", role: "listbox", "aria-label": `${inputLabel} pop-up`, "aria-multiselectable": multiSelect ? "true" : "false", "aria-activedescendant": this.optionHighlighted
                 ? this.getOptionId(this.optionHighlighted)
                 : undefined, tabindex: !this.allowMenuFocus
                 ? "-1"
@@ -1033,7 +1059,7 @@ export class Menu {
             multiSelect &&
             !isLoading &&
             !hasTimedOut &&
-            !hasNoResults && (h("div", { key: '6dc5d80d88ac368c6274e709ba5a8a1dc79bf9e8', class: "option-bar" }, h("ic-typography", { key: '5a62bb37a7c338c00e296519077a8254c39c1c4a' }, h("p", { key: 'd5209b3fa671a87fc4ad2039732315d51d042c9f' }, `${value ? value.length : 0}/${getOptionsWithoutGroupTitlesCount(this.options)} selected`)), h("ic-button", { key: '543d14896d83e275257adf6808a4f855b694a5d4', class: "select-all-button", "aria-label": `${selectAllButtonText} options for ${inputLabel}`, ref: (el) => (this.selectAllButton = el), variant: "tertiary", onClick: this.handleSelectAllClick, onMouseDown: this.handleSelectAllMouseDown, onBlur: this.handleSelectAllBlur, onFocus: this.handleSelectAllFocus, size: size === "small" ? "small" : "medium" }, selectAllButtonText)))));
+            !hasNoResults && (h("div", { key: '7440008eccba1fc099d09ae3916e0d186686d59e', class: "option-bar" }, h("ic-typography", { key: '802bd46a5d028a541060eb4cc57c2c4607cb1b86' }, h("p", { key: '17a482e5bbff099b44550f9800980a649a319358' }, `${value ? value.length : 0}/${getOptionsWithoutGroupTitlesCount(this.options)} selected`)), h("ic-button", { key: '5aa400fd2be98bc038400b699c33bd2b1814cb5d', class: "select-all-button", "aria-label": `${selectAllButtonText} options for ${inputLabel}`, ref: (el) => (this.selectAllButton = el), variant: "tertiary", onClick: this.handleSelectAllClick, onMouseDown: this.handleSelectAllMouseDown, onBlur: this.handleSelectAllBlur, onFocus: this.handleSelectAllFocus, size: size === "small" ? "small" : "medium" }, selectAllButtonText)))));
     }
     static get is() { return "ic-menu"; }
     static get encapsulation() { return "scoped"; }