Skip to content

Commit 767a1c4

Browse files
authored
Merge pull request #1006 from umaknow-jeanluc/fix/taxonomypicker-errorMessage-clear
fix(TaxonomyPicker): errorMessage not cleared when set to empty value
2 parents c568bd5 + 06898c5 commit 767a1c4

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/controls/taxonomyPicker/TaxonomyPicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
9191
};
9292
}
9393

94-
if (nextProps.errorMessage) {
94+
if (nextProps.errorMessage !== this.props.errorMessage) {
9595
if (!newState) {
9696
newState = {};
9797
}

src/webparts/controlsTest/components/ControlsTest.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
445445
showErrorDialog: false,
446446
selectedTeam: [],
447447
selectedTeamChannels: [],
448+
errorMessage: "This field is required"
448449

449450
};
450451

@@ -536,7 +537,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
536537
*/
537538
private _onTaxPickerChange = (terms: IPickerTerms) => {
538539
this.setState({
539-
initialValues: terms
540+
initialValues: terms,
541+
errorMessage: terms.length > 0 ? '' : 'This field is required'
540542
});
541543
console.log("Terms:", terms);
542544
}
@@ -1031,6 +1033,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
10311033
isTermSetSelectable={false}
10321034
hideDeprecatedTags={true}
10331035
hideTagsNotAvailableForTagging={true}
1036+
errorMessage={this.state.errorMessage}
10341037
termActions={{
10351038
actions: [{
10361039
title: "Get term labels",
@@ -1103,7 +1106,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
11031106
name: "HR",
11041107
path: "HR",
11051108
termSet: "b3e9b754-2593-4ae6-abc2-35345402e186"
1106-
}]
1109+
}],
1110+
errorMessage: ""
11071111
});
11081112
}} />
11091113
</div>

src/webparts/controlsTest/components/IControlsTestProps.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ export interface IControlsTestState {
4444
selectedTeam:ITag[];
4545
selectedTeamChannels:ITag[];
4646
filePickerDefaultFolderAbsolutePath?: string;
47+
errorMessage?: string;
4748
}

0 commit comments

Comments
 (0)