Skip to content

Commit 395a96d

Browse files
authored
Merge next into develop (#7492)
2 parents 61f488f + fc7dd04 commit 395a96d

File tree

385 files changed

+6923
-28097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+6923
-28097
lines changed

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ jobs:
169169
0) yarn nx run-many -t test:typeCheck ;; \
170170
1) yarn nx test:karma @blueprintjs/core ;; \
171171
2) yarn nx test:karma @blueprintjs/datetime ;; \
172-
3) yarn nx test:karma @blueprintjs/datetime2 ;; \
173172
4) yarn nx test:karma @blueprintjs/select ;; \
174173
5) yarn nx test:karma @blueprintjs/table
175174
esac

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ about: Something not working as expected?
1313

1414
#### Code Sandbox
1515

16-
Link to a minimal repro (fork [this code sandbox](https://codesandbox.io/p/sandbox/blueprint-v5-x-sandbox-react-16-wy0ojy)): <!-- here -->
16+
Link to a minimal repro (fork [this code sandbox](https://codesandbox.io/p/sandbox/blueprint-v6-react-18-template-lc69nt)): <!-- here -->
1717

1818
#### Steps to reproduce
1919

.yarn/patches/react-day-picker-npm-7.4.9-8853eff118.patch

Lines changed: 0 additions & 31 deletions
This file was deleted.

config/tsconfig.web.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "./tsconfig.base",
33
"compilerOptions": {
44
"jsx": "react",
5-
"lib": ["dom", "dom.iterable", "es5", "es2015.collection", "es2015.iterable"],
5+
"lib": ["dom", "dom.iterable", "es2019"],
66
"module": "es2020",
77
"moduleResolution": "node",
8-
"target": "es5"
8+
"target": "es2019"
99
}
1010
}

packages/core/karma.conf.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ module.exports = async function (config) {
1414
// no need to test legacy APIs
1515
"src/legacy/*",
1616
"src/common/keyCodes.ts",
17-
"src/deprecatedTypeAliases.ts",
1817

1918
// not worth full coverage
2019
"src/accessibility/*",

packages/core/package.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{
22
"name": "@blueprintjs/core",
3-
"version": "5.19.1",
3+
"version": "6.0.0-alpha.2",
44
"description": "Core styles & components",
55
"main": "lib/cjs/index.js",
66
"module": "lib/esm/index.js",
77
"esnext": "lib/esnext/index.js",
88
"typings": "lib/esm/index.d.ts",
99
"style": "lib/css/blueprint.css",
10-
"unpkg": "dist/core.bundle.js",
1110
"files": [
12-
"dist",
1311
"lib",
1412
"scripts",
1513
"src"
@@ -33,7 +31,6 @@
3331
"compile:css": "sass-compile ./src",
3432
"dev": "run-p \"compile:esm --watch\" \"compile:css --watch\"",
3533
"dist": "run-s \"dist:*\"",
36-
"dist:bundle": "NODE_ENV=production webpack",
3734
"dist:css": "css-dist lib/css",
3835
"dist:variables": "generate-css-variables --retainDefault true ../../colors/src/_colors.scss common/_color-aliases.scss common/_variables.scss",
3936
"dist:verify": "assert-package-layout",
@@ -56,14 +53,13 @@
5653
"normalize.css": "^8.0.1",
5754
"react-popper": "^2.3.0",
5855
"react-transition-group": "^4.4.5",
59-
"react-uid": "^2.3.3",
6056
"tslib": "~2.6.2",
6157
"use-sync-external-store": "^1.2.0"
6258
},
6359
"peerDependencies": {
64-
"@types/react": "^16.14.41 || 17 || 18",
65-
"react": "^16.8 || 17 || 18",
66-
"react-dom": "^16.8 || 17 || 18"
60+
"@types/react": "18",
61+
"react": "18",
62+
"react-dom": "18"
6763
},
6864
"peerDependenciesMeta": {
6965
"@types/react": {

packages/core/src/common/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Namespace appended to the beginning of each CSS class: `.#{$ns}-button`.
1717
// N.B. No quotes around this string value, for Less syntax compatibility. Also, this cannot be overriden
1818
// (the JS components have this class prefix hard-coded), so it does not have the `!default` modifier.
19-
$ns: bp5;
19+
$ns: bp6;
2020
// Alias for BP users outside this repo
2121
$bp-ns: $ns;
2222

packages/core/src/common/classes.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ import type { ButtonVariant } from "./buttonVariant";
1919
import { Elevation } from "./elevation";
2020
import { Intent } from "./intent";
2121
import { Position } from "./position";
22-
import type { HTMLInputProps } from "./props";
2322
import type { Size } from "./size";
2423

2524
// injected by webpack.DefinePlugin
2625
declare let BLUEPRINT_NAMESPACE: string | undefined;
2726
declare let REACT_APP_BLUEPRINT_NAMESPACE: string | undefined;
2827

29-
let NS = "bp5";
28+
let NS = "bp6";
3029

3130
if (typeof BLUEPRINT_NAMESPACE !== "undefined") {
3231
NS = BLUEPRINT_NAMESPACE;
@@ -178,8 +177,6 @@ export const ENTITY_TITLE_TITLE_AND_TAGS = `${ENTITY_TITLE}-title-and-tags`;
178177
export const FLEX_EXPANDER = `${NS}-flex-expander`;
179178

180179
export const HTML_SELECT = `${NS}-html-select`;
181-
/** @deprecated use `<HTMLSelect>` component or `Classes.HTML_SELECT` instead */
182-
export const SELECT = `${NS}-select`;
183180

184181
export const HTML_TABLE = `${NS}-html-table`;
185182
export const HTML_TABLE_BORDERED = `${HTML_TABLE}-bordered`;
@@ -278,15 +275,19 @@ export const OVERLAY_SCROLL_CONTAINER = `${OVERLAY}-scroll-container`;
278275
export const OVERLAY_START_FOCUS_TRAP = `${OVERLAY}-start-focus-trap`;
279276
export const OVERLAY_END_FOCUS_TRAP = `${OVERLAY}-end-focus-trap`;
280277

281-
export const PANEL_STACK = `${NS}-panel-stack`;
278+
export const PANEL_STACK = `${NS}-panel-stack2`;
282279
export const PANEL_STACK_HEADER = `${PANEL_STACK}-header`;
283280
export const PANEL_STACK_HEADER_BACK = `${PANEL_STACK}-header-back`;
284281
export const PANEL_STACK_VIEW = `${PANEL_STACK}-view`;
285282

286-
export const PANEL_STACK2 = `${NS}-panel-stack2`;
287-
export const PANEL_STACK2_HEADER = `${PANEL_STACK2}-header`;
288-
export const PANEL_STACK2_HEADER_BACK = `${PANEL_STACK2}-header-back`;
289-
export const PANEL_STACK2_VIEW = `${PANEL_STACK2}-view`;
283+
/** @deprecated Use `PANEL_STACK` instead */
284+
export const PANEL_STACK2 = PANEL_STACK;
285+
/** @deprecated Use `PANEL_STACK_HEADER` instead */
286+
export const PANEL_STACK2_HEADER = PANEL_STACK_HEADER;
287+
/** @deprecated Use PANEL_STACK_HEADER_BACK instead */
288+
export const PANEL_STACK2_HEADER_BACK = PANEL_STACK_HEADER_BACK;
289+
/** @deprecated Use PANEL_STACK_VIEW instead */
290+
export const PANEL_STACK2_VIEW = PANEL_STACK_VIEW;
290291

291292
export const POPOVER = `${NS}-popover`;
292293
export const POPOVER_ARROW = `${POPOVER}-arrow`;
@@ -449,7 +450,7 @@ export function positionClass(position: Position | undefined) {
449450
}
450451

451452
export function sizeClass(
452-
size: Size | HTMLInputProps["size"],
453+
size: Size,
453454
legacyProps: Partial<Record<"large" | "small", boolean>>,
454455
): string | Record<string, boolean> {
455456
if (size === "small") {

packages/core/src/common/context.ts

Lines changed: 0 additions & 27 deletions
This file was deleted.

packages/core/src/common/errors.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const HOTKEYS_PROVIDER_NOT_FOUND =
4545
` useHotkeys() was used outside of a <HotkeysProvider> context. These hotkeys will not be shown in the hotkeys help dialog.`;
4646
export const HOTKEYS_TARGET_CHILDREN_LOCAL_HOTKEYS =
4747
ns +
48-
` <HotkeysTarget2> was configured with local hotkeys, but you did not use the generated event handlers to bind their event handlers. Try using a render function as the child of this component.`;
48+
` <HotkeysTarget> was configured with local hotkeys, but you did not use the generated event handlers to bind their event handlers. Try using a render function as the child of this component.`;
4949

5050
export const INPUT_WARN_LEFT_ELEMENT_LEFT_ICON_MUTEX =
5151
ns + ` <InputGroup> leftElement and leftIcon prop are mutually exclusive, with leftElement taking priority.`;
@@ -68,10 +68,6 @@ export const NUMERIC_INPUT_STEP_SIZE_NON_POSITIVE =
6868
export const NUMERIC_INPUT_CONTROLLED_VALUE_INVALID =
6969
ns + ` <NumericInput> controlled value prop does not adhere to stepSize, min, and/or max constraints.`;
7070

71-
export const PANEL_STACK_INITIAL_PANEL_STACK_MUTEX =
72-
ns + ` <PanelStack> requires exactly one of initialPanel and stack prop`;
73-
export const PANEL_STACK_REQUIRES_PANEL = ns + ` <PanelStack> requires at least one panel in the stack`;
74-
7571
export const OVERFLOW_LIST_OBSERVE_PARENTS_CHANGED =
7672
ns + ` <OverflowList> does not support changing observeParents after mounting.`;
7773

@@ -88,10 +84,6 @@ export const POPOVER_WARN_UNCONTROLLED_ONINTERACTION = ns + ` <Popover> onIntera
8884
export const POPOVER_WARN_TARGET_PROPS_WITH_RENDER_TARGET =
8985
ns + ` <Popover> targetProps value is ignored when renderTarget API is used.`;
9086

91-
export const PORTAL_CONTEXT_CLASS_NAME_STRING = ns + ` <Portal> context blueprintPortalClassName must be string`;
92-
export const PORTAL_LEGACY_CONTEXT_API =
93-
ns + ` setting blueprintPortalClassName via legacy React context API is deprecated, use <PortalProvider> instead.`;
94-
9587
export const RADIOGROUP_WARN_CHILDREN_OPTIONS_MUTEX =
9688
ns + ` <RadioGroup> children and options prop are mutually exclusive, with options taking priority.`;
9789

@@ -111,11 +103,6 @@ export const TOASTER_CREATE_NULL =
111103
ns +
112104
` OverlayToaster.create() is not supported inside React lifecycle methods in React 16.` +
113105
` See usage example on the docs site. https://blueprintjs.com/docs/#core/components/toast.example`;
114-
export const TOASTER_CREATE_ASYNC_NULL =
115-
ns +
116-
` OverlayToaster.createAsync() received a null component ref. This can happen if called inside React lifecycle ` +
117-
`methods in React 16. See usage example on the docs site. ` +
118-
`https://blueprintjs.com/docs/#core/components/toast.example`;
119106
export const TOASTER_MAX_TOASTS_INVALID =
120107
ns + ` <OverlayToaster> maxToasts is set to an invalid number, must be greater than 0`;
121108
export const TOASTER_WARN_INLINE =

0 commit comments

Comments
 (0)