Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
karolkozer committed Sep 9, 2022
2 parents ef1eaa2 + 29a893d commit c1b6608
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 274 deletions.
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,31 @@ Available options in useEpg
| `isLine` | `boolean` | optional | Show/hide line |
| `isRTL` | `boolean` | optional | Change direction to RTL or LTR. Default value is false |
| `theme` | `object` | optional | Object with theme schema |
| `globalStyles` | `string` | optional | Inject custom global styles and font. Font weight: 400,500,600. Default font is "Inter" |
#### Note about width and height props
Without declaring the `width` and `length` properties, the component takes the dimensions of the parent element.
#### globalStyles
Inject own custom font and other global styles.
```tsx
const globalStyles = `
@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap");
.planby {
font-family: "Inter", system-ui, -apple-system,
"Segoe UI", Roboto, Helvetica, Arial, sans-serif,
"Apple Color Emoji", "Segoe UI Emoji";
}
// Other styles
...
`;
```
#### Instance Properties
Properties returned from useEpg
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "planby",
"author": "Karol Kozer",
"version": "0.4.0",
"version": "1.1.0",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
8 changes: 6 additions & 2 deletions src/Epg/Epg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ interface EpgProps {
children: React.ReactNode;
loader?: React.ReactNode;
theme: Theme;
globalStyles?: string;
sidebarWidth: number;
}

Expand All @@ -34,8 +35,9 @@ export const Epg = React.forwardRef<HTMLDivElement, EpgProps>(
children,
width,
height,
theme,
sidebarWidth,
theme,
globalStyles: customGlobalStyles,
isRTL = false,
isSidebar = true,
isTimeline = true,
Expand All @@ -46,10 +48,12 @@ export const Epg = React.forwardRef<HTMLDivElement, EpgProps>(
containerRef
) => {
const renderLoader = () => LoaderComponent ?? <Loader />;
const epgGlobalStyles = customGlobalStyles ?? globalStyles;
return (
<ThemeProvider theme={theme}>
<Global styles={globalStyles} />
<Global styles={epgGlobalStyles} />
<Container
className="planby"
data-testid="container"
width={width}
height={height}
Expand Down
3 changes: 3 additions & 0 deletions src/Epg/hooks/useEpg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ interface useEpgProps {
isRTL?: boolean;
isLine?: boolean;
theme?: Theme;
globalStyles?: string;
dayWidth?: number;
sidebarWidth?: number;
itemHeight?: number;
Expand All @@ -64,6 +65,7 @@ export function useEpg({
isTimeline = true,
isLine = true,
theme: customTheme,
globalStyles,
dayWidth: customDayWidth = DAY_WIDTH,
sidebarWidth = SIDEBAR_WIDTH,
itemHeight = ITEM_HEIGHT,
Expand Down Expand Up @@ -156,6 +158,7 @@ export function useEpg({
sidebarWidth,
ref: containerRef,
theme,
globalStyles,
});

const getLayoutProps = () => ({
Expand Down
1 change: 0 additions & 1 deletion src/Epg/styles/Program.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const Elipsis = `

export const ProgramTitle = styled.p<{ theme?: Theme }>`
font-size: 14px;
font-weight: 400;
text-align: left;
margin-top: 0;
margin-bottom: 5px;
Expand Down
272 changes: 2 additions & 270 deletions src/Epg/styles/global.styles.ts
Original file line number Diff line number Diff line change
@@ -1,279 +1,11 @@
import { css } from "@emotion/react";

export const globalStyles = css`
@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Work+Sans:ital,wght@0,200;0,400;0,500;0,600;1,300&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap");
/*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
/*
Document
========
*/
/**
Use a better box model (opinionated).
*/
*,
::before,
::after {
box-sizing: border-box;
}
/**
1. Correct the line height in all browsers.
2. Prevent adjustments of font size after orientation changes in iOS.
3. Use a more readable tab size (opinionated).
*/
html {
line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
-moz-tab-size: 4; /* 3 */
tab-size: 4; /* 3 */
}
/*
Sections
========
*/
/**
1. Remove the margin in all browsers.
2. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
*/
body {
margin: 0; /* 1 */
.planby {
font-family: "Inter", system-ui, -apple-system,
/* Firefox supports this but not yet system-ui */ "Segoe UI", Roboto,
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; /* 2 */
}
/*
Grouping content
================
*/
/**
1. Add the correct height in Firefox.
2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
*/
hr {
height: 0; /* 1 */
color: inherit; /* 2 */
}
/*
Text-level semantics
====================
*/
/**
Add the correct text decoration in Chrome, Edge, and Safari.
*/
abbr[title] {
text-decoration: underline dotted;
}
/**
Add the correct font weight in Edge and Safari.
*/
b,
strong {
font-weight: bolder;
}
/**
1. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
2. Correct the odd 'em' font sizing in all browsers.
*/
code,
kbd,
samp,
pre {
font-family: ui-monospace, SFMono-Regular, Consolas, "Liberation Mono",
Menlo, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/**
Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/**
Prevent 'sub' and 'sup' elements from affecting the line height in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/*
Tabular data
============
*/
/**
1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
*/
table {
text-indent: 0; /* 1 */
border-color: inherit; /* 2 */
}
/*
Forms
=====
*/
/**
1. Change the font styles in all browsers.
2. Remove the margin in Firefox and Safari.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
}
/**
Remove the inheritance of text transform in Edge and Firefox.
*/
button,
select {
text-transform: none;
}
/**
Correct the inability to style clickable types in iOS and Safari.
*/
button,
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
/**
Remove the inner border and padding in Firefox.
*/
::-moz-focus-inner {
border-style: none;
padding: 0;
}
/**
Restore the focus styles unset by the previous rule.
*/
:-moz-focusring {
outline: 1px dotted ButtonText;
}
/**
Remove the additional ':invalid' styles in Firefox.
See: https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737
*/
:-moz-ui-invalid {
box-shadow: none;
}
/**
Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers.
*/
legend {
padding: 0;
}
/**
Add the correct vertical alignment in Chrome and Firefox.
*/
progress {
vertical-align: baseline;
}
/**
Correct the cursor style of increment and decrement buttons in Safari.
*/
::-webkit-inner-spin-button,
::-webkit-outer-spin-button {
height: auto;
}
/**
1. Correct the odd appearance in Chrome and Safari.
2. Correct the outline style in Safari.
*/
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
}
/**
Remove the inner padding in Chrome and Safari on macOS.
*/
::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
1. Correct the inability to style clickable types in iOS and Safari.
2. Change font properties to 'inherit' in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
}
/*
Interactive
===========
*/
/*
Add the correct display in Chrome and Safari.
*/
summary {
display: list-item;
}
`;

0 comments on commit c1b6608

Please sign in to comment.