@energycap/components 0.36.1-ECAP-18558-new-menu-item-templates.20230707-1413 → 0.36.1

package/lib/controls/combobox/combobox.component.d.ts

@@ -89,10 +89,6 @@ export declare class ComboboxComponent extends FormControlBase implements OnInit
      * @memberof ComboboxComponent
      */
     customMenuTemplate?: TemplateRef<any>;
-    /**
-     * When true, the menu items will preserve the icon space when there is no icon
-     */
-    preserveIconSpace: boolean;
     /**
      * Position the menu as fixed, ideal when comboboxes are inside dialogs
      * Defaulting to true so all menus will be at least the width of the
@@ -379,6 +375,6 @@ export declare class ComboboxComponent extends FormControlBase implements OnInit
      */
     private findDefaultSelectionIndex;
     static ɵfac: i0.ɵɵFactoryDeclaration<ComboboxComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ComboboxComponent, "ec-combobox", never, { "addNew": "addNew"; "maxlength": "maxlength"; "menuPosition": "menuPosition"; "minlength": "minlength"; "options": "options"; "templateType": "templateType"; "customMenuTemplate": "customMenuTemplate"; "preserveIconSpace": "preserveIconSpace"; "popupFixed": "popupFixed"; "totalRecords": "totalRecords"; "upperCase": "upperCase"; "placeholder": "placeholder"; "loadOnOpenObservable": "loadOnOpenObservable"; "hideToggleButton": "hideToggleButton"; "alwaysOpen": "alwaysOpen"; "menuElementClasses": "menuElementClasses"; "textboxElementClasses": "textboxElementClasses"; "hideNoMatches": "hideNoMatches"; "noMatchesText": "noMatchesText"; }, { "addNewClick": "addNewClick"; "search": "search"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ComboboxComponent, "ec-combobox", never, { "addNew": "addNew"; "maxlength": "maxlength"; "menuPosition": "menuPosition"; "minlength": "minlength"; "options": "options"; "templateType": "templateType"; "customMenuTemplate": "customMenuTemplate"; "popupFixed": "popupFixed"; "totalRecords": "totalRecords"; "upperCase": "upperCase"; "placeholder": "placeholder"; "loadOnOpenObservable": "loadOnOpenObservable"; "hideToggleButton": "hideToggleButton"; "alwaysOpen": "alwaysOpen"; "menuElementClasses": "menuElementClasses"; "textboxElementClasses": "textboxElementClasses"; "hideNoMatches": "hideNoMatches"; "noMatchesText": "noMatchesText"; }, { "addNewClick": "addNewClick"; "search": "search"; }, never, never, false, never>;
 }
 export {};

package/lib/controls/menu/menu.component.d.ts

@@ -4,11 +4,10 @@ import { WindowService } from '../../core/window.service';
 import { LinkTarget } from '../../display/tags/tag';
 import { NavItem } from '../navigation/nav-item';
 import * as i0 from "@angular/core";
-export type MenuTemplateType = "label" | "iconAndLabel" | "checkAndLabel" | "iconLabelCaption";
+export type MenuTemplateType = "label" | "iconAndLabel" | "checkAndLabel";
 export type MenuHostElementClasses = 'bg-transparent';
 export interface MenuItem<TValue = any, SItems = any> extends NavItem {
     label: string;
-    caption?: string;
     items?: MenuItem<SItems>[];
     checked?: boolean;
     display?: 'default' | 'heading' | 'divider';
@@ -144,10 +143,6 @@ export declare class MenuComponent implements AfterContentInit, OnDestroy {
      * A reference to the menu check and label template
      */
     private checkAndLabelTemplate;
-    /**
-     * A reference to the menu icon, label and caption template
-     */
-    private iconLabelCaptionTemplate;
     /**
      * Contains the function used to remove the even listener from the renderer
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@energycap/components",
-  "version": "0.36.1-ECAP-18558-new-menu-item-templates.20230707-1413",
+  "version": "0.36.1",
   "dependencies": {
     "tslib": "^2.0.0"
   },

package/src/styles/_base.scss

@@ -30,7 +30,8 @@ a {
 
   &[target="_blank"] {
     &::after {
-      @extend .fas;
+      font: var(--fa-font-solid);
+      @extend .fa-solid;
       content: fa-content('\\' + get-icon-unicode($icons, 'icon-external-link'));
       margin-left: .125rem;
       opacity: .5;

package/src/styles/_icons.scss

@@ -7,7 +7,7 @@ $icon-color-base: rgba(26, 26, 35, .66);
 
 $required-icon: str-replace(url('#{$icon-url-prefix}<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#{$yellow-4}" d="M31.32 21.69l-.09.18-2.48 4.35c-.36.54-.77.62-1.25.27-.12 0-.2 0-.2-.09L19.53 22v9.37a1.26 1.26 0 0 1-.72.67h-5.26c-.59 0-.83-.3-.83-.89 0-.12.15-.21.15-.27V22l-8 4.71h-.12c-.42.66-.8.21-1.16-.27L1 21.82a.82.82 0 0 1 .35-1.26l.18-.1L9 16 .87 11.47v-.09c0-.36-.39-.74-.09-1.16l2.75-4.35v-.09c0-.42.82-.54 1.29-.36l8 4.62V.89c0-.59.18-.89.77-.89h5c.65 0 .91.3.91.89V10l7.94-4.53c.48-.29.72-.21 1.08.27l2.32 4.35v.09c.66.48.45.89-.08 1.25L23 16l7.91 4.53v.09c-.04.18.53.54.41 1.07z"/></svg>'), '#', '%23');
 
-$invalid-icon: str-replace(url('#{$icon-url-prefix}<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#{$icon-color-base}" d="M20.21 20.21h-8.42L10.95 0h10.1l-.84 20.21zm-8.42 3.37h8.42V32h-8.42z"/></svg>'), '#', '%23');
+$invalid-icon: str-replace(url('#{$icon-url-prefix}<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path fill="#{$icon-color-base}" d="M256 48a208 208 0 1 1 0 416 208 208 0 1 1 0-416zm0 464A256 256 0 1 0 256 0a256 256 0 1 0 0 512zm0-384c-13.3 0-24 10.7-24 24V264c0 13.3 10.7 24 24 24s24-10.7 24-24V152c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"/></svg>'), '#', '%23');
 
 @function pending-icon($color: '#0084a9') {
   @return str-replace(url('#{$icon-url-prefix}<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 50 50"><path fill="#{$color}" d="M43.935 25.145c0-10.318-8.364-18.683-18.683-18.683-10.318 0-18.683 8.365-18.683 18.683h4.068c0-8.071 6.543-14.615 14.615-14.615s14.615 6.543 14.615 14.615h4.068z"><animateTransform attributeType="xml" attributeName="transform" type="rotate" from="0 25 25" to="360 25 25" dur="0.8s" repeatCount="indefinite"/></path></svg>'), '#', '%23');

package/src/styles/mixins/_form-control-base.scss

@@ -3,7 +3,7 @@
 @import 'control-base';
 
 $form-control-icon-size: 1rem;
-$form-control-icon-position: .25rem center;
+$form-control-icon-position: .5rem center;
 $form-control-label-size: var(--ec-font-size-label);
 $form-control-label-color: var(--ec-color-secondary-dark);
 $form-control-height: $control-height;
@@ -57,7 +57,7 @@ $checkbox-indicator-size: $form-control-icon-size;
   $width: $form-control-icon-size,
   $height: $form-control-icon-size,
   $position: $form-control-icon-position,
-  $indent: $form-control-icon-size,
+  $indent: $form-control-icon-size + .25rem,
 ) {
   $size: $width, $height;
   @include icon-bg-image($icon, $position, $size);
@@ -68,7 +68,7 @@ $checkbox-indicator-size: $form-control-icon-size;
   $icon-position: $form-control-icon-position;
 
   @if $selector == textarea {
-    $icon-position: .25rem .5rem;
+    $icon-position: .5rem .5rem;
   }
 
   /// Required

package/src/styles/mixins/_overlay-base.scss

@@ -1,7 +1,7 @@
 $overlay-padding-x: 4rem;
 $overlay-padding-y: 3rem;
 
-@mixin overlay($bg: var(--ec-overlay-background-color, var(--ec-background-color)), $padding-x: $overlay-padding-x, $padding-y: $overlay-padding-y) {
+@mixin overlay($bg: var(--ec-background-color), $padding-x: $overlay-padding-x, $padding-y: $overlay-padding-y) {
     align-items: center;
     background-color: $bg;
     display: flex;