Skip to content

Commit

Permalink
Merge branch 'master' into use-custom-downchevron-crossicon-3739
Browse files Browse the repository at this point in the history
  • Loading branch information
bladey authored Jul 8, 2020
2 parents e7a3fcd + 79c9e9d commit 691f355
Show file tree
Hide file tree
Showing 40 changed files with 3,901 additions and 4,955 deletions.
5 changes: 0 additions & 5 deletions .changeset/brown-terms-hear.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/chilly-eagles-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-select": patch
---

Fix repository field
5 changes: 5 additions & 0 deletions .changeset/flat-kings-applaud.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-select': patch
---

Improve performance of option filtering when ignoreAccents is enabled (the default)
5 changes: 0 additions & 5 deletions .changeset/nine-goats-care.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/old-tips-leave.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/real-suns-rescue.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silent-jokes-camp.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/sixty-forks-fry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-select": patch
---

Fix react-select ignoring HTML5 "form" attribute
5 changes: 0 additions & 5 deletions .changeset/soft-lemons-invent.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/spicy-ads-poke.md

This file was deleted.

4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2

docker_defaults: &docker_defaults
docker:
- image: cypress/base:8
- image: cypress/base:13.6.0
environment:
TERM: xterm
working_directory: ~/project/repo
Expand All @@ -17,7 +17,7 @@ install_steps: &install_steps
- restore_cache:
name: Restore node_modules cache
keys:
- dependency-cache-{{ .Branch }}-{{ checksum "package.json" }}
- dependency-cache-{{ .Branch }}-{{ checksum "yarn.lock" }}
- dependency-cache-{{ .Branch }}-
- dependency-cache-
- run:
Expand Down
10 changes: 9 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,21 @@
Before creating an issue...

# Are you asking a question?
Please don't file GitHub issues to ask questions. Use Stack Overflow with a [#react-select](http://stackoverflow.com/questions/tagged/react-select) tag
Please don't file GitHub issues to ask questions. Use Stack Overflow with a [#react-select](http://stackoverflow.com/questions/tagged/react-select) tag.


# Are you reporting a bug or runtime error?
Please include a test case that demonstrates the issue you're reporting!

This is very helpful to maintainers in order to help us see the issue you're seeing.

Please note we are currently only directing our efforts towards the current major (v3) version and beyond.

We understand this might be inconvenient but it is in the best interest of supporting the broader community and to sustain the `react-select` project going forward.

To report bugs against react-select v3 please fork the following code-sandbox:
https://codesandbox.io/s/react-select-v3-sandbox-jgdch

To report bugs against react-select v2 please fork the following code-sandbox:
https://codesandbox.io/s/k5rvn9z3lv

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ jobs:
steps:
- name: Checkout Repo
uses: actions/checkout@master
with:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

- name: Setup Node.js 10.x
uses: actions/setup-node@master
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
7 changes: 2 additions & 5 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ module.exports = {
plugins: [
'emotion',
['@babel/plugin-proposal-class-properties', { loose: true }],
'@babel/plugin-transform-runtime',
],
presets: [
['@babel/preset-env', { loose: true }],
'@babel/preset-react',
'@babel/preset-flow',
],
presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-flow'],
};
6 changes: 3 additions & 3 deletions docs/examples/StyleCompositionExample.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { css } from 'emotion';
/** @jsx jsx */
import { jsx } from '@emotion/core';
import Select from 'react-select';
import { colourOptions } from '../data';

Expand All @@ -18,8 +18,8 @@ const Option = (props: OptionProps) => {
return (
<div
ref={innerRef}
css={getStyles('option', props)}
className={cx(
css(getStyles('option', props)),
{
option: true,
'option--is-disabled': isDisabled,
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"pretty-proptypes": "^0.5.0",
"raf-schd": "^2.1.0",
"raw-loader": "^2.0.0",
"react": "^16.8.0",
"react": "^16.13.0",
"react-codesandboxer": "^2.0.1",
"react-dom": "^16.8.0",
"react-dom": "^16.13.0",
"react-helmet": "^5.2.0",
"react-markings": "^1.3.0",
"react-router-dom": "^4.2.2",
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/advanced/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ export default function Advanced() {
${(
<ExampleWrapper
label="custom getOptionLabel function example"
urlPath="docs/examples/CustomSingleValue.js"
raw={require('!!raw-loader!../../examples/CustomSingleValue.js')}
urlPath="docs/examples/CustomGetOptionLabel.js"
raw={require('!!raw-loader!../../examples/CustomGetOptionLabel.js')}
>
<CustomGetOptionLabel />
</ExampleWrapper>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export default function Home() {
Use the Async component to load options from a remote source as the user types.
~~~jsx
import Async from 'react-select/async';
import AsyncSelect from 'react-select/async';
~~~
${(
Expand Down
4 changes: 0 additions & 4 deletions enzymeAdapter.setup.js

This file was deleted.

23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"@atlaskit/modal-dialog": "^4.0.3",
"@atlaskit/spinner": "^5.0.0",
"@atlaskit/tooltip": "^9.1.4",
"@babel/cli": "^7.0.0",
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.2.3",
"@babel/plugin-transform-runtime": "^7.8.3",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-flow": "^7.0.0",
Expand All @@ -28,13 +28,17 @@
"@emotion/cache": "^10.0.9",
"@emotion/core": "^10.0.9",
"@emotion/css": "^10.0.9",
"@preconstruct/cli": "^1.0.0",
"@testing-library/dom": "7.0.4",
"@testing-library/jest-dom": "5.1.1",
"@testing-library/react": "10.0.1",
"@testing-library/user-event": "^10.0.0",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.0",
"babel-plugin-emotion": "^10.0.9",
"bolt-check": "^0.3.0",
"bundlesize": "^0.17.0",
"chroma-js": "^1.3.6",
"chrono-node": "^1.3.5",
"codesandboxer": "^0.1.1",
Expand All @@ -55,21 +59,20 @@
"flow-bin": "^0.91.0",
"gh-pages": "^1.1.0",
"html-webpack-plugin": "^3.2.0",
"jest": "^24.8.0",
"jest": "^25.1.0",
"jest-emotion": "^10.0.11",
"jest-in-case": "^1.0.2",
"memoize-one": "^5.0.0",
"moment": "^2.20.1",
"node-fetch": "^2.5.0",
"@preconstruct/cli": "^1.0.0",
"pretty-proptypes": "^0.5.0",
"prop-types": "^15.6.0",
"raf": "^3.4.0",
"raf-schd": "^2.1.0",
"raw-loader": "^2.0.0",
"react": "^16.8.0",
"react": "^16.13.0",
"react-codesandboxer": "^2.0.1",
"react-dom": "^16.8.0",
"react-dom": "^16.13.0",
"react-helmet": "^5.2.0",
"react-input-autosize": "^2.2.2",
"react-markings": "^1.3.0",
Expand All @@ -96,8 +99,8 @@
"e2e": "concurrently --kill-others --success=first --names 'SERVER,E2E' 'yarn start --progress=false --no-info' 'yarn test:cypress'",
"test:cypress": "cypress run --spec ./cypress/integration/select_spec.js",
"test:cypress-watch": "node ./node_modules/.bin/cypress open",
"precommit": "flow check && lint-staged",
"postinstall": "preconstruct dev && bolt-check",
"precommit": "flow check",
"postinstall": "preconstruct dev",
"changeset": "changeset",
"version-packages": "changeset version",
"release": "yarn build && changeset publish"
Expand All @@ -121,8 +124,8 @@
"./node_modules"
],
"testRegex": "src/*(/(__tests?__/)([^_].*/)*?[^_][^/]*?\\.(test|spec)?\\.(js?))$",
"setupFiles": [
"./enzymeAdapter.setup.js"
"setupFilesAfterEnv": [
"./test-setup.js"
],
"snapshotSerializers": [
"jest-emotion"
Expand Down
16 changes: 16 additions & 0 deletions packages/react-select/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# react-select

## 3.1.0

### Minor Changes

- [4cf6c43c](https://github.com/JedWatson/react-select/commit/4cf6c43cc17a01b043fb60b33cad355d433fdf8c) [#3690](https://github.com/JedWatson/react-select/pull/3690) Thanks [@JedWatson](https://github.com/JedWatson)! - Add `isLoading` prop support to the AsyncSelect component (see #3690)

### Patch Changes

- [83b48de4](https://github.com/JedWatson/react-select/commit/83b48de4a18263b361744fc5e89d9b9845b26e4f) [#3868](https://github.com/JedWatson/react-select/pull/3868) Thanks [@Tirzono](https://github.com/Tirzono)! - Fix for not focusing the selected value when the menu opens
- [563b046a](https://github.com/JedWatson/react-select/commit/563b046a57a94c47950e62cedc4ce1c489f19f91) [#3794](https://github.com/JedWatson/react-select/pull/3794) Thanks [@mitchellhamilton](https://github.com/mitchellhamilton)! - Convert class components that don't have to be class components to function components to reduce bundle size
- [c7e9c697](https://github.com/JedWatson/react-select/commit/c7e9c697dada15ce3ff9a767bf914ad890080433) [#3682](https://github.com/JedWatson/react-select/pull/3682) Thanks [@JedWatson](https://github.com/JedWatson)! - Allow the input component to be a `textarea` element
- [3c7de0de](https://github.com/JedWatson/react-select/commit/3c7de0de52826fe74d303a01475c43fe88256156) [#3090](https://github.com/JedWatson/react-select/pull/3090) Thanks [@akiselev](https://github.com/akiselev)! - Add aria attributes to dummy input
- [d2a820ef](https://github.com/JedWatson/react-select/commit/d2a820efc70835adf864169eebc76947783a15e2) [#3537](https://github.com/JedWatson/react-select/pull/3537) Thanks [@jdelStrother](https://github.com/jdelStrother)! - Fix Flow issues. Refer to the linked PR for more details on the specific issues.
- [fc52085b](https://github.com/JedWatson/react-select/commit/fc52085b969b1b6f53adf29d52469db9560b828c) [#3662](https://github.com/JedWatson/react-select/pull/3662) Thanks [@eemeli](https://github.com/eemeli)! - Update react-transition-group to ^4.3.0
- [edb18dd3](https://github.com/JedWatson/react-select/commit/edb18dd3d65b8fbc342bde9e805c5e3293ab6e37) [#3797](https://github.com/JedWatson/react-select/pull/3797) Thanks [@mitchellhamilton](https://github.com/mitchellhamilton)! - Enable Babel loose mode to improve bundle size

## 3.0.8

### Patch Changes
Expand Down
11 changes: 4 additions & 7 deletions packages/react-select/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
{
"name": "react-select",
"version": "3.0.8",
"version": "3.1.0",
"description": "A Select control built with and for ReactJS",
"main": "dist/react-select.cjs.js",
"module": "dist/react-select.esm.js",
"sideEffects": false,
"author": "Jed Watson",
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/JedWatson/react-select.git"
},
"repository": "https://github.com/JedWatson/react-select/tree/master/packages/react-select",
"dependencies": {
"@babel/runtime": "^7.4.4",
"@emotion/cache": "^10.0.9",
Expand All @@ -26,8 +23,8 @@
"enzyme": "^3.8.0",
"enzyme-to-json": "^3.3.0",
"jest-in-case": "^1.0.2",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.13.0",
"react-dom": "^16.13.0"
},
"peerDependencies": {
"react": "^16.8.0",
Expand Down
3 changes: 0 additions & 3 deletions packages/react-select/src/Async.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ export type AsyncProps = {
/* Function that returns a promise, which is the set of options to be used
once the promise resolves. */
loadOptions: (string, (OptionsType) => void) => Promise<*> | void,
/* If cacheOptions is truthy, then the loaded data will be cached. The cache
will remain until `cacheOptions` changes value. */
cacheOptions: any,
/* Same behaviour as for Select */
onInputChange?: (string, InputActionMeta) => void,
/* Same behaviour as for Select */
Expand Down
Loading

0 comments on commit 691f355

Please sign in to comment.