Skip to content

Commit c851380

Browse files
authored
FEN-168 Make logo sx props customizable (#233)
* FEN-168 Make Logo customizable * FEN-168 Move PartialLogoProps
1 parent d49b504 commit c851380

File tree

11 files changed

+31
-3
lines changed

11 files changed

+31
-3
lines changed

packages/components/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @baseapp-frontend/components
22

3+
## 1.0.25
4+
5+
### Patch Changes
6+
7+
- Forward LogoProps to make them customizable
8+
39
## 1.0.24
410

511
### Patch Changes

packages/components/modules/navigations/web/Header/index.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const Header: FC<HeaderProps> = ({
1717
children,
1818
onOpenNav,
1919
LogoIcon,
20+
LogoProps,
2021
AccountMenu = DefaultAccountMenu,
2122
AccountMenuProps,
2223
ToolbarProps,
@@ -37,8 +38,10 @@ const Header: FC<HeaderProps> = ({
3738
>
3839
{LogoIcon && (isNavHorizontal || isNavCentered) && (
3940
<Logo
41+
{...LogoProps}
4042
sx={{
4143
display: { xs: 'none', lg: 'flex' },
44+
...LogoProps?.sx,
4245
}}
4346
>
4447
<LogoIcon />

packages/components/modules/navigations/web/Header/types.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FC, PropsWithChildren } from 'react'
22

3+
import { PartialLogoProps } from '@baseapp-frontend/design-system/components/web/logos'
34
import { ThemeLayout, UISettings } from '@baseapp-frontend/design-system/styles/web'
45

56
import { AppBarProps, ToolbarProps as MuiToolbarProps } from '@mui/material'
@@ -14,6 +15,7 @@ export interface HeaderProps extends PropsWithChildren {
1415
settings: UISettings
1516
onOpenNav?: VoidFunction
1617
LogoIcon?: React.FC
18+
LogoProps?: PartialLogoProps
1719
AccountMenu?: FC<AccountMenuProps>
1820
AccountMenuProps?: Partial<AccountMenuProps>
1921
ToolbarProps?: MuiToolbarProps

packages/components/modules/navigations/web/NavMini/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const NavMini: FC<NavMiniProps> = ({
2020
settings,
2121
setSettings,
2222
LogoIcon,
23+
LogoProps,
2324
openNav,
2425
onCloseNav,
2526
hideToggleButton = false,
@@ -59,7 +60,7 @@ const NavMini: FC<NavMiniProps> = ({
5960
}}
6061
>
6162
{LogoIcon && (
62-
<Logo sx={{ mx: 'auto', my: 2 }}>
63+
<Logo {...LogoProps} sx={{ mx: 'auto', my: 2, ...LogoProps?.sx }}>
6364
<LogoIcon />
6465
</Logo>
6566
)}

packages/components/modules/navigations/web/NavMini/types.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { PartialLogoProps } from '@baseapp-frontend/design-system/components/web/logos'
12
import { UISettings } from '@baseapp-frontend/design-system/styles/web'
23

34
import { NavigationData } from '../types'
@@ -9,5 +10,6 @@ export interface NavMiniProps {
910
settings: UISettings
1011
setSettings: (newSettings: Partial<UISettings>) => void
1112
LogoIcon?: React.FC
13+
LogoProps?: PartialLogoProps
1214
hideToggleButton?: boolean
1315
}

packages/components/modules/navigations/web/NavVertical/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const NavVertical: FC<NavVerticalProps> = ({
2020
setSettings,
2121
navData,
2222
LogoIcon,
23+
LogoProps,
2324
openNav,
2425
onCloseNav,
2526
hideToggleButton = false,
@@ -58,7 +59,7 @@ const NavVertical: FC<NavVerticalProps> = ({
5859
}}
5960
>
6061
{LogoIcon && (
61-
<Logo sx={{ mt: 3, ml: 4, mb: 1 }}>
62+
<Logo {...LogoProps} sx={{ mt: 3, ml: 4, mb: 1, ...LogoProps?.sx }}>
6263
<LogoIcon />
6364
</Logo>
6465
)}

packages/components/modules/navigations/web/NavVertical/types.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { PartialLogoProps } from '@baseapp-frontend/design-system/components/web/logos'
12
import { UISettings } from '@baseapp-frontend/design-system/styles/web'
23

34
import { NavigationData } from '../types'
@@ -7,6 +8,7 @@ export interface NavVerticalProps {
78
setSettings: (newSettings: Partial<UISettings>) => void
89
navData: NavigationData
910
LogoIcon?: React.FC
11+
LogoProps?: PartialLogoProps
1012
openNav: boolean
1113
onCloseNav: VoidFunction
1214
hideToggleButton?: boolean

packages/components/modules/navigations/web/NavigationLayout/index.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const NavigationLayout: FC<NavigationLayoutProps> = ({
1919
settings,
2020
setSettings,
2121
LogoIcon,
22+
LogoProps,
2223
AccountMenu,
2324
AccountMenuProps,
2425
ToolbarProps,
@@ -36,6 +37,7 @@ const NavigationLayout: FC<NavigationLayoutProps> = ({
3637
<Header
3738
settings={settings}
3839
LogoIcon={LogoIcon}
40+
LogoProps={LogoProps}
3941
onOpenNav={nav.onTrue}
4042
AccountMenu={AccountMenu}
4143
AccountMenuProps={AccountMenuProps}
@@ -54,6 +56,7 @@ const NavigationLayout: FC<NavigationLayoutProps> = ({
5456
<Header
5557
settings={settings}
5658
LogoIcon={LogoIcon}
59+
LogoProps={LogoProps}
5760
onOpenNav={nav.onTrue}
5861
AccountMenu={AccountMenu}
5962
AccountMenuProps={AccountMenuProps}
@@ -71,6 +74,7 @@ const NavigationLayout: FC<NavigationLayoutProps> = ({
7174
<Header
7275
settings={settings}
7376
LogoIcon={LogoIcon}
77+
LogoProps={LogoProps}
7478
onOpenNav={nav.onTrue}
7579
AccountMenu={AccountMenu}
7680
AccountMenuProps={AccountMenuProps}
@@ -89,6 +93,7 @@ const NavigationLayout: FC<NavigationLayoutProps> = ({
8993
openNav={nav.value}
9094
onCloseNav={nav.onFalse}
9195
LogoIcon={LogoIcon}
96+
LogoProps={LogoProps}
9297
settings={settings}
9398
setSettings={setSettings}
9499
/>
@@ -103,6 +108,7 @@ const NavigationLayout: FC<NavigationLayoutProps> = ({
103108
<Header
104109
settings={settings}
105110
LogoIcon={LogoIcon}
111+
LogoProps={LogoProps}
106112
onOpenNav={nav.onTrue}
107113
AccountMenu={AccountMenu}
108114
AccountMenuProps={AccountMenuProps}
@@ -120,6 +126,7 @@ const NavigationLayout: FC<NavigationLayoutProps> = ({
120126
settings={settings}
121127
setSettings={setSettings}
122128
LogoIcon={LogoIcon}
129+
LogoProps={LogoProps}
123130
openNav={nav.value}
124131
onCloseNav={nav.onFalse}
125132
/>

packages/components/modules/navigations/web/NavigationLayout/types.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FC, PropsWithChildren } from 'react'
22

3+
import { PartialLogoProps } from '@baseapp-frontend/design-system/components/web/logos'
34
import { UISettings } from '@baseapp-frontend/design-system/styles/web'
45

56
import { ToolbarProps as MuiToolbarProps } from '@mui/material'
@@ -12,6 +13,7 @@ export interface NavigationLayoutProps extends PropsWithChildren {
1213
settings: UISettings
1314
setSettings: (newSettings: Partial<UISettings>) => void
1415
LogoIcon?: React.FC
16+
LogoProps?: PartialLogoProps
1517
AccountMenu?: FC<AccountMenuProps>
1618
AccountMenuProps?: Partial<AccountMenuProps>
1719
ToolbarProps?: MuiToolbarProps

packages/components/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@baseapp-frontend/components",
33
"description": "BaseApp components modules such as comments, notifications, messages, and more.",
4-
"version": "1.0.24",
4+
"version": "1.0.25",
55
"sideEffects": false,
66
"scripts": {
77
"babel:transpile": "babel modules -d tmp-babel --extensions .ts,.tsx --ignore '**/__tests__/**','**/__storybook__/**'",

packages/design-system/components/web/logos/Logo/types.ts

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ export interface LogoProps extends BoxProps {
44
children: React.ReactNode
55
disabledLink?: boolean
66
}
7+
8+
export type PartialLogoProps = Omit<LogoProps, 'ref' | 'children'>

0 commit comments

Comments
 (0)