2 files changed, 135 insertions, 12 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 1d61a7510..3f36f5e44 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -12,6 +12,7 @@ import Button from '../../ui/button';
 import Toggle from '../../ui/Toggle';
 import Select from '../../ui/Select';
 import Input from '../../ui/Input';
+import ColorPickerInput from '../../ui/ColorPickerInput';
 import Infobox from '../../ui/Infobox';
 import { H1, H2, H3, H5 } from '../../ui/headline';
 
@@ -115,15 +116,19 @@ const messages = defineMessages({
     id: 'settings.app.sectionServiceIconsSettings',
     defaultMessage: 'Service Icons Settings',
   },
-  universalDarkModeInfo: {
-    id: 'settings.app.universalDarkModeInfo',
-    defaultMessage:
-      'Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.',
+  sectionAccentColorSettings: {
+    id: 'settings.app.sectionAccentColorSettings',
+    defaultMessage: 'Accent Color Settings',
   },
   accentColorInfo: {
     id: 'settings.app.accentColorInfo',
     defaultMessage:
-      'Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})',
+      'Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor} or clear the input field)',
+  },
+  universalDarkModeInfo: {
+    id: 'settings.app.universalDarkModeInfo',
+    defaultMessage:
+      'Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.',
   },
   headlinePrivacy: {
     id: 'settings.app.headlinePrivacy',
@@ -595,18 +600,29 @@ class EditSettingsForm extends Component {
                 )}
 
                 <Hr />
-
-                <Input
-                  placeholder="Accent Color"
-                  onChange={e => this.submit(e)}
-                  field={form.$('accentColor')}
-                />
+                <H2 className='settings__section_header'>
+                  {intl.formatMessage(messages.sectionAccentColorSettings)}
+                </H2>
+                <div className="settings__settings-group__apply-color">
+                  <ColorPickerInput
+                    onChange={e => this.submit(e)}
+                    field={form.$('accentColor')}
+                    className='color-picker-input'
+                  />
+                  <>
+                    <Button
+                      buttonType="secondary"
+                      className="settings__settings-group__apply-color__button"
+                      label="Apply color"
+                      onClick={(e) => { this.submit(e) }}
+                    />
+                  </>
+                </div>
                 <p>
                   {intl.formatMessage(messages.accentColorInfo, {
                     defaultAccentColor: DEFAULT_APP_SETTINGS.accentColor,
                   })}
                 </p>
-
                 <Hr />
 
                 <H2 className='settings__section_header'>
diff --git a/src/components/ui/ColorPickerInput.tsx b/src/components/ui/ColorPickerInput.tsx
new file mode 100644
index 000000000..7cbdb295b
--- /dev/null
+++ b/src/components/ui/ColorPickerInput.tsx
@@ -0,0 +1,107 @@
+import { ChangeEvent, Component } from 'react';
+import { observer } from 'mobx-react';
+import { Field } from 'mobx-react-form';
+import classnames from 'classnames';
+import { SliderPicker } from 'react-color';
+import { DEFAULT_APP_SETTINGS } from '../../config';
+
+interface IProps {
+  field: Field;
+  className?: string;
+  focus?: boolean;
+};
+
+interface IState {
+  background: string;
+}
+
+class ColorPickerInput extends Component<IProps, IState> {
+  static defaultProps = {
+    className: null,
+    focus: false,
+  };
+
+  state = {
+    background: DEFAULT_APP_SETTINGS.accentColor,
+  };
+
+  inputElement: HTMLInputElement | null | undefined;
+
+  componentDidMount() {
+    if (this.props.focus) {
+      this.focus();
+    }
+  }
+
+  onChange(e: ChangeEvent<HTMLInputElement>) {
+    const { field } = this.props;
+
+    field.onChange(e);
+  }
+
+  focus() {
+    this.inputElement?.focus();
+  }
+
+  handleChangeComplete = (color: { hex: string; }) => {
+    const { field } = this.props;
+    this.setState({ background: color.hex });
+    field.value = color.hex
+  };
+
+  render() {
+    const {
+      field,
+      className,
+    } = this.props;
+
+    let { type } = field;
+    type = 'text';
+
+    return (
+      <div
+        className={classnames({
+          'franz-form__field': true,
+          'has-error': field.error,
+          [`${className}`]: className,
+        })}
+      >
+        <SliderPicker
+          color={ this.state.background }
+          onChangeComplete={ this.handleChangeComplete }
+          id={field.id}
+          type={type}
+          className="franz-form__input"
+          name={field.name}
+          value={field.value}
+          placeholder={field.placeholder}
+          onBlur={field.onBlur}
+          onFocus={field.onFocus}
+          ref={(element: HTMLInputElement | null | undefined) => {
+            this.inputElement = element;
+          }}
+          disabled={field.disabled}
+        />
+        <div className="franz-form__input-wrapper franz-form__input-wrapper__color-picker">
+          <input
+            id={field.id}
+            type={type}
+            className="franz-form__input"
+            name={field.name}
+            value={field.value}
+            placeholder={field.placeholder}
+            onChange={e => this.onChange(e)}
+            onBlur={field.onBlur}
+            onFocus={field.onFocus}
+            ref={element => {
+              this.inputElement = element;
+            }}
+            disabled={field.disabled}
+          />
+        </div>
+      </div>
+    );
+  }
+}
+
+export default observer(ColorPickerInput);