Skip to content
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

[framer] Support Framer color tokens for ThemeProvider #19451

Merged
merged 5 commits into from
Feb 2, 2020
Merged

[framer] Support Framer color tokens for ThemeProvider #19451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd4c85e
Support Framer color tokens for ThemeProvider
iKettles Jan 28, 2020
f33bb34
Add comments to Framer parseColor util
iKettles Jan 29, 2020
eaf6d9a
Remove ThemeProvider from templated Framer components
iKettles Jan 29, 2020
3bce43e
Bump material-ui/core and material-ui/icons versions for Framer package
iKettles Jan 29, 2020
8eed1f4
Add new palette colors to Framer ThemeProvider component
iKettles Jan 29, 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
40 changes: 36 additions & 4 deletions framer/Material-UI.framerfx/code/ThemeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,50 @@ import { addPropertyControls, ControlType } from 'framer';
// tslint:disable-next-line: ban-ts-ignore
// @ts-ignore
import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles';
import { parseColor } from './utils/parseColor';

interface Props {
paletteType?: 'dark' | 'light';
primary?: string;
secondary?: string;
error?: string;
info?: string;
warning?: string;
success?: string;
}

const defaultProps: Props = {
paletteType: 'light',
primary: '#3f51b5',
secondary: '#f50057',
error: '#f44336',
info: '#2196f3',
warning: '#ff9800',
success: '#4caf4f',
};

export const Theme: React.SFC<Props> = (props: Props) => {
const { children, error, paletteType, primary, secondary, ...other } = props;
const {
children,
error,
paletteType,
primary,
secondary,
info,
warning,
success,
...other
} = props;

const theme = createMuiTheme({
palette: {
type: paletteType,
primary: { main: primary },
secondary: { main: secondary },
error: { main: error },
primary: { main: parseColor(primary) },
secondary: { main: parseColor(secondary) },
error: { main: parseColor(error) },
info: { main: parseColor(info) },
warning: { main: parseColor(warning) },
success: { main: parseColor(success) },
},
});

Expand Down Expand Up @@ -57,4 +77,16 @@ addPropertyControls(Theme, {
type: ControlType.Color,
title: 'Error',
},
info: {
type: ControlType.Color,
title: 'Info',
},
warning: {
type: ControlType.Color,
title: 'Warning',
},
success: {
type: ControlType.Color,
title: 'Success',
},
});
18 changes: 18 additions & 0 deletions framer/Material-UI.framerfx/code/utils/parseColor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const colorTokenRegex = /var\((--[a-zA-Z0-9-_]+),? ?([a-zA-Z0-9 ()%#.,-]+)?\)/;

/**
* Checks if the color string is a Framer Shared Color token and extracts
* the underlying color or returns the original string.
*
* @param {string} color - A Framer Shared Color Token/regular CSS color
* @return {string} A valid HTML color string
*
* @example
* console.log(parseColor('var(--token-73eaaa94-88d1-416e-9e22-e09837612534, rgb(0, 0, 0))')); // rgb(0, 0, 0)
*
*/
export function parseColor(color: string): string {
const colorToken = color.match(colorTokenRegex);

return colorToken ? colorToken[2] : color;
}
60 changes: 30 additions & 30 deletions framer/Material-UI.framerfx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"name": "@framer/material-ui.material-ui",
"author": "Material-UI Team",
"description": "Material-UI Framer components",
"version": "1.0.0",
"main": "dist/index.js",
"license": "MIT",
"homepage": "http://material-ui.com/",
"repository": {
"type": "git",
"url": "https://github.com/mui-org/material-ui.git"
},
"bugs": {
"url": "https://github.com/mui-org/material-ui/issues"
},
"devDependencies": {
"@types/react": "^16.8"
},
"dependencies": {
"@material-ui/core": "^4.5.0",
"@material-ui/icons": "^4.4.0",
"naming-style": "^1.0.0"
},
"peerDependencies": {
"framer": "^1.0.0",
"react": "^16.8.0"
},
"framer": {
"displayName": "Material-UI",
"id": "ee255265-d0d6-4999-a685-9461c1248b6a"
}
"name": "@framer/material-ui.material-ui",
"author": "Material-UI Team",
"description": "Material-UI Framer components",
"version": "1.0.0",
"main": "dist/index.js",
"license": "MIT",
"homepage": "http://material-ui.com/",
"repository": {
"type": "git",
"url": "https://github.com/mui-org/material-ui.git"
},
"bugs": {
"url": "https://github.com/mui-org/material-ui/issues"
},
"devDependencies": {
"@types/react": "^16.8"
},
"dependencies": {
"@material-ui/core": "^4.9.0",
"@material-ui/icons": "^4.5.1",
"naming-style": "^1.0.0"
},
"peerDependencies": {
"framer": "^1.0.0",
"react": "^16.8.0"
},
"framer": {
"displayName": "Material-UI",
"id": "ee255265-d0d6-4999-a685-9461c1248b6a"
}
}
Loading