@mgdis/mg-components 3.1.0 → 4.0.0

package/dist/collection/components/molecules/inputs/mg-input-select/mg-input-select.css

@@ -10,16 +10,10 @@
   align-items: flex-start;
   min-height: var(--default-size);
   max-width: 100%;
-  /* Style when input is not valid */
+  margin-bottom: var(--mg-inputs-margin-bottom, 0);
   /* Label */
   /* Label-on-top */
 }
-.mg-input.is-not-valid {
-  color: hsl(var(--color-danger));
-}
-.mg-input.is-not-valid .mg-input__box {
-  border-color: hsl(var(--color-danger));
-}
 .mg-input mg-input-title {
   flex-shrink: var(--mg-inputs-shrink, 1);
   width: var(--mg-inputs-title-width, auto);
@@ -73,6 +67,11 @@
 .mg-input__input-container mg-icon {
   display: flex;
 }
+.mg-input__input-container .mg-input__help-text,
+.mg-input__input-container .mg-input__error {
+  text-align: start;
+  font-size: 1.2rem;
+}
 
 .mg-input__input {
   display: flex;
@@ -81,11 +80,22 @@
 .mg-input__input mg-tooltip {
   margin-top: calc((var(--default-size) - var(--mg-icon-regular-size)) / 2);
 }
-.mg-input__input + * {
-  text-align: start;
+.mg-input__input.mg-input__input--has-error .mg-input__box {
+  border-color: hsl(var(--color-danger));
+}
+.mg-input__input + .mg-input__help-text, .mg-input__input + .mg-input__error {
   margin-top: 0.5rem;
 }
 
+.mg-input__error {
+  display: inline-block;
+  margin-top: 0.2rem;
+  padding: 0.3rem 0.8rem;
+  border-radius: 0.3rem;
+  background: hsl(var(--mg-inputs-error-bg-color));
+  color: hsl(var(--color-danger));
+}
+
 /**
  * Style for input "box":
  * - input[type="text"]
@@ -106,6 +116,7 @@
   font-family: inherit;
   color: hsl(var(--color-dark));
   font-size: var(--font-size);
+  text-align: var(--mg-inputs-text-align, left);
 }
 .mg-input__box::placeholder {
   color: var(--mg-inputs-color);
@@ -145,6 +156,23 @@
   display: none;
 }
 
+.mg-input.mg-input--label-on-top .mg-input__box {
+  width: auto;
+  max-width: 100%;
+}
+
+.mg-input.mg-input--has-buttons-group-append ::slotted([slot=append-input]) {
+  --mg-button-border-radius-top-right: 0;
+  --mg-button-border-radius-bottom-right: 0;
+}
+.mg-input.mg-input--has-buttons-group-append ::slotted([slot=append-input]:not(:last-of-type)) {
+  --mg-button-border-right-width: 0;
+}
+.mg-input.mg-input--has-buttons-group-append ::slotted([slot=append-input]:last-of-type) {
+  --mg-button-border-radius-top-right: var(--mg-inputs-border-radius);
+  --mg-button-border-radius-bottom-right: var(--mg-inputs-border-radius);
+}
+
 .mg-input.mg-input--is-append-input-slot-content:not(.mg-input--readonly) ::slotted([slot=append-input]) {
   padding-top: calc((var(--default-size) - var(--mg-icon-regular-size)) / 2);
 }
@@ -195,7 +223,8 @@
 }
 
 .mg-input__box {
+  width: 100%;
   padding-top: 0;
   padding-bottom: 0;
-  padding-right: 0;
+  padding-right: 1rem;
 }

package/dist/collection/components/molecules/inputs/mg-input-select/mg-input-select.js

@@ -1,31 +1,34 @@
-import { Component, Event, h, Prop, State, Watch } from '@stencil/core';
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { Component, Element, Event, h, Prop, State, Watch, Method } from '@stencil/core';
 import { MgInput } from '../MgInput';
 import { createID, ClassList, allItemsAreString } from '../../../../utils/components.utils';
-import { messages } from '../../../../locales';
-import { InputClass } from '../MgInput.conf';
+import { initLocales } from '../../../../locales';
 /**
  * Check if item is a well configured option
- * @param option
- * @returns {boolean}
+ *
+ * @param {SelectOption} option select option
+ * @returns {boolean} select option type is valid
  */
-const isOption = (option) => typeof option === 'object' && typeof option.title === 'string' && option.value !== undefined;
+const isOption = (option) => typeof option === 'object' && typeof option.title === 'string';
 /**
  * Group options
- * @param acc
- * @param {SelectOption} item
- * @param {string} item.group
- * @param {string} item.title
- * @param {any} item.value
- * @param {boolean} item.disabled
- * @returns {OptGroup} grouped options
+ *
+ * @param {(SelectOption | OptGroup)[]} acc reduce accumulator
+ * @param {SelectOption} item item to add
+ * @param {string} item.group item group
+ * @param {string} item.title item title
+ * @param {unknown} item.value item value
+ * @param {boolean} item.disabled is item disabled
+ * @returns {(SelectOption | OptGroup)[]} grouped options
  */
 const groupOptions = (acc, { group, title, value, disabled }) => {
   if (group !== undefined) {
     // Check if group is already created
-    const optgroup = acc.find((grp) => grp.group === group);
+    const optGroup = acc.find(grp => grp.group === group);
     // Add to group
-    if (optgroup) {
-      optgroup.options.push({ title, value, disabled });
+    if (optGroup !== undefined) {
+      optGroup.options.push({ title, value, disabled });
     }
     // Create group
     else {
@@ -39,11 +42,8 @@ const groupOptions = (acc, { group, title, value, disabled }) => {
 };
 export class MgInputSelect {
   constructor() {
-    /************
-     * Internal *
-     ************/
-    // classes
-    this.classError = InputClass.ERROR;
+    // hasError (triggered by blur event)
+    this.hasError = false;
     /**
      * Identifier is used for the element ID (id is a reserved prop in Stencil.js)
      * If not set, it will be created.
@@ -58,11 +58,6 @@ export class MgInputSelect {
      * Define if label is visible
      */
     this.labelHide = false;
-    /**
-     * Input placeholder.
-     * It should be a word or short phrase that demonstrates the expected type of data, not a replacement for labels or help text.
-     */
-    this.placeholder = messages.input.select.placeholder;
     /**
      * Option to remove placeholder
      */
@@ -92,28 +87,66 @@ export class MgInputSelect {
      */
     this.handleInput = () => {
       this.checkValidity();
-      this.value = this.input.value !== '' ? this.options[this.input.value].value : null;
-      this.valueChange.emit(this.value);
+      if (this.hasError) {
+        this.checkError();
+      }
+      if (this.input.value !== '') {
+        this.value = allItemsAreString(this.items) ? this.input.value : this.items.find(item => item.title === this.input.value).value;
+      }
+      else {
+        this.value = null;
+      }
     };
     /**
      * Handle blur event
      */
     this.handleBlur = () => {
-      this.checkValidity();
-      this.checkError();
+      this.displayError();
+    };
+    /**
+     * Check if input is valid
+     */
+    this.checkValidity = () => {
+      if (!this.readonly && this.input !== undefined) {
+        const validity = this.input.checkValidity && this.input.checkValidity();
+        // Set validity
+        this.valid = validity;
+        this.invalid = !validity;
+        //Send event
+        this.inputValid.emit(validity);
+      }
+    };
+    /**
+     * Check input errors
+     */
+    this.checkError = () => {
+      // Set error message
+      this.errorMessage = undefined;
+      if (!this.valid && this.input.validity.valueMissing) {
+        this.errorMessage = this.messages.errors.required;
+      }
     };
   }
+  handleValue(newValue) {
+    if (newValue !== null) {
+      this.readonlyValue = allItemsAreString(this.items) ? this.input.value : this.items.find(item => item.value === newValue).title;
+    }
+    else {
+      this.readonlyValue = null;
+    }
+    this.valueChange.emit(newValue);
+  }
   validateItems(newValue) {
     // String array
     if (allItemsAreString(newValue)) {
       this.valueExist = newValue.includes(this.value);
-      this.options = newValue.map(item => ({ title: item, value: item }));
+      this.options = newValue.map((item) => ({ title: item, value: item }));
     }
     // Object array
     else if (newValue && newValue.every(item => isOption(item))) {
       this.valueExist = newValue.map(item => item.value).includes(this.value);
       // Grouped object options
-      if (newValue.some((item) => item.group !== undefined)) {
+      if (newValue.some(item => item.group !== undefined)) {
         this.options = newValue.reduce(groupOptions, []);
       }
       // Standart object options
@@ -126,49 +159,50 @@ export class MgInputSelect {
     }
   }
   /**
-   * Check if input is valid
+   * Public method to display errors
+   *
+   * @returns {Promise<void>}
    */
-  checkValidity() {
-    if (!this.readonly && this.input !== undefined) {
-      const validity = this.input.checkValidity && this.input.checkValidity();
-      // Set validity
-      this.valid = validity;
-      this.invalid = !validity;
-    }
-  }
-  /**
-   * Check input errors
-   */
-  checkError() {
-    // Set error message
-    this.errorMessage = undefined;
-    if (!this.valid && this.input.validity.valueMissing) {
-      this.errorMessage = messages.errors.required;
-    }
-    // Update class
-    if (this.valid) {
-      this.classList.delete(this.classError);
-    }
-    else {
-      this.classList.add(this.classError);
-    }
+  async displayError() {
+    this.checkValidity();
+    this.checkError();
+    this.hasError = this.invalid;
   }
   /*************
    * Lifecycle *
    *************/
+  /**
+   * Check if component props are well configured on init
+   *
+   * @returns {ReturnType<typeof setTimeout>} timeout
+   */
   componentWillLoad() {
-    // Check items format
+    // Get locales
+    this.messages = initLocales(this.element).messages;
+    // Validate
     this.validateItems(this.items);
+    // Set default placeholder
+    if (this.placeholder === undefined || this.placeholder === '') {
+      this.placeholder = this.messages.input.select.placeholder;
+    }
+    // Check validity when component is ready
     // return a promise to process action only in the FIRST render().
     // https://stenciljs.com/docs/component-lifecycle#componentwillload
-    return setTimeout(() => this.checkValidity(), 0);
+    return setTimeout(() => {
+      this.checkValidity();
+    }, 0);
   }
+  /**
+   * Render
+   *
+   * @returns {HTMLElement} HTML Element
+   */
   render() {
-    return (h(MgInput, { identifier: this.identifier, classList: this.classList, label: this.label, labelOnTop: this.labelOnTop, labelHide: this.labelHide, required: this.required, readonly: this.readonly, width: this.width, disabled: this.disabled, value: this.value, readonlyValue: undefined, tooltip: this.tooltip, displayCharacterLeft: undefined, characterLeftTemplate: undefined, maxlength: undefined, helpText: this.helpText, errorMessage: this.errorMessage, isFieldset: false },
+    return (h(MgInput, { identifier: this.identifier, classList: this.classList, ariaDescribedbyIDs: [], label: this.label, labelOnTop: this.labelOnTop, labelHide: this.labelHide, required: this.required, readonly: this.readonly, mgWidth: this.mgWidth, disabled: this.disabled, value: this.value, readonlyValue: this.readonlyValue, tooltip: this.tooltip, helpText: this.helpText, errorMessage: this.errorMessage, isFieldset: false },
       h("select", { class: "mg-input__box", id: this.identifier, name: this.name, title: this.placeholder, disabled: this.disabled, required: this.required, onInput: this.handleInput, onBlur: this.handleBlur, ref: el => (this.input = el) },
         (!this.placeholderHide || !this.valueExist) && ( // In case passed value does not match any option we display the placeholder
         h("option", { value: "", disabled: this.placeholderDisabled && this.valueExist }, this.placeholder)),
-        this.options.map((option, optionIndex) => option.group !== undefined ? (h("optgroup", { label: option.group }, option.options.map((optgroup, optgroupIndex) => (h("option", { value: optgroupIndex, selected: JSON.stringify(this.value) === JSON.stringify(optgroup.value), disabled: optgroup.disabled }, optgroup.title))))) : (h("option", { value: optionIndex, selected: JSON.stringify(this.value) === JSON.stringify(option.value), disabled: option.disabled }, option.title))))));
+        this.options.map(option => option.group !== undefined ? (h("optgroup", { label: option.group }, option.options.map(optgroup => (h("option", { value: optgroup.title, selected: JSON.stringify(this.value) === JSON.stringify(optgroup.value), disabled: optgroup.disabled }, optgroup.title))))) : (h("option", { value: option.title, selected: JSON.stringify(this.value) === JSON.stringify(option.value), disabled: option.disabled }, option.title))))));
   }
   static get is() { return "mg-input-select"; }
   static get encapsulation() { return "shadow"; }
@@ -264,7 +298,7 @@ export class MgInputSelect {
       "optional": false,
       "docs": {
         "tags": [],
-        "text": "Input label\nRequired"
+        "text": "Input label"
       },
       "attribute": "label",
       "reflect": false
@@ -306,7 +340,7 @@ export class MgInputSelect {
     },
     "placeholder": {
       "type": "string",
-      "mutable": false,
+      "mutable": true,
       "complexType": {
         "original": "string",
         "resolved": "string",
@@ -319,8 +353,7 @@ export class MgInputSelect {
         "text": "Input placeholder.\nIt should be a word or short phrase that demonstrates the expected type of data, not a replacement for labels or help text."
       },
       "attribute": "placeholder",
-      "reflect": false,
-      "defaultValue": "messages.input.select.placeholder"
+      "reflect": false
     },
     "placeholderHide": {
       "type": "boolean",
@@ -412,7 +445,7 @@ export class MgInputSelect {
       "reflect": false,
       "defaultValue": "false"
     },
-    "width": {
+    "mgWidth": {
       "type": "any",
       "mutable": false,
       "complexType": {
@@ -431,7 +464,7 @@ export class MgInputSelect {
         "tags": [],
         "text": "Define input width"
       },
-      "attribute": "width",
+      "attribute": "mg-width",
       "reflect": false
     },
     "tooltip": {
@@ -507,7 +540,8 @@ export class MgInputSelect {
     "classList": {},
     "errorMessage": {},
     "options": {},
-    "valueExist": {}
+    "valueExist": {},
+    "readonlyValue": {}
   }; }
   static get events() { return [{
       "method": "valueChange",
@@ -517,15 +551,55 @@ export class MgInputSelect {
       "composed": true,
       "docs": {
         "tags": [],
-        "text": "Emmited event when value change"
+        "text": "Emited event when value change"
       },
       "complexType": {
-        "original": "string",
-        "resolved": "string",
+        "original": "any",
+        "resolved": "any",
+        "references": {}
+      }
+    }, {
+      "method": "inputValid",
+      "name": "input-valid",
+      "bubbles": true,
+      "cancelable": true,
+      "composed": true,
+      "docs": {
+        "tags": [],
+        "text": "Emited event when checking validity"
+      },
+      "complexType": {
+        "original": "boolean",
+        "resolved": "boolean",
         "references": {}
       }
     }]; }
+  static get methods() { return {
+    "displayError": {
+      "complexType": {
+        "signature": "() => Promise<void>",
+        "parameters": [],
+        "references": {
+          "Promise": {
+            "location": "global"
+          }
+        },
+        "return": "Promise<void>"
+      },
+      "docs": {
+        "text": "Public method to display errors",
+        "tags": [{
+            "name": "returns",
+            "text": undefined
+          }]
+      }
+    }
+  }; }
+  static get elementRef() { return "element"; }
   static get watchers() { return [{
+      "propName": "value",
+      "methodName": "handleValue"
+    }, {
       "propName": "items",
       "methodName": "validateItems"
     }]; }

package/dist/collection/components/molecules/inputs/mg-input-text/{mg-input-text.stories.js → doc/mg-input-text.stories.js}

@@ -2,12 +2,23 @@ import { h } from '@stencil/core';
 export default {
   component: 'mg-input-text',
   title: 'Molecules/Inputs/mg-input-text',
+  argTypes: {
+    mgWidth: {
+      options: [2, 4, 16, 'full'],
+      control: { type: 'select' },
+    },
+  },
+  parameters: { actions: { handles: ['value-change', 'input-valid'] } },
 };
 /**
  * 1. camelCase arguments must be written in the template, for exemple labelOnTop must be placed in the template as label-on-top={args.labelOnTop}
  * 2. boolean arguments with a default true value must be added like display-character-left={args.displayCharacterLeft ? 'true' : 'false'}
+ *
+ * @param {any} args component arguments
+ * @returns {HTMLElement} HTMLElement
  */
-const Template = args => {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const Template = (args) => {
   const labelOnTop = args.labelOnTop;
   delete args.labelOnTop;
   const labelHide = args.labelHide;
@@ -16,12 +27,12 @@ const Template = args => {
   delete args.patternErrorMessage;
   const displayCharacterLeft = args.displayCharacterLeft;
   delete args.displayCharacterLeft;
-  const characterLeftTemplate = args.characterLeftTemplate;
-  delete args.characterLeftTemplate;
   const helpText = args.helpText;
   delete args.helpText;
+  const mgWidth = args.mgWidth;
+  delete args.mgWidth;
   // return element
-  return (h("mg-input-text", Object.assign({}, args, { "label-on-top": labelOnTop, "label-hide": labelHide, "pattern-error-message": patternErrorMessage, "display-character-left": displayCharacterLeft, "character-left-template": characterLeftTemplate, "help-text": helpText })));
+  return (h("mg-input-text", Object.assign({}, args, { "label-on-top": labelOnTop, "label-hide": labelHide, "pattern-error-message": patternErrorMessage, "display-character-left": displayCharacterLeft ? 'true' : 'false', "help-text": helpText, "mg-width": mgWidth })));
 };
 /**
  * Global use
@@ -44,11 +55,11 @@ MgInputText.args = {
   readonly: false,
   pattern: undefined,
   patternErrorMessage: undefined,
+  mgWidth: 'full',
   // Tooltip
   tooltip: 'This is a tooltip',
   // Nb Char Left
   displayCharacterLeft: true,
-  characterLeftTemplate: '{counter} characters left.',
   // Help Text
   helpText: 'Help text with html <strong>bold</strong>, <em>italic</em>.',
 };
@@ -102,11 +113,9 @@ const SearchTemplate = args => {
   delete args.patternErrorMessage;
   const displayCharacterLeft = args.displayCharacterLeft;
   delete args.displayCharacterLeft;
-  const characterLeftTemplate = args.characterLeftTemplate;
-  delete args.characterLeftTemplate;
   // return element
   return (h("form", { role: "search" },
-    h("mg-input-text", Object.assign({}, args, { "label-on-top": labelOnTop, "label-hide": labelHide, "pattern-error-message": patternErrorMessage, "display-character-left": displayCharacterLeft, "character-left-template": characterLeftTemplate }),
+    h("mg-input-text", Object.assign({}, args, { "label-on-top": labelOnTop, "label-hide": labelHide, "pattern-error-message": patternErrorMessage, "display-character-left": displayCharacterLeft }),
       h("mg-button", { slot: "append-input", label: "search" },
         h("mg-icon", { icon: "magnifying-glass" }),
         " Search"))));

package/dist/collection/components/molecules/inputs/mg-input-text/mg-input-text.css

@@ -10,16 +10,10 @@
   align-items: flex-start;
   min-height: var(--default-size);
   max-width: 100%;
-  /* Style when input is not valid */
+  margin-bottom: var(--mg-inputs-margin-bottom, 0);
   /* Label */
   /* Label-on-top */
 }
-.mg-input.is-not-valid {
-  color: hsl(var(--color-danger));
-}
-.mg-input.is-not-valid .mg-input__box {
-  border-color: hsl(var(--color-danger));
-}
 .mg-input mg-input-title {
   flex-shrink: var(--mg-inputs-shrink, 1);
   width: var(--mg-inputs-title-width, auto);
@@ -73,6 +67,11 @@
 .mg-input__input-container mg-icon {
   display: flex;
 }
+.mg-input__input-container .mg-input__help-text,
+.mg-input__input-container .mg-input__error {
+  text-align: start;
+  font-size: 1.2rem;
+}
 
 .mg-input__input {
   display: flex;
@@ -81,11 +80,22 @@
 .mg-input__input mg-tooltip {
   margin-top: calc((var(--default-size) - var(--mg-icon-regular-size)) / 2);
 }
-.mg-input__input + * {
-  text-align: start;
+.mg-input__input.mg-input__input--has-error .mg-input__box {
+  border-color: hsl(var(--color-danger));
+}
+.mg-input__input + .mg-input__help-text, .mg-input__input + .mg-input__error {
   margin-top: 0.5rem;
 }
 
+.mg-input__error {
+  display: inline-block;
+  margin-top: 0.2rem;
+  padding: 0.3rem 0.8rem;
+  border-radius: 0.3rem;
+  background: hsl(var(--mg-inputs-error-bg-color));
+  color: hsl(var(--color-danger));
+}
+
 /**
  * Style for input "box":
  * - input[type="text"]
@@ -106,6 +116,7 @@
   font-family: inherit;
   color: hsl(var(--color-dark));
   font-size: var(--font-size);
+  text-align: var(--mg-inputs-text-align, left);
 }
 .mg-input__box::placeholder {
   color: var(--mg-inputs-color);
@@ -145,6 +156,23 @@
   display: none;
 }
 
+.mg-input.mg-input--label-on-top .mg-input__box {
+  width: auto;
+  max-width: 100%;
+}
+
+.mg-input.mg-input--has-buttons-group-append ::slotted([slot=append-input]) {
+  --mg-button-border-radius-top-right: 0;
+  --mg-button-border-radius-bottom-right: 0;
+}
+.mg-input.mg-input--has-buttons-group-append ::slotted([slot=append-input]:not(:last-of-type)) {
+  --mg-button-border-right-width: 0;
+}
+.mg-input.mg-input--has-buttons-group-append ::slotted([slot=append-input]:last-of-type) {
+  --mg-button-border-radius-top-right: var(--mg-inputs-border-radius);
+  --mg-button-border-radius-bottom-right: var(--mg-inputs-border-radius);
+}
+
 .mg-input.mg-input--is-append-input-slot-content:not(.mg-input--readonly) ::slotted([slot=append-input]) {
   padding-top: calc((var(--default-size) - var(--mg-icon-regular-size)) / 2);
 }
@@ -174,13 +202,14 @@
 }
 
 /**
- * Manage display mg-character-left on focus
+ * Set mg-character-left with inputs
  */
 .mg-input mg-character-left {
-  display: none;
+  opacity: 0.6;
+  font-size: 1.1rem;
 }
-.mg-input.is-focused mg-character-left {
-  display: block;
+.mg-input.mg-input--has-display-character-left .mg-input__input + .mg-input__help-text, .mg-input.mg-input--has-display-character-left .mg-input__input + .mg-input__error {
+  margin-top: 0;
 }
 
 /**
@@ -207,16 +236,37 @@
 /**
 * Icon in input
 */
-.mg-input.mg-input--has-icon .mg-input__input {
-  position: relative;
-}
-.mg-input.mg-input--has-icon .mg-input__input > mg-icon {
+.mg-input.mg-input--has-icon .mg-input__with-character-left > mg-icon {
   position: absolute;
-  top: calc(var(--default-size) - var(--mg-icon-regular-size));
+  top: 50%;
   left: var(--mg-inputs-spacer);
   color: var(--mg-inputs-color);
   transform: translateY(-50%);
 }
-.mg-input.mg-input--has-icon .mg-input__input .mg-input__box {
+.mg-input.mg-input--has-icon .mg-input__with-character-left .mg-input__box {
   padding-left: calc(var(--mg-icon-regular-size) + var(--mg-inputs-spacer) * 2);
+}
+
+/**
+* Character left
+*/
+.mg-input__with-character-left {
+  position: relative;
+  display: inline-flex;
+  width: 100%;
+}
+.mg-input.is-focused .mg-input__with-character-left .mg-input__box {
+  padding-right: calc(var(--mg-character-left-message-length) * 1ch + 0.8rem);
+}
+.mg-input__with-character-left mg-character-left {
+  position: absolute;
+  display: none;
+  top: 50%;
+  right: 1rem;
+  opacity: 0.6;
+  transform: translateY(-50%);
+  font-size: 1.1rem;
+}
+.mg-input.is-focused .mg-input__with-character-left mg-character-left {
+  display: block;
 }