Skip to content

Commit

Permalink
breadcrumb updates
Browse files Browse the repository at this point in the history
  • Loading branch information
olemp committed Mar 22, 2024
1 parent 09e2027 commit 64696d7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions client/components/Breadcrumb/Breadcrumb.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.breadcrumb {
margin-left: -10px;
}
7 changes: 6 additions & 1 deletion client/components/Breadcrumb/Breadcrumb.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ import { ReusableComponent } from 'components/types'
import React from 'react'
import { renderBreadcrumbItem } from './renderBreadcrumbItem'
import { IBreadcrumbComponentProps } from './types'
import styles from './Breadcrumb.module.scss'
import { mergeClasses } from '@fluentui/react-components'

export const BreadcrumbComponent: ReusableComponent<
IBreadcrumbComponentProps
> = (props) => {
return (
<div className={props.className}>
<div
className={mergeClasses(BreadcrumbComponent.className, props.className)}
>
<Breadcrumb size='large'>
{props.items.map((item) => renderBreadcrumbItem(item, props.items))}
</Breadcrumb>
Expand All @@ -17,6 +21,7 @@ export const BreadcrumbComponent: ReusableComponent<
}

BreadcrumbComponent.displayName = 'Breadcrumb'
BreadcrumbComponent.className = styles.breadcrumb
BreadcrumbComponent.defaultProps = {
items: []
}
4 changes: 2 additions & 2 deletions client/components/List/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ function applyFilters<T = any>(
(item) =>
_.filter(Object.keys(filterValues), (key) => {
const value = get(item as any, key, '')
switch (typeof value) {
switch (typeof filterValues[key]) {
case 'boolean': {
return filterValues[key] === value
}
default: {
return filterValues[key].includes(value)
return filterValues[key]?.includes(value)
}
}
}).length === Object.keys(filterValues).length
Expand Down

0 comments on commit 64696d7

Please sign in to comment.