Skip to content

Commit d6ac699

Browse files
authored
Fixed support of ant 4.x DatePicker (#1239)
1 parent e913730 commit d6ac699

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Changelog
2+
- 6.6.15
3+
- Fixed support of AntDesign 4.x DatePicker (PR #1239) (issue #1238)
24
- 6.6.14
35
- Fixed import from JsonLogic when like op is used inside group with some group op (PR #1225) (issue #1221)
46
- Support React 19 (PR #1229) (issue #1205)
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import type { Moment } from "@react-awesome-query-builder/ui";
22
import { Calendar } from "antd";
33
import momentGenerateConfig from "./config";
4-
5-
const MomentCalendar = Calendar.generateCalendar<Moment>(momentGenerateConfig);
4+
const MomentCalendar = (() => {
5+
if (typeof Calendar.generateCalendar === "function") {
6+
return Calendar.generateCalendar<Moment>(momentGenerateConfig);
7+
} else {
8+
// support ant 4.x
9+
return Calendar;
10+
}
11+
})();
612

713
export default MomentCalendar;

packages/antd/modules/widgets/moment/DatePicker.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ import type { Moment } from "@react-awesome-query-builder/ui";
22
import { DatePicker } from "antd";
33
import momentGenerateConfig from "./config";
44

5-
const MomentDatePicker = DatePicker.generatePicker<Moment>(momentGenerateConfig);
5+
const MomentDatePicker = (() => {
6+
if (typeof DatePicker.generatePicker === "function") {
7+
return DatePicker.generatePicker<Moment>(momentGenerateConfig);
8+
} else {
9+
// support ant 4.x
10+
return DatePicker;
11+
}
12+
})();
613

714
export default MomentDatePicker;

0 commit comments

Comments
 (0)