@patternfly/documentation-framework 6.0.0-alpha.99 → 6.0.2

package/layouts/sideNavLayout/sideNavLayout.js

@@ -4,13 +4,11 @@ import {
   Page,
   PageSidebar,
   PageSidebarBody,
-  Brand,
   Dropdown,
   DropdownItem,
   DropdownGroup,
   DropdownList,
   Divider,
-  Icon,
   Masthead,
   MastheadToggle,
   MastheadMain,
@@ -24,10 +22,10 @@ import {
   ToolbarItem,
   SkipToContent,
   Switch,
-  // SearchInput,
+  SearchInput,
   ToggleGroup,
   ToggleGroupItem,
-  MastheadLogo,
+  MastheadLogo
 } from '@patternfly/react-core';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import GithubIcon from '@patternfly/react-icons/dist/esm/icons/github-icon';
@@ -49,52 +47,41 @@ const HeaderTools = ({
   isRTL,
   setIsRTL,
   isDarkTheme,
-  setIsDarkTheme,
+  setIsDarkTheme
 }) => {
-  const initialVersion = staticVersions.Releases.find(
-    (release) => release.latest
-  );
   const latestVersion = versions.Releases.find((version) => version.latest);
-  const previousReleases = Object.values(versions.Releases).filter(
-    (version) => !version.hidden && !version.latest
-  );
-  // const hasSearch = algolia;
+  const previousReleases = Object.values(versions.Releases).filter((version) => !version.hidden && !version.latest);
+  const hasSearch = algolia;
   const [isDropdownOpen, setDropdownOpen] = useState(false);
-  // const [searchValue, setSearchValue] = React.useState('');
-  // const [isSearchExpanded, setIsSearchExpanded] = React.useState(false);
+  const [searchValue, setSearchValue] = React.useState('');
+  const [isSearchExpanded, setIsSearchExpanded] = React.useState(false);
 
   const getDropdownItem = (version, isLatest = false) => (
-    <DropdownItem
-      itemId={version.name}
-      key={version.name}
-      to={isLatest ? '/' : `/${version.name}`}
-    >
-      {`Current ${version.name}`}
+    <DropdownItem itemId={version.name} key={version.name} to={isLatest ? '/' : `/${version.name}`}>
+      {`Release ${version.name}`}
     </DropdownItem>
   );
 
-  // const onChange = (_evt, value) => {
-  //   setSearchValue(value);
-  // };
+  const onChange = (_evt, value) => {
+    setSearchValue(value);
+  };
 
-  // const onToggleExpand = (_evt, isSearchExpanded) => {
-  //   setIsSearchExpanded(!isSearchExpanded);
-  // };
+  const onToggleExpand = (_evt, isSearchExpanded) => {
+    setIsSearchExpanded(!isSearchExpanded);
+  };
 
   const toggleDarkTheme = (_evt, selected) => {
     const darkThemeToggleClicked = !selected === isDarkTheme;
-    document
-      .querySelector('html')
-      .classList.toggle('pf-v6-theme-dark', darkThemeToggleClicked);
+    document.querySelector('html').classList.toggle('pf-v6-theme-dark', darkThemeToggleClicked);
     setIsDarkTheme(darkThemeToggleClicked);
   };
 
-  // useEffect(() => {
-  //   // reattach algolia to input each time search is expanded
-  //   if (hasSearch && isSearchExpanded) {
-  //     attachDocSearch(algolia, '.ws-global-search .pf-v6-c-text-input-group__text-input', 1000);
-  //   }
-  // }, [isSearchExpanded])
+  useEffect(() => {
+    // reattach algolia to input each time search is expanded
+    if (hasSearch && isSearchExpanded) {
+      attachDocSearch(algolia, '.ws-global-search .pf-v6-c-text-input-group__text-input', 1000);
+    }
+  }, [isSearchExpanded]);
 
   return (
     <Toolbar isFullHeight>
@@ -133,7 +120,7 @@ const HeaderTools = ({
               />
             </ToolbarItem>
           )}
-          {/* {hasSearch && (
+          {hasSearch && (
             <ToolbarItem>
               <SearchInput
                 className="ws-global-search"
@@ -141,10 +128,14 @@ const HeaderTools = ({
                 value={searchValue}
                 onChange={onChange}
                 onClear={(_evt) => onChange(_evt, '')}
-                expandableInput={{ isExpanded: isSearchExpanded, onToggleExpand, toggleAriaLabel: 'Expandable search input toggle' }}
+                expandableInput={{
+                  isExpanded: isSearchExpanded,
+                  onToggleExpand,
+                  toggleAriaLabel: 'Expandable search input toggle'
+                }}
               />
             </ToolbarItem>
-          )} */}
+          )}
           <ToolbarItem>
             <Button
               component="a"
@@ -168,55 +159,29 @@ const HeaderTools = ({
                     onClick={() => setDropdownOpen(!isDropdownOpen)}
                     isExpanded={isDropdownOpen}
                   >
-                    Current alphas
+                    Release 6.0.0
                   </MenuToggle>
                 )}
+                popperProps={{ position: 'right' }}
               >
                 <DropdownGroup key="Latest" label="Latest">
-                  <DropdownList>
-                    {getDropdownItem(latestVersion, true)}
-                  </DropdownList>
+                  <DropdownList>{getDropdownItem(latestVersion, true)}</DropdownList>
                 </DropdownGroup>
                 {previousReleases.length > 0 && (
-                  <DropdownGroup
-                    key="Previous releases"
-                    label="Previous releases"
-                  >
+                  <DropdownGroup key="Previous releases" label="Previous releases">
                     <DropdownList>
-                      {previousReleases
-                        .slice(0, 3)
-                        .map((version) => getDropdownItem(version))}
+                      {previousReleases.slice(0, 3).map((version) => getDropdownItem(version))}
                     </DropdownList>
                   </DropdownGroup>
                 )}
                 <Divider key="divider1" />
-                <DropdownGroup
-                  key="Alpha preview version"
-                  label="Alpha preview version"
-                >
-                  <DropdownList>
-                    <DropdownItem
-                      key="PatternFly 6"
-                      className="ws-patternfly-versions"
-                      isExternalLink
-                      to="https://staging.patternfly.org/"
-                      itemId="patternfly-6"
-                    >
-                      PatternFly 6
-                    </DropdownItem>
-                  </DropdownList>
-                </DropdownGroup>
-                <Divider key="divider2" />
-                <DropdownGroup
-                  key="Previous versions"
-                  label="Previous versions"
-                >
+                <DropdownGroup key="Previous versions" label="Previous versions">
                   <DropdownList>
                     <DropdownItem
                       key="PatternFly 5"
                       className="ws-patternfly-versions"
                       isExternalLink
-                      to="https://www.patternfly.org"
+                      to="https://v5-archive.patternfly.org/"
                       itemId="patternfly-5"
                     >
                       PatternFly 5
@@ -257,21 +222,17 @@ export function attachDocSearch(algolia, inputSelector, timeout) {
       inputSelector,
       autocompleteOptions: {
         hint: false,
-        appendTo: `.ws-global-search .pf-v6-c-text-input-group`,
+        appendTo: `.ws-global-search .pf-v6-c-text-input-group`
       },
       debug: process.env.NODE_ENV !== 'production',
-      ...algolia,
+      ...algolia
     });
   } else {
     setTimeout(() => attachDocSearch(algolia, inputSelector, timeout), timeout);
   }
 }
 
-export const SideNavLayout = ({
-  children,
-  groupedRoutes,
-  navOpen: navOpenProp,
-}) => {
+export const SideNavLayout = ({ children, groupedRoutes, navOpen: navOpenProp }) => {
   const algolia = process.env.algolia;
   const hasGdprBanner = process.env.hasGdprBanner;
   const hasVersionSwitcher = process.env.hasVersionSwitcher;
@@ -323,19 +284,9 @@ export const SideNavLayout = ({
               <svg height="40px" viewBox="0 0 679 158">
                 <title>PF-HorizontalLogo-Color</title>
                 <defs>
-                  <linearGradient
-                    x1="68%"
-                    y1="2.25860997e-13%"
-                    x2="32%"
-                    y2="100%"
-                    id="linearGradient-website-masthead"
-                  >
+                  <linearGradient x1="68%" y1="2.25860997e-13%" x2="32%" y2="100%" id="linearGradient-website-masthead">
                     <stop stopColor="#2B9AF3" offset="0%"></stop>
-                    <stop
-                      stopColor="#73BCF7"
-                      stopOpacity="0.502212631"
-                      offset="100%"
-                    ></stop>
+                    <stop stopColor="#73BCF7" stopOpacity="0.502212631" offset="100%"></stop>
                   </linearGradient>
                 </defs>
                 <g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
@@ -404,9 +355,7 @@ export const SideNavLayout = ({
           mainComponent="div"
           masthead={masthead}
           sidebar={SideBar}
-          skipToContent={
-            <SkipToContent href="#ws-page-main">Skip to content</SkipToContent>
-          }
+          skipToContent={<SkipToContent href="#ws-page-main">Skip to content</SkipToContent>}
           isManagedSidebar
           defaultManagedSidebarIsOpen={navOpenProp}
         >

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@patternfly/documentation-framework",
   "description": "A framework to build documentation for PatternFly.",
-  "version": "6.0.0-alpha.99",
+  "version": "6.0.2",
   "author": "Red Hat",
   "license": "MIT",
   "private": false,
@@ -13,7 +13,7 @@
     "@babel/preset-env": "^7.24.3",
     "@babel/preset-react": "^7.24.1",
     "@mdx-js/util": "1.6.16",
-    "@patternfly/ast-helpers": "^1.4.0-alpha.88",
+    "@patternfly/ast-helpers": "^1.4.0-alpha.118",
     "@reach/router": "npm:@gatsbyjs/reach-router@1.3.9",
     "autoprefixer": "9.8.6",
     "babel-loader": "^9.1.3",
@@ -25,7 +25,7 @@
     "copy-webpack-plugin": "11.0.0",
     "css-loader": "6.7.3",
     "detab": "2.0.3",
-    "express": "4.20.0",
+    "express": "4.21.0",
     "file-loader": "6.2.0",
     "file-saver": "1.3.8",
     "fs-extra": "9.0.1",
@@ -73,12 +73,12 @@
     "webpack-merge": "5.8.0"
   },
   "peerDependencies": {
-    "@patternfly/patternfly": "6.0.0-alpha.227",
-    "@patternfly/react-code-editor": "6.0.0-alpha.105",
-    "@patternfly/react-core": "6.0.0-alpha.105",
-    "@patternfly/react-table": "6.0.0-alpha.106",
+    "@patternfly/patternfly": "^6.0.0",
+    "@patternfly/react-code-editor": "^6.0.0",
+    "@patternfly/react-core": "^6.0.0",
+    "@patternfly/react-table": "^6.0.0",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },
-  "gitHead": "76c0524a34271430a74e9d965c733ecfab16e9ac"
+  "gitHead": "d5b85d834a8c461748d13e2d51d08beed4cbd3bd"
 }

package/scripts/md/parseMD.js

@@ -184,7 +184,7 @@ function toReactComponent(mdFilePath, source, buildMode) {
     .use(require('./mdx-ast-to-mdx-hast'), {
       watchExternal(file) {
         if (buildMode === 'start') {
-          const watcher = chokidar.watch(file, { ignoreInitial: true });
+          const watcher = chokidar.watch(globSync(file, { ignoreInitial: true}));
           watcher.on('change', () => {
             sourceMDFile(mdFilePath, source, buildMode);
             writeIndex();
@@ -350,12 +350,12 @@ module.exports = {
   writeIndex,
   watchMD() {
     globs.props.forEach(({ glob, ignore }) => {
-      const propWatcher = chokidar.watch(glob, { ignored: ignore, ignoreInitial: true });
+      const propWatcher = chokidar.watch(globSync(glob, { ignored: ignore, ignoreInitial: true}));
       propWatcher.on('add', sourcePropsFile);
       propWatcher.on('change', sourcePropsFile);
     });
     globs.md.forEach(({ glob, source, ignore }) => {
-      const mdWatcher = chokidar.watch(glob, { ignored: ignore, ignoreInitial: true });
+      const mdWatcher = chokidar.watch(globSync(glob, { ignored: ignore, ignoreInitial: true }));
       function onMDFileChange(file) {
         sourceMDFile(file, source, 'start');
         writeIndex();

package/scripts/md/styled-tags.js

@@ -26,7 +26,7 @@ function styledTags() {
       node.properties.className = node.properties.className || '';
       
       if (contentStyledMdTags.includes(node.tagName)) {
-        node.properties.className += `pf-v6-c-content--${node.tagName}`;
+        node.properties.className += `pf-v6-c-content--${node.tagName} pf-m-editorial`;
       }
 
       if (styledMdTags.includes(node.tagName)) {

package/scripts/md/typecheck.js

@@ -37,7 +37,11 @@ const reactStyles = globSync(path.join(reactStylesDir, 'css/**/*.d.ts'))
 const defaultImports = [
   'react',
   '@reach/router',
+  '@patternfly/react-charts/echarts',
   '@patternfly/react-charts/next',
+  '@patternfly/react-charts/next/echarts',
+  '@patternfly/react-charts/next/victory',
+  '@patternfly/react-charts/victory',
   '@patternfly/react-core/next',
   '@patternfly/react-core/deprecated',
   '@patternfly/react-table/deprecated',