Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Demo #77

Open
wants to merge 32 commits into
base: develop
Choose a base branch
from
Open

Demo #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
82425ea
Merge branch 'hotfix/0.3.3'
furqanZafar Oct 13, 2015
939524a
Merge branch 'release/0.3.4'
furqanZafar Oct 14, 2015
57270c8
Merge branch 'release/0.3.5'
furqanZafar Oct 16, 2015
d967162
Merge branch 'release/0.3.6'
furqanZafar Oct 30, 2015
4b9b6f0
Merge branch 'release/0.3.7'
furqanZafar Nov 2, 2015
8b3285d
Merge branch 'release/0.3.8'
furqanZafar Jan 16, 2016
53f6f9b
Merge branch 'release/0.3.9'
furqanZafar Jan 18, 2016
0725ce2
Merge branch 'release/0.3.10'
furqanZafar Jan 18, 2016
53056ff
Merge branch 'release/0.3.11'
furqanZafar Jan 20, 2016
b189326
Merge branch 'release/0.4.0'
furqanZafar Jan 21, 2016
ced1bda
Merge branch 'release/0.4.1'
furqanZafar Jan 22, 2016
b599237
Merge branch 'release/0.5.0'
furqanZafar Jan 25, 2016
68e10a1
Merge branch 'release/0.5.1'
furqanZafar Jan 25, 2016
aa6890e
Merge branch 'release/0.5.2'
furqanZafar Jan 26, 2016
450501a
Merge branch 'release/0.5.3'
furqanZafar Jan 27, 2016
882dc41
Merge branch 'release/0.6.0'
furqanZafar Jan 30, 2016
78b596b
Merge branch 'release/0.6.1'
furqanZafar Feb 1, 2016
c9bbfa0
Merge branch 'release/0.6.2'
furqanZafar Feb 2, 2016
e9332c8
Merge branch 'release/0.7.0'
furqanZafar Feb 7, 2016
3e3bafa
Merge branch 'release/0.7.2'
furqanZafar Feb 8, 2016
03d6309
Merge branch 'release/0.7.3'
furqanZafar Feb 10, 2016
feadabb
Merge branch 'release/0.8.0'
furqanZafar Feb 15, 2016
d67f31f
Merge branch 'release/0.8.1'
furqanZafar Feb 19, 2016
e0a67b6
Merge branch 'release/0.8.2'
furqanZafar Mar 2, 2016
f643fc0
Merge branch 'release/0.8.3'
furqanZafar Mar 2, 2016
497f4d1
Merge branch 'release/0.8.4'
furqanZafar Mar 3, 2016
d6e30e8
Merge branch 'release/0.9.0'
furqanZafar Mar 18, 2016
21f7ea3
Release 2.0.0 [email protected] support, switching to major version semver…
furqanZafar Apr 11, 2016
ae9e628
Release 2.0.1 #68
furqanZafar Apr 11, 2016
b8b4e38
simple select now accepts 0 as a value
Nyalab Apr 25, 2016
19e114b
Merge pull request #72 from overblog/master
furqanZafar Apr 25, 2016
a6276ae
show tether props 'center' working but not 'top right'
wiber May 5, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# React Selectize

## v2.0.1 / 11th April 2016
## v2.0.0 / 11th April 2016
* switched to major version semver
* added [email protected] to peer deps
* abandoned git flow branching model

## v0.9.0 / 18th March 2016
* added `on-paste` and `value-from-paste` props to `SimpleSelect`
* added `highlighted-uid` and `on-highlighted-uid-change` props to track the current highlighted option
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ styles & features inspired by [React Select](http://jedwatson.github.io/react-se

[![](http://i.imgsafe.co/rQmogzn.gif)](http://furqanZafar.github.io/react-selectize/)

- [Changelog](CHANGELOG.md) (last updated on 18th March 2016)
- [Changelog](CHANGELOG.md) (last updated on 11th April 2016)
- [API Reference](API.md)

# Motivation
Expand Down Expand Up @@ -51,7 +51,7 @@ to include the default styles add the following import statement to your stylus
`@import 'node_modules/react-selectize/themes/index.css'`

* **bower:**
`bower install https://npmcdn.com/react-selectize@0.9.0/bower.zip`
`bower install https://npmcdn.com/react-selectize@2.0.1/bower.zip`

* **1998 script tag:**
```html
Expand All @@ -66,10 +66,10 @@ to include the default styles add the following import statement to your stylus
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.1.1/js/tether.min.js" type="text/javascript" ></script>

<!-- REACT SELECTIZE -->
<script src="https://npmcdn.com/react-selectize@0.9.0/dist/index.min.js" type="text/javascript" ></script>
<script src="https://npmcdn.com/react-selectize@2.0.1/dist/index.min.js" type="text/javascript" ></script>

<!-- THEMES (default, bootstrap3, material) -->
<link rel="stylesheet" href="https://npmcdn.com/react-selectize@0.9.0/dist/index.min.css"/>
<link rel="stylesheet" href="https://npmcdn.com/react-selectize@2.0.1/dist/index.min.css"/>

</head>
</html>
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-selectize",
"version": "0.9.0",
"version": "2.0.1",
"homepage": "https://github.com/furqanZafar/react-selectize",
"authors": [
"Furqan Zafar (Mac Pro) <[email protected]>"
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-selectize",
"version": "0.9.0",
"version": "2.0.1",
"description": "A Stateless & Flexible Select component for React inspired by Selectize",
"main": "src/index.js",
"scripts": {
Expand All @@ -15,10 +15,10 @@
"tether": "^1.1.1"
},
"peerDependencies": {
"react": "^0.14.0",
"react-addons-css-transition-group": "^0.14.0",
"react-addons-shallow-compare": "^0.14.0",
"react-dom": "^0.14.0"
"react": "^0.14.0 || ^15.0.0",
"react-addons-css-transition-group": "^0.14.0 || ^15.0.0",
"react-addons-shallow-compare": "^0.14.0 || ^15.0.0",
"react-dom": "^0.14.0 || ^15.0.0"
},
"browserify-shim": {
"prelude-extension": "global:preludeExtension",
Expand Down Expand Up @@ -53,11 +53,11 @@
"mocha": "^2.3.3",
"mocha-lcov-reporter": "^1.0.0",
"nib": "^1.1.0",
"react": "^0.14.0",
"react-addons-css-transition-group": "^0.14.0",
"react-addons-shallow-compare": "^0.14.6",
"react-addons-test-utils": "^0.14.0",
"react-dom": "^0.14.0",
"react": "^0.14.0 || ^15.0.0",
"react-addons-css-transition-group": "^0.14.0 || ^15.0.0",
"react-addons-shallow-compare": "^0.14.0 || ^15.0.0",
"react-addons-test-utils": "^0.14.0 || ^15.0.0",
"react-dom": "^0.14.0 || ^15.0.0",
"react-router": "^1.0.0-rc1",
"react-tools": "^0.13.3",
"run-sequence": "^1.1.5",
Expand Down
22 changes: 16 additions & 6 deletions public/examples/multi/Tether.ls
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
# {MultiSelect} = require \react-selectize

Form = React.create-class do
Form = React.create-class do

# render :: a -> ReactElement
render: ->
div do
div do
style: border: '1px solid #000', height: 100, overflow: \auto, padding: 20

# RANDOM TEXT
div do
div do
style: padding: 20
"Lorem ipsum dolor sit amet, consectetur adipiscing elit"

# MULTISELECT
React.create-element MultiSelect,
tether: true
React.create-element MultiSelect,
tether: true
tetherProps:
offset: '-20% -20%' # does nothing, why?
# TODO unable to get 'top right' to act properly
attachment: 'top right'
# demo the prop, works here.
target-attachment: 'bottom center'
options: <[apple mango grapes melon strawberry cherry banana kiwi]> |> map ~> label: it, value: it
placeholder: "Select fruits"
options: <[apple mango grapes melon strawberry cherry banana kiwi]> |> map ~> label: it, value: it
placeholder: "Select fruits"

# RANDOM TEXT
div do
div do
style: padding: 20
"Fusce aliquet dui tortor, imperdiet viverra augue pretium nec"


render (React.create-element Form, null), mount-node
render (React.create-element Form, null), mount-node
4 changes: 2 additions & 2 deletions src/SimpleSelect.ls
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ module.exports = React.create-class do
open = @is-open!
search = if @props.has-own-property \search then @props.search else @state.search
value = @value!
values = if !!value then [value] else []
values = if (!!value || value == 0) then [value] else []

# on-*-change :: a -> (() -> ()) -> ()
[
on-highlighted-uid-change
Expand Down
2 changes: 1 addition & 1 deletion test/simple-select.ls
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ describe "SimpleSelect", ->
name: \test
click-to-open-select-control select
click-option find-highlighted-option select
{value} = scry-rendered-DOM-components-with-tag select, \input
{value} = (scry-rendered-DOM-components-with-tag select, \input)
|> find (.type == \hidden)
assert \apple == value

Expand Down