Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

a11y: fix behavior of object-array fields #2407

Merged
merged 2 commits into from
Mar 27, 2020
Merged

a11y: fix behavior of object-array fields #2407

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3daa66d
fix behavior of object-array fields
beyackle Mar 27, 2020
1f40b6d
Merge branch 'master' into beyackle/objectArrayFieldCaptions
a-b-r-o-w-n Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions Composer/packages/extensions/adaptive-form/src/components/fields/ObjectArrayField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

/** @jsx jsx */
import { jsx } from '@emotion/core';
import React, { useState, useMemo } from 'react';
import React, { useState, useMemo, useRef } from 'react';
import { FieldProps } from '@bfc/extension';
import { DefaultButton } from 'office-ui-fabric-react/lib/Button';
import { JSONSchema7 } from 'json-schema';
import { IconButton } from 'office-ui-fabric-react/lib/Button';
import { TextField } from 'office-ui-fabric-react/lib/TextField';
import { TextField, ITextField } from 'office-ui-fabric-react/lib/TextField';
import { FontSizes, NeutralColors, SharedColors } from '@uifabric/fluent-theme';
import formatMessage from 'format-message';
import map from 'lodash/map';
Expand Down Expand Up @@ -38,6 +38,7 @@ const ObjectArrayField: React.FC<FieldProps<any[]>> = props => {
const properties = (itemSchema && itemSchema !== true && itemSchema.properties) || {};
const [newObject, setNewObject] = useState({});
const { arrayItems, handleChange, addItem } = useArrayItems(value, onChange);
const firstNewFieldRef: React.RefObject<ITextField> = useRef(null);

const handleNewObjectChange = (property: string) => (_e: React.FormEvent, newValue?: string) => {
setNewObject({ ...newObject, [property]: newValue });
Expand All @@ -47,14 +48,15 @@ const ObjectArrayField: React.FC<FieldProps<any[]>> = props => {
if (event.key.toLowerCase() === 'enter') {
event.preventDefault();

if (Object.keys(newObject).length) {
if (Object.keys(newObject).length > 0) {
const formattedData = Object.entries(newObject).reduce((obj, [key, value]) => {
const serializeValue = uiOptions?.properties?.[key]?.serializer?.set;
return { ...obj, [key]: typeof serializeValue === 'function' ? serializeValue(value) : value };
}, {});

addItem(formattedData);
setNewObject({});
firstNewFieldRef.current?.focus();
}
}
};
Expand Down Expand Up @@ -129,13 +131,14 @@ const ObjectArrayField: React.FC<FieldProps<any[]>> = props => {
{orderedProperties
.filter(p => !Array.isArray(p))
.map((property, index, allProperties) => {
const lastField = index === allProperties.length - 1;
if (typeof property === 'string') {
return (
<div key={index} css={objectArrayField.objectItemInputField}>
<TextField
autoComplete="off"
iconProps={{
...(index === allProperties.length - 1
...(lastField
? {
iconName: 'ReturnKey',
style: {
Expand All @@ -150,6 +153,14 @@ const ObjectArrayField: React.FC<FieldProps<any[]>> = props => {
value={newObject[property] || ''}
onChange={handleNewObjectChange(property)}
onKeyDown={handleKeyDown}
ariaLabel={
lastField
? formatMessage(
'press Enter to add this item or Tab to move to the next interactive element'
)
: formatMessage('press Tab to advance to the next field')
}
componentRef={index === 0 ? firstNewFieldRef : undefined}
/>
</div>
);
Expand Down