@lets-events/react 11.6.5 → 11.7.0

package/src/components/FormFields/TextFormField.tsx

@@ -1,76 +1,107 @@
-import { useFormContext } from "react-hook-form";
-import { Flex } from "../Flex";
-import { FormLabel } from "./FormLabel";
-import { TextField } from "../TextField";
-import { ErrorFormMessage } from "./ErrorFormMessage";
-import { MaskOptions } from "@react-input/mask";
-import { getNestedValue } from "../../utils/getNestedValue";
-
-export type TextFormFieldProps = {
-  name: string;
-  label?: string;
-  required?: boolean;
-  placeholder?: string;
-  mask?: MaskOptions;
-  validation?: {
-    validate?: (value: string) => boolean | string;
-  };
-  validationErrorMessage?: string;
-  disabled?: boolean;
-  onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
-  value?: string;
-};
-
-export const TextFormField = ({
-  name,
-  label,
-  required,
-  placeholder,
-  mask,
-  validation,
-  validationErrorMessage = "Este campo é obrigatório.",
-  disabled = false,
-  value,
-  onChange,
-}: TextFormFieldProps) => {
-  const {
-    register,
-    formState: { errors },
-  } = useFormContext();
-
-  const validationRules = {
-    required: required ? validationErrorMessage : false,
-    ...validation,
-  };
-
-  const { ref, ...restFieldProps } = register(name, validationRules);
-  const fieldError = getNestedValue(errors, name);
-  const haveError = !!fieldError;
-  const errorMsg = fieldError?.message;
-  return (
-    <Flex direction="column">
-      {label && (
-        <FormLabel
-          name={name}
-          label={label}
-          required={required}
-          haveError={haveError}
-        />
-      )}
-
-      <TextField
-        mask={mask}
-        placeholder={placeholder}
-        disabled={disabled}
-        color={haveError ? "error" : "default"}
-        aria-labelledby={`${name}-label`}
-        {...restFieldProps}
-        ref={ref}
-        onChange={onChange}
-        value={value}
-      />
-
-      <ErrorFormMessage message={errorMsg} />
-    </Flex>
-  );
-};
+import {
+  FieldValues,
+  RegisterOptions,
+  useFormContext,
+  Validate,
+  useController,
+} from "react-hook-form";
+import { Flex } from "../Flex";
+import { FormLabel } from "./subComponents/FormLabel";
+import { TextField, TextFieldProps } from "../TextField";
+import { ErrorFormMessage } from "./subComponents/ErrorFormMessage";
+import { MaskOptions } from "@react-input/mask";
+import { getNestedValue } from "../../utils/getNestedValue";
+import { useCallback, useMemo } from "react";
+import { format, unformat } from "@react-input/mask";
+
+export type TextFormFieldProps = TextFieldProps & {
+  name: string;
+  label?: string;
+  required?: boolean;
+  mask?: MaskOptions;
+  validate?: (value: string) => boolean | string;
+  validationErrorMessage?: string;
+  valueFormatter?: {
+    format: (v: string) => string;
+    unformat: (v: string) => string;
+  };
+};
+
+export const TextFormField = ({
+  name,
+  label,
+  required,
+  mask,
+  validate,
+  validationErrorMessage = "Este campo é obrigatório.",
+  onChange,
+  valueFormatter,
+  ...inputProps
+}: TextFormFieldProps) => {
+  const handleValidate = useCallback(
+    (value: string) => {
+      if (!required && value.trim() === "") return true;
+      return validate?.(value) ?? true;
+    },
+    [validate, required]
+  );
+
+  const { field, fieldState } = useController({
+    name,
+    rules: {
+      required: required ? validationErrorMessage : false,
+      validate: handleValidate,
+      onChange,
+    },
+    defaultValue: "",
+  });
+
+  const fieldError = fieldState.error;
+  const haveError = !!fieldError;
+  const errorMsg = fieldError?.message;
+
+  const { value: formValue, onChange: formChange } = field;
+
+  const formattedValue = useMemo(() => {
+    let value = formValue;
+
+    if (valueFormatter) value = valueFormatter.format(value);
+    if (mask) value = format(value ?? "", mask as any);
+
+    return value;
+  }, [formValue, valueFormatter, mask]);
+
+  const handleChange = (e: any) => {
+    let value = e.target.value;
+
+    if (mask) value = unformat(value, mask as any);
+    if (valueFormatter) value = valueFormatter.unformat(value);
+
+    formChange(value);
+  };
+
+  return (
+    <Flex direction="column">
+      {label && (
+        <FormLabel
+          name={name}
+          label={label}
+          required={required}
+          haveError={haveError}
+        />
+      )}
+
+      <TextField
+        mask={mask}
+        color={haveError ? "error" : "default"}
+        aria-labelledby={`${name}-label`}
+        {...inputProps}
+        {...field}
+        onChange={handleChange}
+        value={formattedValue}
+      />
+
+      <ErrorFormMessage message={errorMsg} />
+    </Flex>
+  );
+};

package/src/components/FormFields/{ErrorFormMessage.tsx → subComponents/ErrorFormMessage.tsx}

@@ -1,36 +1,36 @@
-import { faXmarkCircle } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { colors } from "@lets-events/tokens";
-import { Flex } from "../Flex";
-import { Text } from "../Text";
-import {
-  FieldError,
-  FieldErrorsImpl,
-  FieldValues,
-  Merge,
-} from "react-hook-form";
-
-export type ErrorFormMessageProps = {
-  message?:
-    | string
-    | FieldError
-    | Merge<FieldError, FieldErrorsImpl<any>>
-    | undefined;
-};
-
-export const ErrorFormMessage = ({ message }: ErrorFormMessageProps) => {
-  if (!message) return null;
-
-  if (typeof message !== "string") {
-    return null;
-  }
-  
-  return (
-    <Flex justify={"start"} align={"center"} gap={6}>
-      <FontAwesomeIcon icon={faXmarkCircle} color={colors.error600} size="1x" />
-      <Text typography={"bodyXS"} fontWeight={"medium"} color="error600">
-        {message}
-      </Text>
-    </Flex>
-  );
-};
+import { faXmarkCircle } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { colors } from "@lets-events/tokens";
+import { Flex } from "../../Flex";
+import { Text } from "../../Text";
+import {
+  FieldError,
+  FieldErrorsImpl,
+  FieldValues,
+  Merge,
+} from "react-hook-form";
+
+export type ErrorFormMessageProps = {
+  message?:
+    | string
+    | FieldError
+    | Merge<FieldError, FieldErrorsImpl<any>>
+    | undefined;
+};
+
+export const ErrorFormMessage = ({ message }: ErrorFormMessageProps) => {
+  if (!message) return null;
+
+  if (typeof message !== "string") {
+    return null;
+  }
+  
+  return (
+    <Flex justify={"start"} align={"center"} gap={6}>
+      <FontAwesomeIcon icon={faXmarkCircle} color={colors.error600} size="1x" />
+      <Text typography={"bodyXS"} fontWeight={"medium"} color="error600">
+        {message}
+      </Text>
+    </Flex>
+  );
+};

package/src/components/FormFields/{FormLabel.tsx → subComponents/FormLabel.tsx}

@@ -1,29 +1,29 @@
-import { Text } from "../Text";
-
-export type FormLabelProps = {
-  name: string;
-  label?: string;
-  haveError?: boolean;
-  required?: boolean;
-};
-
-export const FormLabel = ({
-  name,
-  label,
-  haveError,
-  required,
-}: FormLabelProps) => {
-  if (!label) return null;
-
-  return (
-    <Text
-      typography={"labelMedium"}
-      fontWeight={"medium"}
-      color={haveError ? "error600" : "dark700"}
-      id={`${name}-label`}
-    >
-      {label}
-      {!required && <Text color="dark500"> (opcional)</Text>}
-    </Text>
-  );
-};
+import { Text } from "../../Text";
+
+export type FormLabelProps = {
+  name: string;
+  label?: string;
+  haveError?: boolean;
+  required?: boolean;
+};
+
+export const FormLabel = ({
+  name,
+  label,
+  haveError,
+  required,
+}: FormLabelProps) => {
+  if (!label) return null;
+
+  return (
+    <Text
+      typography={"labelMedium"}
+      fontWeight={"medium"}
+      color={haveError ? "error600" : "dark700"}
+      id={`${name}-label`}
+    >
+      {label}
+      {!required && <Text color="dark500"> (opcional)</Text>}
+    </Text>
+  );
+};

package/src/components/FormFields/utils/validation.ts

@@ -0,0 +1,20 @@
+const validateEmail = (email: string) => {
+  const emailRexep =
+    /^(([^<>()[\].,;:\s@"]+(\.[^<>()[\].,;:\s@"]+)*)|(".+"))@(([^<>()[\].,;:\s@"]+\.)+[^<>()[\].,;:\s@"]{2,})$/i;
+  return emailRexep.test(email);
+};
+
+export const maxLength = (max: number, errorMsg: string) => (value: string) => {
+  return value.length > max ? errorMsg : true;
+};
+
+export const minLength = (min: number, errorMsg: string) => (value: string) => {
+  return value.length < min ? errorMsg : true;
+};
+
+export const minMaxLength =
+  (min: number, max: number, errorMsg: string) => (value: string) => {
+    console.log(value)
+    var length = value.length;
+    return length > max || length < min ? errorMsg : true;
+  };

package/src/components/Grid.tsx

@@ -1,138 +1,138 @@
-import { ComponentProps, ElementType } from 'react';
-import { styled } from '../styles'
-import { Grid as GridRadix } from "@radix-ui/themes";
-export const GridStyled = styled(GridRadix, {
-  display: 'grid',
-  variants: {
-    display: {
-      'grid': { display: 'grid' },
-      'inline-grid': { display: 'inline-grid' },
-    },
-    align: {
-      start: { alignItems: 'start' },
-      center: { alignItems: 'center' },
-      end: { alignItems: 'end' },
-      stretch: { alignItems: 'stretch' },
-    },
-    justify: {
-      start: { justifyContent: 'start' },
-      center: { justifyContent: 'center' },
-      end: { justifyContent: 'end' },
-      between: { justifyContent: 'space-between' },
-    },
-    flow: {
-      row: { gridAutoFlow: 'row' },
-      column: { gridAutoFlow: 'column' },
-      'row-dense': { gridAutoFlow: 'row dense' },
-      'column-dense': { gridAutoFlow: 'column dense' },
-    },
-    columns: {
-      1: { gridTemplateColumns: 'repeat(1, 1fr)' },
-      2: { gridTemplateColumns: 'repeat(2, 1fr)' },
-      3: { gridTemplateColumns: 'repeat(3, 1fr)' },
-      4: { gridTemplateColumns: 'repeat(4, 1fr)' },
-      6: { gridTemplateColumns: 'repeat(6, 1fr)' },
-      12: { gridTemplateColumns: 'repeat(12, 1fr)' },
-    },
-    rows: {
-      1: { gridTemplateRows: 'repeat(1, 1fr)' },
-      2: { gridTemplateRows: 'repeat(2, 1fr)' },
-      3: { gridTemplateRows: 'repeat(3, 1fr)' },
-      4: { gridTemplateRows: 'repeat(4, 1fr)' },
-      5: { gridTemplateRows: 'repeat(5, 1fr)' },
-      6: { gridTemplateRows: 'repeat(6, 1fr)' },
-      7: { gridTemplateRows: 'repeat(7, 1fr)' },
-      8: { gridTemplateRows: 'repeat(8, 1fr)' },
-      9: { gridTemplateRows: 'repeat(9, 1fr)' },
-      10: { gridTemplateRows: 'repeat(10, 1fr)' },
-      11: { gridTemplateRows: 'repeat(11, 1fr)' },
-      12: { gridTemplateRows: 'repeat(12, 1fr)' },
-      auto: { gridTemplateRows: 'auto' },
-    },
-    gap: {
-      2: { gap: '$2' },
-      4: { gap: '$4' },
-      6: { gap: '$6' },
-      8: { gap: '$8' },
-      10: { gap: '$10' },
-      12: { gap: '$12' },
-      14: { gap: '$14' },
-      16: { gap: '$16' },
-      20: { gap: '$20' },
-      22: { gap: '$22' },
-      24: { gap: '$24' },
-      32: { gap: '$32' },
-      36: { gap: '$36' },
-      40: { gap: '$40' },
-      48: { gap: '$48' },
-      56: { gap: '$56' },
-      64: { gap: '$64' },
-      72: { gap: '$72' },
-      80: { gap: '$80' },
-      full: { gap: '$full' },
-    },
-    gapX: {
-      2: { gap: '$2' },
-      4: { gap: '$4' },
-      6: { gap: '$6' },
-      8: { gap: '$8' },
-      10: { gap: '$10' },
-      12: { gap: '$12' },
-      14: { gap: '$14' },
-      16: { gap: '$16' },
-      20: { gap: '$20' },
-      22: { gap: '$22' },
-      24: { gap: '$24' },
-      32: { gap: '$32' },
-      36: { gap: '$36' },
-      40: { gap: '$40' },
-      48: { gap: '$48' },
-      56: { gap: '$56' },
-      64: { gap: '$64' },
-      72: { gap: '$72' },
-      80: { gap: '$80' },
-      full: { gap: '$full' },
-    },
-    gapY: {
-      2: { gap: '$2' },
-      4: { gap: '$4' },
-      6: { gap: '$6' },
-      8: { gap: '$8' },
-      10: { gap: '$10' },
-      12: { gap: '$12' },
-      14: { gap: '$14' },
-      16: { gap: '$16' },
-      20: { gap: '$20' },
-      22: { gap: '$22' },
-      24: { gap: '$24' },
-      32: { gap: '$32' },
-      36: { gap: '$36' },
-      40: { gap: '$40' },
-      48: { gap: '$48' },
-      56: { gap: '$56' },
-      64: { gap: '$64' },
-      72: { gap: '$72' },
-      80: { gap: '$80' },
-      full: { gap: '$full' },
-    },
-  },
-  defaultVariants: {
-    gap: 10,
-  }
-
-})
-
-export type GridProps = ComponentProps<typeof GridStyled> & {
-  as?: ElementType
-  children: React.ReactNode,
-  areas?: string
-}
-
-
-export function Grid({ children, ...props }: GridProps) {
-  return (
-    <GridStyled {...props}>
-      {children}
-    </GridStyled>
-  )
+import { ComponentProps, ElementType } from 'react';
+import { styled } from '../styles'
+import { Grid as GridRadix } from "@radix-ui/themes";
+export const GridStyled = styled(GridRadix, {
+  display: 'grid',
+  variants: {
+    display: {
+      'grid': { display: 'grid' },
+      'inline-grid': { display: 'inline-grid' },
+    },
+    align: {
+      start: { alignItems: 'start' },
+      center: { alignItems: 'center' },
+      end: { alignItems: 'end' },
+      stretch: { alignItems: 'stretch' },
+    },
+    justify: {
+      start: { justifyContent: 'start' },
+      center: { justifyContent: 'center' },
+      end: { justifyContent: 'end' },
+      between: { justifyContent: 'space-between' },
+    },
+    flow: {
+      row: { gridAutoFlow: 'row' },
+      column: { gridAutoFlow: 'column' },
+      'row-dense': { gridAutoFlow: 'row dense' },
+      'column-dense': { gridAutoFlow: 'column dense' },
+    },
+    columns: {
+      1: { gridTemplateColumns: 'repeat(1, 1fr)' },
+      2: { gridTemplateColumns: 'repeat(2, 1fr)' },
+      3: { gridTemplateColumns: 'repeat(3, 1fr)' },
+      4: { gridTemplateColumns: 'repeat(4, 1fr)' },
+      6: { gridTemplateColumns: 'repeat(6, 1fr)' },
+      12: { gridTemplateColumns: 'repeat(12, 1fr)' },
+    },
+    rows: {
+      1: { gridTemplateRows: 'repeat(1, 1fr)' },
+      2: { gridTemplateRows: 'repeat(2, 1fr)' },
+      3: { gridTemplateRows: 'repeat(3, 1fr)' },
+      4: { gridTemplateRows: 'repeat(4, 1fr)' },
+      5: { gridTemplateRows: 'repeat(5, 1fr)' },
+      6: { gridTemplateRows: 'repeat(6, 1fr)' },
+      7: { gridTemplateRows: 'repeat(7, 1fr)' },
+      8: { gridTemplateRows: 'repeat(8, 1fr)' },
+      9: { gridTemplateRows: 'repeat(9, 1fr)' },
+      10: { gridTemplateRows: 'repeat(10, 1fr)' },
+      11: { gridTemplateRows: 'repeat(11, 1fr)' },
+      12: { gridTemplateRows: 'repeat(12, 1fr)' },
+      auto: { gridTemplateRows: 'auto' },
+    },
+    gap: {
+      2: { gap: '$2' },
+      4: { gap: '$4' },
+      6: { gap: '$6' },
+      8: { gap: '$8' },
+      10: { gap: '$10' },
+      12: { gap: '$12' },
+      14: { gap: '$14' },
+      16: { gap: '$16' },
+      20: { gap: '$20' },
+      22: { gap: '$22' },
+      24: { gap: '$24' },
+      32: { gap: '$32' },
+      36: { gap: '$36' },
+      40: { gap: '$40' },
+      48: { gap: '$48' },
+      56: { gap: '$56' },
+      64: { gap: '$64' },
+      72: { gap: '$72' },
+      80: { gap: '$80' },
+      full: { gap: '$full' },
+    },
+    gapX: {
+      2: { gap: '$2' },
+      4: { gap: '$4' },
+      6: { gap: '$6' },
+      8: { gap: '$8' },
+      10: { gap: '$10' },
+      12: { gap: '$12' },
+      14: { gap: '$14' },
+      16: { gap: '$16' },
+      20: { gap: '$20' },
+      22: { gap: '$22' },
+      24: { gap: '$24' },
+      32: { gap: '$32' },
+      36: { gap: '$36' },
+      40: { gap: '$40' },
+      48: { gap: '$48' },
+      56: { gap: '$56' },
+      64: { gap: '$64' },
+      72: { gap: '$72' },
+      80: { gap: '$80' },
+      full: { gap: '$full' },
+    },
+    gapY: {
+      2: { gap: '$2' },
+      4: { gap: '$4' },
+      6: { gap: '$6' },
+      8: { gap: '$8' },
+      10: { gap: '$10' },
+      12: { gap: '$12' },
+      14: { gap: '$14' },
+      16: { gap: '$16' },
+      20: { gap: '$20' },
+      22: { gap: '$22' },
+      24: { gap: '$24' },
+      32: { gap: '$32' },
+      36: { gap: '$36' },
+      40: { gap: '$40' },
+      48: { gap: '$48' },
+      56: { gap: '$56' },
+      64: { gap: '$64' },
+      72: { gap: '$72' },
+      80: { gap: '$80' },
+      full: { gap: '$full' },
+    },
+  },
+  defaultVariants: {
+    gap: 10,
+  }
+
+})
+
+export type GridProps = ComponentProps<typeof GridStyled> & {
+  as?: ElementType
+  children: React.ReactNode,
+  areas?: string
+}
+
+
+export function Grid({ children, ...props }: GridProps) {
+  return (
+    <GridStyled {...props}>
+      {children}
+    </GridStyled>
+  )
 }