Skip to content

Commit

Permalink
Merge pull request #1 from JedWatson/master
Browse files Browse the repository at this point in the history
Update from original
  • Loading branch information
mattdell committed May 8, 2015
2 parents 384878f + 7eefadc commit bc3be8b
Show file tree
Hide file tree
Showing 32 changed files with 1,064 additions and 12,287 deletions.
7 changes: 7 additions & 0 deletions .eslintrc
Expand Up @@ -10,11 +10,18 @@
"rules": {
"curly": [2, "multi-line"],
"no-shadow": 0,
"no-trailing-spaces": 0,
"no-underscore-dangle": 0,
"no-unused-expressions": 0,
"quotes": [2, "single", "avoid-escape"],
"react/jsx-quotes": 1,
"react/jsx-no-undef": 1,
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
"react/no-did-mount-set-state": 1,
"react/no-did-update-set-state": 1,
"react/self-closing-comp": 1,
"react/wrap-multilines": 1,
"semi": 2,
"strict": 0
}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -14,5 +14,8 @@ coverage
# Dependency directory
node_modules

# Publish directory
.publish

# Other
.DS_Store
29 changes: 29 additions & 0 deletions HISTORY.md
@@ -1,5 +1,34 @@
# React-Select

## v0.4.8 / 2015-05-02

* fixed; restored `dist/default.css`
* fixed; standalone example works again
* fixed; clarified dependency documentation and added dependencies for Bower
* fixed; Scoping issues in `_bindCloseMenuIfClickedOutside`, thanks [bannaN](https://github.com/bannaN)
* fixed; Doesnt try to set focus afterupdate if component is disabled, thanks [bannaN](https://github.com/bannaN)

## v0.4.7 / 2015-04-21

* improved; lodash is no longer a dependency, thanks [Daniel Lo Nigro](https://github.com/Daniel15)

## v0.4.6 / 2015-04-06

* updated; dependencies, build process and input-autosize component

## v0.4.5 / 2015-03-28

* fixed; issue with long options overlapping arrow and clear icons, thanks [Rohit Kalkur](https://github.com/rovolution)

## v0.4.4 / 2015-03-26

* fixed; error handling click events when the menu is closed, thanks [Ilya Petrov](https://github.com/muromec)
* fixed; issue where options will not be filtered in certain conditions, thanks [G. Kay Lee](https://github.com/gsklee)

## v0.4.3 / 2015-03-25

* added tests and updated dependencies

## v0.4.2 / 2015-03-23

* added; ESLint and contributing guide
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Jed Watson
Copyright (c) 2015 Jed Watson

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
25 changes: 16 additions & 9 deletions README.md
@@ -1,7 +1,7 @@
React-Select
============

A Select control built with and for [React](http://facebook.github.io/react/index.html), initially being developed for use in [KeystoneJS](http://www.keystonejs.com).
A Select control built with and for [React](http://facebook.github.io/react/index.html). Initially built for use in [KeystoneJS](http://www.keystonejs.com).


## Demo & Examples
Expand All @@ -20,27 +20,29 @@ Then open [`localhost:8000`](http://localhost:8000) in a browser.

## Project Status

This is currently a work in progress.

It's loosely based on [Selectize](http://brianreavis.github.io/selectize.js/) (in terms of behaviour and user expereience) and [React-Autocomplete](https://github.com/rackt/react-autocomplete) (as a native React Combobox implemenation), as well as other select controls including [Chosen](http://harvesthq.github.io/chosen/) and [Select2](http://ivaynberg.github.io/select2/).

TODO:
This project is quite stable and ready for production use, however there are plans to improve it including:

- CSS Styles and theme support (working, could be improved)
- Documentation website (currently just examples)
- Custom options rendering

It's loosely based on [Selectize](http://brianreavis.github.io/selectize.js/) (in terms of behaviour and user experience) and [React-Autocomplete](https://github.com/rackt/react-autocomplete) (as a native React Combobox implemenation), as well as other select controls including [Chosen](http://harvesthq.github.io/chosen/) and [Select2](http://ivaynberg.github.io/select2/).


## Installation

The easiest way to use React-Select is to install it from NPM and include it in your own React build process (using [Browserify](http://browserify.org), etc).

You can also use the standalone build by including `dist/select.js` and `dist/default.css` in your page. If you use this, make sure you have already included React and Lodash.

```
npm install react-select --save
```

You can also use the standalone build by including `dist/select.js` and `dist/default.css` in your page. If you use this, make sure you have already included the following dependencies:

* [React](http://facebook.github.io/react/)
* [classNames](http://jedwatson.github.io/classnames/)
* [react-input-autosize](https://github.com/JedWatson/react-input-autosize)


## Usage

Expand Down Expand Up @@ -134,6 +136,11 @@ You can also completely replace the method used to filter either a single option
For multi-select inputs, when providing a custom `filterOptions` method, remember to exclude current values from the returned array of options.


# Contributing

See our [CONTRIBUTING.md](https://github.com/JedWatson/react-select/blob/master/CONTRIBUTING.md) for information on how to contribute.


# License

MIT Licensed. Copyright (c) Jed Watson 2014.
MIT Licensed. Copyright (c) Jed Watson 2015.
6 changes: 5 additions & 1 deletion bower.json
@@ -1,7 +1,7 @@
{
"name": "react-select",
"main": "dist/react-select.min.js",
"version": "0.4.2",
"version": "0.4.8",
"homepage": "https://github.com/JedWatson/react-select",
"authors": [
"Jed Watson"
Expand All @@ -12,6 +12,10 @@
"globals",
"node"
],
"dependencies": {
"classnames": "^1.2.2",
"react-input-autosize": "^0.4.3"
},
"keywords": [
"react",
"react-component",
Expand Down
11 changes: 6 additions & 5 deletions dist/default.css
Expand Up @@ -51,6 +51,7 @@
position: absolute;
top: 0;
left: 0;
right: -15px;
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
Expand Down Expand Up @@ -78,9 +79,9 @@
outline: none;
}
.Select-loading {
-webkit-animation: spin 400ms infinite linear;
-o-animation: spin 400ms infinite linear;
animation: spin 400ms infinite linear;
-webkit-animation: Select-animation-spin 400ms infinite linear;
-o-animation: Select-animation-spin 400ms infinite linear;
animation: Select-animation-spin 400ms infinite linear;
width: 16px;
height: 16px;
box-sizing: border-box;
Expand Down Expand Up @@ -216,12 +217,12 @@
.Select-item-icon:active {
background-color: #c9e6f2;
}
@keyframes spin {
@keyframes Select-animation-spin {
to {
transform: rotate(1turn);
}
}
@-webkit-keyframes spin {
@-webkit-keyframes Select-animation-spin {
to {
-webkit-transform: rotate(1turn);
}
Expand Down

0 comments on commit bc3be8b

Please sign in to comment.