Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wrong updation of DocsNavItem #1180

Merged
merged 4 commits into from
Dec 22, 2022
Merged

fix: wrong updation of DocsNavItem #1180

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb6c957
fix: wrong updation of DocsNavItem (#1179)
Ankitchaudharyy Dec 21, 2022
c061fa9
refactor: changed variable names in DocsNavItem.js (#1179)
Ankitchaudharyy Dec 21, 2022
603b725
Merge branch 'master' into docsNav
akshatnema Dec 22, 2022
4732a76
refactor: function isActiveSlug in DocsNavItem.js (#1179)
Ankitchaudharyy Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/navigation/DocsNav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ export default function DocsNav({
<li className='mb-4' key={item.item.title}>
<DocsNavItem {...item.item} activeSlug={active} defaultClassName='font-body text-sm text-black hover:font-semibold' inactiveClassName='font-regular' activeClassName='font-semibold' bucket={buckets[item.item.rootSectionId]} onClick={onClick} />
<ul className='border-l border-gray-200 pl-4 ml-3 mt-1'>
{Object.values(subCategories).map((subCategory, index) => (
{Object.values(subCategories).map((subCategory) => (
<li key={subCategory.item.title}>
<DocsNavItem {...subCategory.item} indexDocument={index === 0} activeSlug={active} defaultClassName={`font-body text-sm text-black leading-8 ${subCategory.children ? 'hover:font-semibold' : 'hover:text-secondary-600'}`} inactiveClassName='font-regular' activeClassName={subCategory.children ? 'font-semibold' : 'text-secondary-600'} onClick={onClick} />
<DocsNavItem {...subCategory.item} activeSlug={active} defaultClassName={`font-body text-sm text-black leading-8 ${subCategory.children ? 'hover:font-semibold' : 'hover:text-secondary-600'}`} inactiveClassName='font-regular' activeClassName={subCategory.children ? 'font-semibold' : 'text-secondary-600'} onClick={onClick} />
<ul className='border-l border-gray-200 pl-4'>
{subCategory.children && subCategory.children.map(subItem => (
<li key={subItem.title}>
Expand Down
20 changes: 16 additions & 4 deletions components/navigation/DocsNavItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
import Link from 'next/link';

function isActiveSlug(slug, activeSlug) {
function isEqual(currentSlug, activeSlug) {
return currentSlug === activeSlug;
}

function isActiveSlug(slug, activeSlug, sectionSlug) {
if(slug === '/docs') {
return isEqual(slug, activeSlug);
}

if(sectionSlug !== undefined && slug === sectionSlug) {
return isEqual(slug, activeSlug);
}

Ankitchaudharyy marked this conversation as resolved.
Show resolved Hide resolved
const partialSlug = slug.split('/');
const partialActiveSlug = activeSlug.split('/');
const activeParts = partialActiveSlug.filter((a, idx) => a === partialSlug[idx]);
return activeParts.length === partialSlug.length;
}

export default function DocsNavItem({ title, slug, href, indexDocument, activeSlug, onClick = () => {}, defaultClassName = '', inactiveClassName = '', activeClassName = '', bucket }) {
const isActive = slug === '/docs' || indexDocument ? slug === activeSlug : isActiveSlug(slug, activeSlug);
export default function DocsNavItem({ title, slug, href, activeSlug, sectionSlug, onClick = () => {}, defaultClassName = '', inactiveClassName = '', activeClassName = '', bucket }) {
const isActive = isActiveSlug(slug, activeSlug, sectionSlug);
const classes = `${isActive ? activeClassName : inactiveClassName} ${defaultClassName} inline-block`;

return (
Expand All @@ -27,4 +39,4 @@ export default function DocsNavItem({ title, slug, href, indexDocument, activeSl
</div>
</div>
);
}
}