UI Tweaks and bug fixes

This commit is contained in:
Daniel Lautzenheiser
2022-09-22 18:09:57 -04:00
parent 613a1cec76
commit 1aeffbf9c4
83 changed files with 171 additions and 113 deletions

View File

@ -25,7 +25,7 @@
"react-sortable-hoc": "^2.0.0"
},
"peerDependencies": {
"@emotion/core": "11.0.0",
"@emotion/react": "11.10.4",
"@emotion/styled": "11.10.4",
"immutable": "^3.7.6",
"lodash": "^4.17.11",

View File

@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import styled from '@emotion/styled';
import { css, ClassNames } from '@emotion/core';
import { css, ClassNames } from '@emotion/react';
import { List, Map, fromJS } from 'immutable';
import { partial, isEmpty, uniqueId } from 'lodash';
import uuid from 'uuid/v4';
@ -39,7 +39,7 @@ const NestedObjectLabel = styled.div`
border-top: 0;
color: ${props => (props.error ? colors.errorText : 'inherit')};
background-color: ${colors.textFieldBorder};
padding: 13px;
padding: 6px 13px;
border-radius: 0 0 ${lengths.borderRadius} ${lengths.borderRadius};
`;
@ -56,13 +56,11 @@ const styles = {
listControlItem: css`
margin-top: 18px;
&:first-of-type {
margin-top: 26px;
&:last-of-type {
margin-bottom: 14px;
}
`,
listControlItemCollapsed: css`
padding-bottom: 0;
`,
};
const SortableList = SortableContainer(({ items, renderItem }) => {
@ -546,10 +544,12 @@ export default class ListControl extends React.Component {
onRemove={partial(this.handleRemove, index)}
dragHandleHOC={SortableHandle}
data-testid={`styled-list-item-top-bar-${key}`}
title={collapsed ? this.objectLabel(item) : null}
isVariableTypesList={isVariableTypesList}
/>
<NestedObjectLabel collapsed={collapsed} error={hasError}>
{/* <NestedObjectLabel collapsed={collapsed} error={hasError}>
{this.objectLabel(item)}
</NestedObjectLabel>
</NestedObjectLabel> */}
<ClassNames>
{({ css, cx }) => (
<ObjectControl