Commit c29c9110 authored by Carlos's avatar Carlos

PullToRefresh: set backgroundColor as optional

parent f881710a
.idea .idea
dist dist
node_modules node_modules
yarn-error.log
...@@ -14,6 +14,7 @@ describe("PullToRefresh spec", () => { ...@@ -14,6 +14,7 @@ describe("PullToRefresh spec", () => {
releaseContent={<div>Release to refresh</div>} releaseContent={<div>Release to refresh</div>}
refreshContent={<div>Refreshing</div>} refreshContent={<div>Refreshing</div>}
pullDownThreshold={200} pullDownThreshold={200}
backgroundColor="white"
> >
<div>Test</div> <div>Test</div>
</PullToRefresh> </PullToRefresh>
......
...@@ -5,6 +5,7 @@ exports[`PullToRefresh spec App shows PullToRefresh 1`] = ` ...@@ -5,6 +5,7 @@ exports[`PullToRefresh spec App shows PullToRefresh 1`] = `
style={ style={
Object { Object {
"WebkitOverflowScrolling": "touch", "WebkitOverflowScrolling": "touch",
"backgroundColor": "white",
"height": "auto", "height": "auto",
"overflow": "hidden", "overflow": "hidden",
"position": "relative", "position": "relative",
...@@ -31,6 +32,7 @@ exports[`PullToRefresh spec App shows PullToRefresh 1`] = ` ...@@ -31,6 +32,7 @@ exports[`PullToRefresh spec App shows PullToRefresh 1`] = `
style={ style={
Object { Object {
"WebkitOverflowScrolling": "touch", "WebkitOverflowScrolling": "touch",
"backgroundColor": "white",
"height": "auto", "height": "auto",
"overflow": "hidden", "overflow": "hidden",
"position": "relative", "position": "relative",
......
...@@ -24,6 +24,7 @@ export class Basic extends React.Component<BasicProps, BasicState> { ...@@ -24,6 +24,7 @@ export class Basic extends React.Component<BasicProps, BasicState> {
refreshContent={<RefreshContent />} refreshContent={<RefreshContent />}
pullDownThreshold={200} pullDownThreshold={200}
onRefresh={this.onRefresh} onRefresh={this.onRefresh}
backgroundColor="white"
> >
<Container> <Container>
<Label>PullToRefresh</Label> <Label>PullToRefresh</Label>
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
"^.+\\.tsx?$": "ts-jest" "^.+\\.tsx?$": "ts-jest"
}, },
"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx)$", "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx)$",
"testPathIgnorePatterns": [
"dist"
],
"coverageReporters": [ "coverageReporters": [
"html", "html",
"json", "json",
......
...@@ -6,11 +6,9 @@ ...@@ -6,11 +6,9 @@
"typings": "./dist/src/index.d.ts", "typings": "./dist/src/index.d.ts",
"scripts": { "scripts": {
"dev": "webpack-dev-server", "dev": "webpack-dev-server",
"lint": "tslint --project .", "pretest": "rimraf dist && tslint --project . && tsc -p .",
"clean": "rimraf dist", "test": "jest --config=jestconfig.json",
"tsc": "npm run clean && tsc -p .", "prepublish": "npm test"
"test": "rimraf dist && npm run lint && jest --config=jestconfig.json",
"prepublish": "npm test && npm run tsc"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
......
...@@ -7,6 +7,7 @@ export interface PullToRefreshProps { ...@@ -7,6 +7,7 @@ export interface PullToRefreshProps {
refreshContent: JSX.Element; refreshContent: JSX.Element;
pullDownThreshold: number; pullDownThreshold: number;
onRefresh: () => Promise<any>; onRefresh: () => Promise<any>;
backgroundColor?: string;
} }
export interface PullToRefreshState { export interface PullToRefreshState {
...@@ -178,6 +179,7 @@ export class PullToRefresh extends React.Component<PullToRefreshProps, PullToRef ...@@ -178,6 +179,7 @@ export class PullToRefresh extends React.Component<PullToRefreshProps, PullToRef
} }
public render() { public render() {
const {backgroundColor} = this.props;
const containerStyle: React.CSSProperties = { const containerStyle: React.CSSProperties = {
height: "auto", height: "auto",
overflow: "hidden", overflow: "hidden",
...@@ -186,6 +188,10 @@ export class PullToRefresh extends React.Component<PullToRefreshProps, PullToRef ...@@ -186,6 +188,10 @@ export class PullToRefresh extends React.Component<PullToRefreshProps, PullToRef
zIndex: 1, zIndex: 1,
}; };
if (backgroundColor) {
containerStyle.backgroundColor = backgroundColor;
}
return ( return (
<div style={containerStyle}> <div style={containerStyle}>
{this.renderPullDownContent()} {this.renderPullDownContent()}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment