From 12a03a9a72f7895d571dbaeeb245d92aa277a610 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armandphilippot.com>
Date: Fri, 6 Oct 2023 17:48:03 +0200
Subject: refactor(components): merge HeadingButton and Widget components

The HeadingButton component was only used inside Widget component and
it is not very useful on its own so I merge the two components in a
new Collapsible component.
---
 src/components/templates/page/page-layout.stories.tsx | 13 ++++++-------
 src/components/templates/page/page-layout.test.tsx    | 18 ++++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'src/components/templates')

diff --git a/src/components/templates/page/page-layout.stories.tsx b/src/components/templates/page/page-layout.stories.tsx
index 68df415..683b6b2 100644
--- a/src/components/templates/page/page-layout.stories.tsx
+++ b/src/components/templates/page/page-layout.stories.tsx
@@ -252,8 +252,6 @@ SinglePage.args = {
         'linkedin',
         'twitter',
       ]}
-      level={2}
-      expanded={true}
     />,
   ],
   withToC: true,
@@ -330,8 +328,6 @@ Post.args = {
         'linkedin',
         'twitter',
       ]}
-      level={2}
-      expanded={true}
     />,
   ],
   withToC: true,
@@ -372,10 +368,13 @@ Blog.args = {
   ),
   widgets: [
     <LinksListWidget
-      key="sidebar-widget1"
+      heading={
+        <Heading isFake level={3}>
+          Categories
+        </Heading>
+      }
       items={blogCategories}
-      title="Categories"
-      level={2}
+      key="sidebar-widget1"
     />,
   ],
 };
diff --git a/src/components/templates/page/page-layout.test.tsx b/src/components/templates/page/page-layout.test.tsx
index d21e14c..6609b48 100644
--- a/src/components/templates/page/page-layout.test.tsx
+++ b/src/components/templates/page/page-layout.test.tsx
@@ -1,6 +1,6 @@
 import { describe, expect, it } from '@jest/globals';
-import { BreadcrumbList } from 'schema-dts';
-import { render, screen } from '../../../../tests/utils';
+import type { BreadcrumbList } from 'schema-dts';
+import { render, screen as rtlScreen } from '../../../../tests/utils';
 import { comments } from '../../organisms/layout/comments-list.fixture';
 import { PageLayout } from './page-layout';
 
@@ -25,7 +25,7 @@ describe('PageLayout', () => {
       </PageLayout>
     );
     expect(
-      screen.getByRole('heading', { level: 1, name: title })
+      rtlScreen.getByRole('heading', { level: 1, name: title })
     ).toBeInTheDocument();
   });
 
@@ -39,7 +39,7 @@ describe('PageLayout', () => {
         {children}
       </PageLayout>
     );
-    expect(screen.getByText(children)).toBeInTheDocument();
+    expect(rtlScreen.getByText(children)).toBeInTheDocument();
   });
 
   it('renders the breadcrumb', () => {
@@ -53,7 +53,7 @@ describe('PageLayout', () => {
       </PageLayout>
     );
     expect(
-      screen.getByRole('navigation', { name: 'Breadcrumb' })
+      rtlScreen.getByRole('navigation', { name: 'Breadcrumb' })
     ).toBeInTheDocument();
   });
 
@@ -68,9 +68,7 @@ describe('PageLayout', () => {
         {children}
       </PageLayout>
     );
-    expect(
-      screen.getByRole('heading', { level: 2, name: /Table of Contents/i })
-    ).toBeInTheDocument();
+    expect(rtlScreen.getByText(/Table of Contents/i)).toBeInTheDocument();
   });
 
   it('renders the comment form', () => {
@@ -85,7 +83,7 @@ describe('PageLayout', () => {
       </PageLayout>
     );
     expect(
-      screen.getByRole('form', { name: /Leave a comment/i })
+      rtlScreen.getByRole('form', { name: /Leave a comment/i })
     ).toBeInTheDocument();
   });
 
@@ -102,7 +100,7 @@ describe('PageLayout', () => {
       </PageLayout>
     );
     expect(
-      screen.getByRole('heading', { level: 2, name: /Comments/i })
+      rtlScreen.getByRole('heading', { level: 2, name: /Comments/i })
     ).toBeInTheDocument();
   });
 });
-- 
cgit v1.2.3