@conduction/components 2.1.13 → 2.1.15

package/README.md

@@ -4,6 +4,8 @@
 
 - **Version 2.1 (breaking changes from 2.0.x)**
 
+  - 2.1.15: Add InputDate component based on react-datepicker.
+  - 2.1.14: Refactor checkbox to remove svg errors
   - 2.1.13: Refactor components to remove svg errors (e.g. shape-rendering => shapeRendering)
   - 2.1.12: Added ToolTip max-width and break-word
   - 2.1.11: Added CreateKeyValue component disabled state on delete buttons

package/lib/components/formFields/checkbox/Checkbox.module.css

@@ -0,0 +1,7 @@
+.container {
+  user-select: none;
+}
+
+.container:hover {
+  cursor: pointer;
+}

package/lib/components/formFields/{checkbox.d.ts → checkbox/checkbox.d.ts}

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { IReactHookFormProps } from "./types";
+import { IReactHookFormProps } from "./../types";
 export interface ICheckboxProps {
     label: string;
     name: string;

package/lib/components/formFields/checkbox/checkbox.js

@@ -0,0 +1,3 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as styles from "./Checkbox.module.css";
+export const InputCheckbox = ({ name, validation, register, label, defaultChecked, disabled, }) => (_jsxs("div", { className: styles.container, children: [_jsx("input", { type: "checkbox", id: `checkbox${name}`, ...{ defaultChecked, disabled }, ...register(name, { ...validation }) }), _jsx("label", { htmlFor: `checkbox${name}`, children: label })] }));

package/lib/components/formFields/date/Date.d.ts

@@ -0,0 +1,12 @@
+import * as React from "react";
+import "react-datepicker/dist/react-datepicker.css";
+import { Control, FieldValues } from "react-hook-form";
+import { IReactHookFormProps } from "../types";
+interface IDateProps {
+    control: Control<FieldValues, any>;
+    name: string;
+    showTimeSelect?: boolean;
+    disabled?: boolean;
+}
+export declare const InputDate: React.FC<IDateProps & IReactHookFormProps>;
+export {};

package/lib/components/formFields/date/Date.js

@@ -0,0 +1,10 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import "react-datepicker/dist/react-datepicker.css";
+import * as styles from "./Date.module.css";
+import { Controller } from "react-hook-form";
+import DatePicker from "react-datepicker";
+export const InputDate = ({ name, errors, control, validation, disabled, }) => {
+    return (_jsx(Controller, { ...{ control, name }, rules: validation, render: ({ field: { onChange, value } }) => {
+            return (_jsx(DatePicker, { calendarClassName: styles.calendar, className: "denhaag-datepicker__input", onChange: (date) => onChange(date), dateFormat: "d-MM-yyyy HH:mm", selected: value, timeIntervals: 1, showTimeSelect: true, ...{ errors, value, disabled } }));
+        } }));
+};

package/lib/components/formFields/date/Date.module.css

@@ -0,0 +1,12 @@
+.container {
+  display: flex;
+}
+
+.calendar {
+  display: flex;
+}
+
+.calendar > div::before,
+.calendar > div::after {
+  display: none;
+}

package/lib/components/formFields/index.d.ts

@@ -1,7 +1,8 @@
-import { InputText, InputPassword, InputEmail, InputURL, InputDate, InputDateTime, InputNumber, InputFile } from "./input";
+import { InputText, InputPassword, InputEmail, InputURL, InputNumber, InputFile } from "./input";
 import { Textarea } from "./textarea";
-import { InputCheckbox } from "./checkbox";
+import { InputCheckbox } from "./checkbox/checkbox";
 import { InputRadio } from "./radio";
 import { SelectSingle, SelectMultiple, SelectCreate } from "./select/select";
 import { CreateKeyValue, IKeyValue } from "./createKeyValue/CreateKeyValue";
-export { InputRadio, InputText, InputPassword, InputEmail, InputURL, InputDate, InputDateTime, InputNumber, InputCheckbox, InputFile, Textarea, SelectSingle, SelectMultiple, SelectCreate, CreateKeyValue, IKeyValue, };
+import { InputDate } from "./date/Date";
+export { InputRadio, InputText, InputPassword, InputEmail, InputURL, InputDate, InputNumber, InputCheckbox, InputFile, Textarea, SelectSingle, SelectMultiple, SelectCreate, CreateKeyValue, IKeyValue, };

package/lib/components/formFields/index.js

@@ -1,7 +1,8 @@
-import { InputText, InputPassword, InputEmail, InputURL, InputDate, InputDateTime, InputNumber, InputFile, } from "./input";
+import { InputText, InputPassword, InputEmail, InputURL, InputNumber, InputFile } from "./input";
 import { Textarea } from "./textarea";
-import { InputCheckbox } from "./checkbox";
+import { InputCheckbox } from "./checkbox/checkbox";
 import { InputRadio } from "./radio";
 import { SelectSingle, SelectMultiple, SelectCreate } from "./select/select";
 import { CreateKeyValue } from "./createKeyValue/CreateKeyValue";
-export { InputRadio, InputText, InputPassword, InputEmail, InputURL, InputDate, InputDateTime, InputNumber, InputCheckbox, InputFile, Textarea, SelectSingle, SelectMultiple, SelectCreate, CreateKeyValue, };
+import { InputDate } from "./date/Date";
+export { InputRadio, InputText, InputPassword, InputEmail, InputURL, InputDate, InputNumber, InputCheckbox, InputFile, Textarea, SelectSingle, SelectMultiple, SelectCreate, CreateKeyValue, };

package/lib/components/formFields/input.d.ts

@@ -11,8 +11,6 @@ export declare const InputPassword: React.FC<IInputProps & IReactHookFormProps>;
 export declare const InputText: React.FC<IInputProps & IReactHookFormProps>;
 export declare const InputEmail: React.FC<IInputProps & IReactHookFormProps>;
 export declare const InputURL: React.FC<IInputProps & IReactHookFormProps>;
-export declare const InputDate: React.FC<IInputProps & IReactHookFormProps>;
-export declare const InputDateTime: React.FC<IInputProps & IReactHookFormProps>;
 export declare const InputNumber: React.FC<IInputProps & IReactHookFormProps>;
 export declare const InputFloat: React.FC<IInputProps & IReactHookFormProps>;
 interface IInputFileProps {

package/lib/components/formFields/input.js

@@ -10,8 +10,6 @@ export const InputPassword = ({ disabled, name, validation, register, placeholde
 export const InputText = ({ disabled, name, defaultValue, validation, register, icon, placeholder, errors, }) => (_jsx(TextField, { type: "text", ...{ defaultValue, disabled, placeholder, icon }, ...register(name, { ...validation }), invalid: errors[name] }));
 export const InputEmail = ({ disabled, name, defaultValue, validation, register, icon, placeholder, errors, }) => (_jsx(TextField, { type: "email", ...{ defaultValue, disabled, placeholder, icon }, ...register(name, { ...validation }), invalid: errors[name] }));
 export const InputURL = ({ disabled, name, defaultValue, validation, register, icon, placeholder, errors, }) => (_jsx(TextField, { type: "url", ...{ defaultValue, disabled, placeholder, icon }, ...register(name, { ...validation }), invalid: errors[name] }));
-export const InputDate = ({ disabled, name, defaultValue, validation, errors, register, }) => (_jsx(TextField, { type: "date", ...{ defaultValue, disabled }, ...register(name, { ...validation }), invalid: errors[name] }));
-export const InputDateTime = ({ disabled, name, defaultValue, validation, register, errors, }) => (_jsx(TextField, { type: "datetime-local", ...{ defaultValue, disabled }, ...register(name, { ...validation }), invalid: errors[name] }));
 export const InputNumber = ({ disabled, name, defaultValue, validation, register, icon, placeholder, errors, }) => (_jsx(TextField, { type: "number", ...{ defaultValue, disabled, placeholder, icon }, ...register(name, { ...validation, valueAsNumber: true }), invalid: errors[name] }));
 export const InputFloat = ({ disabled, name, defaultValue, validation, register, icon, placeholder, errors, }) => (_jsx(TextField, { type: "number", step: ".01", ...{ disabled, placeholder, icon, defaultValue }, ...register(name, { ...validation, valueAsNumber: true }), invalid: errors[name] }));
 export const InputFile = ({ disabled, name, accept, defaultValue, validation, register, }) => (_jsx("input", { className: "denhaag-textfield__input", type: "file", ...{ defaultValue, disabled, accept }, ...register(name, { ...validation }) }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conduction/components",
-  "version": "2.1.13",
+  "version": "2.1.15",
   "description": "React (Gatsby) components used within the Conduction Skeleton Application (and its implementations)",
   "main": "lib/index.js",
   "scripts": {
@@ -32,6 +32,7 @@
     "clsx": "^1.1.1",
     "gatsby": "^4.11.1",
     "react": "^17.0.1",
+    "react-datepicker": "^4.10.0",
     "react-hook-form": "7.29.0",
     "react-select": "5.3.2",
     "react-tooltip": "^4.2.21"
@@ -39,6 +40,7 @@
   "devDependencies": {
     "@types/node": "^17.0.23",
     "@types/react": "^17.0.43",
+    "@types/react-datepicker": "^4.8.0",
     "@types/react-dom": "^17.0.14",
     "tsc-hooks": "^1.1.1",
     "typescript": "^4.6.3"

package/src/components/formFields/checkbox/Checkbox.module.css

@@ -0,0 +1,7 @@
+.container {
+  user-select: none;
+}
+
+.container:hover {
+  cursor: pointer;
+}

package/src/components/formFields/checkbox/checkbox.tsx

@@ -0,0 +1,28 @@
+import * as styles from "./Checkbox.module.css";
+import { IReactHookFormProps } from "./../types";
+
+export interface ICheckboxProps {
+  label: string;
+  name: string;
+  defaultChecked?: boolean;
+  disabled?: boolean;
+}
+
+export const InputCheckbox: React.FC<ICheckboxProps & IReactHookFormProps> = ({
+  name,
+  validation,
+  register,
+  label,
+  defaultChecked,
+  disabled,
+}) => (
+  <div className={styles.container}>
+    <input
+      type="checkbox"
+      id={`checkbox${name}`}
+      {...{ defaultChecked, disabled }}
+      {...register(name, { ...validation })}
+    />
+    <label htmlFor={`checkbox${name}`}>{label}</label>
+  </div>
+);

package/src/components/formFields/date/Date.module.css

@@ -0,0 +1,12 @@
+.container {
+  display: flex;
+}
+
+.calendar {
+  display: flex;
+}
+
+.calendar > div::before,
+.calendar > div::after {
+  display: none;
+}

package/src/components/formFields/date/Date.tsx

@@ -0,0 +1,42 @@
+import * as React from "react";
+import "react-datepicker/dist/react-datepicker.css";
+import * as styles from "./Date.module.css";
+import { Control, Controller, FieldValues } from "react-hook-form";
+import { IReactHookFormProps } from "../types";
+import DatePicker from "react-datepicker";
+
+interface IDateProps {
+  control: Control<FieldValues, any>;
+  name: string;
+  showTimeSelect?: boolean;
+  disabled?: boolean;
+}
+
+export const InputDate: React.FC<IDateProps & IReactHookFormProps> = ({
+  name,
+  errors,
+  control,
+  validation,
+  disabled,
+}) => {
+  return (
+    <Controller
+      {...{ control, name }}
+      rules={validation}
+      render={({ field: { onChange, value } }) => {
+        return (
+          <DatePicker
+            calendarClassName={styles.calendar}
+            className="denhaag-datepicker__input"
+            onChange={(date) => onChange(date)}
+            dateFormat="d-MM-yyyy HH:mm"
+            selected={value}
+            timeIntervals={1}
+            showTimeSelect
+            {...{ errors, value, disabled }}
+          />
+        );
+      }}
+    />
+  );
+};

package/src/components/formFields/index.tsx

@@ -1,18 +1,10 @@
-import {
-  InputText,
-  InputPassword,
-  InputEmail,
-  InputURL,
-  InputDate,
-  InputDateTime,
-  InputNumber,
-  InputFile,
-} from "./input";
+import { InputText, InputPassword, InputEmail, InputURL, InputNumber, InputFile } from "./input";
 import { Textarea } from "./textarea";
-import { InputCheckbox } from "./checkbox";
+import { InputCheckbox } from "./checkbox/checkbox";
 import { InputRadio } from "./radio";
 import { SelectSingle, SelectMultiple, SelectCreate } from "./select/select";
 import { CreateKeyValue, IKeyValue } from "./createKeyValue/CreateKeyValue";
+import { InputDate } from "./date/Date";
 
 export {
   InputRadio,
@@ -21,7 +13,6 @@ export {
   InputEmail,
   InputURL,
   InputDate,
-  InputDateTime,
   InputNumber,
   InputCheckbox,
   InputFile,

package/src/components/formFields/input.tsx

@@ -91,38 +91,6 @@ export const InputURL: React.FC<IInputProps & IReactHookFormProps> = ({
   />
 );
 
-export const InputDate: React.FC<IInputProps & IReactHookFormProps> = ({
-  disabled,
-  name,
-  defaultValue,
-  validation,
-  errors,
-  register,
-}) => (
-  <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,

package/lib/components/formFields/checkbox.js

@@ -1,3 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { FormControlLabel } from "@gemeente-denhaag/components-react";
-export const InputCheckbox = ({ name, validation, register, label, defaultChecked, disabled, }) => (_jsx(FormControlLabel, { input: _jsx("input", { type: "checkbox", id: `checkbox${name}`, ...{ defaultChecked, disabled }, ...register(name, { ...validation }) }), ...{ label } }));

package/src/components/formFields/checkbox.js

@@ -1,3 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { FormControlLabel } from "@gemeente-denhaag/components-react";
-export const InputCheckbox = ({ name, validation, register, label, }) => _jsx(FormControlLabel, { input: _jsx("input", { type: "checkbox", ...register(name, { ...validation }) }), ...{ label } });

package/src/components/formFields/checkbox.tsx

@@ -1,30 +0,0 @@
-import { FormControlLabel } from "@gemeente-denhaag/components-react";
-import { IReactHookFormProps } from "./types";
-
-export interface ICheckboxProps {
-  label: string;
-  name: string;
-  defaultChecked?: boolean;
-  disabled?: boolean;
-}
-
-export const InputCheckbox: React.FC<ICheckboxProps & IReactHookFormProps> = ({
-  name,
-  validation,
-  register,
-  label,
-  defaultChecked,
-  disabled,
-}) => (
-  <FormControlLabel
-    input={
-      <input
-        type="checkbox"
-        id={`checkbox${name}`}
-        {...{ defaultChecked, disabled }}
-        {...register(name, { ...validation })}
-      />
-    }
-    {...{ label }}
-  />
-);

package/src/index.js

@@ -1,14 +0,0 @@
-export * from "./components/card";
-export * from "./components/casesTable/CasesTable";
-export * from "./components/container/Container";
-export * from "./components/denhaag-wrappers/breadcrumbs/Breadcrumbs";
-export * from "./components/editableTableRow/EditableTableRow";
-export * from "./components/formFields";
-export * from "./components/imageDivider/ImageDivider";
-export * from "./components/logo/Logo";
-export * from "./components/messageForm/MessageForm";
-export * from "./components/messagesTable/MessagesTable";
-export * from "./components/metaIcon/MetaIcon";
-export * from "./components/privateRoute/PrivateRoute";
-export * from "./components/statusSteps/StatusSteps";
-export * from "./components/topNav/TopNav";