-
Notifications
You must be signed in to change notification settings - Fork 400
Added choice radio button handling #1798
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.
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
Open
GuidoZam
wants to merge
7
commits into
pnp:dev
Choose a base branch
from
GuidoZam:dynamic-form-choice-radio-button
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
02d928b
Added choice radio button handling
GuidoZam bf5356f
Removed duplicate label
GuidoZam 4931515
Merge branch 'dev' into dynamic-form-choice-radio-button
GuidoZam 58d565e
Update src/controls/dynamicForm/dynamicField/DynamicField.tsx
GuidoZam f4f21a5
Update src/controls/dynamicForm/dynamicField/DynamicField.tsx
GuidoZam bd2c524
Update src/controls/dynamicForm/dynamicField/DynamicField.tsx
GuidoZam cf47479
Updated choice field initialization
GuidoZam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,5 +1,5 @@ | ||||||
import '@pnp/sp/folders'; | ||||||
import { sp } from '@pnp/sp/presets/all'; | ||||||
import { ChoiceFieldFormatType, sp } from '@pnp/sp/presets/all'; | ||||||
import '@pnp/sp/webs'; | ||||||
import * as strings from 'ControlStrings'; | ||||||
import { ActionButton } from '@fluentui/react/lib/Button'; | ||||||
|
@@ -23,11 +23,10 @@ import { IDynamicFieldProps, IDynamicFieldStyleProps, IDynamicFieldStyles } from | |||||
import { IDynamicFieldState } from './IDynamicFieldState'; | ||||||
import CurrencyMap from "../CurrencyMap"; | ||||||
import { ModernTaxonomyPicker } from '../../modernTaxonomyPicker'; | ||||||
import { classNamesFunction, IProcessedStyleSet, styled } from '@fluentui/react'; | ||||||
import { classNamesFunction, IProcessedStyleSet, styled, ChoiceGroup, IChoiceGroupOption } from '@fluentui/react'; | ||||||
import { getFluentUIThemeOrDefault } from '../../../common/utilities/ThemeUtility'; | ||||||
import { getFieldStyles } from './DynamicField.styles'; | ||||||
|
||||||
|
||||||
const getClassNames = classNamesFunction<IDynamicFieldStyleProps, IDynamicFieldStyles>(); | ||||||
|
||||||
export class DynamicFieldBase extends React.Component<IDynamicFieldProps, IDynamicFieldState> { | ||||||
|
@@ -95,6 +94,7 @@ export class DynamicFieldBase extends React.Component<IDynamicFieldProps, IDynam | |||||
itemsQueryCountLimit, | ||||||
customIcon, | ||||||
orderBy, | ||||||
choiceType, | ||||||
useModernTaxonomyPickerControl | ||||||
} = this.props; | ||||||
|
||||||
|
@@ -190,22 +190,50 @@ export class DynamicFieldBase extends React.Component<IDynamicFieldProps, IDynam | |||||
</div>; | ||||||
} | ||||||
|
||||||
case 'Choice': | ||||||
return <div className={styles.fieldContainer}> | ||||||
<div className={`${styles.labelContainer} ${styles.titleContainer}`}> | ||||||
<Icon className={styles.fieldIcon} iconName={customIcon ?? "CheckMark"} /> | ||||||
{labelEl} | ||||||
</div> | ||||||
<Dropdown | ||||||
case 'Choice': { | ||||||
let choiceControl: JSX.Element = undefined; | ||||||
|
||||||
// If the choiceType is dropdown | ||||||
if (choiceType === ChoiceFieldFormatType.Dropdown) { | ||||||
choiceControl = <Dropdown | ||||||
{...dropdownOptions} | ||||||
defaultSelectedKey={valueToDisplay ? undefined : defaultValue} | ||||||
selectedKey={typeof valueToDisplay === "object" ? valueToDisplay?.key : valueToDisplay} | ||||||
onChange={(e, option) => { this.onChange(option, true); }} | ||||||
onBlur={this.onBlur} | ||||||
errorMessage={errorText} /> | ||||||
errorMessage={errorText} />; | ||||||
} | ||||||
// If the choiceType is radio buttons | ||||||
else if (choiceType === ChoiceFieldFormatType.RadioButtons) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Since we only have two choice type, if it's not |
||||||
// Parse options into radio buttons | ||||||
const optionsGroup: IChoiceGroupOption[] = | ||||||
options.map((option) => { | ||||||
return { | ||||||
key: option.key.toString(), | ||||||
text: option.text, | ||||||
checked: option.key.toString() === valueToDisplay | ||||||
}; | ||||||
}); | ||||||
|
||||||
// Create radio group | ||||||
choiceControl = <ChoiceGroup | ||||||
defaultSelectedKey={valueToDisplay ? undefined : defaultValue} | ||||||
selectedKey={typeof valueToDisplay === "object" ? valueToDisplay?.key : valueToDisplay} | ||||||
options={optionsGroup} | ||||||
onChange={(e, option) => { this.onChange(option, true); }} | ||||||
disabled={disabled} | ||||||
/>; | ||||||
} | ||||||
|
||||||
return <div className={styles.fieldContainer}> | ||||||
<div className={`${styles.labelContainer} ${styles.titleContainer}`}> | ||||||
<Icon className={styles.fieldIcon} iconName={customIcon ?? "CheckMark"} /> | ||||||
{labelEl} | ||||||
</div> | ||||||
{choiceControl} | ||||||
{descriptionEl} | ||||||
</div>; | ||||||
|
||||||
} | ||||||
case 'MultiChoice': | ||||||
return <div className={styles.fieldContainer}> | ||||||
<div className={`${styles.labelContainer} ${styles.titleContainer}`}> | ||||||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you don't have to handle choiceType as "RadioButtons" from the moment you're in a MultiChoice field, so you can remove this test and just make the following assignment: