Merge 7060040 into c8fdc9b

.babelrc

@@ -1,7 +1,3 @@
 {
-  "presets": [
-    "es2015",
-    "stage-2",
-    "react"
-  ]
+  "presets": ["@babel/preset-env", "@babel/preset-typescript", "@babel/preset-react"]
 }

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "printWidth": 100,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "tabWidth": 2
+}

README.md

@@ -123,6 +123,7 @@ ReactDOM.render(
 |[**date**](#date)|<code>Date&#124;string&#124;number</code>|`required`|Date or timestamp in the future|
 |[**daysInHours**](#daysinhours)|`boolean`|`false`|Days are calculated as hours|
 |[**zeroPadLength**](#zeropadlength)|`number`|`2`|Length of zero-padded output, e.g.: `00:01:02`|
+|[**zeroPadDaysLength**](#zeropaddayslength)|`number`|`zeroPadLength`|Length of zero-padded days output, e.g.: `01`|
 |[**controlled**](#controlled) |`boolean`|`false`|Hands over the control to its parent(s)|
 |[**intervalDelay**](#intervaldelay)|`number`|`1000`|Interval delay in milliseconds|
 |[**precision**](#precision)|`number`|`0`|The precision on a millisecond basis|
@@ -148,7 +149,10 @@ Can be useful if the countdown's interval and/or date control should be handed o
 provided [`date`](#date) will be treated as the countdown's actual time difference and not be compared to [`now`](#now) anymore.
 
 ### `zeroPadLength`
-This option defaults to `2` in order to display the common format `00:00:00` instead of `0:0:0`. If the value is higher than `2`, only the hour part _(never days)_ will be zero-padded while it stays at `2` for minutes as well as seconds. If the value is lower, the output won't be zero-padded like the example before is showing.
+This option defaults to `2` in order to display the common format `00:00:00` instead of `0:0:0`. If the value is higher than `2`, only the hours part _(see [`zeroPadDaysLength`](#zeropaddayslength) for days)_ will be zero-padded while it stays at `2` for minutes as well as seconds. If the value is lower, the output won't be zero-padded like the example before is showing.
+
+### `zeroPadDaysLength`
+Defaults to `zeroPadLength`. Works the same way as [`zeroPadLength`](#zeropadlength) does, just for days.
 
 ### `intervalDelay`
 Since this countdown is based on date comparisons, the default value of `1000` milliseconds is probably enough for most scenarios and doesn't need to be changed.

config/enzyme.ts

@@ -0,0 +1,4 @@
+import { configure } from 'enzyme';
+import * as EnzymeAdapter from 'enzyme-adapter-react-16';
+
+configure({ adapter: new EnzymeAdapter() });

examples/.gitignore

@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

examples/README.md

@@ -0,0 +1,44 @@
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.<br>
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.<br>
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.<br>
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.<br>
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br>
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).

examples/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "examples",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": "react-app"
+  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ],
+  "dependencies": {
+    "react": "^16.7.0",
+    "react-dom": "^16.7.0",
+    "react-scripts": "2.1.1",
+    "typescript": "3.1.6"
+  },
+  "devDependencies": {
+    "@types/react-dom": "16.0.9"
+  }
+}

examples/public/index.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="theme-color" content="#000000">
+    <!--
+      manifest.json provides metadata used when your web app is added to the
+      homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>
+      You need to enable JavaScript to run this app.
+    </noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

examples/public/manifest.json

@@ -0,0 +1,15 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

examples/src/index.tsx

@@ -0,0 +1,62 @@
+import React, { Component } from 'react';
+import ReactDOM from 'react-dom';
+
+import Countdown, { CountdownRenderProps, calcTimeDelta } from 'react-countdown-now';
+
+// Random component
+const Completionist = () => <span>You are good to go!</span>;
+
+// Renderer callback with condition
+const renderer = ({ hours, minutes, seconds, completed }: CountdownRenderProps) => {
+  if (completed) {
+    // Render a completed state
+    return <Completionist />;
+  }
+
+  // Render a countdown
+  return (
+    <span>
+      {hours}:{minutes}:{seconds}
+    </span>
+  );
+};
+
+class App extends Component {
+  render() {
+    return (
+      <>
+        <h1>React &lt;Countdown /&gt;</h1>
+        <h2>Examples</h2>
+        <h3>Basic Usage</h3>
+        <Countdown date={Date.now() + 10000} />
+        <hr />
+        <h3>Custom & Conditional Rendering</h3>
+        <h4>Using a React Child for the Completed State</h4>
+        <Countdown date={Date.now() + 5000}>
+          <Completionist />
+        </Countdown>
+        <h3>Custom Renderer with Completed Condition</h3>
+        <Countdown date={Date.now() + 5000} renderer={renderer} />
+        <hr />
+        <h3>Countdown in Milliseconds</h3>
+        <Countdown
+          date={Date.now() + 10000}
+          intervalDelay={0}
+          precision={3}
+          renderer={(props: CountdownRenderProps) => <div>{props.total}</div>}
+        />
+        <hr />
+        <h3>Custom Renderer with stringified render props</h3>
+        <Countdown
+          date={Date.now() + 10000}
+          intervalDelay={0}
+          precision={3}
+          zeroPadLength={2}
+          renderer={props => <pre>{JSON.stringify(props, null, 2)}</pre>}
+        />
+      </>
+    );
+  }
+}
+
+ReactDOM.render(<App />, document.getElementById('root'));

examples/src/react-app-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="react-scripts" />