Skip to content

feat: upgrade fundamental-styles to 0.8.0-rc.16 #957

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

Merged
merged 9 commits into from
Apr 9, 2020
Merged

feat: upgrade fundamental-styles to 0.8.0-rc.16 #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f19bf15
update Calendar styles and markup
meganaconley Apr 2, 2020
8a2822c
fix unit tests
meganaconley Apr 2, 2020
c572551
remove unused parameter
meganaconley Apr 2, 2020
7dd7988
bump size limit
meganaconley Apr 3, 2020
94a8355
update example
meganaconley Apr 3, 2020
10b552b
size limit
meganaconley Apr 3, 2020
6a0c583
pr feedback
meganaconley Apr 6, 2020
e7eeb5c
Merge branch 'master' into fix/update-fs
meganaconley Apr 6, 2020
ea28cc1
change function definitions
meganaconley Apr 9, 2020
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
2 changes: 1 addition & 1 deletion .size-limit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
name: "Fundamental-React Size",
webpack: true,
path: "lib/index.js",
limit: "185 KB"
limit: "190 KB"
}
]
47 changes: 14 additions & 33 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@babel/runtime": "^7.8.0",
"chain-function": "^1.0.1",
"classnames": "^2.2.6",
"fundamental-styles": "0.8.0-rc.10",
"fundamental-styles": "0.8.0-rc.16",
"keycode": "^2.2.0",
"moment": "^2.24.0",
"prop-types": "^15.7.1",
Expand Down
19 changes: 19 additions & 0 deletions src/Calendar/Calendar.Component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
import { Calendar } from '../';
import moment from 'moment';
import path from 'path';
import React from 'react';
import { ComponentPage, Example } from '../_playground';

const tomorrow = moment().add(1, 'day').endOf('day').format('YYYYMMDD');
const nextDay = moment().add(2, 'day').endOf('day').format('YYYYMMDD');
const dayAfter = moment().add(3, 'day').endOf('day').format('YYYYMMDD');
const oneWeek = moment().add(7, 'day').endOf('day').format('YYYYMMDD');

const specialDays = {
[tomorrow]: 1,
[nextDay]: 2,
[dayAfter]: 3,
[oneWeek]: 4
};

export const CalendarComponent = () => {
return (
<ComponentPage
Expand Down Expand Up @@ -33,6 +46,12 @@ export const CalendarComponent = () => {
disableWeekday={['Monday', 'Tuesday']} />
</Example>

<Example
centered
title='Calendar with special days'>
<Calendar specialDays={specialDays} />
</Example>

<Example
centered
title='Calendar with range selection'>
Expand Down
Loading