feat: upstream the FormikField component to make react-component's fi…

…elds and Formik easier to work with.

HACKING.md

@@ -55,6 +55,7 @@ Finally, in your project, add the resolutions for `react` and `react-dom` to `pa
 ```
 "resolutions": {
     "@canonical/react-components": "portal:path_to_react_components",
+    "formik": "portal:path_to_react_components/node_modules/formik",
     "react": "portal:path_to_react_components/node_modules/react",
     "react-dom": "portal:path_to_react_components/node_modules/react-dom"
 }

package.json

@@ -66,6 +66,7 @@
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-storybook": "0.6.15",
     "eslint-plugin-testing-library": "6.2.0",
+    "formik": "2.4.5",
     "jest": "29.7.0",
     "npm-package-json-lint": "7.1.0",
     "prettier": "3.2.4",
@@ -111,6 +112,7 @@
   "peerDependencies": {
     "@types/react": "^17.0.2 || ^18.0.0",
     "@types/react-dom": "^17.0.2 || ^18.0.0",
+    "formik": "^2.4.5",
     "react": "^17.0.2 || ^18.0.0",
     "react-dom": "^17.0.2 || ^18.0.0",
     "vanilla-framework": "^3.15.1 || ^4.0.0"

src/components/FormikField/FormikField.stories.tsx

@@ -0,0 +1,75 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+
+import FormikField from "./FormikField";
+import Select from "../Select";
+import { Formik } from "formik";
+
+const meta: Meta<typeof FormikField> = {
+  title: "FormikField",
+  component: FormikField,
+  tags: ["autodocs"],
+};
+
+export default meta;
+
+type Story = StoryObj<typeof FormikField>;
+
+export const Default: Story = {
+  render: () => (
+    <Formik initialValues={{ username: "" }} onSubmit={() => {}}>
+      <FormikField name="username" label="Username" type="text" />
+    </Formik>
+  ),
+};
+
+export const Fields: Story = {
+  parameters: {
+    docs: {
+      description: {
+        story: `
+Any React Components input can be provided to FormikField (e.g. Input, Textarea or Select) or you may provide a custom component.
+
+Any additional props that need to be passed can be given to FormikField.
+        `,
+      },
+    },
+  },
+  render: () => (
+    <Formik initialValues={{ release: "" }} onSubmit={() => {}}>
+      <FormikField
+        component={Select}
+        name="release"
+        label="Release"
+        options={[
+          { value: "", disabled: true, label: "Select an option" },
+          { value: "1", label: "Cosmic Cuttlefish" },
+          { value: "2", label: "Bionic Beaver" },
+          { value: "3", label: "Xenial Xerus" },
+        ]}
+      />
+    </Formik>
+  ),
+};
+
+export const Errors: Story = {
+  parameters: {
+    docs: {
+      description: {
+        story: `
+Formik parameters are passed to the field using Formik's \`useField\`. This means that validation and errors, state handlers etc. should all just work.
+        `,
+      },
+    },
+  },
+  render: () => (
+    <Formik
+      initialErrors={{ username: "This username has already been taken." }}
+      initialTouched={{ username: true }}
+      initialValues={{ username: "" }}
+      onSubmit={() => {}}
+    >
+      <FormikField name="username" label="Username" type="text" />
+    </Formik>
+  ),
+};

src/components/FormikField/FormikField.test.tsx

@@ -0,0 +1,51 @@
+import React from "react";
+import { render, screen } from "@testing-library/react";
+import { Formik } from "formik";
+
+import FormikField from "./FormikField";
+
+describe("FormikField", () => {
+  it("can set a different component", () => {
+    const Component = () => <select />;
+    render(
+      <Formik initialValues={{}} onSubmit={jest.fn()}>
+        <FormikField component={Component} name="username" />
+      </Formik>
+    );
+
+    expect(screen.getByRole("combobox")).toBeInTheDocument();
+    expect(screen.queryByRole("textbox")).not.toBeInTheDocument();
+  });
+
+  it("can pass errors", () => {
+    render(
+      <Formik
+        initialErrors={{ username: "Uh oh!" }}
+        initialTouched={{ username: true }}
+        initialValues={{ username: "" }}
+        onSubmit={jest.fn()}
+      >
+        <FormikField name="username" />
+      </Formik>
+    );
+
+    expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage(
+      "Error: Uh oh!"
+    );
+  });
+
+  it("can hide the errors", () => {
+    render(
+      <Formik
+        initialErrors={{ username: "Uh oh!" }}
+        initialTouched={{ username: true }}
+        initialValues={{ username: "" }}
+        onSubmit={jest.fn()}
+      >
+        <FormikField displayError={false} name="username" />
+      </Formik>
+    );
+
+    expect(screen.getByRole("textbox")).not.toHaveAccessibleErrorMessage();
+  });
+});

src/components/FormikField/FormikField.tsx

@@ -0,0 +1,53 @@
+import React from "react";
+import { useField } from "formik";
+import {
+  type ComponentProps,
+  type ComponentType,
+  type ElementType,
+  type HTMLProps,
+} from "react";
+import Input from "components/Input";
+
+export type Props<C extends ElementType | ComponentType = typeof Input> = {
+  /**
+   * The component to display. Defaults to `Input`.
+   */
+  component?: C;
+  /**
+   * This can be used to hide errors returned by Formik.
+   */
+  displayError?: boolean;
+  /**
+   * The name of the field as given to Formik.
+   */
+  name: string;
+  value?: HTMLProps<HTMLElement>["value"];
+} & ComponentProps<C>;
+
+/**
+ * This component makes it easier to use Vanilla form inputs with Formik. It
+ * makes use of Formik's context to automatically map errors, values, states
+ * etc. onto the provided field.
+ */
+const FormikField = <C extends ElementType | ComponentType = typeof Input>({
+  component: Component = Input,
+  displayError = true,
+  name,
+  value,
+  label,
+  ...props
+}: Props<C>): JSX.Element => {
+  const [field, meta] = useField({ name, type: props.type, value });
+
+  return (
+    <Component
+      aria-label={label}
+      error={meta.touched && displayError ? meta.error : null}
+      label={label}
+      {...field}
+      {...props}
+    />
+  );
+};
+
+export default FormikField;

src/components/FormikField/index.ts

@@ -0,0 +1 @@
+export { default, type Props as FormikFieldProps } from "./FormikField";

src/components/Input/Input.test.tsx

@@ -10,6 +10,12 @@ describe("Input", () => {
     expect(screen.getByRole("textbox")).toHaveAccessibleName("text label");
   });
 
+  it("can display JSX labels for text inputs", () => {
+    render(<Input type="text" label={<>text label</>} />);
+    expect(screen.getByText("text label")).toHaveClass("p-form__label");
+    expect(screen.getByRole("textbox")).toHaveAccessibleName("text label");
+  });
+
   it("moves the label for radio buttons", () => {
     render(<Input type="radio" label="text label" />);
     expect(

src/components/Input/Input.tsx

@@ -107,7 +107,6 @@ const Input = ({
     "aria-errormessage": hasError ? validationId : null,
     "aria-invalid": hasError,
     id: inputId,
-    label: label,
     required: required,
     ...inputProps,
   };

src/components/TablePagination/TablePaginationControls/__snapshots__/TablePaginationControls.test.tsx.snap

@@ -26,7 +26,6 @@ exports[`<TablePaginationControls /> renders table pagination controls and match
   aria-invalid="false"
   class="p-form-validation__input u-no-margin--bottom pagination-input"
   id="paginationPageInput"
-  label="Page number"
   type="number"
   value="0"
 />

src/components/TablePagination/__snapshots__/TablePagination.test.tsx.snap

@@ -36,7 +36,6 @@ exports[`<TablePagination /> renders table pagination and matches the snapshot 1
         aria-invalid="false"
         class="p-form-validation__input u-no-margin--bottom pagination-input"
         id="paginationPageInput"
-        label="Page number"
         type="number"
         value="1"
       />

src/index.ts

@@ -18,6 +18,7 @@ export { default as ContextualMenu } from "./components/ContextualMenu";
 export { default as EmptyState } from "./components/EmptyState";
 export { default as Field } from "./components/Field";
 export { default as Form } from "./components/Form";
+export { default as FormikField } from "./components/FormikField";
 export { default as Icon, ICONS } from "./components/Icon";
 export { default as Input } from "./components/Input";
 export { default as Label } from "./components/Label";
@@ -93,6 +94,7 @@ export type {
 export type { EmptyStateProps } from "./components/EmptyState";
 export type { FieldProps } from "./components/Field";
 export type { FormProps } from "./components/Form";
+export type { FormikFieldProps } from "./components/FormikField";
 export type { IconProps } from "./components/Icon";
 export type { InputProps } from "./components/Input";
 export type { LabelProps } from "./components/Label";