Skip to content

Commit 4e60d63

Browse files
committed
fix of #666
1 parent 1a24bc6 commit 4e60d63

File tree

4 files changed

+46
-17
lines changed

4 files changed

+46
-17
lines changed

package-lock.json

Lines changed: 32 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"office-ui-fabric-react": "6.214.0",
3838
"react": "16.8.5",
3939
"react-dom": "16.8.5",
40-
"react-quill": "1.3.3"
40+
"react-quill": "1.3.5"
4141
},
4242
"devDependencies": {
4343
"@microsoft/rush-stack-compiler-3.3": "0.3.5",

src/controls/richText/RichText.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,14 @@ export class RichText extends React.Component<IRichTextProps, IRichTextState> {
195195
return true;
196196
}
197197

198+
public componentWillReceiveProps(nextProps: IRichTextProps) {
199+
if (nextProps.value !== this.props.value && nextProps.value !== this.state.text) {
200+
this.setState({
201+
text: nextProps.value
202+
});
203+
}
204+
}
205+
198206
/**
199207
* Returns a handle to the Quill editor
200208
*/
@@ -619,7 +627,7 @@ id="DropDownStyles"
619627
<ReactQuill ref={this.linkQuill}
620628
placeholder={placeholder}
621629
modules={modules}
622-
defaultValue={text || ''} //property value causes issues, defaultValue does not
630+
value={text || ''} //property value causes issues, defaultValue does not
623631
onChange={this.handleChange}
624632
onChangeSelection={this.handleChangeSelection}
625633
onFocus={this.handleOnFocus} />
@@ -637,7 +645,7 @@ id="DropDownStyles"
637645
{
638646
this.renderImageDialog()
639647
}
640-
648+
641649
</div>
642650
);
643651
}
@@ -731,7 +739,7 @@ id="DropDownStyles"
731739
* Hides the insert image dialog
732740
*/
733741
private closeImageDialog = () => {
734-
this.setState({
742+
this.setState({
735743
hideImageDialog: true,
736744
insertImageUrl: undefined,
737745
});

src/webparts/controlsTest/components/ControlsTest.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
875875
maxDate={new Date("05/01/2020")} />
876876

877877
{/* <RichText isEditMode={this.props.displayMode === DisplayMode.Edit} onChange={value => { this.richTextValue = value; return value; }} /> */}
878-
<RichText isEditMode={this.props.displayMode === DisplayMode.Edit} onChange={value => { this.setState({ richTextValue: value }); return value; }} />
878+
<RichText value={this.state.richTextValue} isEditMode={this.props.displayMode === DisplayMode.Edit} onChange={value => { this.setState({ richTextValue: value }); return value; }} />
879+
<PrimaryButton text='Reset text' onClick={() => { this.setState({ richTextValue: 'test' }); }} />
879880

880881
{/* <ListItemAttachments listId='0ffa51d7-4ad1-4f04-8cfe-98209905d6da'
881882
itemId={1}

0 commit comments

Comments
 (0)