diff --git a/Composer/packages/extensions/adaptive-form/src/components/fields/ArrayField.tsx b/Composer/packages/extensions/adaptive-form/src/components/fields/ArrayField.tsx index b4efb42523..b127402955 100644 --- a/Composer/packages/extensions/adaptive-form/src/components/fields/ArrayField.tsx +++ b/Composer/packages/extensions/adaptive-form/src/components/fields/ArrayField.tsx @@ -62,6 +62,7 @@ const ArrayField: React.FC> = (props) => { = (props) => { onReorder, onRemove, index, + label, depth, onBlur, stackArrayItems, @@ -89,7 +90,7 @@ const ArrayFieldItem: React.FC = (props) => { {...rest} css={arrayItem.schemaFieldOverride(!!stackArrayItems)} depth={depth + 1} - label={!stackArrayItems ? false : undefined} + label={!stackArrayItems || label === false ? false : undefined} rawErrors={typeof rawErrors === 'object' ? rawErrors[index] : rawErrors} transparentBorder={!stackArrayItems ? transparentBorder : undefined} uiOptions={uiOptions} diff --git a/Composer/packages/ui-plugins/expressions/src/ExpressionField.tsx b/Composer/packages/ui-plugins/expressions/src/ExpressionField.tsx index 891da22139..c550e4a666 100644 --- a/Composer/packages/ui-plugins/expressions/src/ExpressionField.tsx +++ b/Composer/packages/ui-plugins/expressions/src/ExpressionField.tsx @@ -15,15 +15,20 @@ import { getOptions, getSelectedOption, SchemaOption } from './utils'; const styles = { container: css` + width: 100%; + + label: ExpressionFieldContainer; + `, + field: css` + min-height: 66px; + `, + labelContainer: css` display: flex; justify-content: space-between; align-items: center; label: ExpressionField; `, - field: css` - min-height: 66px; - `, }; const ExpressionField: React.FC = (props) => { @@ -111,9 +116,9 @@ const ExpressionField: React.FC = (props) => { ); return ( -
+
{shouldRenderContainer && ( -
+