Skip to content

Commit 05b3b61

Browse files
xiejay97xiejay97
committed
refactor(ui): use onClose instead of onVisibleChange when no trigger
1 parent b1f46e4 commit 05b3b61

21 files changed

Lines changed: 88 additions & 38 deletions

File tree

‎packages/platform/src/app/routes/layout/sidebar/Sidebar.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ export function AppSidebar(props: AppSidebarProps): JSX.Element | null {
3737
dVisible={menuOpen}
3838
dWidth={200}
3939
dPlacement="left"
40-
onVisibleChange={onMenuOpenChange}
40+
onClose={() => {
41+
onMenuOpenChange(false);
42+
}}
4143
>
4244
{menuNode(false)}
4345
</DDrawer>

‎packages/platform/src/app/routes/list/standard-table/StandardTable.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ export default function StandardTable(): JSX.Element | null {
116116
}}
117117
dMaskClosable={false}
118118
dSkipFirstTransition={false}
119-
onVisibleChange={(visible) => {
119+
onClose={() => {
120120
setParamsOfDeleteModal((draft) => {
121121
if (draft) {
122-
draft.visible = visible;
122+
draft.visible = false;
123123
}
124124
});
125125
}}
@@ -129,10 +129,10 @@ export default function StandardTable(): JSX.Element | null {
129129
aVisible={paramsOfDeviceModal?.visible}
130130
aDevice={paramsOfDeviceModal?.device}
131131
aModelList={modelList}
132-
onVisibleChange={(visible) => {
132+
onClose={() => {
133133
setParamsOfDeviceModal((draft) => {
134134
if (draft) {
135-
draft.visible = visible;
135+
draft.visible = false;
136136
}
137137
});
138138
}}

‎packages/platform/src/app/routes/list/standard-table/detail/Detail.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ export default function Detail(): JSX.Element | null {
5656
aVisible={paramsOfEditModal?.visible}
5757
aDevice={device}
5858
aModelList={modelList}
59-
onVisibleChange={(visible) => {
59+
onClose={() => {
6060
setParamsOfEditModal((draft) => {
6161
if (draft) {
62-
draft.visible = visible;
62+
draft.visible = false;
6363
}
6464
});
6565
}}

‎packages/platform/src/app/routes/list/standard-table/device-modal/DeviceModal.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ export interface AppDeviceModalProps {
1010
aVisible?: boolean;
1111
aDevice?: DeviceDoc;
1212
aModelList?: DSelectItem<string>[];
13-
onVisibleChange?: (visible: boolean) => void;
13+
onClose?: () => void;
1414
onSubmit?: () => void;
1515
}
1616

1717
export function AppDeviceModal(props: AppDeviceModalProps): JSX.Element | null {
18-
const { aVisible = false, aDevice, aModelList, onVisibleChange, onSubmit } = props;
18+
const { aVisible = false, aDevice, aModelList, onClose, onSubmit } = props;
1919

2020
const [form, updateForm] = useForm(
2121
() =>
@@ -44,7 +44,7 @@ export function AppDeviceModal(props: AppDeviceModalProps): JSX.Element | null {
4444
></DModal.Footer>
4545
}
4646
dMaskClosable={false}
47-
onVisibleChange={onVisibleChange}
47+
onClose={onClose}
4848
>
4949
<DForm id="device-form" onSubmit={onSubmit} dUpdate={updateForm} dLabelWidth="6em">
5050
<DForm.Group dFormGroup={form}>

‎packages/site/src/app/components/route/md/Route.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ m -673.67664,1221.6502 -231.2455,-231.24803 55.6165,
8989
dZIndex={909}
9090
dPlacement="bottom"
9191
dMask={false}
92-
onVisibleChange={setMenuOpen}
92+
onClose={() => {
93+
setMenuOpen(false);
94+
}}
9395
>
9496
<DAnchor dList={links} dIndicator={DAnchor.LINE_INDICATOR} onItemClick={() => setMenuOpen(false)} />
9597
</DDrawer>

‎packages/site/src/app/routes/layout/Sidebar.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ export function AppSidebar(props: AppSidebarProps): JSX.Element | null {
109109
</DDrawer.Header>
110110
}
111111
dWidth={280}
112-
onVisibleChange={onMenuOpenChange}
112+
onClose={() => {
113+
onMenuOpenChange(false);
114+
}}
113115
>
114116
<div className="app-layout-sidebar__button-container">
115117
<Link className="app-layout-sidebar__link-button" to="/docs">

‎packages/ui/src/components/alert/Alert.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface DAlertProps extends Omit<React.HTMLAttributes<HTMLDivElement>,
1414
dTitle: React.ReactNode;
1515
dDescription?: React.ReactNode;
1616
dActions?: React.ReactNode[];
17-
onVisibleChange?: (visible: boolean) => void;
17+
onClose?: () => void;
1818
afterVisibleChange?: (visible: boolean) => void;
1919
}
2020

@@ -27,7 +27,7 @@ export function DAlert(props: DAlertProps): JSX.Element | null {
2727
dTitle,
2828
dDescription,
2929
dActions = [],
30-
onVisibleChange,
30+
onClose,
3131
afterVisibleChange,
3232

3333
...restProps
@@ -37,7 +37,7 @@ export function DAlert(props: DAlertProps): JSX.Element | null {
3737
const dPrefix = usePrefixConfig();
3838
//#endregion
3939

40-
const [visible, changeVisible] = useDValue<boolean>(true, dVisible, onVisibleChange);
40+
const [visible, changeVisible] = useDValue<boolean>(true, dVisible, onClose);
4141

4242
return (
4343
<DCollapseTransition

‎packages/ui/src/components/drawer/Drawer.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export interface DDrawerProps extends React.HTMLAttributes<HTMLDivElement> {
3333
dHeader?: React.ReactElement | string;
3434
dFooter?: React.ReactElement;
3535
dChildDrawer?: React.ReactElement;
36-
onVisibleChange?: (visible: boolean) => void;
36+
onClose?: () => void;
3737
afterVisibleChange?: (visible: boolean) => void;
3838
}
3939

@@ -64,7 +64,7 @@ export const DDrawer: {
6464
dHeader,
6565
dFooter,
6666
dChildDrawer,
67-
onVisibleChange,
67+
onClose,
6868
afterVisibleChange,
6969
__zIndex,
7070
__onVisibleChange,
@@ -127,7 +127,7 @@ export const DDrawer: {
127127
: `translateX(${(distance[dPlacement] / 3) * 2}px)`,
128128
};
129129

130-
const [visible, changeVisible] = useDValue<boolean>(false, dVisible, onVisibleChange);
130+
const [visible, changeVisible] = useDValue<boolean>(false, dVisible, onClose);
131131

132132
const isFixed = isUndefined(dContainer);
133133

‎packages/ui/src/components/drawer/demos/1.Basic.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ export default function Demo() {
5353
}}
5454
></DDrawer.Footer>
5555
}
56-
onVisibleChange={setVisible}
56+
onClose={() => {
57+
setVisible(false);
58+
}}
5759
>
5860
<div style={{ height: 2000 }}>Some contents...</div>
5961
</DDrawer>

‎packages/ui/src/components/drawer/demos/2.Placement.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,14 @@ export default function Demo() {
4444
<DButton onClick={() => handleClick('bottom')}>B</DButton>
4545
</div>
4646
</div>
47-
<DDrawer dVisible={visible} dPlacement={placement} dHeader="Placement Drawer" onVisibleChange={setVisible}>
47+
<DDrawer
48+
dVisible={visible}
49+
dPlacement={placement}
50+
dHeader="Placement Drawer"
51+
onClose={() => {
52+
setVisible(false);
53+
}}
54+
>
4855
<div className="app-demo-container">
4956
<div>Some contents...</div>
5057
<div>Some contents...</div>

0 commit comments

Comments
 (0)