From 5d7c0f7ebc5ff6728b92143e3512c1ed29beb317 Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Wed, 10 Apr 2024 13:16:19 +0300
Subject: [PATCH 01/10] feat: add autoFocus to docgen

---
 .../playground/react-docgen-output.json               | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/core/src/storybook/stand-alone-documentaion/playground/react-docgen-output.json b/packages/core/src/storybook/stand-alone-documentaion/playground/react-docgen-output.json
index cf93f99156..61bd5735fd 100644
--- a/packages/core/src/storybook/stand-alone-documentaion/playground/react-docgen-output.json
+++ b/packages/core/src/storybook/stand-alone-documentaion/playground/react-docgen-output.json
@@ -12104,6 +12104,17 @@
             "computed": false
           }
         },
+        "autoFocus": {
+          "required": false,
+          "tsType": {
+            "name": "boolean"
+          },
+          "description": "autoFocus when component mount",
+          "defaultValue": {
+            "value": "false",
+            "computed": false
+          }
+        },
         "disabled": {
           "required": false,
           "tsType": {

From dc6d90df821f490f3fa644eb0256ac9d79ae729d Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Wed, 10 Apr 2024 13:17:55 +0300
Subject: [PATCH 02/10] feat: ensure autoFocus works on RadioButton

---
 .../radioButton-snapshot-tests.jest.tsx.snap       |  9 +++++++++
 .../__tests__/radioButton-tests.jest.tsx           | 14 +++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/components/RadioButton/__tests__/__snapshots__/radioButton-snapshot-tests.jest.tsx.snap b/packages/core/src/components/RadioButton/__tests__/__snapshots__/radioButton-snapshot-tests.jest.tsx.snap
index 44d8af9e62..dffcc7bee5 100644
--- a/packages/core/src/components/RadioButton/__tests__/__snapshots__/radioButton-snapshot-tests.jest.tsx.snap
+++ b/packages/core/src/components/RadioButton/__tests__/__snapshots__/radioButton-snapshot-tests.jest.tsx.snap
@@ -35,6 +35,7 @@ exports[`RadioButton renders correctly when checked 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       checked={true}
       className="input"
       disabled={false}
@@ -60,6 +61,7 @@ exports[`RadioButton renders correctly when default checked 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       className="input"
       defaultChecked={true}
       disabled={false}
@@ -85,6 +87,7 @@ exports[`RadioButton renders correctly when disabled 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={true}
@@ -110,6 +113,7 @@ exports[`RadioButton renders correctly when unchecked 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       checked={false}
       className="input"
       disabled={false}
@@ -135,6 +139,7 @@ exports[`RadioButton renders correctly with componentClassName 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
@@ -160,6 +165,7 @@ exports[`RadioButton renders correctly with empty props 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
@@ -185,6 +191,7 @@ exports[`RadioButton renders correctly with name 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
@@ -210,6 +217,7 @@ exports[`RadioButton renders correctly with text 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
@@ -240,6 +248,7 @@ exports[`RadioButton renders correctly with value 1`] = `
     className="inputContainer"
   >
     <input
+      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
diff --git a/packages/core/src/components/RadioButton/__tests__/radioButton-tests.jest.tsx b/packages/core/src/components/RadioButton/__tests__/radioButton-tests.jest.tsx
index baf6a3f509..121ce997ac 100644
--- a/packages/core/src/components/RadioButton/__tests__/radioButton-tests.jest.tsx
+++ b/packages/core/src/components/RadioButton/__tests__/radioButton-tests.jest.tsx
@@ -6,17 +6,17 @@ describe("RadioButton tests", () => {
   const formName = "myForm";
   const radiosName = "radios";
 
-  const option1Value = "1";
-  const option1Text = "Option 1";
-  const option2Value = "2";
-  const option2Text = "Option 2";
-  const option3Value = "3";
-  const option3Text = "Option 3";
-
   let onChangeMock1: jest.Mock;
   let onChangeMock2: jest.Mock;
   let onChangeMock3: jest.Mock;
 
+  const option1Text = "Option 1";
+  const option1Value = "1";
+  const option2Text = "Option 2";
+  const option2Value = "2";
+  const option3Text = "Option 3";
+  const option3Value = "3";
+
   describe("With one of the radio buttons is checked by default", () => {
     beforeEach(() => {
       onChangeMock1 = jest.fn();

From 594a606930f7e27e11b275e8983408ed2bc5d802 Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Wed, 10 Apr 2024 21:07:36 +0300
Subject: [PATCH 03/10] feat: add autoFocus to Checkbox

---
 packages/core/src/components/Checkbox/Checkbox.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/core/src/components/Checkbox/Checkbox.tsx b/packages/core/src/components/Checkbox/Checkbox.tsx
index b1954d63ac..9836f9bc6e 100644
--- a/packages/core/src/components/Checkbox/Checkbox.tsx
+++ b/packages/core/src/components/Checkbox/Checkbox.tsx
@@ -36,6 +36,8 @@ export interface CheckBoxProps extends VibeComponentProps {
   checked?: boolean;
   /** An in between state to display a non selected */
   indeterminate?: boolean;
+  /** is autoFocus */
+  autoFocus?: boolean;
   /** Set the option to be disabled */
   disabled?: boolean;
   /** the default value which the checkbox will start from  */
@@ -63,6 +65,7 @@ const Checkbox: VibeComponent<CheckBoxProps, HTMLInputElement> = forwardRef(
       ariaLabelledBy,
       onChange = NOOP,
       checked,
+      autoFocus,
       indeterminate = false,
       disabled = false,
       defaultChecked,
@@ -127,6 +130,7 @@ const Checkbox: VibeComponent<CheckBoxProps, HTMLInputElement> = forwardRef(
           value={value}
           name={name}
           type="checkbox"
+          autoFocus={autoFocus}
           onChange={onChange}
           defaultChecked={overrideDefaultChecked}
           disabled={disabled}

From b43fc1bd49329ad7be0131af1d5896c3e794c884 Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Wed, 10 Apr 2024 21:11:14 +0300
Subject: [PATCH 04/10] test: make sure Checkbox can be autoFocused

---
 .../checkbox-snapshot-tests.jest.tsx.snap     |  47 ++++++++
 .../checkbox-snapshot-tests.jest.tsx          |   5 +
 .../__tests__/checkbox-tests.jest.tsx         | 102 ++++++++++++++----
 3 files changed, 132 insertions(+), 22 deletions(-)

diff --git a/packages/core/src/components/Checkbox/__tests__/__snapshots__/checkbox-snapshot-tests.jest.tsx.snap b/packages/core/src/components/Checkbox/__tests__/__snapshots__/checkbox-snapshot-tests.jest.tsx.snap
index c3d6b4bd7f..49a900db2a 100644
--- a/packages/core/src/components/Checkbox/__tests__/__snapshots__/checkbox-snapshot-tests.jest.tsx.snap
+++ b/packages/core/src/components/Checkbox/__tests__/__snapshots__/checkbox-snapshot-tests.jest.tsx.snap
@@ -1,5 +1,52 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Checkbox renders correctly when autoFocus 1`] = `
+<label
+  className="wrapper"
+  data-testid="checkbox"
+  onClickCapture={[Function]}
+  onMouseUp={[Function]}
+>
+  <input
+    aria-label=""
+    autoFocus={true}
+    className="input"
+    defaultChecked={false}
+    disabled={false}
+    name=""
+    onChange={[Function]}
+    type="checkbox"
+    value=""
+  />
+  <div
+    className="checkbox"
+    data-testid="checkbox-checkbox"
+  >
+    <svg
+      aria-hidden={true}
+      className="icon icon noFocusStyle"
+      data-testid="icon"
+      fill="currentColor"
+      height="16"
+      onClick={[Function]}
+      viewBox="0 0 20 20"
+      width="16"
+    >
+      <path
+        clipRule="evenodd"
+        d="M8.53033 14.2478L8 13.7175L7.46967 14.2478C7.76256 14.5407 8.23744 14.5407 8.53033 14.2478ZM8 12.6569L4.53033 9.18718C4.23744 8.89429 3.76256 8.89429 3.46967 9.18718C3.17678 9.48008 3.17678 9.95495 3.46967 10.2478L7.46967 14.2478L8 13.7175L8.53033 14.2478L16.2478 6.53033C16.5407 6.23743 16.5407 5.76256 16.2478 5.46967C15.955 5.17677 15.4801 5.17677 15.1872 5.46967L8 12.6569Z"
+        fill="currentColor"
+        fillRule="evenodd"
+      />
+    </svg>
+  </div>
+  <span
+    className="typography primary start singleLineEllipsis text text2Normal label"
+    data-testid="checkbox-label"
+  />
+</label>
+`;
+
 exports[`Checkbox renders correctly when checked 1`] = `
 <label
   className="wrapper"
diff --git a/packages/core/src/components/Checkbox/__tests__/checkbox-snapshot-tests.jest.tsx b/packages/core/src/components/Checkbox/__tests__/checkbox-snapshot-tests.jest.tsx
index 855419df9b..b8277699aa 100644
--- a/packages/core/src/components/Checkbox/__tests__/checkbox-snapshot-tests.jest.tsx
+++ b/packages/core/src/components/Checkbox/__tests__/checkbox-snapshot-tests.jest.tsx
@@ -25,6 +25,11 @@ describe("Checkbox renders correctly", () => {
     expect(tree).toMatchSnapshot();
   });
 
+  it("when autoFocus", () => {
+    const tree = renderer.create(<Checkbox autoFocus />).toJSON();
+    expect(tree).toMatchSnapshot();
+  });
+
   it("with name", () => {
     const tree = renderer.create(<Checkbox name="checkbox" />).toJSON();
     expect(tree).toMatchSnapshot();
diff --git a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
index 1bab9d84e5..dcc34c9045 100644
--- a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
+++ b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
@@ -39,6 +39,8 @@ type RenderHelper = {
   option3Text: string;
   option3Value: string;
   onChangeMock3: jest.MockedFunction<MockedFunction>;
+  defaultChecked?: boolean;
+  autoFocusOption2?: boolean;
 };
 
 function renderCheckboxes({
@@ -54,7 +56,9 @@ function renderCheckboxes({
   checkbox3Name,
   option3Text,
   option3Value,
-  onChangeMock3
+  onChangeMock3,
+  defaultChecked,
+  autoFocusOption2
 }: RenderHelper) {
   render(
     <form name={formName}>
@@ -62,10 +66,16 @@ function renderCheckboxes({
         name={checkbox1Name}
         value={option1Value}
         label={option1Text}
-        defaultChecked={true}
+        defaultChecked={defaultChecked}
         onChange={onChangeMock1}
       />
-      <Checkbox name={checkbox2Name} value={option2Value} label={option2Text} onChange={onChangeMock2} />
+      <Checkbox
+        name={checkbox2Name}
+        value={option2Value}
+        label={option2Text}
+        onChange={onChangeMock2}
+        autoFocus={autoFocusOption2}
+      />
       <Checkbox name={checkbox3Name} value={option3Value} label={option3Text} onChange={onChangeMock3} />
     </form>
   );
@@ -87,23 +97,24 @@ function testUnselectFirstOption(
 }
 
 describe("Checkbox tests", () => {
-  describe("regular checkbox tests", () => {
-    const {
-      formName,
-      checkbox1Name,
-      option1Value,
-      option1Text,
-      checkbox2Name,
-      option2Value,
-      option2Text,
-      checkbox3Name,
-      option3Value,
-      option3Text
-    } = createCheckboxesVariables();
+  const {
+    formName,
+    checkbox1Name,
+    option1Value,
+    option1Text,
+    checkbox2Name,
+    option2Value,
+    option2Text,
+    checkbox3Name,
+    option3Value,
+    option3Text
+  } = createCheckboxesVariables();
 
-    let onChangeMock1: jest.MockedFunction<MockedFunction>,
-      onChangeMock2: jest.MockedFunction<MockedFunction>,
-      onChangeMock3: jest.MockedFunction<MockedFunction>;
+  let onChangeMock1: jest.MockedFunction<MockedFunction>,
+    onChangeMock2: jest.MockedFunction<MockedFunction>,
+    onChangeMock3: jest.MockedFunction<MockedFunction>;
+
+  describe("regular checkbox tests with default checked", () => {
     beforeEach(() => {
       onChangeMock1 = jest.fn();
       onChangeMock2 = jest.fn();
@@ -122,7 +133,8 @@ describe("Checkbox tests", () => {
         option1Value,
         checkbox1Name,
         checkbox2Name,
-        checkbox3Name
+        checkbox3Name,
+        defaultChecked: true
       });
     });
 
@@ -139,7 +151,7 @@ describe("Checkbox tests", () => {
       expect(option3.checked).toBeFalsy();
     });
 
-    it("should unselect  1st option", () => {
+    it("should unselect 1st option", () => {
       testUnselectFirstOption(option1Text, option2Text, option3Text);
     });
 
@@ -179,6 +191,51 @@ describe("Checkbox tests", () => {
       });
     });
   });
+
+  describe("regular checkbox tests with no default checked", () => {
+    it("should auto focus 2nd checkbox", () => {
+      renderCheckboxes({
+        formName,
+        onChangeMock1,
+        onChangeMock2,
+        onChangeMock3,
+        option3Text,
+        option3Value,
+        option2Text,
+        option2Value,
+        option1Text,
+        option1Value,
+        checkbox1Name,
+        checkbox2Name,
+        checkbox3Name,
+        autoFocusOption2: true
+      });
+
+      const option1 = screen.getByLabelText<HTMLInputElement>(option1Text);
+      const option2 = screen.getByLabelText<HTMLInputElement>(option2Text);
+      const option3 = screen.getByLabelText<HTMLInputElement>(option3Text);
+      expect(option1).not.toHaveFocus();
+      expect(option2).toHaveFocus();
+      expect(option3).not.toHaveFocus();
+    });
+  });
+
+  describe("a11y", () => {
+    it("should add the label", () => {
+      const ariaLabel = "Lable Name";
+      const { getByLabelText } = render(<Checkbox label={ariaLabel} />);
+      const checkboxComponent = getByLabelText(ariaLabel);
+      expect(checkboxComponent).toBeTruthy();
+    });
+
+    it("should be the same text", () => {
+      const ariaLabel = "Lable Name";
+      const { getByText } = render(<Checkbox label={ariaLabel} />);
+      const checkboxComponentText = getByText(ariaLabel);
+      expect(checkboxComponentText).toBeTruthy();
+    });
+  });
+
   describe("specific firefox checkbox tests", () => {
     const {
       formName,
@@ -230,7 +287,8 @@ describe("Checkbox tests", () => {
         option1Value,
         checkbox1Name,
         checkbox2Name,
-        checkbox3Name
+        checkbox3Name,
+        defaultChecked: true
       });
     });
 

From 54fd0d5936f453dee422c99ed7d164d74227153a Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Wed, 10 Apr 2024 21:13:17 +0300
Subject: [PATCH 05/10] test: make sure Checkbox can be autoFocused

---
 .../src/components/Checkbox/__tests__/checkbox-tests.jest.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
index dcc34c9045..310ef25654 100644
--- a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
+++ b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import "@testing-library/jest-dom";
 import { fireEvent, render, cleanup, screen } from "@testing-library/react";
 import Checkbox from "../Checkbox";
 

From ebccf66d80c01c8b276dc368b68e7d8f049e93ea Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Wed, 10 Apr 2024 21:15:48 +0300
Subject: [PATCH 06/10] test: re-run radiobutton snapshot

---
 .../radioButton-snapshot-tests.jest.tsx.snap             | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/core/src/components/RadioButton/__tests__/__snapshots__/radioButton-snapshot-tests.jest.tsx.snap b/packages/core/src/components/RadioButton/__tests__/__snapshots__/radioButton-snapshot-tests.jest.tsx.snap
index dffcc7bee5..44d8af9e62 100644
--- a/packages/core/src/components/RadioButton/__tests__/__snapshots__/radioButton-snapshot-tests.jest.tsx.snap
+++ b/packages/core/src/components/RadioButton/__tests__/__snapshots__/radioButton-snapshot-tests.jest.tsx.snap
@@ -35,7 +35,6 @@ exports[`RadioButton renders correctly when checked 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       checked={true}
       className="input"
       disabled={false}
@@ -61,7 +60,6 @@ exports[`RadioButton renders correctly when default checked 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       className="input"
       defaultChecked={true}
       disabled={false}
@@ -87,7 +85,6 @@ exports[`RadioButton renders correctly when disabled 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={true}
@@ -113,7 +110,6 @@ exports[`RadioButton renders correctly when unchecked 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       checked={false}
       className="input"
       disabled={false}
@@ -139,7 +135,6 @@ exports[`RadioButton renders correctly with componentClassName 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
@@ -165,7 +160,6 @@ exports[`RadioButton renders correctly with empty props 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
@@ -191,7 +185,6 @@ exports[`RadioButton renders correctly with name 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
@@ -217,7 +210,6 @@ exports[`RadioButton renders correctly with text 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}
@@ -248,7 +240,6 @@ exports[`RadioButton renders correctly with value 1`] = `
     className="inputContainer"
   >
     <input
-      autoFocus={false}
       className="input"
       defaultChecked={false}
       disabled={false}

From dbaa866a9481e84bac0d194f47b90e290e308697 Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Wed, 10 Apr 2024 21:19:20 +0300
Subject: [PATCH 07/10] fix: revert to origin/master

---
 .../__tests__/radioButton-tests.jest.tsx           | 14 +++++++-------
 .../playground/react-docgen-output.json            | 11 -----------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/packages/core/src/components/RadioButton/__tests__/radioButton-tests.jest.tsx b/packages/core/src/components/RadioButton/__tests__/radioButton-tests.jest.tsx
index 121ce997ac..baf6a3f509 100644
--- a/packages/core/src/components/RadioButton/__tests__/radioButton-tests.jest.tsx
+++ b/packages/core/src/components/RadioButton/__tests__/radioButton-tests.jest.tsx
@@ -6,16 +6,16 @@ describe("RadioButton tests", () => {
   const formName = "myForm";
   const radiosName = "radios";
 
-  let onChangeMock1: jest.Mock;
-  let onChangeMock2: jest.Mock;
-  let onChangeMock3: jest.Mock;
-
-  const option1Text = "Option 1";
   const option1Value = "1";
-  const option2Text = "Option 2";
+  const option1Text = "Option 1";
   const option2Value = "2";
-  const option3Text = "Option 3";
+  const option2Text = "Option 2";
   const option3Value = "3";
+  const option3Text = "Option 3";
+
+  let onChangeMock1: jest.Mock;
+  let onChangeMock2: jest.Mock;
+  let onChangeMock3: jest.Mock;
 
   describe("With one of the radio buttons is checked by default", () => {
     beforeEach(() => {
diff --git a/packages/core/src/storybook/stand-alone-documentaion/playground/react-docgen-output.json b/packages/core/src/storybook/stand-alone-documentaion/playground/react-docgen-output.json
index 61bd5735fd..cf93f99156 100644
--- a/packages/core/src/storybook/stand-alone-documentaion/playground/react-docgen-output.json
+++ b/packages/core/src/storybook/stand-alone-documentaion/playground/react-docgen-output.json
@@ -12104,17 +12104,6 @@
             "computed": false
           }
         },
-        "autoFocus": {
-          "required": false,
-          "tsType": {
-            "name": "boolean"
-          },
-          "description": "autoFocus when component mount",
-          "defaultValue": {
-            "value": "false",
-            "computed": false
-          }
-        },
         "disabled": {
           "required": false,
           "tsType": {

From 3990d7448e0a6b4bc8eebc244da6fb34de95c34c Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Thu, 11 Apr 2024 08:38:52 +0300
Subject: [PATCH 08/10] test: change optional var to autoFocus

---
 .../__tests__/checkbox-tests.jest.tsx         | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
index 310ef25654..6c533c8b62 100644
--- a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
+++ b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
@@ -41,7 +41,7 @@ type RenderHelper = {
   option3Value: string;
   onChangeMock3: jest.MockedFunction<MockedFunction>;
   defaultChecked?: boolean;
-  autoFocusOption2?: boolean;
+  autoFocus?: boolean;
 };
 
 function renderCheckboxes({
@@ -59,7 +59,7 @@ function renderCheckboxes({
   option3Value,
   onChangeMock3,
   defaultChecked,
-  autoFocusOption2
+  autoFocus
 }: RenderHelper) {
   render(
     <form name={formName}>
@@ -69,14 +69,9 @@ function renderCheckboxes({
         label={option1Text}
         defaultChecked={defaultChecked}
         onChange={onChangeMock1}
+        autoFocus={autoFocus}
       />
-      <Checkbox
-        name={checkbox2Name}
-        value={option2Value}
-        label={option2Text}
-        onChange={onChangeMock2}
-        autoFocus={autoFocusOption2}
-      />
+      <Checkbox name={checkbox2Name} value={option2Value} label={option2Text} onChange={onChangeMock2} />
       <Checkbox name={checkbox3Name} value={option3Value} label={option3Text} onChange={onChangeMock3} />
     </form>
   );
@@ -209,14 +204,14 @@ describe("Checkbox tests", () => {
         checkbox1Name,
         checkbox2Name,
         checkbox3Name,
-        autoFocusOption2: true
+        autoFocus: true
       });
 
       const option1 = screen.getByLabelText<HTMLInputElement>(option1Text);
       const option2 = screen.getByLabelText<HTMLInputElement>(option2Text);
       const option3 = screen.getByLabelText<HTMLInputElement>(option3Text);
-      expect(option1).not.toHaveFocus();
-      expect(option2).toHaveFocus();
+      expect(option1).toHaveFocus();
+      expect(option2).not.toHaveFocus();
       expect(option3).not.toHaveFocus();
     });
   });

From 1588d554b52cd78e7a9a8dfb342eeb3e711a156e Mon Sep 17 00:00:00 2001
From: Chen Saranga <chensar@monday.com>
Date: Thu, 11 Apr 2024 09:58:42 +0300
Subject: [PATCH 09/10] test: remove duplicates

---
 .../Checkbox/__tests__/checkbox-tests.jest.tsx   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
index 6c533c8b62..2f21fd22dc 100644
--- a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
+++ b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
@@ -216,22 +216,6 @@ describe("Checkbox tests", () => {
     });
   });
 
-  describe("a11y", () => {
-    it("should add the label", () => {
-      const ariaLabel = "Lable Name";
-      const { getByLabelText } = render(<Checkbox label={ariaLabel} />);
-      const checkboxComponent = getByLabelText(ariaLabel);
-      expect(checkboxComponent).toBeTruthy();
-    });
-
-    it("should be the same text", () => {
-      const ariaLabel = "Lable Name";
-      const { getByText } = render(<Checkbox label={ariaLabel} />);
-      const checkboxComponentText = getByText(ariaLabel);
-      expect(checkboxComponentText).toBeTruthy();
-    });
-  });
-
   describe("specific firefox checkbox tests", () => {
     const {
       formName,

From 313e042902c10667555315013a487418b9349110 Mon Sep 17 00:00:00 2001
From: chensara <chensara0@gmail.com>
Date: Thu, 11 Apr 2024 10:45:14 +0300
Subject: [PATCH 10/10] Update
 packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx

Co-authored-by: Yossi Saadi <yossisaadi@gmail.com>
---
 .../src/components/Checkbox/__tests__/checkbox-tests.jest.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
index 2f21fd22dc..fe562b49ca 100644
--- a/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
+++ b/packages/core/src/components/Checkbox/__tests__/checkbox-tests.jest.tsx
@@ -189,7 +189,7 @@ describe("Checkbox tests", () => {
   });
 
   describe("regular checkbox tests with no default checked", () => {
-    it("should auto focus 2nd checkbox", () => {
+    it("should auto focus 1st checkbox", () => {
       renderCheckboxes({
         formName,
         onChangeMock1,