Skip to content

Commit 7196d4b

Browse files
Balaji-Sridharan_NYULHBalaji-Sridharan_NYULH
Balaji-Sridharan_NYULH
authored and
Balaji-Sridharan_NYULH
committed
🔀 Merge branch 'main' into fix/scss-lint-issues
2 parents 0a9c694 + e479fc3 commit 7196d4b

File tree

10 files changed

+103
-103
lines changed

10 files changed

+103
-103
lines changed

‎docs-site/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"highlight.js": "^11.10.0",
77
"react": "^18.3.1",
88
"react-dom": "^18.3.1",
9-
"react-live": "^4.1.7"
9+
"react-live": "^4.1.8"
1010
},
1111
"scripts": {
1212
"start": "react-app-rewired start",
@@ -29,7 +29,7 @@
2929
"raw-loader": "^4.0.2",
3030
"react-app-rewired": "^2.2.1",
3131
"react-scripts": "5.0.1",
32-
"sass": "^1.80.7"
32+
"sass": "^1.81.0"
3333
},
3434
"resolutions": {
3535
"strip-ansi": "6.0.1"

‎docs-site/yarn.lock‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5038,13 +5038,13 @@ __metadata:
50385038
linkType: hard
50395039

50405040
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
5041-
version: 7.0.3
5042-
resolution: "cross-spawn@npm:7.0.3"
5041+
version: 7.0.5
5042+
resolution: "cross-spawn@npm:7.0.5"
50435043
dependencies:
50445044
path-key: "npm:^3.1.0"
50455045
shebang-command: "npm:^2.0.0"
50465046
which: "npm:^2.0.1"
5047-
checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
5047+
checksum: 10c0/aa82ce7ac0814a27e6f2b738c5a7cf1fa21a3558a1e42df449fc96541ba3ba731e4d3ecffa4435348808a86212f287c6f20a1ee551ef1ff95d01cfec5f434944
50485048
languageName: node
50495049
linkType: hard
50505050

@@ -10787,15 +10787,15 @@ __metadata:
1078710787
languageName: node
1078810788
linkType: hard
1078910789

10790-
"prism-react-renderer@npm:^2.0.6":
10791-
version: 2.3.1
10792-
resolution: "prism-react-renderer@npm:2.3.1"
10790+
"prism-react-renderer@npm:^2.4.0":
10791+
version: 2.4.0
10792+
resolution: "prism-react-renderer@npm:2.4.0"
1079310793
dependencies:
1079410794
"@types/prismjs": "npm:^1.26.0"
1079510795
clsx: "npm:^2.0.0"
1079610796
peerDependencies:
1079710797
react: ">=16.0.0"
10798-
checksum: 10c0/566932127ca18049a651aa038a8f8c7c1ca15950d21b659c2ce71fd95bd03bef2b5d40c489e7aa3453eaf15d984deef542a609d7842e423e6a13427dd90bd371
10798+
checksum: 10c0/3d6969b057da0efe39e3e637bf93601cd5757de5919180e8df16daf1d1b8eedc39b70c7f6f28724fba0a01bc857c6b78312ab027f4e913159d1165c5aba235bb
1079910799
languageName: node
1080010800
linkType: hard
1080110801

@@ -10992,9 +10992,9 @@ __metadata:
1099210992
react: "npm:^18.3.1"
1099310993
react-app-rewired: "npm:^2.2.1"
1099410994
react-dom: "npm:^18.3.1"
10995-
react-live: "npm:^4.1.7"
10995+
react-live: "npm:^4.1.8"
1099610996
react-scripts: "npm:5.0.1"
10997-
sass: "npm:^1.80.7"
10997+
sass: "npm:^1.81.0"
1099810998
languageName: unknown
1099910999
linkType: soft
1100011000

@@ -11070,17 +11070,17 @@ __metadata:
1107011070
languageName: node
1107111071
linkType: hard
1107211072

11073-
"react-live@npm:^4.1.7":
11074-
version: 4.1.7
11075-
resolution: "react-live@npm:4.1.7"
11073+
"react-live@npm:^4.1.8":
11074+
version: 4.1.8
11075+
resolution: "react-live@npm:4.1.8"
1107611076
dependencies:
11077-
prism-react-renderer: "npm:^2.0.6"
11078-
sucrase: "npm:^3.31.0"
11077+
prism-react-renderer: "npm:^2.4.0"
11078+
sucrase: "npm:^3.35.0"
1107911079
use-editable: "npm:^2.3.3"
1108011080
peerDependencies:
1108111081
react: ">=18.0.0"
1108211082
react-dom: ">=18.0.0"
11083-
checksum: 10c0/728a51cb0b92774076e4592f9b3cbc2af4afac1da549dbb55723728324bdc1968d3f7b268b5dd92929dcc9d3aa1fd1265f7e912b5ee6fd4fe9b5b77898b50237
11083+
checksum: 10c0/fa96ca176bc9074e4892d6a079b94488ba74e95907ea187678afb17e4a23cc7760c3774ef17f4429d2ba562f1fda852a822e18a161ef386676371c56a7585970
1108411084
languageName: node
1108511085
linkType: hard
1108611086

@@ -11591,9 +11591,9 @@ __metadata:
1159111591
languageName: node
1159211592
linkType: hard
1159311593

11594-
"sass@npm:^1.80.7":
11595-
version: 1.80.7
11596-
resolution: "sass@npm:1.80.7"
11594+
"sass@npm:^1.81.0":
11595+
version: 1.81.0
11596+
resolution: "sass@npm:1.81.0"
1159711597
dependencies:
1159811598
"@parcel/watcher": "npm:^2.4.1"
1159911599
chokidar: "npm:^4.0.0"
@@ -11604,7 +11604,7 @@ __metadata:
1160411604
optional: true
1160511605
bin:
1160611606
sass: sass.js
11607-
checksum: 10c0/e0e0df8dc9dd7694826f915196a96cda45fe0fc849be9fc08b43c12aa1250eb512130979ed239e1106476973ace1f52abbcc1d5900a075d3813c282a626dcbf7
11607+
checksum: 10c0/9c59b3c9b4231c18fcb4583cc232dbc4de501ddc11101b7a025e44833e3f3ce6031546dc1cd109ee9f04ebcfb1fe30ff870810af33b8feb9aa9e36dfba9ec1ef
1160811608
languageName: node
1160911609
linkType: hard
1161011610

@@ -12283,7 +12283,7 @@ __metadata:
1228312283
languageName: node
1228412284
linkType: hard
1228512285

12286-
"sucrase@npm:^3.31.0, sucrase@npm:^3.32.0":
12286+
"sucrase@npm:^3.32.0, sucrase@npm:^3.35.0":
1228712287
version: 3.35.0
1228812288
resolution: "sucrase@npm:3.35.0"
1228912289
dependencies:

‎examples/hello-world/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4947,13 +4947,13 @@ __metadata:
49474947
linkType: hard
49484948

49494949
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
4950-
version: 7.0.3
4951-
resolution: "cross-spawn@npm:7.0.3"
4950+
version: 7.0.5
4951+
resolution: "cross-spawn@npm:7.0.5"
49524952
dependencies:
49534953
path-key: "npm:^3.1.0"
49544954
shebang-command: "npm:^2.0.0"
49554955
which: "npm:^2.0.1"
4956-
checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
4956+
checksum: 10c0/aa82ce7ac0814a27e6f2b738c5a7cf1fa21a3558a1e42df449fc96541ba3ba731e4d3ecffa4435348808a86212f287c6f20a1ee551ef1ff95d01cfec5f434944
49574957
languageName: node
49584958
linkType: hard
49594959

‎src/calendar_container.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from "react";
22

3-
export interface CalendarContainerProps extends React.PropsWithChildren {
3+
export interface CalendarContainerProps
4+
extends React.PropsWithChildren<HTMLDivElement> {
45
showTimeSelectOnly?: boolean;
56
showTime?: boolean;
6-
className?: string;
77
}
88

99
const CalendarContainer: React.FC<CalendarContainerProps> = function ({

‎src/popper_component.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import TabLoop from "./tab_loop";
77
import withFloating from "./with_floating";
88

99
import type { FloatingProps } from "./with_floating";
10+
import type { ReactNode } from "react";
1011

1112
interface PortalProps
1213
extends Omit<React.ComponentPropsWithoutRef<typeof Portal>, "children"> {}
@@ -20,7 +21,7 @@ interface PopperComponentProps
2021
className?: string;
2122
wrapperClassName?: string;
2223
popperComponent: React.ReactNode;
23-
popperContainer?: React.FC<React.PropsWithChildren>;
24+
popperContainer?: React.FC<{ children?: ReactNode | undefined }>;
2425
targetComponent: React.ReactNode;
2526
popperOnKeyDown: React.KeyboardEventHandler<HTMLDivElement>;
2627
showArrow?: boolean;

‎src/stylesheets/datepicker.scss‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,7 @@ h2.react-datepicker__current-month {
347347
&.react-datepicker__week-number--clickable {
348348
cursor: pointer;
349349

350-
&:not(
351-
.react-datepicker__week-number--selected,
352-
.react-datepicker__week-number--keyboard-selected
353-
):hover {
350+
&:not(.react-datepicker__week-number--selected):hover {
354351
border-radius: $datepicker__border-radius;
355352
background-color: $datepicker__background-color;
356353
}
@@ -368,22 +365,6 @@ h2.react-datepicker__current-month {
368365
);
369366
}
370367
}
371-
372-
&--keyboard-selected {
373-
border-radius: $datepicker__border-radius;
374-
background-color: color.adjust(
375-
$datepicker__selected-color,
376-
$lightness: 10%
377-
);
378-
color: #fff;
379-
380-
&:hover {
381-
background-color: color.adjust(
382-
$datepicker__selected-color,
383-
$lightness: -5%
384-
);
385-
}
386-
}
387368
}
388369

389370
.react-datepicker__day-names {

‎src/tab_loop.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import React, { Component, createRef } from "react";
22

3-
interface TabLoopProps extends React.PropsWithChildren {
3+
import type { ReactNode } from "react";
4+
5+
interface TabLoopProps {
46
enableTabLoop?: boolean;
7+
children?: ReactNode | undefined;
58
}
69

710
const focusableElementsSelector =

‎src/test/week_number_test.test.tsx‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,6 @@ describe("WeekNumber", () => {
186186
) as HTMLDivElement;
187187
expect(weekNumber).not.toBeNull();
188188

189-
expect(
190-
weekNumber?.classList.contains(
191-
"react-datepicker__week-number--keyboard-selected",
192-
),
193-
).toBe(false);
194189
expect(weekNumber?.tabIndex).toBe(0);
195190
});
196191

@@ -212,11 +207,6 @@ describe("WeekNumber", () => {
212207
".react-datepicker__week-number",
213208
) as HTMLDivElement;
214209
expect(weekNumber).not.toBeNull();
215-
expect(
216-
weekNumber?.classList.contains(
217-
"react-datepicker__week-number--keyboard-selected",
218-
),
219-
).toBe(true);
220210
expect(weekNumber.tabIndex).toBe(0);
221211
});
222212

@@ -267,11 +257,6 @@ describe("WeekNumber", () => {
267257
const weekNumber = container.querySelector(
268258
".react-datepicker__week-number",
269259
) as HTMLDivElement;
270-
expect(
271-
weekNumber?.classList.contains(
272-
"react-datepicker__week-number--keyboard-selected",
273-
),
274-
).toBe(false);
275260
expect(weekNumber.tabIndex).toBe(-1);
276261
});
277262
});
@@ -403,11 +388,6 @@ describe("WeekNumber", () => {
403388
"react-datepicker__week-number--selected",
404389
),
405390
).toBe(false);
406-
expect(
407-
weekNumber?.classList.contains(
408-
"react-datepicker__week-number--keyboard-selected",
409-
),
410-
).toBe(true);
411391
});
412392

413393
it("should have the class 'react-datepicker__week-number--selected' if selected is not current week and preselected is not current week", () => {
@@ -430,11 +410,6 @@ describe("WeekNumber", () => {
430410
"react-datepicker__week-number--selected",
431411
),
432412
).toBe(false);
433-
expect(
434-
weekNumber?.classList.contains(
435-
"react-datepicker__week-number--keyboard-selected",
436-
),
437-
).toBe(false);
438413
});
439414
});
440415
});

‎src/week_number.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ export default class WeekNumber extends Component<WeekNumberProps> {
120120
"react-datepicker__week-number--clickable": !!onClick,
121121
"react-datepicker__week-number--selected":
122122
!!onClick && isSameDay(this.props.date, this.props.selected),
123-
"react-datepicker__week-number--keyboard-selected":
124-
this.isKeyboardSelected(),
125123
};
126124
return (
127125
<div

0 commit comments

Comments
 (0)