From 7b0dc47b047bb82a9fb5642bc5d10f7ce5d37324 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 16:18:23 +0000 Subject: [PATCH] build(deps): bump @blueprintjs/popover2 from 1.11.3 to 1.12.0 (#1454) * build(deps): bump @blueprintjs/popover2 from 1.11.3 to 1.12.0 Bumps [@blueprintjs/popover2](https://github.com/palantir/blueprint/tree/HEAD/packages/core) from 1.11.3 to 1.12.0. - [Release notes](https://github.com/palantir/blueprint/releases) - [Changelog](https://github.com/palantir/blueprint/blob/develop/CHANGELOG.md) - [Commits](https://github.com/palantir/blueprint/commits/@blueprintjs/popover2@1.12.0/packages/core) --- updated-dependencies: - dependency-name: "@blueprintjs/popover2" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * fix breaking change in blueprintjs popover2 work around https://github.com/palantir/blueprint/issues/5889 Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Lechner --- package.json | 2 +- src/toolbar/ActionButton.tsx | 7 ++-- yarn.lock | 71 +----------------------------------- 3 files changed, 6 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index b6a19195..10342023 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dependencies": { "@babel/core": "^7.20.12", "@blueprintjs/core": "^4.15.0", - "@blueprintjs/popover2": "^1.11.3", + "@blueprintjs/popover2": "^1.12.0", "@blueprintjs/select": "^4.8.17", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10", "@pybricks/firmware": "6.7.0", diff --git a/src/toolbar/ActionButton.tsx b/src/toolbar/ActionButton.tsx index 8e6e3fe6..5e79b285 100644 --- a/src/toolbar/ActionButton.tsx +++ b/src/toolbar/ActionButton.tsx @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// Copyright (c) 2020-2022 The Pybricks Authors +// Copyright (c) 2020-2023 The Pybricks Authors import { Button, @@ -9,7 +9,7 @@ import { SpinnerSize, useHotkeys, } from '@blueprintjs/core'; -import { Tooltip2 } from '@blueprintjs/popover2'; +import { Popover2HoverTargetHandlers, Tooltip2 } from '@blueprintjs/popover2'; import { mergeProps } from '@react-aria/utils'; import classNames from 'classnames'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; @@ -110,7 +110,8 @@ const ActionButton: React.VoidFunctionComponent = ({ aria-disabled={enabled === false} aria-label={label} elementRef={tooltipTargetRef as React.Ref} - {...mergeProps(tooltipTargetProps, { + // https://github.com/palantir/blueprint/issues/5889 + {...mergeProps(tooltipTargetProps as Popover2HoverTargetHandlers, { className: classNames( 'pb-toolbar-action-button', enabled === false && Classes.DISABLED, diff --git a/yarn.lock b/yarn.lock index f5a01f20..14826d7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1515,13 +1515,6 @@ __metadata: languageName: node linkType: hard -"@blueprintjs/colors@npm:^4.1.12": - version: 4.1.12 - resolution: "@blueprintjs/colors@npm:4.1.12" - checksum: f59d52b90e969821d29ab66b332f158663284c2c231161614207e411b7e7ce4fd4b5dea2ec2205cad79cf4e3788a0301fd622fde10686988526f7dd34353a062 - languageName: node - linkType: hard - "@blueprintjs/colors@npm:^4.1.13": version: 4.1.13 resolution: "@blueprintjs/colors@npm:4.1.13" @@ -1529,35 +1522,6 @@ __metadata: languageName: node linkType: hard -"@blueprintjs/core@npm:^4.14.3": - version: 4.14.3 - resolution: "@blueprintjs/core@npm:4.14.3" - dependencies: - "@blueprintjs/colors": ^4.1.12 - "@blueprintjs/icons": ^4.12.2 - "@juggle/resize-observer": ^3.4.0 - "@types/dom4": ^2.0.2 - classnames: ^2.3.1 - dom4: ^2.1.5 - normalize.css: ^8.0.1 - popper.js: ^1.16.1 - react-popper: ^1.3.11 - react-transition-group: ^4.4.5 - tslib: ~2.3.1 - peerDependencies: - "@types/react": ^16.14.32 || 17 || 18 - react: ^16.8 || 17 || 18 - react-dom: ^16.8 || 17 || 18 - peerDependenciesMeta: - "@types/react": - optional: true - bin: - upgrade-blueprint-2.0.0-rename: scripts/upgrade-blueprint-2.0.0-rename.sh - upgrade-blueprint-3.0.0-rename: scripts/upgrade-blueprint-3.0.0-rename.sh - checksum: 74b7aef56cccda95b6b7eae6787f2ac9f6cfec6678fea16cce12e657d4a36a2148829470a24fd3080876f89174eb89b7a7a5970f8f39b02af5b8511ee502e4ed - languageName: node - linkType: hard - "@blueprintjs/core@npm:^4.15.0": version: 4.15.0 resolution: "@blueprintjs/core@npm:4.15.0" @@ -1587,17 +1551,6 @@ __metadata: languageName: node linkType: hard -"@blueprintjs/icons@npm:^4.12.2": - version: 4.12.2 - resolution: "@blueprintjs/icons@npm:4.12.2" - dependencies: - change-case: ^4.1.2 - classnames: ^2.3.1 - tslib: ~2.3.1 - checksum: 53e62f1f80814e5cb8c0978a1feb41779f68b9cc23bf1d382608cf0b315527751eaae9f763c30950bb33d60899f4e122c074a23d519d45e4ae23bdb0ac1f40d3 - languageName: node - linkType: hard - "@blueprintjs/icons@npm:^4.13.0": version: 4.13.0 resolution: "@blueprintjs/icons@npm:4.13.0" @@ -1609,28 +1562,6 @@ __metadata: languageName: node linkType: hard -"@blueprintjs/popover2@npm:^1.11.3": - version: 1.11.3 - resolution: "@blueprintjs/popover2@npm:1.11.3" - dependencies: - "@blueprintjs/core": ^4.14.3 - "@juggle/resize-observer": ^3.4.0 - "@popperjs/core": ^2.11.6 - classnames: ^2.3.1 - dom4: ^2.1.5 - react-popper: ^2.3.0 - tslib: ~2.3.1 - peerDependencies: - "@types/react": ^16.14.32 || 17 || 18 - react: ^16.8 || 17 || 18 - react-dom: ^16.8 || 17 || 18 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: 2aee11e767dce910c59f50289dabeebeee1d09745f0f6d69b05deb5113f716695d29950fc870e9b3228f718cedb79e2692dfb3afdd6e1fdf41da60f37ea13967 - languageName: node - linkType: hard - "@blueprintjs/popover2@npm:^1.12.0": version: 1.12.0 resolution: "@blueprintjs/popover2@npm:1.12.0" @@ -2479,7 +2410,7 @@ __metadata: dependencies: "@babel/core": ^7.20.12 "@blueprintjs/core": ^4.15.0 - "@blueprintjs/popover2": ^1.11.3 + "@blueprintjs/popover2": ^1.12.0 "@blueprintjs/select": ^4.8.17 "@pmmmwh/react-refresh-webpack-plugin": ^0.5.10 "@pybricks/firmware": 6.7.0