From 54f14fedfe767b946fbd0af7fb5ec9fe9034c8b4 Mon Sep 17 00:00:00 2001
From: Lee Chase <lee.chase@uk.ibm.com>
Date: Wed, 25 Nov 2020 18:11:33 +0000
Subject: [PATCH 1/2] fix: docgen optional chaining issue tagset

---
 .../src/components/ModifiedTabs/ModifiedTabs.js           | 3 ++-
 packages/experimental/src/components/TagSet/TagSet.js     | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js b/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
index 44b4d75cf9..e1d2d191f7 100644
--- a/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
+++ b/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
@@ -23,7 +23,8 @@ export const ModifiedTabs = ({
       onNewTab();
       setTimeout(() => {
         // set focus to the new tab
-        tabsRef.current.getTabAt(tabs.length)?.tabAnchor?.focus();
+        const tab = tabsRef.current.getTabAt(tabs.length);
+        tab.tabAnchor.focus();
       });
     }
   };
diff --git a/packages/experimental/src/components/TagSet/TagSet.js b/packages/experimental/src/components/TagSet/TagSet.js
index 1ab0b53e5c..dae85a9164 100644
--- a/packages/experimental/src/components/TagSet/TagSet.js
+++ b/packages/experimental/src/components/TagSet/TagSet.js
@@ -91,7 +91,9 @@ export const TagSet = ({
     if (showAllModalOpen) {
       const newFilteredAllTags = [];
       children.forEach((child) => {
-        const dataSearch = child.props['data-search']?.toLocaleLowerCase();
+        const dataSearch = (
+          child.props['data-search'] || ''
+        ).toLocaleLowerCase();
         const contentsAsString = child.props.children
           .toString()
           .toLocaleLowerCase();
@@ -179,7 +181,9 @@ export const TagSet = ({
   };
 
   const handleClickOutsideCheck = (ev) => {
-    const tooltipEl = overflowTagContent.current?.parentElement?.parentElement;
+    const tooltipEl =
+      overflowTagContent.current &&
+      overflowTagContent.current.parentElement.parentElement;
     if (
       tooltipEl !== undefined &&
       (tooltipEl === ev.target || tooltipEl.contains(ev.target))

From b8cc36b85e901486c800d83c21df3aa7eb97fbff Mon Sep 17 00:00:00 2001
From: Lee Chase <lee.chase@uk.ibm.com>
Date: Thu, 26 Nov 2020 09:00:03 +0000
Subject: [PATCH 2/2] fix: test errors

---
 .../experimental/src/components/ModifiedTabs/ModifiedTabs.js  | 4 +++-
 packages/experimental/src/components/TagSet/TagSet.js         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js b/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
index e1d2d191f7..ab0bf16345 100644
--- a/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
+++ b/packages/experimental/src/components/ModifiedTabs/ModifiedTabs.js
@@ -24,7 +24,9 @@ export const ModifiedTabs = ({
       setTimeout(() => {
         // set focus to the new tab
         const tab = tabsRef.current.getTabAt(tabs.length);
-        tab.tabAnchor.focus();
+        if (tab & tab.tabAnchor) {
+          tab.tabAnchor.focus();
+        }
       });
     }
   };
diff --git a/packages/experimental/src/components/TagSet/TagSet.js b/packages/experimental/src/components/TagSet/TagSet.js
index dae85a9164..3d882646d9 100644
--- a/packages/experimental/src/components/TagSet/TagSet.js
+++ b/packages/experimental/src/components/TagSet/TagSet.js
@@ -185,7 +185,7 @@ export const TagSet = ({
       overflowTagContent.current &&
       overflowTagContent.current.parentElement.parentElement;
     if (
-      tooltipEl !== undefined &&
+      tooltipEl &&
       (tooltipEl === ev.target || tooltipEl.contains(ev.target))
     ) {
       // inside click