This commit is contained in:
Jan Prochazka
2020-12-12 20:06:18 +01:00
parent 0c0c0356a6
commit ae0606cc84
4 changed files with 14 additions and 32 deletions

View File

@@ -1,6 +1,6 @@
import React from 'react';
import ModalBase from './ModalBase';
import { FormTextField, FormSubmit, FormButton, FormCheckboxField } from '../utility/forms';
import { FormTextField, FormSubmit, FormButton, FormCheckboxField, FormFieldTemplate } from '../utility/forms';
import ModalHeader from './ModalHeader';
import ModalContent from './ModalContent';
import ModalFooter from './ModalFooter';
@@ -8,7 +8,6 @@ import { FormProvider, useForm } from '../utility/FormProvider';
import axios from '../utility/axios';
import uuidv1 from 'uuid/v1';
import { FontIcon } from '../icons';
import { FormFieldTemplateDefault } from '../utility/formStyle';
function FontIconPreview() {
const { values } = useForm();
@@ -93,9 +92,9 @@ export default function FavoriteModal({ modalState, editingData = undefined, sav
<ModalContent>
<FormTextField label="Title" name="title" focused />
<FormTextField label="Icon" name="icon" />
<FormFieldTemplateDefault label="Icon preview" type="icon">
<FormFieldTemplate label="Icon preview" type="icon">
<FontIconPreview />
</FormFieldTemplateDefault>
</FormFieldTemplate>
<FormCheckboxField label="Show in toolbar" name="showInToolbar" />
<FormCheckboxField label="Open on startup" name="openOnStartup" />
</ModalContent>

View File

@@ -1,12 +1,11 @@
import React from 'react';
import ModalBase from './ModalBase';
import { FormTextField, FormSubmit, FormArchiveFolderSelect } from '../utility/forms';
import { FormTextField, FormSubmit, FormArchiveFolderSelect, FormFieldTemplate } from '../utility/forms';
import styled from 'styled-components';
import ModalHeader from './ModalHeader';
import ModalContent from './ModalContent';
import ModalFooter from './ModalFooter';
import { FormProvider } from '../utility/FormProvider';
import { FormFieldTemplateDefault } from '../utility/formStyle';
const SelectWrapper = styled.div`
width: 150px;
@@ -25,11 +24,11 @@ export default function SaveArchiveModal({ file = 'new-table', folder = 'default
<ModalHeader modalState={modalState}>Save to archive</ModalHeader>
<FormProvider initialValues={{ file, folder }}>
<ModalContent>
<FormFieldTemplateDefault label="Folder" type="select">
<FormFieldTemplate label="Folder" type="select">
<SelectWrapper>
<FormArchiveFolderSelect name="folder" />
</SelectWrapper>
</FormFieldTemplateDefault>
</FormFieldTemplate>
<FormTextField label="File name" name="file" />
</ModalContent>
<ModalFooter>