Skip to content

Commit 53e470f

Browse files
authored
Merge pull request #15 from 1Byte-Software/develop
Update DashboardTemplate component token
2 parents 77bfa97 + 175e4e3 commit 53e470f

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

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.4.4-1",
3+
"version": "1.4.12",
44
"main": "dist/index.js",
55
"module": "dist/index.js",
66
"types": "dist/index.d.ts",

src/templates/DashboardTemplate/Sider/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { forwardRef, useState } from 'react';
22
import { DashboardTemplateSiderStyles } from './styles';
33
import { RdDashboardTemplateSiderComponent } from './types';
4+
import { getComponentOrGlobalToken, getComponentToken } from '../../../utils';
45

56
export const DashboardTemplateSider: RdDashboardTemplateSiderComponent = forwardRef(
67
(props, ref) => {
78
const { children, render, ...restProps } = props;
89
const [collapsed, setCollapsed] = useState(false);
10+
const siderWidth = getComponentToken('DashboardTemplate', 'siderWidth');
911

1012
if (render) {
1113
return render({ children, ...restProps });
@@ -14,7 +16,7 @@ export const DashboardTemplateSider: RdDashboardTemplateSiderComponent = forward
1416
return (
1517
<DashboardTemplateSiderStyles
1618
ref={ref}
17-
width={264}
19+
width={siderWidth || 264}
1820
collapsedWidth={68}
1921
collapsible
2022
collapsed={collapsed}

src/templates/DashboardTemplate/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { RdDashboardTemplateSiderComponent, RdDashboardTemplateSiderProps } from
55
//#region Define extended component tokens
66
type DashboardTemplateComponentTokenExtend = {
77
contentPadding?: string;
8+
siderWidth?: number;
89
};
910

1011
//#endregion

0 commit comments

Comments
 (0)