fixes #26.

src/components/Editor/index.js

@@ -178,121 +178,71 @@ class Editor extends React.Component {
             )}
 
             {showUpload ? (
-              closeUploadWhenBlur ? (
-                <Popover
-                  trigger="click"
-                  overlayStyle={{ zIndex: 999 }}
-                  content={
-                    <div
-                      style={{
-                        width: 112 * maxUpload,
-                        minHeight: 100,
-                        margin: "0 auto"
-                      }}
-                    >
-                      <Upload
-                        onChangeFileList={this.handleChangeFileList}
-                        onUpload={this.handleUpload}
-                        maxUpload={maxUpload}
-                        fileList={this.state.fileList}
-                      />
-                    </div>
-                  }
-                  placement="bottomLeft"
-                  title={
-                    <div style={{ margin: "5px auto" }}>
-                      <span>
-                        上传图片
-                        {maxUpload >= 2 ? (
-                          <span style={{ color: "#666", fontWeight: 400 }}>
-                            (您还能上传{maxUpload - this.state.fileList.length}张图片)
-                          </span>
-                        ) : null}
-                      </span>
-                      <Icon
-                        type="close"
-                        onClick={() => this.handleShowUpload(false)}
-                        style={{
-                          float: "right",
-                          cursor: "pointer",
-                          marginTop: 4
-                        }}
-                      />
-                    </div>
-                  }
-                >
-                  {imageToolIcon ? (
-                    React.cloneElement(imageToolIcon, {
-                      onClick: () => this.handleShowUpload(true)
-                    })
-                  ) : (
-                    <Icon
-                      type="picture"
-                      className="comment-toolbar-icon"
-                      style={{ marginLeft: 10 }}
-                      onClick={() => this.handleShowUpload(true)}
+              <Popover
+                trigger="click"
+                visible={this.state.showUpload}
+                overlayStyle={{ zIndex: 999 }}
+                onVisibleChange={
+                  closeUploadWhenBlur
+                    ? visible => {
+                        this.handleShowUpload(visible);
+                      }
+                    : null
+                }
+                content={
+                  <div
+                    style={{
+                      width: 112 * maxUpload,
+                      minHeight: 100,
+                      margin: "0 auto"
+                    }}
+                  >
+                    <Upload
+                      onChangeFileList={this.handleChangeFileList}
+                      onUpload={this.handleUpload}
+                      maxUpload={maxUpload}
+                      fileList={this.state.fileList}
+                      showError={this.props.showError}
+                      onError={this.props.onError}
                     />
-                  )}
-                </Popover>
-              ) : (
-                <Popover
-                  visible={this.state.showUpload}
-                  overlayStyle={{ zIndex: 999 }}
-                  content={
-                    <div
+                  </div>
+                }
+                placement="bottomLeft"
+                title={
+                  <div style={{ margin: "5px auto" }}>
+                    <span>
+                      上传图片
+                      {maxUpload >= 2 ? (
+                        <span style={{ color: "#666", fontWeight: 400 }}>
+                          (您还能上传{maxUpload - this.state.fileList.length}张图片)
+                        </span>
+                      ) : null}
+                    </span>
+                    <Icon
+                      type="close"
+                      onClick={() => this.handleShowUpload(false)}
                       style={{
-                        width: 112 * maxUpload,
-                        minHeight: 100,
-                        margin: "0 auto"
+                        float: "right",
+                        cursor: "pointer",
+                        marginTop: 4
                       }}
-                    >
-                      <Upload
-                        onChangeFileList={this.handleChangeFileList}
-                        onUpload={this.handleUpload}
-                        maxUpload={maxUpload}
-                        fileList={this.state.fileList}
-                        showError={this.props.showError}
-                        onError={this.props.onError}
-                      />
-                    </div>
-                  }
-                  placement="bottomLeft"
-                  title={
-                    <div style={{ margin: "5px auto" }}>
-                      <span>
-                        上传图片
-                        {maxUpload >= 2 ? (
-                          <span style={{ color: "#666", fontWeight: 400 }}>
-                            (您还能上传{maxUpload - this.state.fileList.length}张图片)
-                          </span>
-                        ) : null}
-                      </span>
-                      <Icon
-                        type="close"
-                        onClick={() => this.handleShowUpload(false)}
-                        style={{
-                          float: "right",
-                          cursor: "pointer",
-                          marginTop: 4
-                        }}
-                      />
-                    </div>
-                  }
-                >
-                  {imageToolIcon ? (
-                    React.cloneElement(imageToolIcon, {
-                      onClick: () => this.handleShowUpload(true)
-                    })
-                  ) : (
-                    <Icon
-                      type="picture"
-                      className="comment-toolbar-icon"
-                      style={{ marginLeft: 10 }}
-                      onClick={() => this.handleShowUpload(true)}
                     />
-                  )}
-                </Popover>
-              )
+                  </div>
+                }
+              >
+                {imageToolIcon ? (
+                  React.cloneElement(imageToolIcon, {
+                    onClick: () => this.handleShowUpload(true)
+                  })
+                ) : (
+                  <Icon
+                    type="picture"
+                    className="comment-toolbar-icon"
+                    style={{ marginLeft: 10 }}
+                    onClick={() => this.handleShowUpload(true)}
+                  />
+                )}
+              </Popover>
             ) : null}
           </div>