From ccdf147c6a7719769a7e36d3e3c7c15d4c5a37c4 Mon Sep 17 00:00:00 2001
From: Vadym Shchekotilin <86330150+vashjs@users.noreply.github.com>
Date: Wed, 23 Oct 2024 09:20:00 +0200
Subject: [PATCH] STCOM-1341Change Repeatable fields component's focus
 behaviour (#2371)

---
 CHANGELOG.md                                  |  1 +
 lib/RepeatableField/RepeatableField.js        | 12 ++++++--
 lib/RepeatableField/RepeatableFieldContent.js |  7 ++---
 .../hooks/useIsElementFocused.js              | 30 +++++++++++++++++++
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 lib/RepeatableField/hooks/useIsElementFocused.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ced1665b..36caaff1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 * Export `<StripesOverlayWrapper>` that will automatically apply the `usePortal` behavior to nested overlay components. Refs STCOM-1353.
 * Properly pass `readOnly` prop to `<RadioButton>`'s internally rendered `<Label>`. Refs STCOM-1367.
 * `TextArea` - move focus to the field after clearing the field by clicking on the `x` icon. Refs STCOM-1369.
+* Change `Repeatable field` focus behaviour. Refs STCOM-1341.
 
 ## [12.1.0](https://github.com/folio-org/stripes-components/tree/v12.1.0) (2024-03-12)
 [Full Changelog](https://github.com/folio-org/stripes-components/compare/v12.0.0...v12.1.0)
diff --git a/lib/RepeatableField/RepeatableField.js b/lib/RepeatableField/RepeatableField.js
index 5b340812d..c3ace1b0b 100644
--- a/lib/RepeatableField/RepeatableField.js
+++ b/lib/RepeatableField/RepeatableField.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
@@ -11,6 +11,7 @@ import IconButton from '../IconButton';
 import { RepeatableFieldContent } from "./RepeatableFieldContent";
 import css from './RepeatableField.css';
 import { useFocusedIndex } from "./hooks/useFocusedIndex";
+import { useIsElementFocused } from "./hooks/useIsElementFocused";
 
 
 const RepeatableField = ({
@@ -29,12 +30,16 @@ const RepeatableField = ({
   onRemove,
   renderField,
 }) => {
+  const rootRef = useRef(null);
   const showDeleteBtn = typeof onRemove === 'function';
   const fieldsLength = fields.length;
+  const isSomeChildElementFocused = useIsElementFocused(rootRef);
   const focusedIndex = useFocusedIndex(fieldsLength);
+  const hasToBeFocused = (index) => isSomeChildElementFocused && focusedIndex === index;
 
   return (
     <fieldset
+      ref={rootRef}
       id={id}
       data-test-repeatable-field
       className={classnames(css.repeatableField, { [css.hasMargin]: hasMargin }, className)}
@@ -78,7 +83,10 @@ const RepeatableField = ({
               key={getFieldUniqueKey(field, index, fields)}
               data-test-repeatable-field-list-item
             >
-              <RepeatableFieldContent isFocused={focusedIndex === index} >
+              <RepeatableFieldContent
+                rootRef={rootRef}
+                isFocused={hasToBeFocused(index)}
+              >
                 {renderField(field, index, fields)}
               </RepeatableFieldContent>
               {
diff --git a/lib/RepeatableField/RepeatableFieldContent.js b/lib/RepeatableField/RepeatableFieldContent.js
index 1cdf00a2c..854cdb341 100644
--- a/lib/RepeatableField/RepeatableFieldContent.js
+++ b/lib/RepeatableField/RepeatableFieldContent.js
@@ -6,13 +6,12 @@ import { getFirstFocusable } from "../../util/getFocusableElements";
 import css from "./RepeatableField.css";
 
 export const RepeatableFieldContent = ({ children, isFocused }) => {
+
   const callbackRef = useCallback((node) => {
-    if (node) {
+    if (node && isFocused) {
       const elem = getFirstFocusable(node, true, true);
 
-      if (isFocused) {
-        elem?.focus();
-      }
+      elem?.focus();
     }
   }, [isFocused])
 
diff --git a/lib/RepeatableField/hooks/useIsElementFocused.js b/lib/RepeatableField/hooks/useIsElementFocused.js
new file mode 100644
index 000000000..0944bbe0f
--- /dev/null
+++ b/lib/RepeatableField/hooks/useIsElementFocused.js
@@ -0,0 +1,30 @@
+import { useEffect, useState } from "react";
+
+export const useIsElementFocused = (ref) => {
+  const [isFocused, setIsFocused] = useState(false);
+
+  useEffect(() => {
+    const checkIfFocused = () => {
+      if (ref.current) {
+        const focusedElement = document.activeElement;
+        if (ref.current.contains(focusedElement)) {
+          setIsFocused(true);
+        } else {
+          setIsFocused(false);
+        }
+      }
+    };
+
+    window.addEventListener("focusin", checkIfFocused);
+    window.addEventListener("focusout", checkIfFocused);
+
+    checkIfFocused();
+
+    return () => {
+      window.removeEventListener("focusin", checkIfFocused);
+      window.removeEventListener("focusout", checkIfFocused);
+    };
+  }, [ref]);
+
+  return isFocused;
+};