This commit is contained in:
Jan Prochazka
2021-01-23 07:22:09 +01:00
parent 37cc86f8d2
commit 451af5d09f
141 changed files with 763 additions and 787 deletions

View File

@@ -14,7 +14,7 @@ const Row = styled.div`
// padding: 5px;
cursor: pointer;
&:hover {
background-color: ${(props) => props.theme.manager_background_blue[1]};
background-color: ${props => props.theme.manager_background_blue[1]};
}
`;
const Name = styled.div`
@@ -29,13 +29,13 @@ const Icon = styled(FontIcon)`
position: relative;
top: 5px;
&:hover {
background-color: ${(props) => props.theme.manager_background3};
background-color: ${props => props.theme.manager_background3};
}
padding: 5px;
`;
const EditorInput = styled.input`
width: calc(100% - 10px);
background-color: ${(props) =>
background-color: ${props =>
// @ts-ignore
props.isError ? props.theme.manager_background_red[1] : props.theme.manager_background};
`;
@@ -53,7 +53,7 @@ function ColumnNameEditor({
const [value, setValue] = React.useState(defaultValue || '');
const editorRef = React.useRef(null);
const isError = value && existingNames && existingNames.includes(value);
const handleKeyDown = (event) => {
const handleKeyDown = event => {
if (value && event.keyCode == keycodes.enter && !isError) {
onEnter(value);
setValue('');
@@ -82,7 +82,7 @@ function ColumnNameEditor({
onKeyDown={handleKeyDown}
onBlur={handleBlur}
value={value}
onChange={(ev) => setValue(ev.target.value)}
onChange={ev => setValue(ev.target.value)}
// @ts-ignore
isError={isError}
{...other}
@@ -141,17 +141,17 @@ export default function FreeTableColumnEditor(props) {
index == editingColumn ? (
<ColumnNameEditor
defaultValue={column.columnName}
onEnter={(columnName) => {
onEnter={columnName => {
dispatchChangeColumns(
props,
(cols) => cols.map((col, i) => (index == i ? { columnName } : col)),
(row) => _.mapKeys(row, (v, k) => (k == column.columnName ? columnName : k))
cols => cols.map((col, i) => (index == i ? { columnName } : col)),
row => _.mapKeys(row, (v, k) => (k == column.columnName ? columnName : k))
);
}}
onBlur={() => setEditingColumn(null)}
focusOnCreate
blurOnEnter
existingNames={model.structure.columns.map((x) => x.columnName)}
existingNames={model.structure.columns.map(x => x.columnName)}
/>
) : (
<ColumnManagerRow
@@ -159,23 +159,23 @@ export default function FreeTableColumnEditor(props) {
column={column}
onEdit={() => setEditingColumn(index)}
onRemove={() => {
dispatchChangeColumns(props, (cols) => cols.filter((c, i) => i != index));
dispatchChangeColumns(props, cols => cols.filter((c, i) => i != index));
}}
onUp={() => {
dispatchChangeColumns(props, (cols) => exchange(cols, index, index - 1));
dispatchChangeColumns(props, cols => exchange(cols, index, index - 1));
}}
onDown={() => {
dispatchChangeColumns(props, (cols) => exchange(cols, index, index + 1));
dispatchChangeColumns(props, cols => exchange(cols, index, index + 1));
}}
/>
)
)}
<ColumnNameEditor
onEnter={(columnName) => {
dispatchChangeColumns(props, (cols) => [...cols, { columnName }]);
onEnter={columnName => {
dispatchChangeColumns(props, cols => [...cols, { columnName }]);
}}
placeholder="New column"
existingNames={model.structure.columns.map((x) => x.columnName)}
existingNames={model.structure.columns.map(x => x.columnName)}
/>
</ManagerInnerContainer>
</>

View File

@@ -12,7 +12,7 @@ import WidgetColumnBar, { WidgetColumnBarItem } from '../widgets/WidgetColumnBar
import useTheme from '../theme/useTheme';
const LeftContainer = styled.div`
background-color: ${(props) => props.theme.manager_background};
background-color: ${props => props.theme.manager_background};
display: flex;
flex: 1;
`;
@@ -25,7 +25,7 @@ const DataGridContainer = styled.div`
function extractMacroValuesForMacro(macroValues, macro) {
if (!macro) return {};
return {
..._.fromPairs((macro.args || []).filter((x) => x.default != null).map((x) => [x.name, x.default])),
..._.fromPairs((macro.args || []).filter(x => x.default != null).map(x => [x.name, x.default])),
..._.mapKeys(macroValues, (v, k) => k.replace(/^.*#/, '')),
};
}

View File

@@ -47,18 +47,18 @@ export default function FreeTableGridCore(props) {
initialValues.sourceStorageType = 'jsldata';
initialValues.sourceJslId = jslid;
initialValues.sourceList = ['editor-data'];
showModal((modalState) => <ImportExportModal modalState={modalState} initialValues={initialValues} />);
showModal(modalState => <ImportExportModal modalState={modalState} initialValues={initialValues} />);
}
const handleSelectionChanged = React.useCallback(
(cells) => {
cells => {
if (onSelectionChanged) onSelectionChanged(cells);
setSelectedCells(cells);
},
[setSelectedCells]
);
const handleKeyDown = React.useCallback((event) => {
const handleKeyDown = React.useCallback(event => {
if (event.keyCode == keycodes.escape) {
setSelectedMacro(null);
}

View File

@@ -19,8 +19,8 @@ const Container = styled.div`
height: ${dimensions.toolBar.height}px;
min-height: ${dimensions.toolBar.height}px;
overflow: hidden;
border-top: 1px solid ${(props) => props.theme.border};
border-bottom: 1px solid ${(props) => props.theme.border};
border-top: 1px solid ${props => props.theme.border};
border-bottom: 1px solid ${props => props.theme.border};
`;
const Header = styled.div`

View File

@@ -25,12 +25,12 @@ export default function MacroManager({ managerSize, selectedMacro, setSelectedMa
<AppObjectList
list={_.sortBy(macros, 'title')}
AppObjectComponent={MacroAppObject}
onObjectClick={(macro) => setSelectedMacro(macro)}
getCommonProps={(data) => ({
onObjectClick={macro => setSelectedMacro(macro)}
getCommonProps={data => ({
isBold: selectedMacro && selectedMacro.name == data.name,
})}
filter={filter}
groupFunc={(data) => data.group}
groupFunc={data => data.group}
/>
{/* {macros.map((macro) => (
<MacroListItem key={`${macro.group}/${macro.name}`} macro={macro} />

View File

@@ -6,7 +6,7 @@ import { FormProvider } from '../utility/FormProvider';
export default function MacroParameters({ args, onChangeValues, macroValues, namePrefix }) {
if (!args || args.length == 0) return null;
const initialValues = {
..._.fromPairs(args.filter((x) => x.default != null).map((x) => [`${namePrefix}${x.name}`, x.default])),
..._.fromPairs(args.filter(x => x.default != null).map(x => [`${namePrefix}${x.name}`, x.default])),
...macroValues,
};
return (