@popsure/dirty-swan 0.62.5 → 0.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@popsure/dirty-swan",
-  "version": "v0.62.5",
+  "version": "0.63.0",
   "author": "Vincent Audoire <vincent@getpopsure.com>",
   "license": "MIT",
   "private": false,

package/src/lib/components/comparisonTable/components/AccordionItem/AccordionItem.tsx

@@ -1,7 +1,7 @@
 import AnimateHeight from 'react-animate-height';
 
 import styles from './AccordionItem.module.scss';
-import { useState } from 'react';
+import { useRef, useState } from 'react';
 
 const ChevronSVG = ({ className }: { className?: string }) => (
   <svg
@@ -27,19 +27,52 @@ export const AccordionItem = ({
   className = '',
   headerClassName = '',
   label,
+  isOpen: controlledIsOpen,
+  onToggle,
+  scrollOnOpen,
+  scrollTopOffset = 0,
 }: {
   children: React.ReactNode | string;
   className?: string;
   headerClassName?: string;
   label: React.ReactNode;
+  isOpen?: boolean;
+  onToggle?: () => void;
+  scrollOnOpen?: boolean;
+  scrollTopOffset?: number;
 }) => {
-  const [isOpen, setIsOpen] = useState(false);
+  const [internalIsOpen, setInternalIsOpen] = useState(false);
+  const sectionRef = useRef<HTMLElement>(null);
+  const userToggled = useRef(false);
+
+  const isControlled = controlledIsOpen !== undefined && onToggle !== undefined;
+  const isOpen = isControlled ? controlledIsOpen : internalIsOpen;
+
   const handleClick = () => {
-    setIsOpen(!isOpen);
+    userToggled.current = true;
+    if (isControlled) {
+      onToggle();
+    } else {
+      setInternalIsOpen(!internalIsOpen);
+    }
+  };
+
+  const handleAnimationEnd = () => {
+    if (userToggled.current && isOpen && scrollOnOpen && sectionRef.current) {
+      userToggled.current = false;
+      const top =
+        sectionRef.current.getBoundingClientRect().top +
+        window.scrollY -
+        scrollTopOffset;
+      window.scrollTo({ top, behavior: 'smooth' });
+    }
   };
 
   return (
-    <section className={`d-flex fd-column ${styles.container} ${className}`}>
+    <section
+      ref={sectionRef}
+      className={`d-flex fd-column ${styles.container} ${className}`}
+    >
       <button
         className={`d-flex ai-center jc-between ${styles.headerButton} ${headerClassName}`}
         onClick={handleClick}
@@ -58,7 +91,11 @@ export const AccordionItem = ({
       </button>
       {/* Min height is 0.1 so that the scroll position is correctly synced across accordion items but is not actually shown.
       If set to 0, react-animate-height will set display to "none" which means scrolling is not synced. */}
-      <AnimateHeight duration={300} height={isOpen ? 'auto' : 0.1}>
+      <AnimateHeight
+        duration={300}
+        height={isOpen ? 'auto' : 0.1}
+        onHeightAnimationEnd={handleAnimationEnd}
+      >
         {children}
       </AnimateHeight>
     </section>

package/src/lib/components/comparisonTable/hooks/useComparisonTable.ts

@@ -11,7 +11,6 @@ export const useComparisonTable = ({
   const [showMore, setShowMore] = useState<boolean>(false);
   const [headerWidth, setHeaderWidth] = useState(1400);
   const [selectedTabIndex, setSelectedTabIndex] = useState(0);
-  const [selectedSection, setSelectedSection] = useState('');
   const [headerId, setHeaderId] = useState('');
   const headerRef = useRef<HTMLDivElement | null>(null);
   const contentContainerRef = useRef<HTMLDivElement | null>(null);
@@ -140,8 +139,6 @@ export const useComparisonTable = ({
     headerWidth,
     headerId,
     contentContainerRef,
-    selectedSection,
-    setSelectedSection,
     selectedTabIndex,
     setSelectedTabIndex,
     headerRefCallbackRef,

package/src/lib/components/comparisonTable/index.stories.tsx

@@ -254,6 +254,14 @@ const story = {
     collapsibleSections: {
       description: 'Make table groups with a label collapsible',
     },
+    scrollOnOpen: {
+      description:
+        'When enabled, the page scrolls to the top of a newly expanded section.',
+    },
+    scrollTopOffset: {
+      description:
+        'Offset in pixels from the top of the viewport when scrolling to an expanded section.',
+    },
     cellWidth: {
       description: 'Width of a table content cell',
     },
@@ -287,7 +295,9 @@ const story = {
     showDetailsCaption: 'Show details',
     hideScrollBars: false,
     hideScrollBarsMobile: true,
-    collapsibleSections: false,
+    collapsibleSections: true,
+    scrollOnOpen: true,
+    scrollTopOffset: 0,
     cellWidth: undefined,
     firstColumnWidth: undefined,
     stickyHeaderTopOffset: 0,
@@ -325,6 +335,8 @@ export const ComparisonTableStory = {
     data,
     headers,
     collapsibleSections,
+    scrollOnOpen,
+    scrollTopOffset,
     hideDetails,
     classNameOverrides,
     hideDetailsCaption,
@@ -341,6 +353,8 @@ export const ComparisonTableStory = {
         data={data}
         headers={headers}
         collapsibleSections={collapsibleSections}
+        scrollOnOpen={scrollOnOpen}
+        scrollTopOffset={scrollTopOffset}
         hideDetails={hideDetails}
         classNameOverrides={classNameOverrides}
         hideDetailsCaption={hideDetailsCaption}

package/src/lib/components/comparisonTable/index.tsx

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { Fragment } from 'react';
+import { Fragment, useRef, useState } from 'react';
 import { ScrollSync, ScrollSyncPane } from 'react-scroll-sync';
 
 import { AccordionItem } from './components/AccordionItem';
@@ -52,6 +52,8 @@ export interface ComparisonTableProps<T> {
   hideScrollBars?: boolean;
   hideScrollBarsMobile?: boolean;
   collapsibleSections?: boolean;
+  scrollOnOpen?: boolean;
+  scrollTopOffset?: number;
   cellWidth?: number;
   firstColumnWidth?: number;
   stickyHeaderTopOffset?: number;
@@ -83,6 +85,8 @@ const ComparisonTable = <T extends { id: number }>(
     hideScrollBars,
     hideScrollBarsMobile = true,
     collapsibleSections,
+    scrollOnOpen,
+    scrollTopOffset = 0,
     cellWidth,
     firstColumnWidth,
     stickyHeaderTopOffset,
@@ -94,8 +98,6 @@ const ComparisonTable = <T extends { id: number }>(
     headerWidth,
     headerId,
     contentContainerRef,
-    selectedSection,
-    setSelectedSection,
     selectedTabIndex,
     headerRefCallbackRef,
     handleArrowsClick,
@@ -103,6 +105,9 @@ const ComparisonTable = <T extends { id: number }>(
     showMore,
   } = useComparisonTable({ onSelectionChanged });
 
+  const [openSectionId, setOpenSectionId] = useState<number | null>(null);
+  const stickyHeaderRef = useRef<HTMLDivElement>(null);
+
   const cssVariablesStyle = {
     '--tableWidth': `${headerWidth}px`,
     ...(cellWidth ? { '--cellWidth': `${cellWidth}px` } : {}),
@@ -125,6 +130,7 @@ const ComparisonTable = <T extends { id: number }>(
         })}
       >
         <div
+          ref={stickyHeaderRef}
           id={headerId}
           className={classNames(baseStyles.header, classNameOverrides?.header)}
         >
@@ -190,6 +196,18 @@ const ComparisonTable = <T extends { id: number }>(
                         )}
                         label={headerGroup.label}
                         headerClassName="p24 br8"
+                        isOpen={openSectionId === headerGroup.id}
+                        onToggle={() =>
+                          setOpenSectionId((prev) =>
+                            prev === headerGroup.id ? null : headerGroup.id
+                          )
+                        }
+                        scrollOnOpen={scrollOnOpen}
+                        scrollTopOffset={
+                          scrollTopOffset +
+                          (stickyHeaderRef.current?.getBoundingClientRect()
+                            .height ?? 0)
+                        }
                       >
                         <ScrollSyncPane>
                           <div

package/src/lib/components/dateSelector/components/calendarCaption.module.scss

@@ -44,7 +44,6 @@
   border: 1px solid $ds-neutral-300;
   cursor: pointer;
   font-weight: 700;
-  font-size: 1.15em;
   color: $ds-neutral-900;
   padding: 8px 12px;
   border-radius: 8px;

package/src/lib/components/dateSelector/components/datepicker.scss

@@ -244,7 +244,6 @@
   top: -112px;
   z-index: 100;
   background-color: white;
-  border: 1px solid #d2d2d8;
   box-shadow: 0px 0px 32px rgba(210, 210, 216, 0.25);
   border-radius: 16px;
   display: inline-block;

package/src/lib/components/table/Table.stories.tsx

@@ -143,6 +143,48 @@ const initialData: TableData = [
         { rating: { type: 'zap', value: 3 } },
         { rating: { type: 'star', value: 3 } },
       ],
+      [
+        { text: 'Rating', modalContent: 'info' },
+        { rating: { type: 'zap', value: 1 }, modalContent: 'Maybe' },
+        { rating: { type: 'zap', value: 3 } },
+        { rating: { type: 'star', value: 3 } },
+      ],
+      [
+        { text: 'Rating', modalContent: 'info' },
+        { rating: { type: 'zap', value: 1 }, modalContent: 'Maybe' },
+        { rating: { type: 'zap', value: 3 } },
+        { rating: { type: 'star', value: 3 } },
+      ],
+      [
+        { text: 'Rating', modalContent: 'info' },
+        { rating: { type: 'zap', value: 1 }, modalContent: 'Maybe' },
+        { rating: { type: 'zap', value: 3 } },
+        { rating: { type: 'star', value: 3 } },
+      ],
+      [
+        { text: 'Rating', modalContent: 'info' },
+        { rating: { type: 'zap', value: 1 }, modalContent: 'Maybe' },
+        { rating: { type: 'zap', value: 3 } },
+        { rating: { type: 'star', value: 3 } },
+      ],
+      [
+        { text: 'Rating', modalContent: 'info' },
+        { rating: { type: 'zap', value: 1 }, modalContent: 'Maybe' },
+        { rating: { type: 'zap', value: 3 } },
+        { rating: { type: 'star', value: 3 } },
+      ],
+      [
+        { text: 'Rating', modalContent: 'info' },
+        { rating: { type: 'zap', value: 1 }, modalContent: 'Maybe' },
+        { rating: { type: 'zap', value: 3 } },
+        { rating: { type: 'star', value: 3 } },
+      ],
+      [
+        { text: 'Rating', modalContent: 'info' },
+        { rating: { type: 'zap', value: 1 }, modalContent: 'Maybe' },
+        { rating: { type: 'zap', value: 3 } },
+        { rating: { type: 'star', value: 3 } },
+      ],
       [
         {
           type: 'CARD',
@@ -203,6 +245,14 @@ const story = {
     collapsibleSections: {
       subContent: 'This property allows to collapse the sections of the table.',
     },
+    scrollOnOpen: {
+      subContent:
+        'When enabled, the page scrolls to the top of a newly expanded section.',
+    },
+    scrollTopOffset: {
+      subContent:
+        'Offset in pixels from the top of the viewport when scrolling to an expanded section.',
+    },
     hideDetails: {
       subContent: 'This property allows to hide the details of the table.',
     },
@@ -244,7 +294,9 @@ const story = {
   },
   args: {
     tableData: initialData,
-    collapsibleSections: false,
+    collapsibleSections: true,
+    scrollOnOpen: true,
+    scrollTopOffset: 0,
     hideDetails: false,
     stickyHeaderTopOffset: 0,
     title: 'Title of the table',
@@ -262,6 +314,8 @@ const story = {
 export const TableStory = {
   render: ({
     collapsibleSections,
+    scrollOnOpen,
+    scrollTopOffset,
     tableData,
     hideColumns,
     hideDetails,
@@ -303,6 +357,8 @@ export const TableStory = {
             },
           }}
           collapsibleSections={collapsibleSections}
+          scrollOnOpen={scrollOnOpen}
+          scrollTopOffset={scrollTopOffset}
           tableData={tableData}
           hideColumns={hideColumns}
           hideDetails={hideDetails}

package/src/lib/components/table/Table.tsx

@@ -39,6 +39,8 @@ export interface TableProps {
   modalContentRenderer?: (content: ReactNode) => ReactNode;
   onModalOpen?: ModalFunction;
   onSelectionChanged?: (index: number) => void;
+  scrollOnOpen?: boolean;
+  scrollTopOffset?: number;
   stickyHeaderTopOffset?: number;
   tableData: TableData;
   textOverrides?: TextOverrides;
@@ -63,6 +65,8 @@ const Table = ({
   modalContentRenderer,
   onModalOpen,
   onSelectionChanged,
+  scrollOnOpen,
+  scrollTopOffset = 0,
   stickyHeaderTopOffset = 0,
   tableData,
   textOverrides: definedTextOverrides,
@@ -76,6 +80,7 @@ const Table = ({
   const [shouldHideDetails, setShouldHideDetails] = useState(true);
   const containerRef = useRef<HTMLDivElement | null>(null);
   const headerRef = useRef<HTMLDivElement | null>(null);
+  const stickyHeaderRef = useRef<HTMLDivElement | null>(null);
   const columnsLength = tableData[0].rows[0].length;
 
   useScrollSync(headerRef, containerRef, !isMobile);
@@ -154,6 +159,7 @@ const Table = ({
         </>
       ) : (
         <div
+          ref={stickyHeaderRef}
           aria-hidden
           className={styles.stickyHeader}
           style={{ top: `${stickyHeaderTopOffset}px` }}
@@ -179,6 +185,9 @@ const Table = ({
           title={title}
           className={className}
           collapsibleSections={collapsibleSections}
+          scrollOnOpen={scrollOnOpen}
+          scrollTopOffset={scrollTopOffset}
+          stickyHeaderRef={stickyHeaderRef}
           hideColumns={hideColumns}
           hideDetails={hideDetails}
           hideRows={hideRows}

package/src/lib/components/table/components/TableContents/Collapsible.tsx

@@ -4,9 +4,10 @@ import classNames from 'classnames';
 interface CollapsibleProps {
   children: ReactNode;
   isExpanded?: boolean;
+  onTransitionEnd?: () => void;
 }
 
-export const Collapsible = ({ children, isExpanded }: CollapsibleProps) => {
+export const Collapsible = ({ children, isExpanded, onTransitionEnd }: CollapsibleProps) => {
   const [height, setHeight] = useState<number | undefined>();
 
   const observerRef = useRef<ResizeObserver | null>(null);
@@ -45,6 +46,7 @@ export const Collapsible = ({ children, isExpanded }: CollapsibleProps) => {
       style={{
         maxHeight: isExpanded ? height : '0px',
       }}
+      onTransitionEnd={isExpanded ? onTransitionEnd : undefined}
     >
       {children}
     </div>

package/src/lib/components/table/components/TableContents/TableContents.tsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { MutableRefObject, useCallback, useRef, useState } from 'react';
 import { TableSection } from '../TableSection/TableSection';
 import { ChevronDownIcon, ChevronUpIcon } from '../../../icon';
 import { Card } from '../../../cards/card';
@@ -12,6 +12,9 @@ import { IconRenderer } from '../IconRenderer/IconRenderer';
 export interface TableContentsProps {
   className?: string;
   collapsibleSections?: boolean;
+  scrollOnOpen?: boolean;
+  scrollTopOffset?: number;
+  stickyHeaderRef?: MutableRefObject<HTMLDivElement | null>;
   tableData: TableData;
   hideColumns?: number[];
   hideDetails?: boolean;
@@ -27,6 +30,9 @@ export interface TableContentsProps {
 const TableContents = ({
   className,
   collapsibleSections,
+  scrollOnOpen,
+  scrollTopOffset = 0,
+  stickyHeaderRef,
   tableData,
   hideColumns = [],
   hideDetails,
@@ -39,14 +45,33 @@ const TableContents = ({
   imageComponent,
 }: TableContentsProps) => {
   const [isSectionOpen, setOpenSection] = useState<number | null>(null);
+  const lastToggledSection = useRef<number | null>(null);
+  const sectionRefs = useRef<Record<number, HTMLDivElement | null>>({});
   const firstHeadRow = tableData?.[0]?.rows?.[0];
   const tableWidth = isMobile ? `${firstHeadRow?.length * 50}%` : '';
   const handleToggleSection = (index: number) => {
+    lastToggledSection.current = isSectionOpen === index ? null : index;
     setOpenSection((currentSection) =>
       currentSection === index ? null : index
     );
   };
 
+  const handleScrollToSection = useCallback(
+    (index: number) => {
+      if (scrollOnOpen && lastToggledSection.current === index && sectionRefs.current[index]) {
+        const headerHeight =
+          stickyHeaderRef?.current?.getBoundingClientRect().height ?? 0;
+        const top =
+          sectionRefs.current[index]!.getBoundingClientRect().top +
+          window.scrollY -
+          scrollTopOffset -
+          headerHeight;
+        window.scrollTo({ top, behavior: 'smooth' });
+      }
+    },
+    [scrollOnOpen, scrollTopOffset, stickyHeaderRef]
+  );
+
   // Calculate global row offset for each section
   let globalRowOffset = 0;
 
@@ -69,7 +94,7 @@ const TableContents = ({
           .filter(localRowIndex => localRowIndex >= 0 && localRowIndex < rows.length);
 
         const result = (isFirstSection || isVisible) && (
-          <div key={index}>
+          <div key={index} ref={(el) => { sectionRefs.current[index] = el; }}>
             {section?.title && (
               <div className={styles.cardWrapper}>
                 <div className={classNames(styles.card, 'p0')}>
@@ -103,7 +128,10 @@ const TableContents = ({
               </div>
             )}
 
-            <Collapsible isExpanded={isExpanded}>
+            <Collapsible
+              isExpanded={isExpanded}
+              onTransitionEnd={() => handleScrollToSection(index)}
+            >
               <TableSection
                 className={classNames(className, 'mb24')}
                 tableCellRows={