Skip to content

React Inline CSS Support #118

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.

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 8 commits into from
Feb 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions editor-packages/editor-canvas/math/center-of.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ export function centerOf(
vbcenter[1] - boxcenter[1] * scale,
];

console.log(translate, scale);

return {
box: box,
center: boxcenter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ export function CodeOptionsControl(props: CodeOptionsControlProps) {
value: "react_with_styled_components",
description: "with styled-component",
},
{
name: "React",
value: "react_with_inline_css",
description: "with inline-css",
},
{
name: "Flutter",
value: "flutter_default",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export enum Language {
html = "html",
}

export type ReactStylingStrategy = "css" | "styled-components" | "css-in-jsx";
export type ReactStylingStrategy = "css" | "styled-components" | "inline-css";

export interface FlutterOption {
framework: Framework.flutter;
Expand Down Expand Up @@ -38,10 +38,10 @@ export const react_presets = {
language: Language.tsx,
styling: "styled-components",
},
react_with_css_in_jsx: <ReactOption>{
react_with_inline_css: <ReactOption>{
framework: Framework.react,
language: Language.tsx,
styling: "css-in-jsx",
styling: "inline-css",
},
react_with_css: <ReactOption>{
framework: Framework.react,
Expand Down Expand Up @@ -74,8 +74,8 @@ export const all_preset_options__prod = [
flutter_presets.flutter_default,
react_presets.react_default,
react_presets.react_with_styled_components,
react_presets.react_with_inline_css,
vanilla_presets.vanilla_default,
// react_with_css_in_jsx // NOT ON PRODUCTION
// react_with_css // NOT ON PRODUCTION
];

Expand All @@ -84,8 +84,8 @@ export const all_preset_options_map__prod = {
flutter_default: flutter_presets.flutter_default,
react_default: react_presets.react_default,
react_with_styled_components: react_presets.react_with_styled_components,
react_with_inline_css: react_presets.react_with_inline_css,
vanilla_default: vanilla_presets.vanilla_default,
// react_with_css_in_jsx // NOT ON PRODUCTION
// react_with_css // NOT ON PRODUCTION
};

Expand All @@ -97,7 +97,7 @@ export const lang_by_framework = {

export const react_styles: ReactStylingStrategy[] = [
"styled-components",
"css-in-jsx",
"inline-css",
"css",
];

Expand Down
112 changes: 0 additions & 112 deletions editor/pages/figma/to-flutter.tsx

This file was deleted.

132 changes: 0 additions & 132 deletions editor/pages/figma/to-react.tsx

This file was deleted.

4 changes: 4 additions & 0 deletions editor/query/to-code-options-from-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@ export function get_framework_config(framework: string) {
case "react.default":
return react_presets.react_default;
case "react-with-styled-components":
case "react_with_styled_components":
return react_presets.react_with_styled_components;
case "react-with-emotion-styled":
return react_presets.react_with_emotion_styled;
case "react_with_inline_css":
case "react-with-inline-css":
return react_presets.react_with_inline_css;
case "flutter":
case "flutter_default":
case "flutter-default":
Expand Down
26 changes: 24 additions & 2 deletions editor/scaffolds/code/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,37 @@ export function CodeSegment() {
}, [targetted?.id, framework_config]);

const { code, scaffold, name: componentName } = result ?? {};

return (
<CodeEditorContainer>
<EditorAppbarFragments.CodeEditor />
<CodeOptionsControl
initialPreset={router.query.framework as string}
fallbackPreset="react_default"
onUseroptionChange={(o) => {
set_framework_config(get_framework_config(o.framework));
let c;
switch (o.framework) {
case "react": {
switch (o.styling) {
case "inline-css":
c = get_framework_config("react-with-inline-css");
break;
case "styled-components":
c = get_framework_config("react-with-styled-components");
break;
case "css":
// TODO:
break;
}
break;
}
case "flutter":
c = get_framework_config(o.framework);
break;
case "vanilla":
c = get_framework_config(o.framework);
break;
}
set_framework_config(c);
}}
/>
<CodeEditor
Expand Down
2 changes: 1 addition & 1 deletion externals/design-sdk
Loading