kelt-ui-kit-react 1.9.5 → 1.9.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kelt-ui-kit-react",
   "type": "module",
-  "version": "1.9.5",
+  "version": "1.9.6",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/expands/expand/expand.tsx

@@ -67,10 +67,16 @@ export const Expand = ({
 
   useEffect(() => {
     if (active) {
-      const timer = setTimeout(() => {
+      const timer1 = setTimeout(() => {
         scrollToHeader();
       }, 100);
-      return () => clearTimeout(timer);
+      const timer2 = setTimeout(() => {
+        scrollToHeader();
+      }, 350);
+      return () => {
+        clearTimeout(timer1);
+        clearTimeout(timer2);
+      };
     }
   }, [active, scrollToHeader]);
 
@@ -86,47 +92,43 @@ export const Expand = ({
         const expandElement = expandRef.current;
         if (!expandElement) return;
 
-        let scrollParent: HTMLElement | null = expandElement.parentElement;
-        while (scrollParent) {
-          const style = window.getComputedStyle(scrollParent);
-          const isScrollable =
-            /(auto|scroll)/.test(style.overflow + style.overflowY) &&
-            scrollParent.scrollHeight > scrollParent.clientHeight;
-
-          if (isScrollable) {
-            const parentRect = scrollParent.getBoundingClientRect();
-            const targetRect = target.getBoundingClientRect();
-
-            // 1. Si l'input est déjà visible dans le conteneur, on ne scrolle pas
-            const isVisible =
-              targetRect.top >= parentRect.top &&
-              targetRect.bottom <= parentRect.bottom;
-
-            if (isVisible) {
-              return;
-            }
-
-            const headerRect = expandElement.getBoundingClientRect();
-            const headerOffsetTop =
-              headerRect.top - parentRect.top + scrollParent.scrollTop;
-
-            // 2. Si on a déjà scrollé vers ou au-delà du header, on ne remonte JAMAIS
-            if (scrollParent.scrollTop >= headerOffsetTop - 5) {
-              if (targetRect.bottom > parentRect.bottom) {
-                target.scrollIntoView({ behavior: "smooth", block: "nearest" });
+        const performScroll = () => {
+          let scrollParent: HTMLElement | null = expandElement.parentElement;
+          while (scrollParent) {
+            const style = window.getComputedStyle(scrollParent);
+            const isScrollable =
+              /(auto|scroll)/.test(style.overflow + style.overflowY) &&
+              scrollParent.scrollHeight > scrollParent.clientHeight;
+
+            if (isScrollable) {
+              const parentRect = scrollParent.getBoundingClientRect();
+              const headerRect = expandElement.getBoundingClientRect();
+              const headerOffsetTop =
+                headerRect.top - parentRect.top + scrollParent.scrollTop;
+
+              // Si on a déjà scrollé vers ou au-delà du header, on ne remonte JAMAIS au header
+              if (scrollParent.scrollTop >= headerOffsetTop - 10) {
+                const targetRect = target.getBoundingClientRect();
+                if (targetRect.bottom > parentRect.bottom) {
+                  target.scrollIntoView({ behavior: "smooth", block: "nearest" });
+                }
+                return;
               }
+
+              // Si on n'a pas encore scrollé jusqu'au header, on y va
+              scrollParent.scrollTo({
+                top: headerOffsetTop,
+                behavior: "smooth",
+              });
               return;
             }
-
-            // 3. Sinon, on scrolle vers le header
-            scrollParent.scrollTo({
-              top: headerOffsetTop,
-              behavior: "smooth",
-            });
-            return;
+            scrollParent = scrollParent.parentElement;
           }
-          scrollParent = scrollParent.parentElement;
-        }
+        };
+
+        performScroll();
+        // Répéter après l'ouverture du clavier virtuel (spécifique tablettes / mobiles Android)
+        setTimeout(performScroll, 300);
       }
     },
     [active],