Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Fixed Multiple Choice Type undo/redo functionality #1844

Merged
cwhitten merged 6 commits into from
Jan 11, 2020
Merged

fix: Fixed Multiple Choice Type undo/redo functionality #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26490e5
Fixed multiple choice type undo/redo functionality
tdurnford Jan 9, 2020
733530d
Fixed input width
tdurnford Jan 9, 2020
c2afe70
Merge branch 'master' into 1824
tdurnford Jan 9, 2020
f1b743c
Merge branch 'master' into 1824
tdurnford Jan 10, 2020
454aa8b
Merge branch 'master' into 1824
boydc2014 Jan 10, 2020
fd79cef
Merge branch 'master' into 1824
cwhitten Jan 11, 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
1 change: 1 addition & 0 deletions Composer/packages/extensions/obiformeditor/src/Form/ArrayFieldTemplate/StringArray.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const StringArray: React.FunctionComponent<ArrayFieldTemplateProps> = props => {
iconName: 'ReturnKey',
style: { color: SharedColors.cyanBlue10, opacity: 0.6 },
}}
styles={{ root: { width: '100%' } }}
data-testid="string-array-text-input"
/>
</div>
Expand Down
32 changes: 19 additions & 13 deletions ...ser/packages/extensions/obiformeditor/src/Form/fields/PromptField/ChoiceInput/Choices.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/** @jsx jsx */
import { jsx } from '@emotion/core';
import React, { useCallback, useMemo, useState } from 'react';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { Dropdown, ResponsiveMode } from 'office-ui-fabric-react/lib/Dropdown';
import { JSONSchema6 } from 'json-schema';
import { IChoice } from '@bfc/shared';
Expand Down Expand Up @@ -47,6 +47,10 @@ export const Choices: React.FC<ChoicesProps> = props => {
[choiceType, onchange, setChoiceType]
);

useEffect(() => {
setChoiceType(Array.isArray(formData ?? []) && typeof formData !== 'string' ? 'static' : 'dynamic');
}, [formData]);

return (
<React.Fragment>
<div style={{ display: 'flex', justifyContent: 'space-between', padding: '5px 0' }}>
Expand All @@ -60,19 +64,21 @@ export const Choices: React.FC<ChoicesProps> = props => {
}
id={id}
/>
<Dropdown
styles={{
caretDownWrapper: { height: '24px', lineHeight: '24px' },
root: { padding: '7px 0', width: '100px' },
title: { height: '24px', lineHeight: '20px' },
}}
onChange={handleChange}
options={options}
selectedKey={choiceType}
responsiveMode={ResponsiveMode.large}
/>
{options.length > 0 && (
<Dropdown
styles={{
caretDownWrapper: { height: '24px', lineHeight: '24px' },
root: { padding: '7px 0', width: '100px' },
title: { height: '24px', lineHeight: '20px' },
}}
onChange={handleChange}
options={options}
selectedKey={choiceType}
responsiveMode={ResponsiveMode.large}
/>
)}
</div>
{choiceType === 'static' ? (
{!options || choiceType === 'static' ? (
<StaticChoices {...props} />
) : (
<DynamicChoices {...props} formContext={formContext} schema={dynamicSchema as JSONSchema6} />
Expand Down