Skip to content

Refactor | Overmind: Refactor /app/pages/common/Modals/PreferencesModal/CodeFormatting/Prettier/index.js #2759

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 1 commit into from
Oct 15, 2019
Merged

Refactor | Overmind: Refactor /app/pages/common/Modals/PreferencesModal/CodeFormatting/Prettier/index.js #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 21 additions & 9 deletions ...cesModal/CodeFormatting/Prettier/index.js → ...esModal/CodeFormatting/Prettier/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { inject, observer } from 'app/componentConnectors';
import React, { FunctionComponent } from 'react';
import { useOvermind } from 'app/overmind';

import {
SubContainer,
Expand All @@ -9,16 +9,28 @@ import {
Rule,
} from '../../elements';

function PrettierComponent({ store, signals }) {
const PrettierComponent: FunctionComponent = () => {
const {
state: {
preferences: {
settings: { prettierConfig },
},
},
actions: {
preferences: { settingChanged },
},
} = useOvermind();

const bindValue = name => ({
value: store.preferences.settings.prettierConfig[name],
value: prettierConfig[name],
setValue: value =>
signals.preferences.settingChanged({
settingChanged({
name: `prettierConfig.${name}`,
value,
}),
});

const { fluid } = prettierConfig;
return (
<SubContainer>
<PreferenceContainer>
Expand All @@ -45,15 +57,15 @@ function PrettierComponent({ store, signals }) {
<Rule />
<PaddedPreference
style={{
opacity: store.preferences.settings.prettierConfig.fluid ? 0.5 : 1,
opacity: fluid ? 0.5 : 1,
}}
title="Print width"
type="number"
{...bindValue('printWidth')}
/>
<SubDescription
style={{
opacity: store.preferences.settings.prettierConfig.fluid ? 0.5 : 1,
opacity: fluid ? 0.5 : 1,
}}
>
Specify the line length that the printer will wrap on.
Expand Down Expand Up @@ -143,6 +155,6 @@ function PrettierComponent({ store, signals }) {
</PreferenceContainer>
</SubContainer>
);
}
};

export const Prettier = inject('store', 'signals')(observer(PrettierComponent));
export const Prettier = PrettierComponent;
25 changes: 0 additions & 25 deletions packages/app/src/app/pages/common/Modals/PreferencesModal/CodeFormatting/index.js
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions packages/app/src/app/pages/common/Modals/PreferencesModal/CodeFormatting/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React, { FunctionComponent } from 'react';

import Question from 'react-icons/lib/go/question';

import { Prettier } from './Prettier';
import { Title } from '../elements';

export const CodeFormatting: FunctionComponent = () => (
<div>
<Title>
Prettier Settings{' '}
<a
href="https://prettier.io/docs/en/options.html"
target="_blank"
rel="noopener noreferrer"
>
<Question style={{ marginBottom: '3px' }} />
</a>
</Title>

<Prettier />
</div>
);