ublo-lib 1.0.32 → 1.0.33

package/es/common/components/custom-contact-form/field.js

@@ -5,6 +5,7 @@ import Attachment from "./attachment";
 import Input from "dt-design-system/es/input";
 import Textarea from "dt-design-system/es/textarea";
 import Select from "dt-design-system/es/select";
+import MultipleSelect from "dt-design-system/es/multiple-select";
 import Checkbox from "dt-design-system/es/checkbox";
 import NumberPicker from "dt-design-system/es/number-picker";
 import * as Fetcher from "../../utils/fetcher";
@@ -12,20 +13,22 @@ import { FIELD_TESTS_ERROR_CODES, validate } from "./utils";
 import * as Messages from "./messages";
 import styles from "./field.module.css";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 
 const getTag = type => {
-  switch (true) {
-    case type === "textarea":
+  switch (type) {
+    case "textarea":
       return Textarea;
 
-    case type === "select":
+    case "multiple-select":
+      return MultipleSelect;
+
+    case "select":
       return Select;
 
-    case type === "checkbox":
+    case "checkbox":
       return Checkbox;
 
-    case type === "number":
+    case "number":
       return NumberPicker;
 
     default:
@@ -49,6 +52,15 @@ const getProps = (type, name, className, data, required, placeholder, autoSizing
     };
   }
 
+  if (type === "multiple-select") {
+    return {
+      onChange,
+      ...commonProps,
+      values: commonProps.value,
+      onBlur: undefined
+    };
+  }
+
   if (type === "select") {
     return {
       onValueChange: onChange,
@@ -71,29 +83,6 @@ const getProps = (type, name, className, data, required, placeholder, autoSizing
   };
 };
 
-const Checkboxes = ({
-  checkboxes,
-  data,
-  name,
-  onChange,
-  disabled
-}) => {
-  if (!checkboxes.length) return null;
-  return checkboxes.map((checkbox, i) => {
-    const {
-      value = checkbox,
-      label = checkbox
-    } = checkbox;
-    const checked = data[name].value.includes(value);
-    return _jsx(Checkbox, {
-      label: label,
-      onValueChange: onChange,
-      value: checked,
-      disabled: disabled
-    }, i);
-  });
-};
-
 const getLabel = (lang, label, required) => {
   if (!required) return `${label} (${Messages.get(lang, "optionnal")})`;
   return label;
@@ -128,29 +117,10 @@ const Inner = ({
     [className]: className,
     [classes]: classes
   });
-  const fieldsetRef = React.useRef();
   const Tag = getTag(type);
-  const onChange = React.useCallback((value, event) => {
-    const isAutoFilled = document.activeElement !== event?.target;
-
-    if (fieldsetRef.current) {
-      const values = Array.from(fieldsetRef.current.querySelectorAll("input")).reduce((acc, checkbox) => {
-        const parent = checkbox.closest("label");
-        const value = parent.textContent.trim();
-        const {
-          checked
-        } = checkbox;
-        return checked ? [...acc, value] : acc;
-      }, []);
-      setData(data => ({ ...data,
-        [name]: {
-          value: values,
-          valid: true
-        }
-      }));
-      setValid(true);
-      return;
-    }
+  const onChange = React.useCallback(eventOrValue => {
+    const value = eventOrValue?.target?.value || eventOrValue;
+    const isAutoFilled = document.activeElement !== eventOrValue?.target;
 
     if (type === "number" || isAutoFilled) {
       const isValid = validate(type, value, required);
@@ -207,22 +177,6 @@ const Inner = ({
       getSubjects();
     }
   }, [kind, name, onChange, site]);
-
-  if (type === "checkbox-group") {
-    return _jsxs("fieldset", {
-      ref: fieldsetRef,
-      children: [label && _jsx("legend", {
-        children: label
-      }), _jsx(Checkboxes, {
-        checkboxes: options,
-        data: data,
-        name: name,
-        onChange: onChange,
-        disabled: disabled
-      })]
-    });
-  }
-
   const fieldLabel = getLabel(lang, label, required);
   const isInputValid = required && activated && valid;
   const errorMessage = required && activated && !valid && Messages.get(lang, FIELD_TESTS_ERROR_CODES[type]);

package/es/common/components/custom-contact-form/messages.js

@@ -33,6 +33,7 @@ const locales = {
     TESTS_PHONE_ERROR: 'Le téléphone doit être au format "0612345678" ou "+33612345678"',
     TESTS_TEXTAREA_ERROR: "Ce champ ne doit pas être vide",
     TESTS_SELECT_ERROR: "Ce champ ne doit pas être vide",
+    TESTS_MULTIPLE_SELECT_ERROR: "Ce champ ne doit pas être vide",
     optionnal: "optionnel"
   },
   en: {
@@ -66,8 +67,9 @@ const locales = {
     TESTS_EMAIL_ERROR: 'The email must be in the format "john.doe@domain.com"',
     TESTS_DATE_ERROR: 'The date must be in the following format: "YYYY-MM-DD"',
     TESTS_PHONE_ERROR: 'The date must be in the following formats: "0612345678" or "+33612345678"',
-    TESTS_TEXTAREA_ERROR: "this field cannot be empty",
-    TESTS_SELECT_ERROR: "this field cannot be empty",
+    TESTS_TEXTAREA_ERROR: "This field cannot be empty",
+    TESTS_SELECT_ERROR: "This field cannot be empty",
+    TESTS_MULTIPLE_SELECT_ERROR: "This field cannot be empty",
     optionnal: "optionnal"
   }
 };

package/es/common/components/custom-contact-form/utils.js

@@ -13,9 +13,10 @@ export const FIELD_TESTS_ERROR_CODES = {
   email: "TESTS_EMAIL_ERROR",
   phone: "TESTS_PHONE_ERROR",
   textarea: "TESTS_TEXTAREA_ERROR",
-  select: "TESTS_SELECT_ERROR"
+  select: "TESTS_SELECT_ERROR",
+  "multiple-select": "TESTS_MULTIPLE_SELECT_ERROR"
 };
-const IGNORED_FIELDS = ["title", "subject", "attachment", "checkbox", "checkbox-group"];
+const IGNORED_FIELDS = ["title", "subject", "attachment", "checkbox"];
 export const getInitialFormState = (fields, presets) => Object.keys(fields).reduce((acc, key) => {
   const field = fields[key];
   const {
@@ -54,7 +55,7 @@ export const getInitialFormState = (fields, presets) => Object.keys(fields).redu
     };
   }
 
-  if (type === "checkbox-group") {
+  if (type === "multiple-select") {
     const value = presets?.[key].length || [];
     return { ...acc,
       [key]: {
@@ -74,6 +75,7 @@ export const getInitialFormState = (fields, presets) => Object.keys(fields).redu
 }, {});
 export const validate = (type, value, required) => {
   if (IGNORED_FIELDS.includes(type) || !required) return true;
+  if (type === "multiple-select") return value.length > 0;
   if (type === "number") return value >= 0;
   if (!value) return false;
   const regex = TESTS[type];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "peerDependencies": {
     "dt-design-system": "^2.0.0",
     "next": "^12.0.0",