@conduction/components 2.0.33 → 2.1.0

package/src/components/formFields/input.tsx

@@ -1,176 +1,179 @@
-import * as React from "react";
-import { TextField } from "@gemeente-denhaag/components-react";
-import { ShowIcon, HideIcon } from "@gemeente-denhaag/icons";
-import { IReactHookFormProps } from "./types";
-
-export interface IInputProps {
-  name: string;
-  disabled?: boolean;
-  defaultValue?: string;
-  icon?: JSX.Element;
-  placeholder?: string;
-}
-
-export const InputPassword: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  validation,
-  register,
-  placeholder,
-  errors,
-}) => {
-  const [showPassword, setShowPassword] = React.useState<boolean>(false);
-
-  return (
-    <TextField
-      type={showPassword ? "text" : "password"}
-      {...{ disabled, placeholder }}
-      {...register(name, { ...validation })}
-      invalid={errors[name]}
-      icon={<span onClick={() => setShowPassword(!showPassword)}>{showPassword ? <HideIcon /> : <ShowIcon />}</span>}
-    />
-  );
-};
-
-export const InputText: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  defaultValue,
-  validation,
-  register,
-  icon,
-  placeholder,
-  errors,
-}) => (
-  <TextField
-    type="text"
-    {...{ defaultValue, disabled, placeholder, icon }}
-    {...register(name, { ...validation })}
-    invalid={errors[name]}
-  />
-);
-
-export const InputEmail: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  defaultValue,
-  validation,
-  register,
-  icon,
-  placeholder,
-  errors,
-}) => (
-  <TextField
-    type="email"
-    {...{ defaultValue, disabled, placeholder, icon }}
-    {...register(name, { ...validation })}
-    invalid={errors[name]}
-  />
-);
-
-export const InputURL: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  defaultValue,
-  validation,
-  register,
-  icon,
-  placeholder,
-  errors,
-}) => (
-  <TextField
-    type="url"
-    {...{ defaultValue, disabled, placeholder, icon }}
-    {...register(name, { ...validation })}
-    invalid={errors[name]}
-  />
-);
-
-export const InputDate: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  defaultValue,
-  validation,
-  register,
-  errors,
-}) => (
-  <TextField
-    type="date"
-    {...{ defaultValue, disabled }}
-    {...register(name, { ...validation })}
-    invalid={errors[name]}
-  />
-);
-
-export const InputDateTime: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  defaultValue,
-  validation,
-  register,
-  errors,
-}) => (
-  <TextField
-    type="datetime-local"
-    {...{ defaultValue, disabled }}
-    {...register(name, { ...validation })}
-    invalid={errors[name]}
-  />
-);
-
-export const InputNumber: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  defaultValue,
-  validation,
-  register,
-  icon,
-  placeholder,
-  errors,
-}) => (
-  <TextField
-    type="number"
-    {...{ defaultValue, disabled, placeholder, icon }}
-    {...register(name, { ...validation, valueAsNumber: true })}
-    invalid={errors[name]}
-  />
-);
-
-export const InputFloat: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  defaultValue,
-  validation,
-  register,
-  icon,
-  placeholder,
-  errors,
-}) => (
-  <TextField
-    type="number"
-    step=".01"
-    {...{ disabled, placeholder, icon, defaultValue }}
-    {...register(name, { ...validation, valueAsNumber: true })}
-    invalid={errors[name]}
-  />
-);
-
-interface IInputFileProps {
-  accept?: string;
-}
-
-export const InputFile: React.FC<IInputFileProps & IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  accept,
-  defaultValue,
-  validation,
-  register,
-}) => (
-  <input
-    className="denhaag-textfield__input"
-    type="file"
-    {...{ defaultValue, disabled, accept }}
-    {...register(name, { ...validation })}
-  />
-);
+import * as React from "react";
+import { Datepicker, TextField } from "@gemeente-denhaag/components-react";
+import { ShowIcon, HideIcon } from "@gemeente-denhaag/icons";
+import { IReactHookFormProps } from "./types";
+import { Control, FieldValues, Controller } from "react-hook-form";
+
+export interface IInputProps {
+  name: string;
+  disabled?: boolean;
+  defaultValue?: string;
+  icon?: JSX.Element;
+  placeholder?: string;
+  control?: Control<FieldValues, any>;
+}
+
+export const InputPassword: React.FC<IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  validation,
+  register,
+  placeholder,
+  errors,
+}) => {
+  const [showPassword, setShowPassword] = React.useState<boolean>(false);
+
+  return (
+    <TextField
+      type={showPassword ? "text" : "password"}
+      {...{ disabled, placeholder }}
+      {...register(name, { ...validation })}
+      invalid={errors[name]}
+      icon={<span onClick={() => setShowPassword(!showPassword)}>{showPassword ? <HideIcon /> : <ShowIcon />}</span>}
+    />
+  );
+};
+
+export const InputText: React.FC<IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  defaultValue,
+  validation,
+  register,
+  icon,
+  placeholder,
+  errors,
+}) => (
+  <TextField
+    type="text"
+    {...{ defaultValue, disabled, placeholder, icon }}
+    {...register(name, { ...validation })}
+    invalid={errors[name]}
+  />
+);
+
+export const InputEmail: React.FC<IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  defaultValue,
+  validation,
+  register,
+  icon,
+  placeholder,
+  errors,
+}) => (
+  <TextField
+    type="email"
+    {...{ defaultValue, disabled, placeholder, icon }}
+    {...register(name, { ...validation })}
+    invalid={errors[name]}
+  />
+);
+
+export const InputURL: React.FC<IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  defaultValue,
+  validation,
+  register,
+  icon,
+  placeholder,
+  errors,
+}) => (
+  <TextField
+    type="url"
+    {...{ defaultValue, disabled, placeholder, icon }}
+    {...register(name, { ...validation })}
+    invalid={errors[name]}
+  />
+);
+
+export const InputDate: React.FC<IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  defaultValue,
+  validation,
+  errors,
+  control,
+}) => (
+  <Controller
+    {...{ control, name, defaultValue }}
+    rules={validation}
+    render={({ field: { onChange, value } }) => {
+      return <Datepicker {...{ value, onChange, disabled }} error={!!errors[name]} />;
+    }}
+  />
+);
+
+export const InputDateTime: React.FC<IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  defaultValue,
+  validation,
+  register,
+  errors,
+}) => (
+  <TextField
+    type="datetime-local"
+    {...{ defaultValue, disabled }}
+    {...register(name, { ...validation })}
+    invalid={errors[name]}
+  />
+);
+
+export const InputNumber: React.FC<IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  defaultValue,
+  validation,
+  register,
+  icon,
+  placeholder,
+  errors,
+}) => (
+  <TextField
+    type="number"
+    {...{ defaultValue, disabled, placeholder, icon }}
+    {...register(name, { ...validation, valueAsNumber: true })}
+    invalid={errors[name]}
+  />
+);
+
+export const InputFloat: React.FC<IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  defaultValue,
+  validation,
+  register,
+  icon,
+  placeholder,
+  errors,
+}) => (
+  <TextField
+    type="number"
+    step=".01"
+    {...{ disabled, placeholder, icon, defaultValue }}
+    {...register(name, { ...validation, valueAsNumber: true })}
+    invalid={errors[name]}
+  />
+);
+
+interface IInputFileProps {
+  accept?: string;
+}
+
+export const InputFile: React.FC<IInputFileProps & IInputProps & IReactHookFormProps> = ({
+  disabled,
+  name,
+  accept,
+  defaultValue,
+  validation,
+  register,
+}) => (
+  <input
+    className="denhaag-textfield__input"
+    type="file"
+    {...{ defaultValue, disabled, accept }}
+    {...register(name, { ...validation })}
+  />
+);

package/src/components/formFields/radio.tsx

@@ -1,21 +1,21 @@
-import { FormControlLabel } from "@gemeente-denhaag/components-react";
-import { IReactHookFormProps } from "./types";
-
-interface IRadioProps {
-  label: string;
-  name: string;
-  value: string;
-}
-
-export const InputRadio: React.FC<IRadioProps & IReactHookFormProps> = ({
-  name,
-  validation,
-  register,
-  label,
-  value,
-}) => (
-  <FormControlLabel
-    input={<input type="radio" {...{ value }} {...register(name, { ...validation })} />}
-    {...{ label }}
-  />
-);
+import { FormControlLabel } from "@gemeente-denhaag/components-react";
+import { IReactHookFormProps } from "./types";
+
+interface IRadioProps {
+  label: string;
+  name: string;
+  value: string;
+}
+
+export const InputRadio: React.FC<IRadioProps & IReactHookFormProps> = ({
+  name,
+  validation,
+  register,
+  label,
+  value,
+}) => (
+  <FormControlLabel
+    input={<input type="radio" {...{ value }} {...register(name, { ...validation })} />}
+    {...{ label }}
+  />
+);

package/src/components/formFields/select/select.module.css

@@ -1,38 +1,38 @@
-:root {
-  --conduction-input-select-border: 1px solid var(--skeleton-color-grey-3);
-  --conduction-input-select-border-focus: 2px dashed var(--skeleton-color-grey-5);
-}
-
-.select > div {
-  background-color: var(--skeleton-color-white);
-  border: var(--conduction-input-select-border);
-  border-radius: var(--skeleton-border-radius-md);
-  box-sizing: border-box;
-  padding-block-start: var(--skeleton-size-xs);
-  padding-block-end: var(--skeleton-size-xs);
-}
-
-.select.error > div {
-  border-color: var(
-    --utrecht-textbox-invalid-border-color,
-    var(--utrecht-form-input-invalid-border-color, var(--utrecht-textbox-border-color, var(--utrecht-form-input-border-color)))
-  );
-}
-
-.select .select > div:focus-within {
-  outline: none;
-  box-shadow: none;
-}
-
-.select > div:focus-within::after {
-  content: "";
-  display: block;
-  position: absolute;
-  pointer-events: none;
-  bottom: calc(var(--skeleton-size-2xs) * -1);
-  left: calc(var(--skeleton-size-2xs) * -1);
-  right: calc(var(--skeleton-size-2xs) * -1);
-  top: calc(var(--skeleton-size-2xs) * -1);
-  border: var(--conduction-input-select-border-focus);
-  border-radius: var(--skeleton-border-radius-md);
-}
+:root {
+  --conduction-input-select-border: 1px solid var(--skeleton-color-grey-3);
+  --conduction-input-select-border-focus: 2px dashed var(--skeleton-color-grey-5);
+}
+
+.select > div {
+  background-color: var(--skeleton-color-white);
+  border: var(--conduction-input-select-border);
+  border-radius: var(--skeleton-border-radius-md);
+  box-sizing: border-box;
+  padding-block-start: var(--skeleton-size-xs);
+  padding-block-end: var(--skeleton-size-xs);
+}
+
+.select.error > div {
+  border-color: var(
+    --utrecht-textbox-invalid-border-color,
+    var(--utrecht-form-input-invalid-border-color, var(--utrecht-textbox-border-color, var(--utrecht-form-input-border-color)))
+  );
+}
+
+.select .select > div:focus-within {
+  outline: none;
+  box-shadow: none;
+}
+
+.select > div:focus-within::after {
+  content: "";
+  display: block;
+  position: absolute;
+  pointer-events: none;
+  bottom: calc(var(--skeleton-size-2xs) * -1);
+  left: calc(var(--skeleton-size-2xs) * -1);
+  right: calc(var(--skeleton-size-2xs) * -1);
+  top: calc(var(--skeleton-size-2xs) * -1);
+  border: var(--conduction-input-select-border-focus);
+  border-radius: var(--skeleton-border-radius-md);
+}