Skip to content

Commit 1e53703

Browse files
committed
Migrate from datetime2 -> datetime
1 parent b0354a9 commit 1e53703

File tree

4 files changed

+8
-31
lines changed

4 files changed

+8
-31
lines changed

packages/ui-components/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,15 @@ to the developer) or included in Javascript for further processing by a bundler:
2727
```js
2828
import "@blueprintjs/core/lib/css/blueprint.css";
2929
import "@blueprintjs/icons/lib/css/blueprint-icons.css";
30+
// For date time picker
31+
import "@blueprintjs/datetime/lib/css/blueprint-datetime.css";
3032
import "@macrostrat/ui-components/lib/esm/index.css";
3133
```
3234

33-
We also provide [`init.js`](init.js), a small helper that imports these styles
34-
and sets up common Babel and BlueprintJS configuration.
35-
3635
## Extensions
3736

3837
Some extensions require additional libraries that may or may not be installed.
39-
For instance, buttons in `@macrostrat/ui-components/lib/esm/
38+
For instance, buttons in `@macrostrat/ui-comonents/lib/esm/
4039

4140
## Todo
4241

packages/ui-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"dependencies": {
4545
"@blueprintjs/core": "^6.6.1",
46-
"@blueprintjs/datetime2": "^3.0.13",
46+
"@blueprintjs/datetime": "^6.0.13",
4747
"@blueprintjs/select": "^6.0.13",
4848
"@macrostrat/hyper": "^3.0.6",
4949
"@types/react": "^18.3.12",

packages/ui-components/src/model-editor.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// @ts-nocheck
22
import { Component, createContext, ReactElement, useContext } from "react";
33
import h from "@macrostrat/hyper";
4-
import { DateInput3 } from "@blueprintjs/datetime2";
4+
import { DateInput } from "@blueprintjs/datetime";
55
import { EditableText } from "@blueprintjs/core";
66
import { EditButton, DeleteButton } from "./buttons";
77
import { StatefulComponent } from "./util";
88
import classNames from "classnames";
99
import update, { Spec } from "immutability-helper";
1010

11-
import "@blueprintjs/datetime2/lib/css/blueprint-datetime2.css";
11+
import "@blueprintjs/datetime/lib/css/blueprint-datetime.css";
1212

1313
const ModelEditorContext = createContext<any>({});
1414

@@ -223,7 +223,7 @@ class EditableDateField extends Component<any, any> {
223223
if (!isEditing) {
224224
return h("div", { className }, valueText);
225225
}
226-
return h(DateInput3, {
226+
return h(DateInput, {
227227
className,
228228
value: new Date(value),
229229
formatDate: (date) => date.toLocaleDateString(),

yarn.lock

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,28 +1299,6 @@ __metadata:
12991299
languageName: node
13001300
linkType: hard
13011301

1302-
"@blueprintjs/datetime2@npm:^3.0.13":
1303-
version: 3.0.13
1304-
resolution: "@blueprintjs/datetime2@npm:3.0.13"
1305-
dependencies:
1306-
"@blueprintjs/colors": "npm:^5.1.12"
1307-
"@blueprintjs/core": "npm:^6.6.1"
1308-
"@blueprintjs/datetime": "npm:^6.0.13"
1309-
"@blueprintjs/icons": "npm:^6.5.0"
1310-
date-fns: "npm:^2.28.0"
1311-
react-day-picker: "npm:^8.10.0"
1312-
tslib: "npm:~2.6.2"
1313-
peerDependencies:
1314-
"@types/react": 18
1315-
react: 18
1316-
react-dom: 18
1317-
peerDependenciesMeta:
1318-
"@types/react":
1319-
optional: true
1320-
checksum: 10c0/d7457b789565f166c5bb1327b8c8a016e75c1e328df20bceb65f8d601d24a0e43755c08b7aaeab4746e395641a9fb1147de920bd3ba47021a91afab124ddbd34
1321-
languageName: node
1322-
linkType: hard
1323-
13241302
"@blueprintjs/datetime@npm:^6.0.13":
13251303
version: 6.0.13
13261304
resolution: "@blueprintjs/datetime@npm:6.0.13"
@@ -2676,7 +2654,7 @@ __metadata:
26762654
resolution: "@macrostrat/ui-components@workspace:packages/ui-components"
26772655
dependencies:
26782656
"@blueprintjs/core": "npm:^6.6.1"
2679-
"@blueprintjs/datetime2": "npm:^3.0.13"
2657+
"@blueprintjs/datetime": "npm:^6.0.13"
26802658
"@blueprintjs/select": "npm:^6.0.13"
26812659
"@macrostrat/hyper": "npm:^3.0.6"
26822660
"@types/react": "npm:^18.3.12"

0 commit comments

Comments
 (0)