Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jquense/react-big-calendar
Browse files Browse the repository at this point in the history
…into react-big-calendar-v0-28-6

* 'master' of https://github.com/jquense/react-big-calendar: (106 commits)
  fix: revert a bug that the height of the column is broken when displayed in IE11 (jquense#1789)" (jquense#1805)
  fix: bug with resize segments not being removed (jquense#1800)
  fix: preserve time on horizontal resizing (jquense#1795)
  Update README.md (jquense#1799)
  fix: enforce `resizable` prop (jquense#1796)
  fix: a bug that the height of the column is broken when displayed in IE11 (jquense#1789)
  Use main Reactiflux invite (jquense#1780)
  fix: item preview inside cell while dragging from outside not working… (jquense#1770)
  fix onKeyPressEvent should not be required (jquense#1767)
  feat: add onKeyPressEvent (jquense#1754)
  chore(deps): bump handlebars from 4.1.2 to 4.7.6 (jquense#1745)
  feat: add resourceId to handleSelectAllDaySlot fns slotInfo (jquense#1735)
  fix: Fix top part of 24hour event in week/day view (jquense#1732)
  intljusticemission renamed to jquense (jquense#1710)
  docs: little documentation clarification (jquense#1700)
  docs: update README.md (jquense#1690)
  feat: starting to hooks to avoid deprecation warnings (jquense#1687)
  docs: fixed return type for View parameter (jquense#1677)
  feat: add dragging ability from the monthly Popup component (jquense#1554)
  fix: hide indicator when current time is not in the interval (jquense#1639)
  ...

# Conflicts:
#	.size-snapshot.json
#	src/Calendar.js
#	yarn.lock
  • Loading branch information
soumendu-toddle committed Nov 11, 2020
2 parents d4e6f0a + 41104fa commit 917991c
Show file tree
Hide file tree
Showing 106 changed files with 22,980 additions and 15,025 deletions.
5 changes: 5 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
"esm": {
"presets": [
["jason", { "modules": false }]
],
"plugins": [
["babel-plugin-transform-rename-import", {
replacements: [{ original: "lodash", replacement: "lodash-es" }]
}]
]
}
}
Expand Down
9 changes: 8 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@ parser: babel-eslint
extends:
- jason/react
- prettier
plugins:
- react-hooks
env:
es6: true
rules:
global-require: off
no-unused-vars: [2, {
no-console: ['error', {
allow: ['warn', 'error', 'info']
}]
no-unused-vars: ['error', {
vars: all,
args: after-used,
varsIgnorePattern: ^_,
argsIgnorePattern: ^_,
}]
react-hooks/rules-of-hooks: error
react-hooks/exhaustive-deps: warn
17 changes: 17 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
41 changes: 41 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Release

on:
push:
branches:
- master

jobs:
release:
name: release
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1

- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'

- name: Install Dependencies
run: yarn install

- name: Unit Test & Linting
run: yarn test

- name: Build
run: yarn build

- name: Semantic Release
uses: cycjimmy/semantic-release-action@master
id: semantic
with:
branch: master
extra_plugins: |
@semantic-release/git
@semantic-release/changelog
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
26 changes: 26 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Test

on: [pull_request]


jobs:
test:
name: Test
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1

- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'

- name: Install Dependencies
run: yarn install

- name: Unit Test & Linting
run: yarn test

- name: Build
run: yarn build
24 changes: 12 additions & 12 deletions .size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"./dist/react-big-calendar.js": {
"bundled": 471816,
"minified": 153449,
"gzipped": 42377
"bundled": 509547,
"minified": 149932,
"gzipped": 45769
},
"./dist/react-big-calendar.min.js": {
"bundled": 414483,
"minified": 136396,
"gzipped": 38497
"bundled": 446246,
"minified": 130919,
"gzipped": 41339
},
"dist/react-big-calendar.esm.js": {
"bundled": 168484,
"minified": 80934,
"gzipped": 19947,
"bundled": 176376,
"minified": 84316,
"gzipped": 21023,
"treeshaked": {
"rollup": {
"code": 62442,
"import_statements": 1470
"code": 60196,
"import_statements": 1590
},
"webpack": {
"code": 65950
"code": 64714
}
}
}
Expand Down
1 change: 1 addition & 0 deletions .storybook/addons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import '@storybook/addon-actions/register'
9 changes: 8 additions & 1 deletion .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { configure } from '@storybook/react'
import { configure, addParameters } from '@storybook/react'
import rbcTheme from './rbc.theme'

addParameters({
options: {
theme: rbcTheme,
},
})

function loadStories() {
require('../stories')
Expand Down
30 changes: 30 additions & 0 deletions .storybook/rbc.theme.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { create } from '@storybook/theming'

export default create({
base: 'light',

colorSecondary: 'white',

// UI
appBg: 'white',

// Typography
fontBase: '"Open Sans", sans-serif',
fontCode: 'monospace',

// Text colors
textColor: 'black',
textInverseColor: 'rgba(255,255,255,0.9)',

// Toolbar default and active colors
barTextColor: 'white',
barBg: 'rgb(49, 116, 173)',

// Form colors
inputBg: 'white',
inputTextColor: 'black',
inputBorderRadius: 4,

brandTitle: 'Big Calendar',
brandUrl: 'http://intljusticemission.github.io/react-big-calendar/examples',
})
24 changes: 10 additions & 14 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@ const { rules, loaders, plugins, stats } = require('webpack-atoms')

const browsers = ['last 2 versions', 'ie >= 10']

module.exports = function(config) {
return {
...config,
module: {
rules: [
rules.js(),
rules.fonts(),
rules.images(),
rules.css(),
rules.less({ browsers }),
],
},
plugins: [...config.plugins],
}
module.exports = function({ config }) {
config.module.rules = [
rules.js(),
rules.fonts(),
rules.images(),
rules.css(),
rules.sass({ browsers }),
]

return config
}
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
sudo: false
language: node_js
node_js:
- stable
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- node
branches:
only:
- master
Loading

0 comments on commit 917991c

Please sign in to comment.