Fixed tags color changing and hiding

main
Dmitry Kalinin 6 years ago
parent a99dd38fee
commit 8b27dbe613

@ -1139,6 +1139,7 @@
attributes: { ...this.attributes },
label: this.label,
group: this.groupObject,
color: this.color,
updated: this.updated,
frame,
};
@ -1171,6 +1172,10 @@
this._saveLock(data.lock);
}
if (updated.color) {
this._saveColor(data.color);
}
this.updateTimestamp(updated);
updated.reset();

@ -719,30 +719,21 @@ function ObjectItemComponent(props: Props): JSX.Element {
return (
<div style={{ display: 'flex' }}>
{
objectType !== ObjectType.TAG ? (
<Popover
placement='left'
trigger='click'
content={(
<ColorChanger
onChange={changeColor}
colors={colors}
/>
)}
>
<div
className='cvat-objects-sidebar-state-item-color'
style={{ background: ` ${color}` }}
/>
</Popover>
) : (
<div
className='cvat-objects-sidebar-state-item-color'
<Popover
placement='left'
trigger='click'
content={(
<ColorChanger
onChange={changeColor}
colors={colors}
/>
)
}
)}
>
<div
className='cvat-objects-sidebar-state-item-color'
style={{ background: ` ${color}` }}
/>
</Popover>
<div
onMouseEnter={activate}
id={`cvat-objects-sidebar-state-item-${clientID}`}

@ -84,7 +84,9 @@ function mapStateToProps(state: CombinedState): StateToProps {
objectStates.forEach((objectState: any) => {
const { clientID, lock } = objectState;
if (!lock) {
statesHidden = statesHidden && objectState.hidden;
if (objectState.objectType !== ObjectType.TAG) {
statesHidden = statesHidden && objectState.hidden;
}
statesLocked = statesLocked && objectState.lock;
}
const stateCollapsed = clientID in collapsed ? collapsed[clientID] : true;

Loading…
Cancel
Save