@patternfly/react-core 6.1.0-prerelease.13 → 6.1.0-prerelease.15

package/helpers/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"6.1.0-prerelease.12","private":true}
+{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"6.1.0-prerelease.14","private":true}

package/layouts/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"6.1.0-prerelease.12","private":true}
+{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"6.1.0-prerelease.14","private":true}

package/next/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"6.1.0-prerelease.12","private":true}
+{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"6.1.0-prerelease.14","private":true}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "6.1.0-prerelease.13",
+  "version": "6.1.0-prerelease.15",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -46,15 +46,15 @@
     "subpaths": "node ../../scripts/exportSubpaths.mjs --config subpaths.config.json"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^6.1.0-prerelease.5",
-    "@patternfly/react-styles": "^6.1.0-prerelease.4",
-    "@patternfly/react-tokens": "^6.1.0-prerelease.4",
+    "@patternfly/react-icons": "^6.1.0-prerelease.6",
+    "@patternfly/react-styles": "^6.1.0-prerelease.5",
+    "@patternfly/react-tokens": "^6.1.0-prerelease.5",
     "focus-trap": "7.6.2",
     "react-dropzone": "^14.3.5",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "6.1.0-prerelease.6",
+    "@patternfly/patternfly": "6.1.0-prerelease.11",
     "case-anything": "^2.1.13",
     "css": "^3.0.0",
     "fs-extra": "^11.2.0"
@@ -63,5 +63,5 @@
     "react": "^17 || ^18",
     "react-dom": "^17 || ^18"
   },
-  "gitHead": "c7e24529a18c2c333701a5382306ac03f306dc1f"
+  "gitHead": "4e43d6c8d9fcba0bbaef61870d8d0399229a106f"
 }

package/src/components/CalendarMonth/CalendarMonth.tsx

@@ -319,18 +319,15 @@ export const CalendarMonth = ({
                   onSelectToggle(isOpen);
                 }}
                 onSelect={(ev, monthNum) => {
-                  // When we put CalendarMonth in a Popover we want the Popover's onDocumentClick
-                  // to see the SelectOption as a child so it doesn't close the Popover.
-                  setTimeout(() => {
-                    setIsSelectOpen(false);
-                    onSelectToggle(false);
-                    const newDate = changeMonth(Number(monthNum as string));
-                    setFocusedDate(newDate);
-                    setShouldFocus(false);
-                    onMonthChange(ev, newDate);
-                  }, 0);
+                  setIsSelectOpen(false);
+                  onSelectToggle(false);
+                  const newDate = changeMonth(Number(monthNum as string));
+                  setFocusedDate(newDate);
+                  setShouldFocus(false);
+                  onMonthChange(ev, newDate);
                 }}
                 selected={monthFormatted}
+                popperProps={{ appendTo: 'inline' }}
               >
                 <SelectList>
                   {longMonths.map((longMonth, index) => (

package/src/components/Modal/examples/Modal.md

@@ -20,7 +20,7 @@ Basic modals give users the option to either confirm or cancel an action.
 
 To flag an open modal, use the `isOpen` property. To execute a callback when a modal is closed, use the `onClose` property.
 
-A modal must have a `<ModalBody>`, containing the main content of the modal. The `<ModalHeader>` and `<ModalFooter>` components are not required, but are typically used to display the modal title and any button actions, respectively. 
+The `<ModalBody>`, `<ModalHeader>`, and `<ModalFooter>` components are not required, but are typically used to display the main content of the modal, modal title, and any button actions, respectively.
 
 ```ts file="./ModalBasic.tsx"
 

package/src/components/SkipToContent/examples/SkipToContentBasic.tsx

@@ -1,128 +1,146 @@
 import React from 'react';
-import { SkipToContent } from '@patternfly/react-core';
+import { Content, SkipToContent } from '@patternfly/react-core';
 
-export const SkipToContentBasic: React.FunctionComponent = () => (
-  <React.Fragment>
-    <SkipToContent href="#main-content">Skip to content</SkipToContent>
-    <p>Press tab to skip to content at the bottom of the page.</p>
-    <div style={{ height: '2000px' }}></div>
-    <h1 id="main-content">Main content</h1>
-    <p>
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla accumsan, metus ultrices eleifend gravida, nulla
-      nunc varius lectus, nec rutrum justo nibh eu lectus. Ut vulputate semper dui. Fusce erat odio, sollicitudin vel
-      erat vel, interdum mattis neque. Sub works as well!
-    </p>
-    <h2>Second level</h2>
-    <p>
-      Curabitur accumsan turpis pharetra
-      <strong>augue tincidunt</strong> blandit. Quisque condimentum maximus mi, sit amet commodo arcu rutrum id. Proin
-      pretium urna vel cursus venenatis. Suspendisse potenti. Etiam mattis sem rhoncus lacus dapibus facilisis. Donec at
-      dignissim dui. Ut et neque nisl.
-    </p>
-    <ul>
-      <li>In fermentum leo eu lectus mollis, quis dictum mi aliquet.</li>
-      <li>Morbi eu nulla lobortis, lobortis est in, fringilla felis.</li>
-      <li>
-        Aliquam nec felis in sapien venenatis viverra fermentum nec lectus.
-        <ul>
-          <li>In fermentum leo eu lectus mollis, quis dictum mi aliquet.</li>
-          <li>Morbi eu nulla lobortis, lobortis est in, fringilla felis.</li>
-          <li>
-            Ut venenatis, nisl scelerisque.
-            <ol>
-              <li>Donec blandit a lorem id convallis.</li>
-              <li>Cras gravida arcu at diam gravida gravida.</li>
-              <li>Integer in volutpat libero.</li>
-            </ol>
-          </li>
-        </ul>
-      </li>
-      <li>Ut non enim metus.</li>
-    </ul>
-    <h3>Third level</h3>
-    <p>
-      Quisque ante lacus, malesuada ac auctor vitae, congue
-      <a href="#">non ante</a>. Phasellus lacus ex, semper ac tortor nec, fringilla condimentum orci. Fusce eu rutrum
-      tellus.
-    </p>
-    <ol>
-      <li>Donec blandit a lorem id convallis.</li>
-      <li>Cras gravida arcu at diam gravida gravida.</li>
-      <li>Integer in volutpat libero.</li>
-      <li>Donec a diam tellus.</li>
-      <li>
-        Etiam auctor nisl et.
-        <ul>
-          <li>Donec blandit a lorem id convallis.</li>
-          <li>Cras gravida arcu at diam gravida gravida.</li>
-          <li>
-            Integer in volutpat libero.
-            <ol>
-              <li>Donec blandit a lorem id convallis.</li>
-              <li>Cras gravida arcu at diam gravida gravida.</li>
-            </ol>
-          </li>
-        </ul>
-      </li>
-      <li>Aenean nec tortor orci.</li>
-      <li>Quisque aliquam cursus urna, non bibendum massa viverra eget.</li>
-      <li>Vivamus maximus ultricies pulvinar.</li>
-    </ol>
-    <blockquote>
-      Ut venenatis, nisl scelerisque sollicitudin fermentum, quam libero hendrerit ipsum, ut blandit est tellus sit amet
-      turpis.
-    </blockquote>
-    <p>
-      Quisque at semper enim, eu hendrerit odio. Etiam auctor nisl et
-      <em>justo sodales</em> elementum. Maecenas ultrices lacus quis neque consectetur, et lobortis nisi molestie.
-    </p>
-    <hr />
-    <p>
-      Sed sagittis enim ac tortor maximus rutrum. Nulla facilisi. Donec mattis vulputate risus in luctus. Maecenas
-      vestibulum interdum commodo.
-    </p>
-    <dl>
-      <dt>Web</dt>
-      <dd>The part of the internet that contains websites and web pages</dd>
-      <dt>HTML</dt>
-      <dd>A markup language for creating web pages</dd>
-      <dt>CSS</dt>
-      <dd>A technology to make HTML look better</dd>
-    </dl>
-    <p>
-      Suspendisse egestas sapien non felis placerat elementum. Morbi tortor nisl, suscipit sed mi sit amet, mollis
-      malesuada nulla. Nulla facilisi. Nullam ac erat ante.
-    </p>
-    <h4>Fourth level</h4>
-    <p>
-      Nulla efficitur eleifend nisi, sit amet bibendum sapien fringilla ac. Mauris euismod metus a tellus laoreet, at
-      elementum ex efficitur.
-    </p>
-    <p>
-      Maecenas eleifend sollicitudin dui, faucibus sollicitudin augue cursus non. Ut finibus eleifend arcu ut vehicula.
-      Mauris eu est maximus est porta condimentum in eu justo. Nulla id iaculis sapien.
-    </p>
-    <small>Sometimes you need small text to display things like date created</small>
-    <p>
-      Phasellus porttitor enim id metus volutpat ultricies. Ut nisi nunc, blandit sed dapibus at, vestibulum in felis.
-      Etiam iaculis lorem ac nibh bibendum rhoncus. Nam interdum efficitur ligula sit amet ullamcorper. Etiam tristique,
-      leo vitae porta faucibus, mi lacus laoreet metus, at cursus leo est vel tellus. Sed ac posuere est. Nunc ultricies
-      nunc neque, vitae ultricies ex sodales quis. Aliquam eu nibh in libero accumsan pulvinar. Nullam nec nisl
-      placerat, pretium metus vel, euismod ipsum. Proin tempor cursus nisl vel condimentum. Nam pharetra varius metus
-      non pellentesque.
-    </p>
-    <h5>Fifth level</h5>
-    <p>
-      Aliquam sagittis rhoncus vulputate. Cras non luctus sem, sed tincidunt ligula. Vestibulum at nunc elit. Praesent
-      aliquet ligula mi, in luctus elit volutpat porta. Phasellus molestie diam vel nisi sodales, a eleifend augue
-      laoreet. Sed nec eleifend justo. Nam et sollicitudin odio.
-    </p>
-    <h6>Sixth level</h6>
-    <p>
-      Cras in nibh lacinia, venenatis nisi et, auctor urna. Donec pulvinar lacus sed diam dignissim, ut eleifend eros
-      accumsan. Phasellus non tortor eros. Ut sed rutrum lacus. Etiam purus nunc, scelerisque quis enim vitae, malesuada
-      ultrices turpis. Nunc vitae maximus purus, nec consectetur dui. Suspendisse euismod, elit vel rutrum commodo,
-      ipsum tortor maximus dui, sed varius sapien odio vitae est. Etiam at cursus metus.
-    </p>
-  </React.Fragment>
-);
+export const SkipToContentBasic: React.FunctionComponent = () => {
+  const mainContentId = 'main-content';
+  const handleClick = (e) => {
+    e.preventDefault();
+    const mainContentElement = document.getElementById(mainContentId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+      mainContentElement.scrollIntoView();
+    }
+  };
+
+  return (
+    <React.Fragment>
+      <SkipToContent onClick={handleClick} href={`#${mainContentId}`}>
+        Skip to content
+      </SkipToContent>
+      <p>Press tab to skip to content at the bottom of the page.</p>
+      <div style={{ height: '2000px' }}></div>
+      <div tabIndex={-1} id={mainContentId}>
+        <Content>
+          <h1>Main content</h1>
+          <p>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla accumsan, metus ultrices eleifend gravida,
+            nulla nunc varius lectus, nec rutrum justo nibh eu lectus. Ut vulputate semper dui. Fusce erat odio,
+            sollicitudin vel erat vel, interdum mattis neque. Sub works as well!
+          </p>
+          <h2>Second level</h2>
+          <p>
+            Curabitur accumsan turpis pharetra
+            <strong>augue tincidunt</strong> blandit. Quisque condimentum maximus mi, sit amet commodo arcu rutrum id.
+            Proin pretium urna vel cursus venenatis. Suspendisse potenti. Etiam mattis sem rhoncus lacus dapibus
+            facilisis. Donec at dignissim dui. Ut et neque nisl.
+          </p>
+          <ul>
+            <li>In fermentum leo eu lectus mollis, quis dictum mi aliquet.</li>
+            <li>Morbi eu nulla lobortis, lobortis est in, fringilla felis.</li>
+            <li>
+              Aliquam nec felis in sapien venenatis viverra fermentum nec lectus.
+              <ul>
+                <li>In fermentum leo eu lectus mollis, quis dictum mi aliquet.</li>
+                <li>Morbi eu nulla lobortis, lobortis est in, fringilla felis.</li>
+                <li>
+                  Ut venenatis, nisl scelerisque.
+                  <ol>
+                    <li>Donec blandit a lorem id convallis.</li>
+                    <li>Cras gravida arcu at diam gravida gravida.</li>
+                    <li>Integer in volutpat libero.</li>
+                  </ol>
+                </li>
+              </ul>
+            </li>
+            <li>Ut non enim metus.</li>
+          </ul>
+          <h3>Third level</h3>
+          <p>
+            Quisque ante lacus, malesuada ac auctor vitae, congue
+            <a href="#">non ante</a>. Phasellus lacus ex, semper ac tortor nec, fringilla condimentum orci. Fusce eu
+            rutrum tellus.
+          </p>
+          <ol>
+            <li>Donec blandit a lorem id convallis.</li>
+            <li>Cras gravida arcu at diam gravida gravida.</li>
+            <li>Integer in volutpat libero.</li>
+            <li>Donec a diam tellus.</li>
+            <li>
+              Etiam auctor nisl et.
+              <ul>
+                <li>Donec blandit a lorem id convallis.</li>
+                <li>Cras gravida arcu at diam gravida gravida.</li>
+                <li>
+                  Integer in volutpat libero.
+                  <ol>
+                    <li>Donec blandit a lorem id convallis.</li>
+                    <li>Cras gravida arcu at diam gravida gravida.</li>
+                  </ol>
+                </li>
+              </ul>
+            </li>
+            <li>Aenean nec tortor orci.</li>
+            <li>Quisque aliquam cursus urna, non bibendum massa viverra eget.</li>
+            <li>Vivamus maximus ultricies pulvinar.</li>
+          </ol>
+          <blockquote>
+            Ut venenatis, nisl scelerisque sollicitudin fermentum, quam libero hendrerit ipsum, ut blandit est tellus
+            sit amet turpis.
+          </blockquote>
+          <p>
+            Quisque at semper enim, eu hendrerit odio. Etiam auctor nisl et
+            <em>justo sodales</em> elementum. Maecenas ultrices lacus quis neque consectetur, et lobortis nisi molestie.
+          </p>
+          <hr />
+          <p>
+            Sed sagittis enim ac tortor maximus rutrum. Nulla facilisi. Donec mattis vulputate risus in luctus. Maecenas
+            vestibulum interdum commodo.
+          </p>
+          <dl>
+            <dt>Web</dt>
+            <dd>The part of the internet that contains websites and web pages</dd>
+            <dt>HTML</dt>
+            <dd>A markup language for creating web pages</dd>
+            <dt>CSS</dt>
+            <dd>A technology to make HTML look better</dd>
+          </dl>
+          <p>
+            Suspendisse egestas sapien non felis placerat elementum. Morbi tortor nisl, suscipit sed mi sit amet, mollis
+            malesuada nulla. Nulla facilisi. Nullam ac erat ante.
+          </p>
+          <h4>Fourth level</h4>
+          <p>
+            Nulla efficitur eleifend nisi, sit amet bibendum sapien fringilla ac. Mauris euismod metus a tellus laoreet,
+            at elementum ex efficitur.
+          </p>
+          <p>
+            Maecenas eleifend sollicitudin dui, faucibus sollicitudin augue cursus non. Ut finibus eleifend arcu ut
+            vehicula. Mauris eu est maximus est porta condimentum in eu justo. Nulla id iaculis sapien.
+          </p>
+          <small>Sometimes you need small text to display things like date created</small>
+          <p>
+            Phasellus porttitor enim id metus volutpat ultricies. Ut nisi nunc, blandit sed dapibus at, vestibulum in
+            felis. Etiam iaculis lorem ac nibh bibendum rhoncus. Nam interdum efficitur ligula sit amet ullamcorper.
+            Etiam tristique, leo vitae porta faucibus, mi lacus laoreet metus, at cursus leo est vel tellus. Sed ac
+            posuere est. Nunc ultricies nunc neque, vitae ultricies ex sodales quis. Aliquam eu nibh in libero accumsan
+            pulvinar. Nullam nec nisl placerat, pretium metus vel, euismod ipsum. Proin tempor cursus nisl vel
+            condimentum. Nam pharetra varius metus non pellentesque.
+          </p>
+          <h5>Fifth level</h5>
+          <p>
+            Aliquam sagittis rhoncus vulputate. Cras non luctus sem, sed tincidunt ligula. Vestibulum at nunc elit.
+            Praesent aliquet ligula mi, in luctus elit volutpat porta. Phasellus molestie diam vel nisi sodales, a
+            eleifend augue laoreet. Sed nec eleifend justo. Nam et sollicitudin odio.
+          </p>
+          <h6>Sixth level</h6>
+          <p>
+            Cras in nibh lacinia, venenatis nisi et, auctor urna. Donec pulvinar lacus sed diam dignissim, ut eleifend
+            eros accumsan. Phasellus non tortor eros. Ut sed rutrum lacus. Etiam purus nunc, scelerisque quis enim
+            vitae, malesuada ultrices turpis. Nunc vitae maximus purus, nec consectetur dui. Suspendisse euismod, elit
+            vel rutrum commodo, ipsum tortor maximus dui, sed varius sapien odio vitae est. Etiam at cursus metus.
+          </p>
+        </Content>
+      </div>
+    </React.Fragment>
+  );
+};

package/src/components/Wizard/examples/Wizard.md

@@ -34,6 +34,8 @@ DrawerColorVariant,
 DrawerHead,
 DrawerActions,
 DrawerCloseButton,
+Modal,
+ModalVariant,
 Wizard,
 WizardFooter,
 WizardFooterWrapper,
@@ -46,7 +48,6 @@ WizardNavItem,
 WizardNav,
 WizardHeader
 } from '@patternfly/react-core';
-import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
 import SlackHashIcon from '@patternfly/react-icons/dist/esm/icons/slack-hash-icon';
 import CogsIcon from '@patternfly/react-icons/dist/esm/icons/cogs-icon';

package/src/components/Wizard/examples/WizardWithinModal.tsx

@@ -1,21 +1,18 @@
 import React from 'react';
-import { Button, Wizard, WizardStep, WizardHeader } from '@patternfly/react-core';
-import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
+import { Button, Modal, ModalVariant, Wizard, WizardHeader, WizardStep } from '@patternfly/react-core';
 
-export const WizardWithinModal = () => {
+export const WizardWithinModal: React.FunctionComponent = () => {
   const [isModelOpen, setIsModalOpen] = React.useState(false);
 
   return (
     <>
       <Button onClick={() => setIsModalOpen(true)}>Show Modal</Button>
 
-      <ModalDeprecated
+      <Modal
         isOpen={isModelOpen}
-        showClose={false}
         aria-label="Wizard modal"
-        hasNoBodyWrapper
         onEscapePress={() => setIsModalOpen(false)}
-        variant={ModalVariantDeprecated.medium}
+        variant={ModalVariant.medium}
       >
         <Wizard
           height={400}
@@ -43,7 +40,7 @@ export const WizardWithinModal = () => {
             Review step content
           </WizardStep>
         </Wizard>
-      </ModalDeprecated>
+      </Modal>
     </>
   );
 };

package/src/demos/DashboardWrapper.tsx

@@ -98,8 +98,19 @@ export const DashboardWrapper: React.FC<DashboardWrapperProps> = ({
     </PageSidebar>
   );
 
+  const defaultContainerId = 'main-content-page-layout-default-nav';
+
+  const handleClick = (event: React.MouseEvent) => {
+    event.preventDefault();
+
+    const mainContentElement = document.getElementById(mainContainerId ?? defaultContainerId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+    }
+  };
+
   const PageSkipToContent = (
-    <SkipToContent href={`#${mainContainerId ?? 'main-content-page-layout-default-nav'}`}>
+    <SkipToContent onClick={handleClick} href={`#${mainContainerId ?? defaultContainerId}`}>
       Skip to content
     </SkipToContent>
   );
@@ -112,7 +123,7 @@ export const DashboardWrapper: React.FC<DashboardWrapperProps> = ({
       skipToContent={PageSkipToContent}
       banner={banner}
       breadcrumb={renderedBreadcrumb}
-      mainContainerId={mainContainerId ?? 'main-content-page-layout-default-nav'}
+      mainContainerId={mainContainerId ?? defaultContainerId}
       notificationDrawer={notificationDrawer}
       isNotificationDrawerExpanded={isNotificationDrawerExpanded}
       {...(typeof onPageResize === 'function' && {

package/src/demos/ExpandableSection/examples/ExpandableTextDemo.tsx

@@ -8,13 +8,7 @@ export const ExpandableTextDemo: React.FunctionComponent = () => {
     setIsExpanded(isExpanded);
   };
 
-  const content = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque nec dignissim turpis, et tristique purus.
-  Phasellus efficitur ante quis dolor viverra imperdiet. Orci varius natoque penatibus et magnis dis parturient
-  montes, nascetur ridiculus mus. Pellentesque laoreet, sem ac elementum semper, lectus mauris vestibulum nulla,
-  eget volutpat massa neque vel turpis. Donec finibus enim eu leo accumsan consectetur. Praesent massa diam,
-  tincidunt eu dui ac, ullamcorper elementum est. Phasellus metus felis, venenatis vitae semper nec, porta a metus.
-  Vestibulum justo nisi, imperdiet id eleifend at, varius nec lorem. Fusce porttitor mollis nibh, ut elementum ante
-  commodo tincidunt. Integer tincidunt at ipsum non aliquet.`;
+  const content = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque nec dignissim turpis, et tristique purus. Phasellus efficitur ante quis dolor viverra imperdiet. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Pellentesque laoreet, sem ac elementum semper, lectus mauris vestibulum nulla, eget volutpat massa neque vel turpis. Donec finibus enim eu leo accumsan consectetur. Praesent massa diam, tincidunt eu dui ac, ullamcorper elementum est. Phasellus metus felis, venenatis vitae semper nec, porta a metus. Vestibulum justo nisi, imperdiet id eleifend at, varius nec lorem. Fusce porttitor mollis nibh, ut elementum ante commodo tincidunt. Integer tincidunt at ipsum non aliquet.`;
 
   return (
     <ExpandableSection

package/src/demos/NotificationDrawer/examples/NotificationDrawerBasic.tsx

@@ -279,7 +279,21 @@ export const NotificationDrawerBasic: React.FunctionComponent = () => {
     </PageSidebar>
   );
   const pageId = 'main-content-page-layout-default-nav';
-  const PageSkipToContent = <SkipToContent href={`#${pageId}`}>Skip to content</SkipToContent>;
+
+  const handleClick = (event) => {
+    event.preventDefault();
+
+    const mainContentElement = document.getElementById(pageId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+    }
+  };
+
+  const PageSkipToContent = (
+    <SkipToContent onClick={handleClick} href={`#${pageId}`}>
+      Skip to content
+    </SkipToContent>
+  );
 
   const PageBreadcrumb = (
     <Breadcrumb>

package/src/demos/NotificationDrawer/examples/NotificationDrawerGrouped.tsx

@@ -329,7 +329,21 @@ export const NotificationDrawerGrouped: React.FunctionComponent = () => {
     </PageSidebar>
   );
   const pageId = 'main-content-page-layout-default-nav';
-  const PageSkipToContent = <SkipToContent href={`#${pageId}`}>Skip to content</SkipToContent>;
+
+  const handleClick = (event) => {
+    event.preventDefault();
+
+    const mainContentElement = document.getElementById(pageId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+    }
+  };
+
+  const PageSkipToContent = (
+    <SkipToContent onClick={handleClick} href={`#${pageId}`}>
+      Skip to content
+    </SkipToContent>
+  );
 
   const PageBreadcrumb = (
     <Breadcrumb>

package/src/demos/examples/Masthead/MastheadWithHorizontalNav.tsx

@@ -282,7 +282,20 @@ export const MastheadWithHorizontalNav: React.FunctionComponent = () => {
 
   const mainContainerId = 'main-content-page-layout-tertiary-nav';
 
-  const pageSkipToContent = <SkipToContent href={`#${mainContainerId}`}>Skip to content</SkipToContent>;
+  const handleClick = (event) => {
+    event.preventDefault();
+
+    const mainContentElement = document.getElementById(mainContainerId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+    }
+  };
+
+  const pageSkipToContent = (
+    <SkipToContent onClick={handleClick} href={`#${mainContainerId}`}>
+      Skip to content
+    </SkipToContent>
+  );
 
   return (
     <Page

package/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx

@@ -515,7 +515,20 @@ export const MastheadWithUtilitiesAndUserDropdownMenu: React.FunctionComponent =
 
   const mainContainerId = 'main-content-page-layout-tertiary-nav';
 
-  const pageSkipToContent = <SkipToContent href={`#${mainContainerId}`}>Skip to content</SkipToContent>;
+  const handleClick = (event) => {
+    event.preventDefault();
+
+    const mainContentElement = document.getElementById(mainContainerId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+    }
+  };
+
+  const pageSkipToContent = (
+    <SkipToContent onClick={handleClick} href={`#${mainContainerId}`}>
+      Skip to content
+    </SkipToContent>
+  );
 
   return (
     <Page

package/src/demos/examples/Nav/NavDefault.tsx

@@ -58,7 +58,21 @@ export const NavDefault: React.FunctionComponent = () => {
     </PageSidebar>
   );
   const pageId = 'main-content-page-layout-default-nav';
-  const PageSkipToContent = <SkipToContent href={`#${pageId}`}>Skip to content</SkipToContent>;
+
+  const handleClick = (event) => {
+    event.preventDefault();
+
+    const mainContentElement = document.getElementById(pageId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+    }
+  };
+
+  const PageSkipToContent = (
+    <SkipToContent onClick={handleClick} href={`#${pageId}`}>
+      Skip to content
+    </SkipToContent>
+  );
 
   return (
     <>

package/src/demos/examples/Nav/NavExpandable.tsx

@@ -84,7 +84,21 @@ export const NavExpandableDemo: React.FunctionComponent = () => {
     </PageSidebar>
   );
   const pageId = 'main-content-page-layout-expandable-nav';
-  const PageSkipToContent = <SkipToContent href={`#${pageId}`}>Skip to content</SkipToContent>;
+
+  const handleClick = (event) => {
+    event.preventDefault();
+
+    const mainContentElement = document.getElementById(pageId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+    }
+  };
+
+  const PageSkipToContent = (
+    <SkipToContent onClick={handleClick} href={`#${pageId}`}>
+      Skip to content
+    </SkipToContent>
+  );
 
   return (
     <React.Fragment>

package/src/demos/examples/Nav/NavFlyout.tsx

@@ -259,7 +259,21 @@ export const NavFlyout: React.FunctionComponent = () => {
   );
 
   const pageId = 'main-content-page-layout-flyout-nav';
-  const PageSkipToContent = <SkipToContent href={`#${pageId}`}>Skip to Content</SkipToContent>;
+
+  const handleClick = (event) => {
+    event.preventDefault();
+
+    const mainContentElement = document.getElementById(pageId);
+    if (mainContentElement) {
+      mainContentElement.focus();
+    }
+  };
+
+  const PageSkipToContent = (
+    <SkipToContent onClick={handleClick} href={`#${pageId}`}>
+      Skip to content
+    </SkipToContent>
+  );
 
   return (
     <Page