Skip to content

Commit 2480c0d

Browse files
authored
Merge pull request #49 from 1Byte-Software/develop
Update version 1.10.1
2 parents ad43549 + 6dc4518 commit 2480c0d

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.10.1]
9+
10+
### Fixed
11+
12+
- Fix `HeaderSider` in `DashboardTemplate`.
13+
814
## [1.10.0]
915

1016
### Added

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "1byte-react-design",
3-
"version": "1.10.0",
3+
"version": "1.10.1",
44
"description": "A simple React UI library",
55
"main": "dist/index.js",
66
"module": "dist/index.js",

src/templates/DashboardTemplate/Sider/index.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,12 @@ export const DashboardTemplateSider: RdDashboardTemplateSiderComponent = forward
9999
- For "contentHeight": when the screen shrinks into fixed overlay mode,
100100
the headerSidebar still renders (at this point, the sider behaves like fullHeight).
101101
*/}
102-
<DashboardTemplateHeaderSidebarStyled fixedOnScroll={fixedHeaderOnScroll}>
103-
{headerSidebar?.(collapsed ?? false)}
104-
</DashboardTemplateHeaderSidebarStyled>
102+
{(sidebarMode === 'fullHeight' ||
103+
(sidebarMode === 'contentHeight' && collapsed)) && (
104+
<DashboardTemplateHeaderSidebarStyled fixedOnScroll={fixedHeaderOnScroll}>
105+
{headerSidebar?.(collapsed ?? false)}
106+
</DashboardTemplateHeaderSidebarStyled>
107+
)}
105108

106109
<DashboardTemplateSiderContentStyled>
107110
{children}

0 commit comments

Comments
 (0)