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.

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

fix(TaxonomyPicker): errorMessage not cleared when set to empty value #1006

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/controls/taxonomyPicker/TaxonomyPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
};
}

if (nextProps.errorMessage) {
if (nextProps.errorMessage !== this.props.errorMessage) {
if (!newState) {
newState = {};
}
Expand Down
8 changes: 6 additions & 2 deletions src/webparts/controlsTest/components/ControlsTest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
showErrorDialog: false,
selectedTeam: [],
selectedTeamChannels: [],
errorMessage: "This field is required"

};

Expand Down Expand Up @@ -536,7 +537,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
*/
private _onTaxPickerChange = (terms: IPickerTerms) => {
this.setState({
initialValues: terms
initialValues: terms,
errorMessage: terms.length > 0 ? '' : 'This field is required'
});
console.log("Terms:", terms);
}
Expand Down Expand Up @@ -1031,6 +1033,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
isTermSetSelectable={false}
hideDeprecatedTags={true}
hideTagsNotAvailableForTagging={true}
errorMessage={this.state.errorMessage}
termActions={{
actions: [{
title: "Get term labels",
Expand Down Expand Up @@ -1103,7 +1106,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
name: "HR",
path: "HR",
termSet: "b3e9b754-2593-4ae6-abc2-35345402e186"
}]
}],
errorMessage: ""
});
}} />
</div>
Expand Down
1 change: 1 addition & 0 deletions src/webparts/controlsTest/components/IControlsTestProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ export interface IControlsTestState {
selectedTeam:ITag[];
selectedTeamChannels:ITag[];
filePickerDefaultFolderAbsolutePath?: string;
errorMessage?: string;
}