Skip to content

Commit

Permalink
Merge 3033e03 into 73220f7
Browse files Browse the repository at this point in the history
  • Loading branch information
Boris Sekachev committed Nov 22, 2020
2 parents 73220f7 + 3033e03 commit bb9db7b
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cvat-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cvat-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-ui",
"version": "1.10.6",
"version": "1.10.7",
"description": "CVAT single-page application",
"main": "src/index.tsx",
"scripts": {
Expand Down
35 changes: 27 additions & 8 deletions cvat-ui/src/components/labels-editor/label-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class LabelForm extends React.PureComponent<Props, {}> {
message: patterns.validateAttributeName.message,
},
],
})(<Input disabled={locked} placeholder='Name' />)}
})(<Input className='cvat-attribute-name-input' disabled={locked} placeholder='Name' />)}
</Form.Item>
</Col>
);
Expand All @@ -142,7 +142,7 @@ class LabelForm extends React.PureComponent<Props, {}> {
{form.getFieldDecorator(`type[${key}]`, {
initialValue: type,
})(
<Select disabled={locked}>
<Select className='cvat-attribute-type-input' disabled={locked}>
<Select.Option value={AttributeType.SELECT}>Select</Select.Option>
<Select.Option value={AttributeType.RADIO}>Radio</Select.Option>
<Select.Option value={AttributeType.CHECKBOX}>Checkbox</Select.Option>
Expand Down Expand Up @@ -191,7 +191,14 @@ class LabelForm extends React.PureComponent<Props, {}> {
validator,
},
],
})(<Select mode='tags' dropdownMenuStyle={{ display: 'none' }} placeholder='Attribute values' />)}
})(
<Select
className='cvat-attribute-values-input'
mode='tags'
dropdownMenuStyle={{ display: 'none' }}
placeholder='Attribute values'
/>,
)}
</Form.Item>
</Tooltip>
);
Expand All @@ -207,7 +214,7 @@ class LabelForm extends React.PureComponent<Props, {}> {
{form.getFieldDecorator(`values[${key}]`, {
initialValue: value,
})(
<Select>
<Select className='cvat-attribute-values-input'>
<Select.Option value='false'> False </Select.Option>
<Select.Option value='true'> True </Select.Option>
</Select>,
Expand Down Expand Up @@ -264,7 +271,7 @@ class LabelForm extends React.PureComponent<Props, {}> {
validator,
},
],
})(<Input disabled={locked} placeholder='min;max;step' />)}
})(<Input className='cvat-attribute-values-input' disabled={locked} placeholder='min;max;step' />)}
</Form.Item>
);
}
Expand All @@ -277,7 +284,7 @@ class LabelForm extends React.PureComponent<Props, {}> {
<Form.Item>
{form.getFieldDecorator(`values[${key}]`, {
initialValue: value,
})(<Input placeholder='Default value' />)}
})(<Input className='cvat-attribute-values-input' placeholder='Default value' />)}
</Form.Item>
);
}
Expand All @@ -293,7 +300,13 @@ class LabelForm extends React.PureComponent<Props, {}> {
{form.getFieldDecorator(`mutable[${key}]`, {
initialValue: value,
valuePropName: 'checked',
})(<Checkbox disabled={locked}> Mutable </Checkbox>)}
})(
<Checkbox className='cvat-attribute-mutable-checkbox' disabled={locked}>
{' '}
Mutable
{' '}
</Checkbox>,
)}
</Tooltip>
</Form.Item>
);
Expand Down Expand Up @@ -326,7 +339,13 @@ class LabelForm extends React.PureComponent<Props, {}> {

return (
<Form.Item key={key}>
<Row type='flex' justify='space-between' align='middle'>
<Row
type='flex'
justify='space-between'
align='middle'
cvat-attribute-id={key}
className='cvat-attribute-inputs-wrapper'
>
{this.renderAttributeNameInput(key, attr)}
{this.renderAttributeTypeInput(key, attr)}
<Col span={6}>
Expand Down

0 comments on commit bb9db7b

Please sign in to comment.