From bcdc1c949c8f22a95e73b86f6a869c623b7f7dbb Mon Sep 17 00:00:00 2001 From: M Miller Date: Wed, 9 Oct 2024 13:14:41 -0700 Subject: [PATCH 1/3] Update pds-toolkit-react to dev.168 --- package-lock.json | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 882dd916cb..b167581afd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4128,22 +4128,23 @@ } }, "node_modules/@pantheon-systems/pds-design-tokens": { - "version": "1.0.0-dev.134", - "resolved": "https://registry.npmjs.org/@pantheon-systems/pds-design-tokens/-/pds-design-tokens-1.0.0-dev.134.tgz", - "integrity": "sha512-3lnbRwnRTj2yZ/wpnpWAtcEDuXV9Be3mewM89xWIRoXNQ7srUyvFbj0NNNr/VegioT+Ftg1MMQWWfPJoGYbeuw==", + "version": "1.0.0-dev.140", + "resolved": "https://registry.npmjs.org/@pantheon-systems/pds-design-tokens/-/pds-design-tokens-1.0.0-dev.140.tgz", + "integrity": "sha512-ZgB5H5ZYwNoO+e4kJVBF+s1sTjX9DswTFIAj9TXe3DwqGEv/c2XQMHeyjqaKRS6Cbe6Ts8gIBllIu4clIHxcDQ==", "license": "GPL-3.0-or-later" }, "node_modules/@pantheon-systems/pds-toolkit-react": { - "version": "1.0.0-dev.138", - "resolved": "https://registry.npmjs.org/@pantheon-systems/pds-toolkit-react/-/pds-toolkit-react-1.0.0-dev.138.tgz", - "integrity": "sha512-dGRT5tapGBggyvdk0fV6xbpI5V5PsIXlP5NLC1yGPyoImKA7FK8H6InhLNkGD/YmR/nIDl7uBsFkEOBTK20UrA==", + "version": "1.0.0-dev.168", + "resolved": "https://registry.npmjs.org/@pantheon-systems/pds-toolkit-react/-/pds-toolkit-react-1.0.0-dev.168.tgz", + "integrity": "sha512-WVkvYbetfl+A8fB8qVx1NtUvszDRgAXDCWTe48NW76ynR+yc/JQX3EiP5C2BR5/yElpwJIt3FXsgRDuYGC7dcQ==", "dependencies": { "@floating-ui/react": "^0.24.3", "@floating-ui/react-dom": "~1.3.0", - "@pantheon-systems/pds-design-tokens": "^1.0.0-dev.134", + "@pantheon-systems/pds-design-tokens": "^1.0.0-dev.140", "@reactuses/core": "^5.0.15", "focus-trap-react": "^10.2.1", "hash-sum": "^2.0.0", + "react-hotkeys-hook": "^4.5.1", "react-router-dom": "^6.13.0", "react-toastify": "^9.0.3" }, @@ -4206,6 +4207,16 @@ "react-dom": ">=16.3.0" } }, + "node_modules/@pantheon-systems/pds-toolkit-react/node_modules/react-hotkeys-hook": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-4.5.1.tgz", + "integrity": "sha512-scAEJOh3Irm0g95NIn6+tQVf/OICCjsQsC9NBHfQws/Vxw4sfq1tDQut5fhTEvPraXhu/sHxRd9lOtxzyYuNAg==", + "license": "MIT", + "peerDependencies": { + "react": ">=16.8.1", + "react-dom": ">=16.8.1" + } + }, "node_modules/@pantheon-systems/pds-toolkit-react/node_modules/react-router-dom": { "version": "6.22.3", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.3.tgz", @@ -29193,21 +29204,22 @@ } }, "@pantheon-systems/pds-design-tokens": { - "version": "1.0.0-dev.134", - "resolved": "https://registry.npmjs.org/@pantheon-systems/pds-design-tokens/-/pds-design-tokens-1.0.0-dev.134.tgz", - "integrity": "sha512-3lnbRwnRTj2yZ/wpnpWAtcEDuXV9Be3mewM89xWIRoXNQ7srUyvFbj0NNNr/VegioT+Ftg1MMQWWfPJoGYbeuw==" + "version": "1.0.0-dev.140", + "resolved": "https://registry.npmjs.org/@pantheon-systems/pds-design-tokens/-/pds-design-tokens-1.0.0-dev.140.tgz", + "integrity": "sha512-ZgB5H5ZYwNoO+e4kJVBF+s1sTjX9DswTFIAj9TXe3DwqGEv/c2XQMHeyjqaKRS6Cbe6Ts8gIBllIu4clIHxcDQ==" }, "@pantheon-systems/pds-toolkit-react": { - "version": "1.0.0-dev.138", - "resolved": "https://registry.npmjs.org/@pantheon-systems/pds-toolkit-react/-/pds-toolkit-react-1.0.0-dev.138.tgz", - "integrity": "sha512-dGRT5tapGBggyvdk0fV6xbpI5V5PsIXlP5NLC1yGPyoImKA7FK8H6InhLNkGD/YmR/nIDl7uBsFkEOBTK20UrA==", + "version": "1.0.0-dev.168", + "resolved": "https://registry.npmjs.org/@pantheon-systems/pds-toolkit-react/-/pds-toolkit-react-1.0.0-dev.168.tgz", + "integrity": "sha512-WVkvYbetfl+A8fB8qVx1NtUvszDRgAXDCWTe48NW76ynR+yc/JQX3EiP5C2BR5/yElpwJIt3FXsgRDuYGC7dcQ==", "requires": { "@floating-ui/react": "^0.24.3", "@floating-ui/react-dom": "~1.3.0", - "@pantheon-systems/pds-design-tokens": "^1.0.0-dev.134", + "@pantheon-systems/pds-design-tokens": "^1.0.0-dev.140", "@reactuses/core": "^5.0.15", "focus-trap-react": "^10.2.1", "hash-sum": "^2.0.0", + "react-hotkeys-hook": "^4.5.1", "react-router-dom": "^6.13.0", "react-toastify": "^9.0.3" }, @@ -29249,6 +29261,12 @@ "tabbable": "^6.2.0" } }, + "react-hotkeys-hook": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-4.5.1.tgz", + "integrity": "sha512-scAEJOh3Irm0g95NIn6+tQVf/OICCjsQsC9NBHfQws/Vxw4sfq1tDQut5fhTEvPraXhu/sHxRd9lOtxzyYuNAg==", + "requires": {} + }, "react-router-dom": { "version": "6.22.3", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.3.tgz", From df0248bda2764904f23cd1806c26f8ed3515ea6c Mon Sep 17 00:00:00 2001 From: M Miller Date: Wed, 9 Oct 2024 13:36:15 -0700 Subject: [PATCH 2/3] Add PDS GlobalWrapper and standardize mobile breakpoint --- gatsby-browser.js | 9 +++++++++ gatsby-ssr.js | 9 +++++++++ src/layout/header/index.js | 7 ++++--- src/vars/responsive.js | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 src/vars/responsive.js diff --git a/gatsby-browser.js b/gatsby-browser.js index 414cea296d..794bf32399 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,6 +1,10 @@ import React from "react" import { location, globalHistory } from "@reach/router" +// Import PDS Global wrapper for applying global context providers. +import { GlobalWrapper } from "@pantheon-systems/pds-toolkit-react" +import { MOBILE_MENU_BREAKPOINT } from './src/vars/responsive' + // Import PDS core styles. import "./node_modules/@pantheon-systems/pds-toolkit-react/_dist/css/pds-core.css" import "./node_modules/@pantheon-systems/pds-toolkit-react/_dist/css/pds-layouts.css" @@ -42,3 +46,8 @@ export const onRouteUpdate = () => { export const onInitialClientRender = () => { window.dispatchEvent(new Event("resize")) } + +// Global context providers +export const wrapRootElement = ({ element }) => { + return {element} +} diff --git a/gatsby-ssr.js b/gatsby-ssr.js index ec0fbc5480..c256b36a8b 100644 --- a/gatsby-ssr.js +++ b/gatsby-ssr.js @@ -1,5 +1,9 @@ import React from 'react' +// Import PDS Global wrapper for applying global context providers. +import { GlobalWrapper } from "@pantheon-systems/pds-toolkit-react" +import { MOBILE_MENU_BREAKPOINT } from './src/vars/responsive' + /* * Add global scripts to ensure Bootstrap and jQuery JS is included */ @@ -15,3 +19,8 @@ export const onRenderBody = ({ setPostBodyComponents }) => { } ]) } + +// Global context providers +export const wrapRootElement = ({ element }) => { + return {element} +} diff --git a/src/layout/header/index.js b/src/layout/header/index.js index 89cf6f8d91..134e29f2ea 100644 --- a/src/layout/header/index.js +++ b/src/layout/header/index.js @@ -6,6 +6,8 @@ import { NavMenu, } from "@pantheon-systems/pds-toolkit-react" +import { MOBILE_MENU_BREAKPOINT } from '../../vars/responsive' + import "./style.css" // Links for NavMenu component. @@ -118,7 +120,6 @@ const mainNavigationLinks = [ }, ] -const mobileMenuBreakpoint = 900 const Header = ({ page }) => ( <> @@ -126,12 +127,12 @@ const Header = ({ page }) => ( Skip to main content - +
Date: Wed, 9 Oct 2024 13:53:11 -0700 Subject: [PATCH 3/3] Update index.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update PDS `InputText` for `TextInput` — the former is deprecated and will be removed before PDS 1.0.0 release. --- src/layout/SearchBar/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/layout/SearchBar/index.js b/src/layout/SearchBar/index.js index ca45d8b4ee..221e97dc4d 100644 --- a/src/layout/SearchBar/index.js +++ b/src/layout/SearchBar/index.js @@ -2,7 +2,7 @@ import React from "react" import { Link } from "gatsby" import AddSearch from "../../components/addSearch" -import { InputText } from "@pantheon-systems/pds-toolkit-react" +import { TextInput } from "@pantheon-systems/pds-toolkit-react" import "./style.css" @@ -16,13 +16,13 @@ const SearchBar = ({ page }) => ( title="Search Pantheon Documentation" className="pds-spacing-pad-block-start-l pds-spacing-pad-block-end-2xl" > - {page == "default" ? : null}