commit c791f00036ffa58daa07cdffb6c109ebd05a7a57 · kitten.sh/urql

+1 -1

packages/site/package.json

···

       46
       46
        
           "react-router-ga": "^1.2.3",

     

       47
       47
        
           "react-scroll": "^1.7.15",

     

       48
       48
        
           "react-static": "^7.2.3",

     

       49
       49
       -
           "react-static-plugin-md-pages": "^0.1.7",

     

       49
       49
       +
           "react-static-plugin-md-pages": "^0.2.0",

     

       50
       50
        
           "styled-components": "^5.0.1"

     

       51
       51
        
         },

     

       52
       52
        
         "devDependencies": {

+13 -10

packages/site/src/components/sidebar.js

···

       81
       81
        
       

     

       82
       82
        
       const Sidebar = props => {

     

       83
       83
        
         const location = useLocation();

     

       84
       84
       -
         const currentPage = useMarkdownPage();

     

       85
       84
        
         const tree = useMarkdownTree();

     

       86
       85
        
       

     

       87
       86
        
         const sidebarItems = useMemo(() => {

     

       88
       88
       -
           if (!currentPage || !tree || !tree.children || !location) {

     

       87
       87
       +
           let pathname = location.pathname.match(/docs\/?(.+)?/);

     

       88
       88
       +
       

     

       89
       89
       +
           if (!pathname || !tree || !tree.children || !location) {

     

       89
       90
        
             return null;

     

       90
       91
        
           }

     

       91
       91
       -
       

     

       92
       92
       -
           const pathname = location.pathname.endsWith('/')

     

       93
       93
       -
             ? currentPage.path + '/'

     

       94
       94
       -
             : currentPage.path;

     

       92
       92
       +
           pathname = pathname[0];

     

       93
       93
       +
           const pathnameWithoutSlash = pathname.replace(/\/$/, '');

     

       95
       94
        
       

     

       96
       95
        
           let children = tree.children;

     

       97
       96
        
           if (tree.frontmatter && tree.originalPath) {

     
···

       102
       101
        
             const pageChildren = page.children || [];

     

       103
       102
        
       

     

       104
       103
        
             const isActive = pageChildren.length

     

       105
       105
       -
               ? currentPage.path.startsWith(page.path)

     

       106
       106
       -
               : currentPage.path === page.path;

     

       104
       104
       +
               ? pathnameWithoutSlash.startsWith(page.path)

     

       105
       105
       +
               : !!page.path.match(new RegExp(`${pathnameWithoutSlash}$`, 'g'));

     

       107
       106
        
       

     

       108
       107
        
             return (

     

       109
       108
        
               <Fragment key={page.key}>

     
···

       119
       118
        
                   <SidebarNavSubItemWrapper>

     

       120
       119
        
                     {pageChildren.map(childPage => (

     

       121
       120
        
                       <SidebarNavSubItem

     

       122
       122
       -
                         isActive={() => childPage.path === currentPage.path}

     

       121
       121
       +
                         isActive={() =>

     

       122
       122
       +
                           !!childPage.path.match(

     

       123
       123
       +
                             new RegExp(`${pathnameWithoutSlash}$`, 'g')

     

       124
       124
       +
                           )

     

       125
       125
       +
                         }

     

       123
       126
        
                         to={relative(pathname, childPage.path)}

     

       124
       127
        
                         key={childPage.key}

     

       125
       128
        
                       >

     
···

       131
       134
        
               </Fragment>

     

       132
       135
        
             );

     

       133
       136
        
           });

     

       134
       134
       -
         }, [currentPage, tree, location]);

     

       137
       137
       +
         }, [location, tree]);

     

       135
       138
        
       

     

       136
       139
        
         return <SidebarStyling {...props}>{sidebarItems}</SidebarStyling>;

     

       137
       140
        
       };

+4 -12

packages/site/src/screens/docs/index.js

···

       3
       3
        
       

     

       4
       4
        
       import Article, { ArticleStyling } from './article';

     

       5
       5
        
       import Header from './header';

     

       6
       6
       -
       import Sidebar, { SidebarStyling } from '../../components/sidebar';

     

       6
       6
       +
       import Sidebar from '../../components/sidebar';

     

       7
       7
        
       

     

       8
       8
        
       import burger from '../../assets/burger.svg';

     

       9
       9
        
       import closeButton from '../../assets/close.svg';

     
···

       51
       51
        
                 onClick={() => setSidebarOpen(prev => !prev)}

     

       52
       52
        
               />

     

       53
       53
        
               {/* load just the styles if Suspense fallback in use */}

     

       54
       54
       +
               <Sidebar sidebarOpen={sidebarOpen} closeSidebar={closeSidebar} />

     

       54
       55
        
               {isLoading ? (

     

       55
       55
       -
                 <>

     

       56
       56
       -
                   <SidebarStyling

     

       57
       57
       -
                     sidebarOpen={sidebarOpen}

     

       58
       58
       -
                     closeSidebar={closeSidebar}

     

       59
       59
       -
                   />

     

       60
       60
       -
                   <ArticleStyling>{children}</ArticleStyling>

     

       61
       61
       -
                 </>

     

       56
       56
       +
                 <ArticleStyling>{children}</ArticleStyling>

     

       62
       57
        
               ) : (

     

       63
       63
       -
                 <>

     

       64
       64
       -
                   <Sidebar sidebarOpen={sidebarOpen} closeSidebar={closeSidebar} />

     

       65
       65
       -
                   <Article>{children}</Article>

     

       66
       66
       -
                 </>

     

       58
       58
       +
                 <Article>{children}</Article>

     

       67
       59
        
               )}

     

       68
       60
        
             </Container>

     

       69
       61
        
           </>

+4 -4

yarn.lock

···

       11752
       11752
        
         dependencies:

     

       11753
       11753
        
           object-is "^1.0.2"

     

       11754
       11754
        
       

     

       11755
       11755
       -
       react-static-plugin-md-pages@^0.1.7:

     

       11756
       11756
       -
         version "0.1.7"

     

       11757
       11757
       -
         resolved "https://registry.yarnpkg.com/react-static-plugin-md-pages/-/react-static-plugin-md-pages-0.1.7.tgz#13f3daf1ce32fef9a77d037600572aeb752340c8"

     

       11758
       11758
       -
         integrity sha512-Y17VFyrOBMi2FqfumB5a50RHu2TbckC9LL2GMotJjL0PhbdpJBhgL6vbjEdJXoJxjk2JR93/dyZZcJmXhSL5MA==

     

       11755
       11755
       +
       react-static-plugin-md-pages@^0.2.0:

     

       11756
       11756
       +
         version "0.2.0"

     

       11757
       11757
       +
         resolved "https://registry.yarnpkg.com/react-static-plugin-md-pages/-/react-static-plugin-md-pages-0.2.0.tgz#5d5b70dff9fbb276da4ac76680536fa093c0da3d"

     

       11758
       11758
       +
         integrity sha512-PtcKa48bJSMvKQSA/8Pz8rxL9ZgTXIvci/BCT6OKunC7iQimSWLv1XvLr88a54SY7xq9/pPe+UkmJGNl5w+egg==

     

       11759
       11759
        
         dependencies:

     

       11760
       11760
        
           "@mdx-js/mdx" "^1.5.5"

     

       11761
       11761
        
           "@mdx-js/react" "^1.5.5"