Skip to content

Commit e635e2e

Browse files
ryan-stackwaveryan-stackwave
committed
Upgraded to blueprintjs 5
1 parent 29e210f commit e635e2e

19 files changed

Lines changed: 14153 additions & 15312 deletions

File tree

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"@jscutlery/semver": "^5.2.2",
1919
"@nx/cypress": "20.4.6",
2020
"@nx/esbuild": "20.4.6",
21-
"@nx/eslint": "^20.4.6",
22-
"@nx/eslint-plugin": "^20.4.6",
21+
"@nx/eslint": "20.4.6",
22+
"@nx/eslint-plugin": "20.4.6",
2323
"@nx/jest": "20.4.6",
2424
"@nx/js": "20.4.6",
2525
"@nx/react": "20.4.6",
@@ -92,5 +92,6 @@
9292
"volta": {
9393
"node": "18.18.0",
9494
"yarn": "1.22.21"
95-
}
95+
},
96+
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
9697
}

‎packages/ove/demo/src/utils/renderToggle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
HTMLSelect,
66
Dialog,
77
useHotkeys,
8-
KeyCombo
8+
KeyComboTag
99
} from "@blueprintjs/core";
1010
import {
1111
getStringFromReactComponent,
@@ -127,7 +127,7 @@ export default function renderToggle({
127127
transform: "scale(0.8)"
128128
}}
129129
>
130-
<KeyCombo minimal combo={hotkey} />
130+
<KeyComboTag minimal combo={hotkey} />
131131
</div>
132132
</>
133133
)}

‎packages/ove/demo/src/utils/useToggle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
HTMLSelect,
66
Dialog,
77
useHotkeys,
8-
KeyCombo
8+
KeyComboTag
99
} from "@blueprintjs/core";
1010
import ReactMarkdown from "react-markdown";
1111
import remarkGfm from "remark-gfm";
@@ -185,7 +185,7 @@ const useToggle = ({
185185
transform: "scale(0.8)"
186186
}}
187187
>
188-
<KeyCombo minimal combo={hotkey} />
188+
<KeyComboTag minimal combo={hotkey} />
189189
</div>
190190
</>
191191
)}

‎packages/ove/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"@teselagen/ui": "file:../ui",
1717
"@teselagen/file-utils": "file:../file-utils",
1818
"@teselagen/bio-parsers": "file:../bio-parsers",
19-
"@blueprintjs/core": "3.54.0",
19+
"@blueprintjs/core": "5.19.0",
20+
"@blueprintjs/popover2": "^2.1.31",
2021
"@hello-pangea/dnd": "16.2.0",
2122
"@risingstack/react-easy-state": "^6.3.0",
2223
"@teselagen/react-list": "0.8.18",
@@ -58,7 +59,6 @@
5859
"to-regex-range": "5.0.1",
5960
"use-debounce": "^8.0.4",
6061
"validate.io-nonnegative-integer-array": "^1.0.1",
61-
"cypress-real-events": "^1.13.0",
6262
"biomsa": "^0.2.4",
6363
"shortid": "2.2.16",
6464
"@use-gesture/react": "10.3.0",

‎packages/ove/src/Editor/index.js‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
import { debounce, find, get, some, isArray } from "lodash-es";
22
// import sizeMe from "react-sizeme";
33
import { showContextMenu } from "@teselagen/ui";
4-
import {
5-
Button,
6-
ButtonGroup,
7-
Intent,
8-
Icon,
9-
Tooltip,
10-
ContextMenu
11-
} from "@blueprintjs/core";
4+
import { Button, ButtonGroup, Intent, Icon, Tooltip } from "@blueprintjs/core";
125
import PropTypes from "prop-types";
136

147
import VersionHistoryView from "../VersionHistoryView";
@@ -54,6 +47,7 @@ import isMobile from "is-mobile";
5447
import { getClientX, getClientY } from "../utils/editorUtils";
5548
import PCRTool from "../PCRTool/PCRTool";
5649
import classNames from "classnames";
50+
import * as Popover2 from "@blueprintjs/popover2";
5751

5852
// if (process.env.NODE_ENV !== 'production') {
5953
// const {whyDidYouUpdate} = require('why-did-you-update');
@@ -304,9 +298,12 @@ export class Editor extends React.Component {
304298
const { previewModeButtonMenu } = this.props;
305299
event.preventDefault();
306300
if (previewModeButtonMenu) {
307-
ContextMenu.show(previewModeButtonMenu, {
308-
left: getClientX(event),
309-
top: getClientY(event)
301+
Popover2.showContextMenu({
302+
content: previewModeButtonMenu,
303+
targetOffset: {
304+
left: getClientX(event),
305+
top: getClientY(event)
306+
}
310307
});
311308
}
312309
};

‎packages/ove/src/ToolBar/cutsiteTool.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Icon, Button, KeyCombo } from "@blueprintjs/core";
1+
import { Icon, Button, KeyComboTag } from "@blueprintjs/core";
22
import CutsiteFilter from "../CutsiteFilter";
33
import React from "react";
44
import ToolbarItem from "./ToolbarItem";
@@ -79,7 +79,7 @@ function CutsiteToolDropDown({
7979
}}
8080
>
8181
<span style={{ display: "flex" }}>
82-
Virtual Digest &nbsp; <KeyCombo minimal combo="mod+shift+d" />
82+
Virtual Digest &nbsp; <KeyComboTag minimal combo="mod+shift+d" />
8383
</span>
8484
</Button>
8585
)}

‎packages/ui/demo/src/examples/HotkeysDialog.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { KeyCombo } from "@blueprintjs/core";
1+
import { KeyComboTag } from "@blueprintjs/core";
22
import React from "react";
33
import { hotkeysById, HotkeysDialog, withHotkeys } from "../../../src";
44

@@ -89,7 +89,7 @@ export default class HotkeysDialogDemo extends React.Component {
8989
<h2 style={{ fontWeight: 300, textAlign: "center" }}>
9090
To view available hotkeys, press
9191
<br />
92-
<KeyCombo combo={this.dialogHotkeyCombo} />
92+
<KeyComboTag combo={this.dialogHotkeyCombo} />
9393
</h2>
9494
</div>
9595
<this.hotkeyEnabler />

‎packages/ui/demo/src/renderToggle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
HTMLSelect,
66
Dialog,
77
useHotkeys,
8-
KeyCombo
8+
KeyComboTag
99
} from "@blueprintjs/core";
1010
import { lifecycle, mapProps } from "recompose";
1111
import { omit } from "lodash-es";
@@ -126,7 +126,7 @@ export default function renderToggle({
126126
transform: "scale(0.8)"
127127
}}
128128
>
129-
<KeyCombo minimal combo={hotkey} />
129+
<KeyComboTag minimal combo={hotkey} />
130130
</div>
131131
</>
132132
)}

‎packages/ui/demo/src/useToggle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
HTMLSelect,
66
Dialog,
77
useHotkeys,
8-
KeyCombo
8+
KeyComboTag
99
} from "@blueprintjs/core";
1010
import ReactMarkdown from "react-markdown";
1111
import remarkGfm from "remark-gfm";
@@ -185,7 +185,7 @@ const useToggle = ({
185185
transform: "scale(0.8)"
186186
}}
187187
>
188-
<KeyCombo minimal combo={hotkey} />
188+
<KeyComboTag minimal combo={hotkey} />
189189
</div>
190190
</>
191191
)}

‎packages/ui/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
"./style.css": "./style.css"
1212
},
1313
"dependencies": {
14-
"@blueprintjs/core": "3.54.0",
15-
"@blueprintjs/datetime": "^3.24.1",
16-
"@blueprintjs/select": "3.18.11",
14+
"@blueprintjs/core": "5.19.0",
15+
"@blueprintjs/datetime2": "^2.3.32",
16+
"@blueprintjs/popover2": "^2.1.31",
17+
"@blueprintjs/select": "5.3.20",
1718
"@dnd-kit/core": "^6.1.0",
1819
"@dnd-kit/modifiers": "^7.0.0",
1920
"@dnd-kit/sortable": "^8.0.0",
@@ -51,8 +52,6 @@
5152
"url-join": "^4.0.1",
5253
"use-deep-compare-effect": "^1.6.1",
5354
"write-excel-file": "^1.4.25",
54-
"cypress-real-events": "^1.13.0",
55-
"chance": "^1.1.11",
5655
"@dnd-kit/utilities": "3.2.2",
5756
"@teselagen/file-utils": "file:../file-utils",
5857
"@blueprintjs/icons": "3.33.0"

0 commit comments

Comments
 (0)