From bc3b8344bfa6895ef10cfc42377ce6715e969fe1 Mon Sep 17 00:00:00 2001
From: Hadas Farhi <hadasfa@monday.com>
Date: Wed, 13 Apr 2022 17:38:55 +0300
Subject: [PATCH 1/4] fix function sign

---
 src/components/Combobox/Combobox.jsx               |  7 ++++++-
 .../components/ComboboxItems/ComboboxItems.jsx     |  7 +++++--
 .../components/ComboboxOption/ComboboxOption.jsx   | 14 +++++++++++---
 .../ComboboxRenderers/ComboboxRenderers.jsx        |  4 +++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/Combobox/Combobox.jsx b/src/components/Combobox/Combobox.jsx
index d221eecabd..8a5401824e 100644
--- a/src/components/Combobox/Combobox.jsx
+++ b/src/components/Combobox/Combobox.jsx
@@ -46,7 +46,11 @@ const Combobox = forwardRef(
       optionRenderer,
       renderOnlyVisibleOptions,
       clearFilterOnSelection,
-      maxOptionsWithoutScroll
+      maxOptionsWithoutScroll,
+      /**
+       * temporary flag for investigate a bug - will remove very soon
+       */
+      forceUndoScrollNullCheck = false
     },
     ref
   ) => {
@@ -195,6 +199,7 @@ const Combobox = forwardRef(
           />
           {stickyCategories && <StickyCategoryHeader label={activeCategoryLabel} />}
           <ComboboxItems
+            forceUndoScrollNullCheck={forceUndoScrollNullCheck}
             categories={categories}
             options={filteredOptions}
             filterValue={filterValue}
diff --git a/src/components/Combobox/components/ComboboxItems/ComboboxItems.jsx b/src/components/Combobox/components/ComboboxItems/ComboboxItems.jsx
index 53439fe8c7..70e0db0573 100644
--- a/src/components/Combobox/components/ComboboxItems/ComboboxItems.jsx
+++ b/src/components/Combobox/components/ComboboxItems/ComboboxItems.jsx
@@ -27,7 +27,8 @@ export const ComboboxItems = ({
   shouldScrollToSelectedItem,
   renderOnlyVisibleOptions,
   onActiveCategoryChanged,
-  maxOptionsWithoutScroll
+  maxOptionsWithoutScroll,
+  forceUndoScrollNullCheck
 }) => {
   const activeCategoryId = useRef();
 
@@ -56,7 +57,8 @@ export const ComboboxItems = ({
           optionRenderer,
           isActiveByKeyboard,
           activeItemIndex,
-          shouldScrollToSelectedItem
+          shouldScrollToSelectedItem,
+          forceUndoScrollNullCheck
         },
         isVirtualized: renderOnlyVisibleOptions
       }),
@@ -69,6 +71,7 @@ export const ComboboxItems = ({
       isActiveByKeyboard,
       activeItemIndex,
       shouldScrollToSelectedItem,
+      forceUndoScrollNullCheck,
       renderOnlyVisibleOptions
     ]
   );
diff --git a/src/components/Combobox/components/ComboboxOption/ComboboxOption.jsx b/src/components/Combobox/components/ComboboxOption/ComboboxOption.jsx
index 3eb912d725..f06cf7a7fb 100644
--- a/src/components/Combobox/components/ComboboxOption/ComboboxOption.jsx
+++ b/src/components/Combobox/components/ComboboxOption/ComboboxOption.jsx
@@ -29,7 +29,11 @@ const ComboboxOption = ({
     disabled,
     selected,
     ariaLabel,
-    belongToCategory = false
+    belongToCategory = false,
+    /**
+     * temporary flag for investigate a bug - will remove very soon
+     */
+    forceUndoScrollNullCheck = false
   } = option;
   let { tooltipContent } = option;
 
@@ -41,9 +45,13 @@ const ComboboxOption = ({
   useEffect(() => {
     const element = ref.current;
     if (isActive && element && shouldScrollWhenActive) {
-      element.scrollIntoView?.({ behaviour: "smooth" });
+      if (forceUndoScrollNullCheck) {
+        element?.scrollIntoView({ behaviour: "smooth" });
+      } else {
+        element.scrollIntoView?.({ behaviour: "smooth" });
+      }
     }
-  }, [ref, isActive, shouldScrollWhenActive]);
+  }, [ref, isActive, shouldScrollWhenActive, forceUndoScrollNullCheck]);
 
   const renderIcon = (icon, iconType, className) => {
     if (iconType === ComboboxOption.iconTypes.RENDERER) {
diff --git a/src/components/Combobox/components/ComboboxRenderers/ComboboxRenderers.jsx b/src/components/Combobox/components/ComboboxRenderers/ComboboxRenderers.jsx
index 98589e2bc6..bceaa2ab8f 100644
--- a/src/components/Combobox/components/ComboboxRenderers/ComboboxRenderers.jsx
+++ b/src/components/Combobox/components/ComboboxRenderers/ComboboxRenderers.jsx
@@ -114,7 +114,8 @@ export function optionItemRenderer({
   shouldScrollToSelectedItem,
   activeItemIndex,
   belongToCategory,
-  isActiveByKeyboard
+  isActiveByKeyboard,
+  forceUndoScrollNullCheck
 }) {
   return (
     <ComboboxOption
@@ -130,6 +131,7 @@ export function optionItemRenderer({
       optionLineHeight={optionLineHeight}
       belongToCategory={belongToCategory}
       shouldScrollWhenActive={shouldScrollToSelectedItem}
+      forceUndoScrollNullCheck={forceUndoScrollNullCheck}
     />
   );
 }

From d508128c35e4d5fa38c263bffb27fa0ab4d0db06 Mon Sep 17 00:00:00 2001
From: Hadas Farhi <hadasfa@monday.com>
Date: Wed, 13 Apr 2022 17:44:59 +0300
Subject: [PATCH 2/4] add flag to check wierd behviuor

---
 .../Combobox/__stories__/combobox.stories.mdx        |  1 +
 .../components/ComboboxOption/ComboboxOption.jsx     | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/Combobox/__stories__/combobox.stories.mdx b/src/components/Combobox/__stories__/combobox.stories.mdx
index 0ac583f340..3f9a8aa9bf 100644
--- a/src/components/Combobox/__stories__/combobox.stories.mdx
+++ b/src/components/Combobox/__stories__/combobox.stories.mdx
@@ -384,6 +384,7 @@ better user experience.
                 <Combobox
                   options={options}
                   renderOnlyVisibleOptions
+                  forceUndoScrollNullCheck
                   placeholder="Placeholder text here"
                   maxOptionsWithoutScroll={3}
                 />
diff --git a/src/components/Combobox/components/ComboboxOption/ComboboxOption.jsx b/src/components/Combobox/components/ComboboxOption/ComboboxOption.jsx
index f06cf7a7fb..ecbd838870 100644
--- a/src/components/Combobox/components/ComboboxOption/ComboboxOption.jsx
+++ b/src/components/Combobox/components/ComboboxOption/ComboboxOption.jsx
@@ -16,7 +16,11 @@ const ComboboxOption = ({
   onOptionHover,
   optionLineHeight,
   shouldScrollWhenActive,
-  optionRenderer
+  optionRenderer,
+  /**
+   * temporary flag for investigate a bug - will remove very soon
+   */
+  forceUndoScrollNullCheck = false
 }) => {
   const {
     id,
@@ -29,11 +33,7 @@ const ComboboxOption = ({
     disabled,
     selected,
     ariaLabel,
-    belongToCategory = false,
-    /**
-     * temporary flag for investigate a bug - will remove very soon
-     */
-    forceUndoScrollNullCheck = false
+    belongToCategory = false
   } = option;
   let { tooltipContent } = option;
 

From e4a4345e1b9da90cc7b8ef19fdacd5f96f54d90f Mon Sep 17 00:00:00 2001
From: Hadas Farhi <hadasfa@monday.com>
Date: Sun, 17 Apr 2022 15:19:02 +0300
Subject: [PATCH 3/4] fix snapshot

---
 .../__snapshots__/breadcrumbItem-snapshot-tests.jest.js.snap    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BreadcrumbsBar/BreadcrumbItem/__tests__/__snapshots__/breadcrumbItem-snapshot-tests.jest.js.snap b/src/components/BreadcrumbsBar/BreadcrumbItem/__tests__/__snapshots__/breadcrumbItem-snapshot-tests.jest.js.snap
index 35ffc7cbc3..30aab773a9 100644
--- a/src/components/BreadcrumbsBar/BreadcrumbItem/__tests__/__snapshots__/breadcrumbItem-snapshot-tests.jest.js.snap
+++ b/src/components/BreadcrumbsBar/BreadcrumbItem/__tests__/__snapshots__/breadcrumbItem-snapshot-tests.jest.js.snap
@@ -12,7 +12,7 @@ exports[`BreadcrumbsItem renders correctly  when disabled item 1`] = `
       <span
         aria-disabled="true"
         className="breadcrumb-content disabled"
-        tabIndex="0"
+        tabIndex="-1"
       >
         <span
           className="breadcrumb-text"

From bac2a5290b065156d82d3f33d204c618cf28cf96 Mon Sep 17 00:00:00 2001
From: Hadas Farhi <hadasfa@monday.com>
Date: Sun, 17 Apr 2022 15:20:46 +0300
Subject: [PATCH 4/4] fix story

---
 src/components/Combobox/__stories__/combobox.stories.mdx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Combobox/__stories__/combobox.stories.mdx b/src/components/Combobox/__stories__/combobox.stories.mdx
index 3f9a8aa9bf..0ac583f340 100644
--- a/src/components/Combobox/__stories__/combobox.stories.mdx
+++ b/src/components/Combobox/__stories__/combobox.stories.mdx
@@ -384,7 +384,6 @@ better user experience.
                 <Combobox
                   options={options}
                   renderOnlyVisibleOptions
-                  forceUndoScrollNullCheck
                   placeholder="Placeholder text here"
                   maxOptionsWithoutScroll={3}
                 />