Skip to content

Commit 92d2661

Browse files
committed
Merge branch 'develop' into bvandercar/segmentedcontrol-value-types
2 parents ee2ac5e + 5d092cd commit 92d2661

File tree

472 files changed

+3625
-3551
lines changed

Some content is hidden

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

472 files changed

+3625
-3551
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
- store_test_results: { path: ./reports }
138138
- store_artifacts: { path: ./reports }
139139

140-
test-react-16: &test-react
140+
test-react-18: &test-react
141141
docker: *docker-node-browsers-image
142142
resource_class: xlarge
143143
environment:
@@ -177,7 +177,7 @@ jobs:
177177
- store_test_results: { path: ./reports }
178178
- store_artifacts: { path: ./reports }
179179

180-
test-iso-react-16: &test-iso
180+
test-iso-react-18: &test-iso
181181
docker: *docker-node-image
182182
environment:
183183
JUNIT_REPORT_PATH: reports
@@ -228,14 +228,14 @@ workflows:
228228
requires: [compile]
229229
- test-node-libs:
230230
requires: [compile]
231-
- test-react-16:
231+
- test-react-18:
232232
requires: [compile]
233-
- test-iso-react-16:
233+
- test-iso-react-18:
234234
requires: [compile]
235235
- deploy-preview:
236236
requires: [dist]
237237
- deploy-npm:
238-
requires: [dist, lint, test-node-libs, test-react-16, test-iso-react-16]
238+
requires: [dist, lint, test-node-libs, test-react-18, test-iso-react-18]
239239
filters:
240240
branches:
241241
only:

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ about: Something not working as expected?
77

88
#### Environment
99

10-
- __Package version(s)__: <!-- fill this out -->
11-
- __Operating System__: <!-- fill this out -->
12-
- __Browser name and version__: <!-- fill this out -->
10+
- **Package version(s)**: <!-- fill this out -->
11+
- **Operating System**: <!-- fill this out -->
12+
- **Browser name and version**: <!-- fill this out -->
1313

1414
#### Code Sandbox
1515

.github/ISSUE_TEMPLATE/Feature_request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ about: Propose a new feature or suggest an idea
77

88
#### Environment
99

10-
- __Package version(s)__: <!-- fill this out -->
11-
- __Browser and OS versions__: <!-- fill this out -->
10+
- **Package version(s)**: <!-- fill this out -->
11+
- **Browser and OS versions**: <!-- fill this out -->
1212

1313
#### Feature request
1414

.github/ISSUE_TEMPLATE/Support_question.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ about: Need help with Blueprint?
77

88
#### Environment
99

10-
- __Package version(s)__: <!-- fill this out -->
11-
- __Browser and OS versions__: <!-- fill this out -->
10+
- **Package version(s)**: <!-- fill this out -->
11+
- **Browser and OS versions**: <!-- fill this out -->
1212

1313
#### Question
1414

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#### Checklist
44

5-
- [ ] Includes tests
6-
- [ ] Update documentation
5+
- [ ] Includes tests
6+
- [ ] Update documentation
77

88
<!-- DO NOT enable CircleCI for your fork. Our build will run when you open this PR. -->
99

.stylelintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"color-function-notation": "legacy",
1313
"declaration-empty-line-before": null,
1414
"no-invalid-position-at-import-rule": [true, {
15-
"ignoreAtRules": ["use", "forward"]
15+
"ignoreAtRules": ["use"]
1616
}],
1717
"scss/media-feature-value-dollar-variable": null,
1818
"selector-max-universal": 1
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/types/Props.d.ts b/types/Props.d.ts
2+
index f8fcd45ab3048d9b34709eba1797597ac2facdec..3afa05a42f485ff23899f20df2ff9d85bf588eed 100644
3+
--- a/types/Props.d.ts
4+
+++ b/types/Props.d.ts
5+
@@ -44,7 +44,7 @@ export interface DayPickerProps {
6+
captionElement?:
7+
| React.ReactElement<Partial<CaptionElementProps>>
8+
| React.ComponentClass<CaptionElementProps>
9+
- | React.SFC<CaptionElementProps>;
10+
+ | React.FC<CaptionElementProps>;
11+
className?: string;
12+
classNames?: ClassNames;
13+
containerProps?: React.DetailedHTMLProps<
14+
@@ -69,7 +69,7 @@ export interface DayPickerProps {
15+
navbarElement?:
16+
| React.ReactElement<Partial<NavbarElementProps>>
17+
| React.ComponentClass<NavbarElementProps>
18+
- | React.SFC<NavbarElementProps>;
19+
+ | React.FC<NavbarElementProps>;
20+
numberOfMonths?: number;
21+
onBlur?: (e: React.FocusEvent<HTMLDivElement>) => void;
22+
onCaptionClick?: (month: Date, e: React.MouseEvent<HTMLDivElement>) => void;
23+
@@ -142,7 +142,7 @@ export interface DayPickerProps {
24+
weekdayElement?:
25+
| React.ReactElement<Partial<WeekdayElementProps>>
26+
| React.ComponentClass<WeekdayElementProps>
27+
- | React.SFC<WeekdayElementProps>;
28+
+ | React.FC<WeekdayElementProps>;
29+
weekdaysLong?: string[];
30+
weekdaysShort?: string[];
31+
tabIndex?: number;

CHANGELOG.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
Changelog
2-
---------
1+
# Changelog
32

43
Changelogs for `@blueprintjs/*` packages currently live in the project's Github wiki:
54

6-
- [5.x Changelog](https://github.com/palantir/blueprint/wiki/5.x-Changelog)
7-
- [4.x Changelog](https://github.com/palantir/blueprint/wiki/4.x-Changelog)
8-
- [3.x Changelog](https://github.com/palantir/blueprint/wiki/3.x-Changelog)
5+
- [5.x Changelog](https://github.com/palantir/blueprint/wiki/5.x-Changelog)
6+
- [4.x Changelog](https://github.com/palantir/blueprint/wiki/4.x-Changelog)
7+
- [3.x Changelog](https://github.com/palantir/blueprint/wiki/3.x-Changelog)

CONTRIBUTING.md

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,24 @@ A typical contributor workflow looks like this:
3636

3737
1. Create a new feature branch. We like to use a format like `[your-initials]/[short-name]`:
3838
for example, `bd/refactor-buttons`.
39-
1. Run development build tasks - follow the ["Developing libraries" steps in the README](https://github.com/palantir/blueprint/blob/develop/README.md#developing-libraries).
40-
1. Visit http://localhost:9000 in your web browser to see the interactive docs web app.
39+
2. Run development build tasks - follow the ["Developing libraries" steps in the README](https://github.com/palantir/blueprint/blob/develop/README.md#developing-libraries).
40+
3. Visit http://localhost:9000 in your web browser to see the interactive docs web app.
4141
4. Write some code. :hammer: **Refer to the wiki in this repo for detailed instructions on:**
4242
- [Development practices](https://github.com/palantir/blueprint/wiki/Development-practices)
4343
- [Coding guidelines](https://github.com/palantir/blueprint/wiki/Coding-guidelines)
4444
- [Editor integration](https://github.com/palantir/blueprint/wiki/Editor-integration)
4545
5. Ensure your code **compiles properly** and is **tested**, **linted**, and **formatted**.
4646
- Run `yarn compile` at the repo root to build all libraries.
4747
- Run `yarn bundle` at the repo root to build the Blueprint documentation and other bundles.
48-
- Add unit tests as necessary when fixing bugs or adding features; run them with `yarn test`
49-
in the relevant package directory.
50-
- Linting is best handled by your editor for real-time feedback (see
51-
[Editor integration](https://github.com/palantir/blueprint/wiki/Editor-integration)). Run
52-
`yarn lint` to be 100% safe.
48+
- Add unit tests as necessary when fixing bugs or adding features; run them with `yarn test` in the relevant package directory.
49+
- Linting is best handled by your editor for real-time feedback (see [Editor integration](https://github.com/palantir/blueprint/wiki/Editor-integration)). Run `yarn lint` to be 100% safe.
5350
- TypeScript lint errors can often be automatically fixed by ESLint. Run lint fixes with `yarn lint-fix`.
54-
- Code formatting is enforced using [Prettier](https://prettier.io/). These errors can be fixed in your editor
55-
through the Prettier extension (make sure you have set up the editor integrations linked above).
56-
__Formatting checks will not run__ during the `yarn lint` package script.
57-
Instead, when using the CLI or in a CI environment, you should run the `yarn format` script to fix all
58-
formatting issues across the Blueprint monorepo.
59-
1. Submit a Pull Request on GitHub and fill out the template.
60-
- ⚠️ __DO NOT enable CircleCI for your fork of Blueprint.__ When you open a PR, your branch will be checked out
61-
and built in palantir's CI pipeline automatically. There is no need to enable the CI build for your fork's
62-
pipeline. If you do, this may cause problems in the CI build.
63-
- If you have already opened a PR where CircleCI built the code in your own personal or organization pipeline,
64-
you will likely have to disable the project from building at app.circleci.com/settings/project/github/\<your-username\>/website
65-
and open a new PR.
66-
1. Team members will review your code and merge it after approvals.
51+
- Code formatting is enforced using [Prettier](https://prettier.io/). These errors can be fixed in your editor through the Prettier extension (make sure you have set up the editor integrations linked above). **Formatting checks will not run** during the `yarn lint` package script. Instead, when using the CLI or in a CI environment you should run the `yarn format` script to fix all formatting issues across the Blueprint monorepo.
52+
6. Submit a Pull Request on GitHub and fill out the template.
53+
- ⚠️ **DO NOT enable CircleCI for your fork of Blueprint.** When you open a PR, your branch will be checked out and built in palantir's CI pipeline automatically. There is no need to enable the CI build for your fork's pipeline. If you do, this may cause problems in the CI build.
54+
- If you have already opened a PR where CircleCI built the code in your own personal or organization pipeline, you will likely have to disable the project from building at app.circleci.com/settings/project/github/\<your-username\>/website and open a new PR.
55+
7. Team members will review your code and merge it after approvals.
6756
- You may be asked to make modifications to code style or to fix bugs you may have not noticed.
6857
- Please respond to comments in a timely fashion (even if to tell us you need more time).
6958
- _Do not_ amend commits and `push --force` as they break the PR history. Please add more commits; we squash each PR to a single commit on merge.
70-
1. Hooray, you contributed! :tophat:
59+
8. Hooray, you contributed! :tophat:

README.md

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ First, ensure you have `nvm` ([Node Version Manager](https://github.com/nvm-sh/n
8484
After cloning this repo, run:
8585

8686
1. `nvm use` to use the supported Node version for Blueprint development.
87-
1. `corepack enable` to activate [Yarn](https://yarnpkg.com/getting-started) as the Node package manager.
88-
1. `yarn` to install all dependencies for the monorepo.
89-
1. If seeing an error like "Error when performing the request ...", you may be using a VPN that needs to be disabled to install the dependencies.
90-
1. If running on Windows:
87+
2. `corepack enable` to activate [Yarn](https://yarnpkg.com/getting-started) as the Node package manager.
88+
3. `yarn` to install all dependencies for the monorepo.
89+
1. If seeing an error like "Error when performing the request ...", you may be using a VPN that needs to be disabled to install the dependencies.
90+
4. If running on Windows:
9191
1. `npm install -g windows-build-tools` to install build tools globally
92-
1. Ensure `bash` is your configured script-shell by running:<br />
92+
2. Ensure `bash` is your configured script-shell by running:<br />
9393
`npm config set script-shell "C:\\Program Files\\git\\bin\\bash.exe"`
94-
1. `yarn verify` to ensure you have all the build tooling working properly.
95-
1. There may currently be some errors when running this step, even though everything is set up properly, see https://github.com/palantir/blueprint/issues/6926 for more info.
94+
5. `yarn verify` to ensure you have all the build tooling working properly.
95+
1. There may currently be some errors when running this step, even though everything is set up properly, see https://github.com/palantir/blueprint/issues/6926 for more info.
9696

9797
### Incorporating upstream changes
9898

@@ -101,47 +101,33 @@ If you were previously in a working state and have just pulled new code from `de
101101
- If there were package dependency changes, run `yarn` at the root.
102102
- This command is very quick if there are no new things to install.
103103
- Run `yarn compile` to get the latest built versions of the library packages in this repo.
104-
- This command is quicker than `yarn verify` since it doesn't build the application packages (`docs-app`,
105-
`landing-app`, etc.) or run tests
104+
- This command is quicker than `yarn verify` since it doesn't build the application packages (`docs-app`,`landing-app`, etc.) or run tests
106105

107106
### Developing libraries
108107

109108
There are a few ways to run development scripts, here they are listed from simplest to more advanced usage:
110109

111-
- Run `yarn dev` from the root directory to watch changes across all packages and run the docs application with
112-
webpack-dev-server.
110+
- Run `yarn dev` from the root directory to watch changes across all packages and run the docs application with webpack-dev-server.
113111
- Alternately, most libraries have a dev script to run the docs app _and_ watch changes to only that package:
114112
- `yarn dev:core`
115113
- `yarn dev:docs`
116114
- `yarn dev:datetime`
117115
- `yarn dev:select`
118116
- `yarn dev:table`
119-
- Lastly, if you want to control exactly which dev scripts are run and view the console output in the cleanest way,
120-
we recommend opening separate terminal windows or splits and running local package dev tasks in each one. This is
121-
the recommended workflow for frequent contributors and advanced developers. For example, to test changes in the core
122-
and icons packages, you would run the following in separate terminals:
117+
- Lastly, if you want to control exactly which dev scripts are run and view the console output in the cleanest way, we recommend opening separate terminal windows or splits and running local package dev tasks in each one. This is the recommended workflow for frequent contributors and advanced developers. For example, to test changes in the core and icons packages, you would run the following in separate terminals:
123118
- `cd packages/core && yarn dev`
124119
- `cd packages/icons && yarn dev`
125120
- `cd packages/docs-app && yarn dev`
126121

127122
### Updating documentation
128123

129-
Much of Blueprint's documentation lives inside source code as JSDoc comments in `.tsx` files and KSS markup in `.scss`
130-
files. This documentation is extracted and converted into static JSON data using
131-
[documentalist](https://github.com/palantir/documentalist/).
132-
133-
If you are updating documentation sources (_not_ the docs UI code which lives in `packages/docs-app` or the docs theme
134-
in `packages/docs-theme`), you'll need to run `yarn compile` from `packages/docs-data` to see changes reflected in the
135-
application. For simplicity, an alias script `yarn docs-data` exists in the root to minimize directory hopping.
124+
Much of Blueprint's documentation lives inside source code as JSDoc comments in `.tsx` files and KSS markup in `.scss` files. This documentation is extracted and converted into static JSON data using [documentalist](https://github.com/palantir/documentalist/). If you are updating documentation sources (_not_ the docs UI code which lives in `packages/docs-app` or the docs theme in `packages/docs-theme`), you'll need to run `yarn compile` from `packages/docs-data` to see changes reflected in the application. For simplicity, an alias script `yarn docs-data` exists in the root to minimize directory hopping.
136125

137126
### Updating icons
138127

139-
The [One-time setup](#one-time-setup) and [Incorporating upstream changes](#incorporating-upstream-changes) steps should
140-
produce the generated source code in this repo used to build the icons documentation. This is sufficient for most
141-
development workflows.
128+
The [One-time setup](#one-time-setup) and [Incorporating upstream changes](#incorporating-upstream-changes) steps should produce the generated source code in this repo used to build the icons documentation. This is sufficient for most development workflows.
142129

143-
If you are updating icons or adding new ones, you'll need to run `yarn compile` in `packages/icons` to see those changes
144-
reflected before running any of the dev scripts.
130+
If you are updating icons or adding new ones, you'll need to run `yarn compile` in `packages/icons` to see those changes reflected before running any of the dev scripts.
145131

146132
## License
147133

0 commit comments

Comments
 (0)