Skip to content

add cleanStyle and dirtyStyle props #23

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.

Sign up for GitHub

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

Open
arnsa wants to merge 17 commits into
base: master
Choose a base branch
from
Open

add cleanStyle and dirtyStyle props #23

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b82405f
add cleanStyle and dirtyStyle props
Sep 26, 2017
1636e64
Updated index.js
victorpiccoli Mar 16, 2018
f4504ec
Merge pull request #29 from victorpiccoli/patch-1
mayank-patel May 7, 2018
868acb5
Update package.json
mayank-patel May 7, 2018
0923dad
Bug fix
nairihar May 25, 2018
24c11fe
Merge pull request #31 from nairihar/master
mayank-patel Jul 17, 2018
8b34845
Version Bump
mayank-patel Jul 17, 2018
5cfd984
Update .travis.yml
mayank-patel Jul 17, 2018
6e3dcf6
Adding selectionColor prop
murtraja Oct 13, 2018
26b867e
Update package.json
mayank-patel Oct 29, 2018
2a4fd0f
Update package.json
mayank-patel Oct 29, 2018
002eebc
Merge pull request #39 from mayank-patel/release
mayank-patel Oct 29, 2018
77c04b9
Merge pull request #35 from murtraja/patch-1
mayank-patel Oct 29, 2018
97014c2
Adding accessibilityLabel prop
murtraja Jan 16, 2019
3a8a9c8
Merge pull request #42 from murtraja/patch-1
mayank-patel Jan 18, 2019
91ca697
add cleanStyle and dirtyStyle props
Sep 26, 2017
fe84565
merge conflicts fix
arnsa Mar 23, 2019
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
27 changes: 15 additions & 12 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ var propTypes = {
style: View.propTypes.style,
}

const cleanStyle = {
fontSize: 20,
top: 7
};

const dirtyStyle = {
fontSize: 12,
top: -17
};

var FloatingLabel = React.createClass({
propTypes: propTypes,

Expand All @@ -31,7 +41,10 @@ var FloatingLabel = React.createClass({
dirty: !!this.props.value
};

var style = state.dirty ? dirtyStyle : cleanStyle
this.cleanStyle = this.props.cleanStyle ? this.props.cleanStyle : cleanStyle;
this.dirtyStyle = this.props.dirtyStyle ? this.props.dirtyStyle : dirtyStyle;

var style = state.dirty ? this.dirtyStyle : this.cleanStyle
state.labelStyle = {
fontSize: new Animated.Value(style.fontSize),
top: new Animated.Value(style.top)
Expand All @@ -48,7 +61,7 @@ var FloatingLabel = React.createClass({
},

_animate(dirty) {
var nextStyle = dirty ? dirtyStyle : cleanStyle
var nextStyle = dirty ? this.dirtyStyle : this.cleanStyle
var labelStyle = this.state.labelStyle
var anims = Object.keys(nextStyle).map(prop => {
return Animated.timing(
Expand Down Expand Up @@ -194,16 +207,6 @@ var styles = StyleSheet.create({
label: labelStyleObj
})

var cleanStyle = {
fontSize: 20,
top: 7
}

var dirtyStyle = {
fontSize: 12,
top: -17,
}

FloatingLabel.propTypes = {
disabled: PropTypes.bool,
style: Text.propTypes.style,
Expand Down