Merge branch 'master' into feature/fixed-focus-and-backwards-focus

kamyar · web-flow · commit 22727b71d6f6 · 2021-06-11T01:16:10.000+02:00
diff --git a/.babelrc b/.babelrc
@@ -5,7 +5,8 @@
   ],
   "plugins": [
     ["@babel/plugin-proposal-class-properties"],
-    ["@babel/plugin-proposal-export-default-from"]
+    ["@babel/plugin-proposal-export-default-from"],
+    "date-fns"
   ]
 }
  
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @burakcan @mkg0 @kamyar
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '16 22 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,22 @@
+name: Publish
+on:
+    push:
+        tags:
+            - release/*
+jobs:
+  build:
+    name: NPM Package
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Publish new version to NPM
+      uses: actions/setup-node@v1
+      with:
+        node-version: 13.x
+        registry-url: 'https://registry.npmjs.org'
+    - run: yarn install
+    - run: yarn build
+    - run: yarn publish
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,14 @@
+name: CI
+on: [push]
+jobs:
+  build:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: borales/actions-yarn@v2.0.0
+        with:
+          cmd: install
+      - uses: borales/actions-yarn@v2.0.0
+        with:
+          cmd: test
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ node_modules/
 lib/
 NOTES.txt
 styleguide/
+dist/
diff --git a/.npmignore b/.npmignore
@@ -1,11 +1,16 @@
-node_modules/
-.DS_Store
-*.log
-.gitignore
-.gitattributes
 .git/
+.github/
+.vscode/
 demo/
+node_modules/
+styleguide/
 webpack/
-yarn.lock.js
-.postcssconfig
 .babelrc
+.DS_Store
+.eslintrc.js
+.gitattributes
+.gitignore
+*.log
+postcss.config.js
+styleguide.config.js
+yarn.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+
+## 1.2.0
+
+### Added
+- `dayContentRenderer` prop: You can control how each date cell is rendered be passing this function that excepts a date and returns what need to be rendered (#242, #384, #476)
+
+
+## 1.1.4
+
+### Fixed
+- #356: Use babel-plugin-date-fns to reduce bundle size
+- #373, #415, #416: Add missing aria labels
+
+
 ## 1.0.0
 ### Changed
 - BREAKING: `date-fns` is now loaded as a peerDependency. You can use this plugin with your own project's `date-fns` version. However if you want to keep using date-fns versions older than 2.0.0, (minimum version is 2.0.0-alpha.1) you need to pass the following props to your component. ([See the reason here](https://blog.date-fns.org/post/unicode-tokens-in-date-fns-v2-sreatyki91jg/), also see [this table](https://date-fns.org/docs/format))
@@ -56,15 +70,15 @@ NEW
 ```js
 <Calendar
   date={this.state.eventDate} // js object
-  onChange={date => this.setState({ eventDate: date })} // 
+  onChange={date => this.setState({ eventDate: date })} //
 />
 ```
 
 NEW with moment (or any other date libraries)
 ```js
 <Calendar
   date={this.state.eventDate.toDate()} // convert moment object to js Date
-  onChange={date => this.setState({ eventDate: moment(date) })} // 
+  onChange={date => this.setState({ eventDate: moment(date) })} //
 />
 ```
 - BREAKING: Theming and style approach complately changed. `react-date-range` don't use inline styles any more. At the new version you should import **skeleton styles** and **theme styles**
@@ -86,7 +100,7 @@ import 'react-date-range/dist/theme/default.css';
  NEW
  ```js
   import turkish from 'react-date-range/locale/tr';
-  // you can view full list in https://github.com/Adphorus/react-date-range/tree/next/src/locale/index.js
+  // you can view full list in https://github.com/hypeserver/react-date-range/tree/next/src/locale/index.js
   <Calendar locale={turkish} />
 ```
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing Guide
 
-Make sure your issue or feature doesn't have any related issue at [react-date-range repo](https://github.com/Adphorus/react-date-range/issues). If it didn't exist already, create an issue.
+Make sure your issue or feature doesn't have any related issue at [react-date-range repo](https://github.com/hypeserver/react-date-range/issues). If it didn't exist already, create an issue.
 
 ## Getting Started
 
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2015-2016 Adphorus
+Copyright (c) 2015-2020 Adphorus
+Copyright (c) 2020-     Hypeserver
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 [![npm](https://img.shields.io/npm/v/react-date-range)](https://www.npmjs.com/package/react-date-range)
 [![npm](https://img.shields.io/npm/l/react-date-range)]()
 [![npm](https://img.shields.io/npm/dw/react-date-range)](https://www.npmjs.com/package/react-date-range)
+[![sponsors](https://img.shields.io/github/sponsors/hypeserver)](https://github.com/sponsors/hypeserver)
 
 
 A date library agnostic React component for choosing dates and date ranges. Uses [date-fns](http://date-fns.org/) for date operations.
@@ -140,6 +141,7 @@ fixedHeight                          | Boolean   | false            | Since some
 renderStaticRangeLabel(`DefinedRange`)| Function |                  | Callback function to be triggered for the static range configurations that have `hasCustomRendering: true` on them. Instead of rendering `staticRange.label`, return value of this callback will be rendered.
 staticRanges(`DefinedRange`, `DateRangePicker`)  | Array            | [default preDefined ranges](https://github.com/hypeserver/react-date-range/blob/master/src/defaultRanges.js)             | -
 inputRanges(`DefinedRange`, `DateRangePicker`)   | Array            | [default input ranges](https://github.com/hypeserver/react-date-range/blob/master/src/defaultRanges.js)             | -
+ariaLabels                           | Object    | {}               | inserts aria-label to inner elements
 
  *shape of range:
  ```js
@@ -154,6 +156,22 @@ inputRanges(`DefinedRange`, `DateRangePicker`)   | Array            | [default i
   }
 ```
 
+ **shape of ariaLabels:
+ ```js
+  {
+    // The key of dateInput should be same as key in range.
+    dateInput: PropTypes.objectOf(
+      PropTypes.shape({
+        startDate: PropTypes.string,
+        endDate: PropTypes.string
+      })
+    ),
+    monthPicker: PropTypes.string,
+    yearPicker: PropTypes.string,
+    prevButton: PropTypes.string,
+    nextButton: PropTypes.string,
+  }
+```
 #### Infinite Scrolled Mode
 
 To enable infinite scroll set `scroll={{enabled: true}}` basically. Infinite scroll feature is affected by `direction`(rendering direction for months) and `months`(for rendered months count) props directly.
@@ -172,9 +190,17 @@ If you prefer, you can overwrite calendar sizes with `calendarWidth`/`calendarHe
 ```
 
 
-TODOs
+### Release workflow
+- Merge everything that needs to be in the release to master
+- Open a new release PR than:
+  - bumps version to appropriate one <new_version>
+  - Update CHANGELOG.md
+- Make sure the demo and important features are working as expected
+- After merging, tag the master commit with `release/<new_version>` and let Github Action handle publishing
+- = Profit 🙈
+
+### TODOs
 
 - Make mobile friendly (integrate tap and swipe actions)
-- Add complex booking customization example with exposed dayRenderer prop
 - Add tests
 - Improve documentation
diff --git a/demo/components/StyleGuide.js b/demo/components/StyleGuide.js
@@ -74,7 +74,7 @@ export function StyleGuideRenderer({ classes, title, homepageUrl, children }) {
               </a>
             </Logo>
             <nav className={classes.nav}>
-              <a className={classes.headerLink} href="https://github.com/Adphorus/react-date-range">
+              <a className={classes.headerLink} href="https://github.com/hypeserver/react-date-range">
                 GitHub
               </a>
             </nav>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-date-range",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "A React component for choosing dates and date ranges.",
   "main": "dist/index.js",
   "scripts": {
@@ -22,16 +22,17 @@
   "contributors": [
     "Burak Can <neoberg@gmail.com> (https://github.com/burakcan)",
     "Mehmet Kamil Morcay <mehmetmorcay@gmail.com> (https://github.com/mkg0)",
+    "Kamyar Ghasemlou <github@kamy.me> (https://github.com/kamyar)",
     "Engin Semih Basmacı <semih.basmaci@gmail.com> (https://github.com/mortargrind)",
     "Onur Kerimov <onurkerimov@gmail.com> (https://github.com/onurkerimov)"
   ],
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "http://github.com/Adphorus/react-date-range"
+    "url": "http://github.com/hypeserver/react-date-range"
   },
   "bugs": {
-    "url": "http://github.com/Adphorus/react-date-range/issues"
+    "url": "http://github.com/hypeserver/react-date-range/issues"
   },
   "browserslist": [
     "defaults"
@@ -56,6 +57,7 @@
     "autoprefixer": "^9.7.3",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
+    "babel-plugin-date-fns": "^2.0.0",
     "css-loader": "^3.2.0",
     "date-fns": "^2.8.1",
     "enzyme": "^3.11.0",
diff --git a/src/accessibility/index.js b/src/accessibility/index.js
@@ -0,0 +1,11 @@
+import PropTypes from 'prop-types';
+
+export const ariaLabelsShape = PropTypes.shape({
+  dateInput: PropTypes.objectOf(
+    PropTypes.shape({ startDate: PropTypes.string, endDate: PropTypes.string })
+  ),
+  monthPicker: PropTypes.string,
+  yearPicker: PropTypes.string,
+  prevButton: PropTypes.string,
+  nextButton: PropTypes.string,
+});
diff --git a/src/components/Calendar/index.js b/src/components/Calendar/index.js
diff --git a/src/components/DateInput/index.js b/src/components/DateInput/index.js
diff --git a/src/components/DateRangePicker/README.md b/src/components/DateRangePicker/README.md
diff --git a/src/components/DayCell/index.js b/src/components/DayCell/index.js
diff --git a/src/components/InputRangeField/index.js b/src/components/InputRangeField/index.js
diff --git a/src/components/InputRangeField/index.test.js b/src/components/InputRangeField/index.test.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`	`],`
`6`	`6`	`"plugins": [`
`7`	`7`	`["@babel/plugin-proposal-class-properties"],`
`8`		`- ["@babel/plugin-proposal-export-default-from"]`
	`8`	`+ ["@babel/plugin-proposal-export-default-from"],`
	`9`	`+ "date-fns"`
`9`	`10`	`]`
`10`	`11`	`}`
`11`	`12`