Skip to content

Commit 3e1733e

Browse files
committed
Merge branch 'main' into pr-3988-rebase-v3
2 parents b34bfb2 + 76fea24 commit 3e1733e

File tree

18 files changed

+1173
-664
lines changed

18 files changed

+1173
-664
lines changed

docs-site/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.77.8"
32+
"sass": "^1.79.4"
3333
},
3434
"resolutions": {
3535
"strip-ansi": "6.0.1"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Default from "../../examples/default";
88
import NoAnchorArrow from "../../examples/noAnchorArrow";
99
import ShowTime from "../../examples/showTime";
1010
import ShowTimeOnly from "../../examples/showTimeOnly";
11+
import HideTimeCaption from "../../examples/hideTimeCaption";
1112
import ExcludeTimes from "../../examples/excludeTimes";
1213
import IncludeTimes from "../../examples/includeTimes";
1314
import InjectTimes from "../../examples/injectTimes";
@@ -487,6 +488,10 @@ export default class exampleComponents extends React.Component {
487488
title: "Select Time Only",
488489
component: ShowTimeOnly,
489490
},
491+
{
492+
title: "Hide Time Caption",
493+
component: HideTimeCaption,
494+
},
490495
{
491496
title: "Show previous months",
492497
component: MultiMonthPrevious,

docs-site/src/examples/customTimeInput.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<input
55
value={value}
66
onChange={(e) => onChange(e.target.value)}
7+
onClick={(e) => e.target?.focus()}
78
style={{ border: "solid 1px pink" }}
89
/>
910
);
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
() => {
2+
const [startDate, setStartDate] = useState(new Date());
3+
return (
4+
<DatePicker
5+
selected={startDate}
6+
onChange={(date) => setStartDate(date)}
7+
showTimeSelect
8+
showTimeSelectOnly
9+
timeIntervals={15}
10+
dateFormat="h:mm aa"
11+
showTimeCaption={false}
12+
/>
13+
);
14+
};

0 commit comments

Comments
 (0)