Skip to content

Commit b0ac0ae

Browse files
committed
Merge branch 'main' into refactor/date-input-value
2 parents 66df4dc + fac5608 commit b0ac0ae

File tree

15 files changed

+499
-139
lines changed

15 files changed

+499
-139
lines changed

.github/workflows/security.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Security Review
2+
3+
permissions:
4+
pull-requests: write # Needed for leaving PR comments
5+
contents: read
6+
7+
on:
8+
pull_request:
9+
10+
jobs:
11+
security:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
ref: ${{ github.event.pull_request.head.sha || github.sha }}
17+
fetch-depth: 2
18+
19+
- uses: anthropics/claude-code-security-review@main
20+
with:
21+
comment-pr: true
22+
claude-api-key: ${{ secrets.CLAUDE_API_KEY }}

docs-site/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
"preview": "vite preview"
2222
},
2323
"devDependencies": {
24-
"@eslint/js": "^9.29.0",
24+
"@eslint/js": "^9.32.0",
2525
"@types/react": "^19.1.8",
2626
"@types/react-dom": "^19.1.6",
2727
"@vitejs/plugin-react": "^4.6.0",
28-
"eslint": "^9.29.0",
28+
"eslint": "^9.32.0",
2929
"eslint-plugin-react": "^7.37.5",
3030
"eslint-plugin-react-hooks": "^6.0.0",
3131
"eslint-plugin-react-refresh": "^0.4.20",
32-
"globals": "^16.2.0",
32+
"globals": "^16.3.0",
3333
"sass": "^1.89.2",
3434
"vite": "^6.3.5"
3535
},

docs-site/src/components/Examples/index.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ import CustomTimeInput from "../../examples/customTimeInput?raw";
100100
import CloseOnScroll from "../../examples/closeOnScroll?raw";
101101
import CloseOnScrollCallback from "../../examples/closeOnScrollCallback?raw";
102102
import SelectsRange from "../../examples/selectsRange?raw";
103+
import SelectsRangeWithCustomSeparator from "../../examples/customRangeSeparator?raw";
103104
import selectsRangeWithDisabledDates from "../../examples/selectsRangeWithDisabledDates?raw";
104105
import CalendarStartDay from "../../examples/calendarStartDay?raw";
105106
import ExternalForm from "../../examples/externalForm?raw";
@@ -242,6 +243,10 @@ export default class exampleComponents extends React.Component {
242243
title: "Date range for one datepicker",
243244
component: SelectsRange,
244245
},
246+
{
247+
title: "Date range for one datepicker with custom range separator",
248+
component: SelectsRangeWithCustomSeparator,
249+
},
245250
{
246251
title: "Date range for one datepicker with disabled dates highlighted",
247252
component: selectsRangeWithDisabledDates,
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
() => {
2+
const [startDate, setStartDate] = useState(new Date());
3+
const [endDate, setEndDate] = useState(addDays(new Date(), 3));
4+
5+
const onChange = (dates) => {
6+
const [start, end] = dates;
7+
setStartDate(start);
8+
setEndDate(end);
9+
};
10+
11+
return (
12+
<DatePicker
13+
selected={startDate}
14+
onChange={onChange}
15+
startDate={startDate}
16+
endDate={endDate}
17+
selectsRange
18+
rangeSeparator=" to "
19+
/>
20+
);
21+
};

docs-site/yarn.lock

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -786,30 +786,30 @@ __metadata:
786786
languageName: node
787787
linkType: hard
788788

789-
"@eslint/config-array@npm:^0.20.1":
790-
version: 0.20.1
791-
resolution: "@eslint/config-array@npm:0.20.1"
789+
"@eslint/config-array@npm:^0.21.0":
790+
version: 0.21.0
791+
resolution: "@eslint/config-array@npm:0.21.0"
792792
dependencies:
793793
"@eslint/object-schema": "npm:^2.1.6"
794794
debug: "npm:^4.3.1"
795795
minimatch: "npm:^3.1.2"
796-
checksum: 10c0/709108c3925d83c2166024646829ab61ba5fa85c6568daefd32508899f46ed8dc36d7153042df6dcc7e58ad543bc93298b646575daecb5eb4e39a43d838dab42
796+
checksum: 10c0/0ea801139166c4aa56465b309af512ef9b2d3c68f9198751bbc3e21894fe70f25fbf26e1b0e9fffff41857bc21bfddeee58649ae6d79aadcd747db0c5dca771f
797797
languageName: node
798798
linkType: hard
799799

800-
"@eslint/config-helpers@npm:^0.2.1":
801-
version: 0.2.1
802-
resolution: "@eslint/config-helpers@npm:0.2.1"
803-
checksum: 10c0/3e829a78b0bb4f7c44384ba1df3986e5de24b7f440ad5c6bb3cfc366ded773a869ca9ee8d212b5a563ae94596c5940dea6fd2ea1ee53a84c6241ac953dcb8bb7
800+
"@eslint/config-helpers@npm:^0.3.0":
801+
version: 0.3.0
802+
resolution: "@eslint/config-helpers@npm:0.3.0"
803+
checksum: 10c0/013ae7b189eeae8b30cc2ee87bc5c9c091a9cd615579003290eb28bebad5d78806a478e74ba10b3fe08ed66975b52af7d2cd4b4b43990376412b14e5664878c8
804804
languageName: node
805805
linkType: hard
806806

807-
"@eslint/core@npm:^0.14.0":
808-
version: 0.14.0
809-
resolution: "@eslint/core@npm:0.14.0"
807+
"@eslint/core@npm:^0.15.0, @eslint/core@npm:^0.15.1":
808+
version: 0.15.1
809+
resolution: "@eslint/core@npm:0.15.1"
810810
dependencies:
811811
"@types/json-schema": "npm:^7.0.15"
812-
checksum: 10c0/259f279445834ba2d2cbcc18e9d43202a4011fde22f29d5fb802181d66e0f6f0bd1f6b4b4b46663451f545d35134498231bd5e656e18d9034a457824b92b7741
812+
checksum: 10c0/abaf641940776638b8c15a38d99ce0dac551a8939310ec81b9acd15836a574cf362588eaab03ab11919bc2a0f9648b19ea8dee33bf12675eb5b6fd38bda6f25e
813813
languageName: node
814814
linkType: hard
815815

@@ -830,10 +830,10 @@ __metadata:
830830
languageName: node
831831
linkType: hard
832832

833-
"@eslint/js@npm:9.29.0, @eslint/js@npm:^9.29.0":
834-
version: 9.29.0
835-
resolution: "@eslint/js@npm:9.29.0"
836-
checksum: 10c0/d0ccf37063fa27a3fae9347cb044f84ca10b5a2fa19ffb2b3fedf3b96843ac1ff359ea9f0ab0e80f2f16fda4cb0dc61ea0fed0375090f050fe0a029e7d6de3a3
833+
"@eslint/js@npm:9.32.0, @eslint/js@npm:^9.32.0":
834+
version: 9.32.0
835+
resolution: "@eslint/js@npm:9.32.0"
836+
checksum: 10c0/f71e8f9146638d11fb15238279feff98801120a4d4130f1c587c4f09b024ff5ec01af1ba88e97ba6b7013488868898a668f77091300cc3d4394c7a8ed32d2667
837837
languageName: node
838838
linkType: hard
839839

@@ -844,13 +844,13 @@ __metadata:
844844
languageName: node
845845
linkType: hard
846846

847-
"@eslint/plugin-kit@npm:^0.3.1":
848-
version: 0.3.1
849-
resolution: "@eslint/plugin-kit@npm:0.3.1"
847+
"@eslint/plugin-kit@npm:^0.3.4":
848+
version: 0.3.4
849+
resolution: "@eslint/plugin-kit@npm:0.3.4"
850850
dependencies:
851-
"@eslint/core": "npm:^0.14.0"
851+
"@eslint/core": "npm:^0.15.1"
852852
levn: "npm:^0.4.1"
853-
checksum: 10c0/a75f0b5d38430318a551b83e27bee570747eb50beeb76b03f64b0e78c2c27ef3d284cfda3443134df028db3251719bc0850c105f778122f6ad762d5270ec8063
853+
checksum: 10c0/64331ca100f62a0115d10419a28059d0f377e390192163b867b9019517433d5073d10b4ec21f754fa01faf832aceb34178745924baab2957486f8bf95fd628d2
854854
languageName: node
855855
linkType: hard
856856

@@ -2558,18 +2558,18 @@ __metadata:
25582558
languageName: node
25592559
linkType: hard
25602560

2561-
"eslint@npm:^9.29.0":
2562-
version: 9.29.0
2563-
resolution: "eslint@npm:9.29.0"
2561+
"eslint@npm:^9.32.0":
2562+
version: 9.32.0
2563+
resolution: "eslint@npm:9.32.0"
25642564
dependencies:
25652565
"@eslint-community/eslint-utils": "npm:^4.2.0"
25662566
"@eslint-community/regexpp": "npm:^4.12.1"
2567-
"@eslint/config-array": "npm:^0.20.1"
2568-
"@eslint/config-helpers": "npm:^0.2.1"
2569-
"@eslint/core": "npm:^0.14.0"
2567+
"@eslint/config-array": "npm:^0.21.0"
2568+
"@eslint/config-helpers": "npm:^0.3.0"
2569+
"@eslint/core": "npm:^0.15.0"
25702570
"@eslint/eslintrc": "npm:^3.3.1"
2571-
"@eslint/js": "npm:9.29.0"
2572-
"@eslint/plugin-kit": "npm:^0.3.1"
2571+
"@eslint/js": "npm:9.32.0"
2572+
"@eslint/plugin-kit": "npm:^0.3.4"
25732573
"@humanfs/node": "npm:^0.16.6"
25742574
"@humanwhocodes/module-importer": "npm:^1.0.1"
25752575
"@humanwhocodes/retry": "npm:^0.4.2"
@@ -2604,7 +2604,7 @@ __metadata:
26042604
optional: true
26052605
bin:
26062606
eslint: bin/eslint.js
2607-
checksum: 10c0/75e3f841e0f8b0fa93dbb2ba6ae538bd8b611c3654117bc3dadf90bb009923dfd2c15ec2948dc6e6b8b571317cc125c5cceb9255da8cd644ee740020df645dd8
2607+
checksum: 10c0/e8a23924ec5f8b62e95483002ca25db74e25c23bd9c6d98a9f656ee32f820169bee3bfdf548ec728b16694f198b3db857d85a49210ee4a035242711d08fdc602
26082608
languageName: node
26092609
linkType: hard
26102610

@@ -3022,10 +3022,10 @@ __metadata:
30223022
languageName: node
30233023
linkType: hard
30243024

3025-
"globals@npm:^16.2.0":
3026-
version: 16.2.0
3027-
resolution: "globals@npm:16.2.0"
3028-
checksum: 10c0/c2b3ea163faa6f8a38076b471b12f4bda891f7df7f7d2e8294fb4801d735a51a73431bf4c1696c5bf5dbca5e0a0db894698acfcbd3068730c6b12eef185dea25
3025+
"globals@npm:^16.3.0":
3026+
version: 16.3.0
3027+
resolution: "globals@npm:16.3.0"
3028+
checksum: 10c0/c62dc20357d1c0bf2be4545d6c4141265d1a229bf1c3294955efb5b5ef611145391895e3f2729f8603809e81b30b516c33e6c2597573844449978606aad6eb38
30293029
languageName: node
30303030
linkType: hard
30313031

@@ -4464,16 +4464,16 @@ __metadata:
44644464
version: 0.0.0-use.local
44654465
resolution: "react-datepicker-docs@workspace:."
44664466
dependencies:
4467-
"@eslint/js": "npm:^9.29.0"
4467+
"@eslint/js": "npm:^9.32.0"
44684468
"@types/react": "npm:^19.1.8"
44694469
"@types/react-dom": "npm:^19.1.6"
44704470
"@vitejs/plugin-react": "npm:^4.6.0"
44714471
date-fns: "npm:^4.1.0"
4472-
eslint: "npm:^9.29.0"
4472+
eslint: "npm:^9.32.0"
44734473
eslint-plugin-react: "npm:^7.37.5"
44744474
eslint-plugin-react-hooks: "npm:^6.0.0"
44754475
eslint-plugin-react-refresh: "npm:^0.4.20"
4476-
globals: "npm:^16.2.0"
4476+
globals: "npm:^16.3.0"
44774477
highlight.js: "npm:^11.11.1"
44784478
lodash: "npm:^4.17.21"
44794479
prism-react-renderer: "npm:^2.4.1"

docs/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,4 @@
9292
| `value` | | | |
9393
| `withPortal` | | `false` | |
9494
| `yearItemNumber` | | `12` | |
95+
| `rangeSeparator` | | `" - "` | |

examples/hello-world/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"react": "^19.1.0",
6+
"react": "^19.1.1",
77
"react-datepicker": "^8.4.0",
8-
"react-dom": "^19.1.0",
8+
"react-dom": "^19.1.1",
99
"react-scripts": "5.0.1"
1010
},
1111
"scripts": {

0 commit comments

Comments
 (0)