@aquera/nile-elements 0.0.2 → 0.0.3-10

package/src/nile-option/nile-option.ts

@@ -14,6 +14,7 @@ import { html } from 'lit';
 import { watch } from '../internal/watch';
 import type { CSSResultGroup } from 'lit';
 import NileElement from '../internal/nile-element';
+import '../nile-checkbox';
 
 /**
  * Nile icon component.
@@ -51,6 +52,7 @@ export class NileOption extends NileElement {
   @state() selected = false; // the option is selected and has aria-selected="true"
   @state() hasHover = false; // we need this because Safari doesn't honor :hover styles while dragging
   @state() hidden = false; // the option is hidden
+  @state() isMultipleSelect = false;
 
   /**
    * The option's value. When selected, the containing form control will receive this value. The value must be unique
@@ -66,6 +68,20 @@ export class NileOption extends NileElement {
     super.connectedCallback();
     this.setAttribute('role', 'option');
     this.setAttribute('aria-selected', 'false');
+
+    // Find the closest parent 'nile-select' element
+    const parentSelect = this.closest('nile-select');
+
+    // Check if the parent has the 'multiple' attribute
+    if (parentSelect && parentSelect.hasAttribute('multiple')) {
+      let multipleValue = parentSelect.getAttribute('multiple');
+      if (multipleValue !== 'false') {
+        if(multipleValue === ''){
+          multipleValue = 'true';
+        }
+        this.isMultipleSelect = Boolean(multipleValue);
+      }
+    }
   }
 
   private handleDefaultSlotChange() {
@@ -135,21 +151,18 @@ export class NileOption extends NileElement {
             part="base"
             class=${classMap({
               option: true,
-              'option--current': this.current,
+              'option--single-select': !this.isMultipleSelect,
+              'option--current': this.selected && !this.isMultipleSelect,
               'option--disabled': this.disabled,
-              'option--selected': this.selected,
+              'option--selected': this.selected && !this.isMultipleSelect,
               'option--hover': this.hasHover,
             })}
             @mouseenter=${this.handleMouseEnter}
             @mouseleave=${this.handleMouseLeave}
           >
-            <nile-icon
-              part="checked-icon"
-              class="option__check"
-              name="tick"
-              color=${this.current ? '#005EA6' : ''}
-              aria-hidden="true"
-            ></nile-icon>
+
+          ${this.isMultipleSelect ? html`<nile-checkbox class="option--checkbox" .checked=${this.selected}></nile-checkbox>` : ''}
+
             <slot part="prefix" name="prefix" class="option__prefix"></slot>
             <slot
               part="label"

package/src/nile-radio-group/nile-radio-group.css.ts

@@ -19,6 +19,14 @@ export default css`
 
   .form-control__label {
     padding: 0;
+    font-size: 14px;
+    color: var(--nile-colors-dark-900);
+    font-family: Colfax-regular;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 14px;
+    letter-spacing: 0.2px;
   }
 
   .radio-group--required .radio-group__label::after {

package/src/nile-radio-group/nile-radio-group.ts

@@ -34,7 +34,7 @@ export class NileRadioGroup extends NileElement {
   @query('slot:not([name])') defaultSlot: HTMLSlotElement;
 
   @state() private hasButtonGroup = false;
-  @state() private errorMessage = '';
+
   @state() defaultValue = '';
 
   /**
@@ -43,9 +43,6 @@ export class NileRadioGroup extends NileElement {
    */
   @property() label = '';
 
-  /** The radio groups's help text. If you need to display HTML, use the `help-text` slot instead. */
-  @property({ attribute: 'help-text' }) helpText = '';
-
   /** The name of the radio group, submitted as a name/value pair with form data. */
   @property() name = 'option';
 
@@ -69,6 +66,10 @@ export class NileRadioGroup extends NileElement {
   /** Used to disabled or not */
   @property({ type: Boolean, reflect: true }) disabled = false;
 
+  @property({ attribute: 'help-text' }) helpText = '';
+
+  @property({ attribute: 'error-message' }) errorMessage = '';
+
   connectedCallback() {
     super.connectedCallback();
     this.defaultValue = this.value;
@@ -203,7 +204,8 @@ export class NileRadioGroup extends NileElement {
     const hasLabelSlot = this.hasSlotController.test('label');
     const hasHelpTextSlot = this.hasSlotController.test('help-text');
     const hasLabel = this.label ? true : !!hasLabelSlot;
-    const hasHelpText = this.helpText ? true : !!hasHelpTextSlot;
+    const hasHelpText = this.helpText ? true : false;
+    const hasErrorMessage = this.errorMessage ? true : false;
 
     const defaultSlot = html`
       <slot
@@ -241,7 +243,6 @@ export class NileRadioGroup extends NileElement {
 
         <div part="form-control-input" class="form-control-input">
           <div class="visually-hidden">
-            <div id="error-message" aria-live="assertive">${this.errorMessage}</div>
             <label class="radio-group__validation">
               <input
                 type="text"
@@ -261,15 +262,24 @@ export class NileRadioGroup extends NileElement {
             <div class="${this.labelInline ? `form-control--inline-radio`:``}"> ${defaultSlot}</div> `}
         </div>
 
-        <slot
-          name="help-text"
-          part="form-control-help-text"
-          id="help-text"
-          class="form-control__help-text"
-          aria-hidden=${hasHelpText ? 'false' : 'true'}
-        >
-          ${this.helpText}
-        </slot>
+        ${
+          hasHelpText
+            ? html`
+                <nile-form-help-text>${this.helpText}</nile-form-help-text>
+              `
+            : ``
+        }
+
+        ${
+          hasErrorMessage
+            ? html`
+                <nile-form-error-message
+                  >${this.errorMessage}</nile-form-error-message
+                >
+              `
+            : ``
+        }
+
       </fieldset>
     `;
   }

package/src/nile-select/nile-select.css.ts

@@ -36,16 +36,20 @@ export const styles = css`
   /* Label */
   .form-control--has-label .form-control__label {
     display: inline-block;
-    color: #333333;
-    margin-bottom: 0.75rem;
+    margin-bottom: 12px;
+    color: var(--nile-colors-dark-900);
+    font-family: Colfax-regular;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 14px;
+    letter-spacing: 0.2px;
   }
 
-
   .form-control--has-label.form-control--medium .form-control__label {
-    font-size: 1rem;
+    font-size: 14px;
   }
 
-
   :host([required]) .form-control--has-label .form-control__label::after {
     content: '*';
     margin-inline-start: -2px;
@@ -63,7 +67,6 @@ export const styles = css`
     font-size: 0.875rem;
   }
 
-
   .form-control--has-help-text.form-control--radio-group
     .form-control__help-text {
     margin-top: 0.25rem;
@@ -127,6 +130,11 @@ export const styles = css`
     padding: 0;
     margin: 0;
     -webkit-appearance: none;
+    font-family: var(--nile-font-family-serif);
+  }
+
+  .select__display-input::placeholder {
+    font-family: var(--nile-font-family-serif);
   }
 
   .select:not(.select--disabled):hover .select__display-input {
@@ -171,11 +179,14 @@ export const styles = css`
   }
 
   .select__tags-count {
-    position: absolute;
-    right: 0;
-    border: 1px solid rgb(169, 218, 218);
-    border-radius: 0.25rem;
-    margin-right: 30px;
+    color: #005ea6;
+    font-family: Colfax-regular;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 14px;
+    letter-spacing: 0.2px;
+    margin: 6px;
   }
 
   .select__tags-count-clearable {
@@ -197,6 +208,11 @@ export const styles = css`
     border: solid 1px #cccccc;
   }
 
+  .select--standard .select__combobox:hover {
+    border: 1px solid #000;
+    background: #fff;
+  }
+
   .select--standard.select--disabled .select__combobox {
     background-color: #f4f4f4;
     border-color: #cccccc;
@@ -209,8 +225,18 @@ export const styles = css`
   .select--standard:not(.select--disabled).select--open .select__combobox,
   .select--standard:not(.select--disabled).select--focused .select__combobox {
     background-color: #f4f4f4;
-    border-color: #0059ff;
-    box-shadow: 0 0 0 3px rgba(0, 89, 255, 0.4);
+  }
+
+  .select--warning .select__combobox {
+    border-color: var(--nile-colors-yellow-500);
+  }
+
+  .select--error .select__combobox {
+    border-color: #e5434d;
+  }
+
+  .select--success {
+    border-color: #43e5c0;
   }
 
   /* Filled selects */
@@ -284,7 +310,7 @@ export const styles = css`
     align-items: center;
     justify-content: center;
     font-size: inherit;
-    color: #005EA6;
+    color: #005ea6;
     border: none;
     background: none;
     padding: 0;
@@ -320,7 +346,6 @@ export const styles = css`
     position: relative;
     font-size: 1rem;
     font-weight: 400;
-    box-shadow: 0 0.25rem 0.5rem rgba(0, 0, 0, 0.15);
     background: #ffffff;
     border: solid 1px #cccccc;
     border-radius: 0.25rem;
@@ -333,13 +358,11 @@ export const styles = css`
     max-height: var(--auto-size-available-height);
   }
 
-  .select__options{
+  .select__options {
     padding-top: 10px;
   }
 
-  .select__options{
-    padding: 5px;
-    margin: 4px;
+  .select__options {
     font-size: 14px;
     color: rgb(133, 129, 129);
   }
@@ -377,10 +400,40 @@ export const styles = css`
     display: flex;
     flex-direction: row;
     align-items: flex-start;
-    padding: 8px 8px 16px;
+    padding: 8px 12px 16px;
     gap: 12px;
     justify-content: space-between;
   }
+
+  .tag__prefix[slot='prefix'] {
+    height: 14px;
+    display: inline-block;
+    overflow: hidden;
+  }
+
+  .tag__prefix[slot='prefix'] img {
+    max-height: 100%;
+  }
+
+  .select__loader {
+    width: 100%;
+    text-align: center;
+    display: block;
+  }
+
+  .select__loader--icon {
+    margin-top: 20px;
+    animation: spin 0.6s linear infinite;
+  }
+
+  @keyframes spin {
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  }
 `;
 
 export default [styles];

package/src/nile-select/nile-select.ts

@@ -36,6 +36,7 @@ import type { CSSResultGroup } from 'lit';
 import type { NileFormControl } from '../internal/nile-element';
 import type NileOption from '../nile-option/nile-option';
 import type NilePopup from '../nile-popup/nile-popup';
+import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 
 type NileRemoveEvent = CustomEvent<Record<PropertyKey, never>>;
 
@@ -139,17 +140,31 @@ export class NileSelect extends NileElement implements NileFormControl {
   @property() size: 'small' | 'medium' | 'large' = 'medium';
 
   /** Placeholder text to show as a hint when the select is empty. */
-  @property() placeholder = '';
+  @property() placeholder = 'Select...';
 
   /** Placeholder text to show as a hint when the select is empty. */
   @state() searchValue = '';
 
-  /** Allows more than one option to be selected. */
   @property({ type: Boolean, reflect: true }) searchEnabled = false;
 
+  @property({ type: Boolean, reflect: true }) optionsLoading = false;
+
   /** Allows more than one option to be selected. */
   @property({ type: Boolean, reflect: true }) multiple = false;
 
+  @property({ attribute: 'help-text' }) helpText = '';
+
+  @property({ attribute: 'error-message' }) errorMessage = '';
+
+  /** Sets the input to a warning state, changing its visual appearance. */
+  @property({ type: Boolean }) warning = false;
+
+  /** Sets the input to an error state, changing its visual appearance. */
+  @property({ type: Boolean }) error = false;
+
+  /** Sets the input to a success state, changing its visual appearance. */
+  @property({ type: Boolean }) success = false;
+
   /**
    * The maximum number of selected options to show when `multiple` is true. After the maximum, "+n" will be shown to
    * indicate the number of additional items that are selected. Set to 0 to remove the limit.
@@ -190,8 +205,6 @@ export class NileSelect extends NileElement implements NileFormControl {
    */
   @property({ reflect: true }) placement: 'top' | 'bottom' = 'bottom';
 
-  /** The select's help text. If you need to display HTML, use the `help-text` slot instead. */
-  @property({ attribute: 'help-text' }) helpText = '';
 
   /**
    * By default, form controls are associated with the nearest containing `<form>` element. This attribute allows you
@@ -572,6 +585,25 @@ export class NileSelect extends NileElement implements NileFormControl {
     return [...this.querySelectorAll<NileOption>('nile-option')];
   }
 
+  private getOptionPrefix(option: NileOption): string {
+    const prefixSlot = option.shadowRoot?.querySelector('slot[name="prefix"]') as HTMLSlotElement;
+    if (!prefixSlot) return '';
+
+    const assignedNodes = prefixSlot.assignedNodes();
+    const htmlStrings: string[] = [];
+
+    assignedNodes.forEach(node => {
+      if (node instanceof HTMLElement) {
+        htmlStrings.push(node.outerHTML);
+      } else if (node.nodeType === Node.TEXT_NODE) {
+        // Text node
+        htmlStrings.push(node.textContent || '');
+      }
+    });
+
+    return htmlStrings.join('');
+  }
+
   // Gets the first <nile-option> element
   private getFirstOption() {
     return this.querySelector<NileOption>('nile-option');
@@ -681,7 +713,7 @@ export class NileSelect extends NileElement implements NileFormControl {
     allOptions.forEach(el => {
       const lowerCaseLabel = el.getTextLabel().toLowerCase();
       const lowerCaseValue = (el.value || '').toLowerCase();
-      if (lowerCaseLabel.startsWith(lowerCaseSearchValue) || lowerCaseValue.startsWith(lowerCaseSearchValue)) {
+      if (lowerCaseLabel.includes(lowerCaseSearchValue) || lowerCaseValue.includes(lowerCaseSearchValue)) {
         el.hidden = false;
         filteredOptions.push(el);
       } else {
@@ -819,11 +851,12 @@ export class NileSelect extends NileElement implements NileFormControl {
     const hasLabelSlot = this.hasSlotController.test('label');
     const hasHelpTextSlot = this.hasSlotController.test('help-text');
     const hasLabel = this.label ? true : !!hasLabelSlot;
-    const hasHelpText = this.helpText ? true : !!hasHelpTextSlot;
     const hasClearIcon =
       this.clearable && !this.disabled && this.value.length > 0;
     const isPlaceholderVisible = this.placeholder && this.value.length === 0;
     const searchValue = this.searchValue || '';
+    const hasHelpText = this.helpText ? true : false;
+    const hasErrorMessage = this.errorMessage ? true : false;
 
     return html`
       <div
@@ -851,6 +884,9 @@ export class NileSelect extends NileElement implements NileFormControl {
           <nile-popup
             class=${classMap({
               select: true,
+              'select--warning': this.warning,
+              'select--error': this.error,
+              'select--success': this.success,
               'select--standard': true,
               'select--filled': this.filled,
               'select--pill': this.pill,
@@ -880,11 +916,14 @@ export class NileSelect extends NileElement implements NileFormControl {
               @keydown=${this.handleComboboxKeyDown}
               @mousedown=${this.handleComboboxMouseDown}
             >
-              <slot part="prefix" name="prefix"       class=${classMap({
-              'select__prefix': true,
-              'multiple': this.multiple,
-
-            })}></slot>
+              <slot
+                part="prefix"
+                name="prefix"
+                class=${classMap({
+                  select__prefix: true,
+                  multiple: this.multiple,
+                })}
+              ></slot>
 
               <input
                 part="display-input"
@@ -921,30 +960,32 @@ export class NileSelect extends NileElement implements NileFormControl {
                             <nile-tag
                               part="tag"
                               exportparts="
-                                base:tag__base,
-                                content:tag__content,
-                                remove-button:tag__remove-button,
-                                remove-button__base:tag__remove-button__base
-                              "
+                                  base:tag__base,
+                                  content:tag__content,
+                                  remove-button:tag__remove-button,
+                                  remove-button__base:tag__remove-button__base
+                                "
                               ?pill=${this.pill}
                               size=${this.size}
                               removable
                               @nile-remove=${(event: NileRemoveEvent) =>
                                 this.handleTagRemove(event, option)}
                             >
+                              ${this.getOptionPrefix(option)
+                                ? html`<span class="tag__prefix" slot="prefix"
+                                    >${unsafeHTML(
+                                      this.getOptionPrefix(option)
+                                    )}</span
+                                  >`
+                                : ''}
                               ${option.getTextLabel()}
                             </nile-tag>
                           `;
                         } else if (index === this.maxOptionsVisible) {
                           return html`
-                            <nile-tag
-                              class="select__tags-count ${hasClearIcon
-                                ? `select__tags-count-clearable`
-                                : ``} "
-                              size=${this.size}
-                            >
-                              +${this.selectedOptions.length - index}
-                            </nile-tag>
+                            <span class="select__tags-count"
+                              >+${this.selectedOptions.length - index} More
+                            </span>
                           `;
                         } else {
                           return null;
@@ -1009,7 +1050,19 @@ export class NileSelect extends NileElement implements NileFormControl {
               @mouseup=${this.handleOptionClick}
               @slotchange=${this.handleDefaultSlotChange}
             >
-            ${this.searchEnabled
+
+              ${this.optionsLoading
+                ? html`
+                    <span class="select__loader">
+                      <nile-icon
+                        class="select__loader--icon"
+                        name="button-loading-blue"
+                      ></nile-icon>
+                    </span>
+                  `
+                : ''}
+
+              ${this.searchEnabled
                 ? html` <div class="select__search">
                     <nile-input
                       size="small"
@@ -1024,13 +1077,16 @@ export class NileSelect extends NileElement implements NileFormControl {
                     </nile-input>
                   </div>`
                 : ``}
-                <div class="select__options">
+              <div class="select__options">
                 ${this.showNoResults
-                ? html` <div class="select__no-results">${this.noResultsMessage} </div>
-                `: ''}
+                  ? html`
+                      <div class="select__no-results">
+                        ${this.noResultsMessage}
+                      </div>
+                    `
+                  : ''}
                 <slot></slot>
-                  </div>
-
+              </div>
 
               ${this.multiple
                 ? html` <div
@@ -1045,7 +1101,7 @@ export class NileSelect extends NileElement implements NileFormControl {
                         ?disabled="${this.selectedOptions.length === 0}"
                         ?checked="${this.showSelected}"
                       >
-                        Show Selected</nile-checkbox
+                        &nbsp; Show Selected</nile-checkbox
                       >
                     </span>
                     <span class="select__clear" @click="${this.unSlectAll}"
@@ -1057,15 +1113,16 @@ export class NileSelect extends NileElement implements NileFormControl {
           </nile-popup>
         </div>
 
-        <slot
-          name="help-text"
-          part="form-control-help-text"
-          id="help-text"
-          class="form-control__help-text"
-          aria-hidden=${hasHelpText ? 'false' : 'true'}
-        >
-          ${this.helpText}
-        </slot>
+        ${hasHelpText
+          ? html` <nile-form-help-text>${this.helpText}</nile-form-help-text> `
+          : ``}
+        ${hasErrorMessage
+          ? html`
+              <nile-form-error-message
+                >${this.errorMessage}</nile-form-error-message
+              >
+            `
+          : ``}
       </div>
     `;
   }

package/src/nile-slide-toggle/nile-slide-toggle.css.ts

@@ -19,6 +19,13 @@ export default css`
   .nile-slide-toggle__label {
     margin-left: 2px;
     font-size: 14px;
+    color: var(--nile-colors-dark-900);
+    font-family: Colfax-regular;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 14px;
+    letter-spacing: 0.2px;
   }
 
   .nile-slide-toggle__switch input {

package/src/nile-slide-toggle/nile-slide-toggle.ts

@@ -9,6 +9,10 @@ export class NileSlideToggle extends LitElement {
   @property({ type: String }) label = '';
   @property({ type: Boolean, reflect: true }) isChecked = false;
 
+  @property({ attribute: 'help-text' }) helpText = '';
+
+  @property({ attribute: 'error-message' }) errorMessage = '';
+
   toggleValue() {
     this.isChecked = !this.isChecked;
     this.dispatchEvent(
@@ -17,6 +21,9 @@ export class NileSlideToggle extends LitElement {
   }
 
   public render() {
+    const hasHelpText = this.helpText ? true : false;
+    const hasErrorMessage = this.errorMessage ? true : false;
+
     return html`
     <div class="nile-slide-toggle">
       <label class="nile-slide-toggle__switch">
@@ -31,6 +38,23 @@ export class NileSlideToggle extends LitElement {
         <slot>${this.label}</slot>
       </span>
     </div>
+    ${
+          hasHelpText
+            ? html`
+                <nile-form-help-text>${this.helpText}</nile-form-help-text>
+              `
+            : ``
+        }
+
+        ${
+          hasErrorMessage
+            ? html`
+                <nile-form-error-message
+                  >${this.errorMessage}</nile-form-error-message
+                >
+              `
+            : ``
+        }
     `;
   }
 }