Merge branch 'master' of Hepper/comment into master

lib/components/Editor/index.js

           showUpload = _props.showUpload,
           multiple = _props.multiple,
           emojiPopoverPlacement = _props.emojiPopoverPlacement,
+          uploadPopoverPlacement = _props.uploadPopoverPlacement,
+          uploadOverlayClassName = _props.uploadOverlayClassName,
           closeUploadWhenBlur = _props.closeUploadWhenBlur,
           maxUpload = _props.maxUpload,
           btnLoading = _props.btnLoading,
                   trigger: "click",
                   placement: emojiPopoverPlacement,
                   autoAdjustOverflow: false,
+                  overlayStyle: { zIndex: 999 },
                   content: _react2.default.createElement(
                     "div",
                     {
-                      style: { width: 240 },
+                      style: { width: 240, height: 205 },
                       onWheel: this.handleEmojiScroll
                     },
                     _react2.default.createElement(_Emoji2.default, {
                   trigger: "click"
                   // TODO: 针对非 react.js，直接使用 click 事件来控制展开或关闭
                   // visible={this.state.showUpload}
-                  , overlayStyle: { zIndex: 999 },
+                  , placement: uploadPopoverPlacement,
+                  overlayClassName: uploadOverlayClassName,
+                  autoAdjustOverflow: false,
+                  overlayStyle: { zIndex: 999 },
                   onVisibleChange: closeUploadWhenBlur ? function (visible) {
                     _this3.handleShowUpload(visible);
                   } : null,
                     }),
                     _react2.default.createElement("div", { className: "clearfix" })
                   ),
-                  placement: "bottomLeft",
                   title: _react2.default.createElement(
                     "div",
                     { style: { margin: "5px auto" } },
   showEmoji: _propTypes2.default.bool,
   emojiPopoverPlacement: _propTypes2.default.string,
   showUpload: _propTypes2.default.bool,
+  uploadPopoverPlacement: _propTypes2.default.string,
+  uploadOverlayClassName: _propTypes2.default.string,
   multiple: _propTypes2.default.bool,
   closeUploadWhenBlur: _propTypes2.default.bool,
   maxUpload: _propTypes2.default.number,
   multiple: true,
   emojiPopoverPlacement: "bottomLeft",
   closeUploadWhenBlur: false,
+  uploadPopoverPlacement: "bottomLeft",
+  uploadOverlayClassName: "",
   maxUpload: 1,
   // btnSubmitText: "发表",
   btnLoading: false,

lib/index.js

       console.log(c);
     },
     editorProps: {
-      // emojiPopoverPlacement: "bottom"
+      // emojiPopoverPlacement: "bottom",
+      uploadPopoverPlacement: "top"
     }
   });
 }

lib/index.js.map

-{"version":3,"sources":["../src/index.js"],"names":["Index","props","editorProps","renderComment","config","id","Error","type","businessId","console","warn","API","ReactDOM","render","document","getElementById","window","process","env","NODE_ENV","businessUserId","userId","onCountChange","log","c"],"mappings":";;;;AAAA;;;;AACA;;;;AACA;;;;;;AACA;;AAEA,IAAMA,QAAQ,SAARA,KAAQ;AAAA,SACZ;AAAC,iBAAD;AAAA,eAAK,sBAAL,EAAsB,oBAAtB,EAAqC,oBAArC,EAAoD,eAApD,IAAkEC,KAAlE;AACE,kCAAC,WAAD,aAAQ,WAAW,CAAnB,EAAsB,eAAtB,IAAoCA,MAAMC,WAA1C;AADF,GADY;AAAA,CAAd;;AAMA;;;;;;;;AAQA,SAASC,aAAT,CAAuBC,MAAvB,EAA+B;AAC7B,MAAI,CAACA,OAAOC,EAAZ,EAAgB;AACd,UAAM,IAAIC,KAAJ,CAAU,gBAAV,CAAN;AACD;AACD,MAAI,CAACF,OAAOG,IAAZ,EAAkB;AAChB,UAAM,IAAID,KAAJ,CAAU,kBAAV,CAAN;AACD;AACD,MAAI,CAACF,OAAOI,UAAZ,EAAwB;AACtB;AACAJ,WAAOI,UAAP,GAAoB,MAApB;AACAC,YAAQC,IAAR,CAAa,+BAAb;AACD;AACD,MAAI,CAACN,OAAOO,GAAZ,EAAiB;AACf;AACAP,WAAOO,GAAP,GAAa,oCAAb;AACAF,YAAQC,IAAR,CACE,sDADF;AAGD;;AAEDE,qBAASC,MAAT,CAAgB,8BAAC,KAAD,EAAWT,MAAX,CAAhB,EAAuCU,SAASC,cAAT,CAAwBX,OAAOC,EAA/B,CAAvC;AACA;AACD;;AAEDW,OAAOb,aAAP,GAAuBA,aAAvB;;AAEA,IAAIc,QAAQC,GAAR,CAAYC,QAAZ,KAAyB,YAA7B,EAA2C;AACzChB,gBAAc;AACZE,QAAI,cADQ;AAEZE,UAAM,CAFM;AAGZC,gBAAY,MAHA;AAIZY,oBAAgB,CAJJ;AAKZC,YAAQ,KALI;AAMZC,mBAAe,0BAAK;AAClBb,cAAQc,GAAR,CAAYC,CAAZ;AACD,KARW;AASZtB,iBAAa;AACX;AADW;AATD,GAAd;AAaD;;AAED;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":["import React from \"react\";\nimport ReactDOM from \"react-dom\";\nimport App, { Editor } from \"./App\";\n// import registerServiceWorker from \"./registerServiceWorker\";\n\nconst Index = props => (\n  <App showAlertComment showAlertReply showAlertFavor showError {...props}>\n    <Editor maxUpload={9} autoFocus {...props.editorProps} />\n  </App>\n);\n\n/**\n * 渲染评论组件\n * @param {object} config 编辑器配置\n *  - {string} id 渲染评论的DOM的 ID\n *  - {number} type 评论的 type\n *  - {string} businessId 评论的 businessId\n *  - {string} API, API 前缀, 默认 http://api.links123.net/comment/v1\n */\nfunction renderComment(config) {\n  if (!config.id) {\n    throw new Error(\"id is required\");\n  }\n  if (!config.type) {\n    throw new Error(\"type is required\");\n  }\n  if (!config.businessId) {\n    // throw new Error(\"businessId is required\");\n    config.businessId = \"test\";\n    console.warn(\"没有传入 businessId 参数，默认使用: test\");\n  }\n  if (!config.API) {\n    // throw new Error(\"API is required\");\n    config.API = \"http://api.links123.net/comment/v1\";\n    console.warn(\n      \"没有传入 API 参数，默认使用: http://api.links123.net/comment/v1\"\n    );\n  }\n\n  ReactDOM.render(<Index {...config} />, document.getElementById(config.id));\n  // registerServiceWorker();\n}\n\nwindow.renderComment = renderComment;\n\nif (process.env.NODE_ENV !== \"production\") {\n  renderComment({\n    id: \"root-comment\",\n    type: 1,\n    businessId: \"test\",\n    businessUserId: 4,\n    userId: 71299,\n    onCountChange: c => {\n      console.log(c);\n    },\n    editorProps: {\n      // emojiPopoverPlacement: \"bottom\"\n    }\n  });\n}\n\n// renderComment({\n//   id: \"root-comment\",\n//   type: 1,\n//   businessId: \"test\",\n//   API: 'http://api.links123.net/comment/v1',\n// });\n"]}
+{"version":3,"sources":["../src/index.js"],"names":["Index","props","editorProps","renderComment","config","id","Error","type","businessId","console","warn","API","ReactDOM","render","document","getElementById","window","process","env","NODE_ENV","businessUserId","userId","onCountChange","log","c","uploadPopoverPlacement"],"mappings":";;;;AAAA;;;;AACA;;;;AACA;;;;;;AACA;;AAEA,IAAMA,QAAQ,SAARA,KAAQ;AAAA,SACZ;AAAC,iBAAD;AAAA,eAAK,sBAAL,EAAsB,oBAAtB,EAAqC,oBAArC,EAAoD,eAApD,IAAkEC,KAAlE;AACE,kCAAC,WAAD,aAAQ,WAAW,CAAnB,EAAsB,eAAtB,IAAoCA,MAAMC,WAA1C;AADF,GADY;AAAA,CAAd;;AAMA;;;;;;;;AAQA,SAASC,aAAT,CAAuBC,MAAvB,EAA+B;AAC7B,MAAI,CAACA,OAAOC,EAAZ,EAAgB;AACd,UAAM,IAAIC,KAAJ,CAAU,gBAAV,CAAN;AACD;AACD,MAAI,CAACF,OAAOG,IAAZ,EAAkB;AAChB,UAAM,IAAID,KAAJ,CAAU,kBAAV,CAAN;AACD;AACD,MAAI,CAACF,OAAOI,UAAZ,EAAwB;AACtB;AACAJ,WAAOI,UAAP,GAAoB,MAApB;AACAC,YAAQC,IAAR,CAAa,+BAAb;AACD;AACD,MAAI,CAACN,OAAOO,GAAZ,EAAiB;AACf;AACAP,WAAOO,GAAP,GAAa,oCAAb;AACAF,YAAQC,IAAR,CACE,sDADF;AAGD;;AAEDE,qBAASC,MAAT,CAAgB,8BAAC,KAAD,EAAWT,MAAX,CAAhB,EAAuCU,SAASC,cAAT,CAAwBX,OAAOC,EAA/B,CAAvC;AACA;AACD;;AAEDW,OAAOb,aAAP,GAAuBA,aAAvB;;AAEA,IAAIc,QAAQC,GAAR,CAAYC,QAAZ,KAAyB,YAA7B,EAA2C;AACzChB,gBAAc;AACZE,QAAI,cADQ;AAEZE,UAAM,CAFM;AAGZC,gBAAY,MAHA;AAIZY,oBAAgB,CAJJ;AAKZC,YAAQ,KALI;AAMZC,mBAAe,0BAAK;AAClBb,cAAQc,GAAR,CAAYC,CAAZ;AACD,KARW;AASZtB,iBAAa;AACX;AACAuB,8BAAwB;AAFb;AATD,GAAd;AAcD;;AAED;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":["import React from \"react\";\nimport ReactDOM from \"react-dom\";\nimport App, { Editor } from \"./App\";\n// import registerServiceWorker from \"./registerServiceWorker\";\n\nconst Index = props => (\n  <App showAlertComment showAlertReply showAlertFavor showError {...props}>\n    <Editor maxUpload={9} autoFocus {...props.editorProps} />\n  </App>\n);\n\n/**\n * 渲染评论组件\n * @param {object} config 编辑器配置\n *  - {string} id 渲染评论的DOM的 ID\n *  - {number} type 评论的 type\n *  - {string} businessId 评论的 businessId\n *  - {string} API, API 前缀, 默认 http://api.links123.net/comment/v1\n */\nfunction renderComment(config) {\n  if (!config.id) {\n    throw new Error(\"id is required\");\n  }\n  if (!config.type) {\n    throw new Error(\"type is required\");\n  }\n  if (!config.businessId) {\n    // throw new Error(\"businessId is required\");\n    config.businessId = \"test\";\n    console.warn(\"没有传入 businessId 参数，默认使用: test\");\n  }\n  if (!config.API) {\n    // throw new Error(\"API is required\");\n    config.API = \"http://api.links123.net/comment/v1\";\n    console.warn(\n      \"没有传入 API 参数，默认使用: http://api.links123.net/comment/v1\"\n    );\n  }\n\n  ReactDOM.render(<Index {...config} />, document.getElementById(config.id));\n  // registerServiceWorker();\n}\n\nwindow.renderComment = renderComment;\n\nif (process.env.NODE_ENV !== \"production\") {\n  renderComment({\n    id: \"root-comment\",\n    type: 1,\n    businessId: \"test\",\n    businessUserId: 4,\n    userId: 71299,\n    onCountChange: c => {\n      console.log(c);\n    },\n    editorProps: {\n      // emojiPopoverPlacement: \"bottom\",\n      uploadPopoverPlacement: \"top\"\n    }\n  });\n}\n\n// renderComment({\n//   id: \"root-comment\",\n//   type: 1,\n//   businessId: \"test\",\n//   API: 'http://api.links123.net/comment/v1',\n// });\n"]}

lib/version.json

 {
     "name":       "comment",
-    "buildDate":  1559795177962,
+    "buildDate":  1560392257361,
     "version":    "1.0.4",
-    "numCommits": 137,
-    "hash":       "c861eb3",
-    "dirty":      true
+    "numCommits": 143,
+    "hash":       "7a06eef",
+    "dirty":      false
 }

package.json

   },
   "private": true,
   "dependencies": {
-    "antd": "^3.6.6",
+    "antd": "^3.19.3",
     "axios": "^0.18.0",
     "dayjs": "^1.7.2",
     "js-cookie": "^2.2.0",

src/components/Editor/index.js

       showUpload,
       multiple,
       emojiPopoverPlacement,
+      uploadPopoverPlacement,
+      uploadOverlayClassName,
       closeUploadWhenBlur,
       maxUpload,
       // btnSubmitText,
                   trigger="click"
                   placement={emojiPopoverPlacement}
                   autoAdjustOverflow={false}
+                  overlayStyle={{ zIndex: 999 }}
                   content={
                     <div
-                      style={{ width: 240 }}
+                      style={{ width: 240, height: 205 }}
                       onWheel={this.handleEmojiScroll}
                     >
                       <Emoji
                   trigger="click"
                   // TODO: 针对非 react.js，直接使用 click 事件来控制展开或关闭
                   // visible={this.state.showUpload}
+                  placement={uploadPopoverPlacement}
+                  overlayClassName={uploadOverlayClassName}
+                  autoAdjustOverflow={false}
                   overlayStyle={{ zIndex: 999 }}
                   onVisibleChange={
                     closeUploadWhenBlur
                       <div className="clearfix" />
                     </div>
                   }
-                  placement="bottomLeft"
                   title={
                     <div style={{ margin: "5px auto" }}>
                       <span>
   showEmoji: PropTypes.bool,
   emojiPopoverPlacement: PropTypes.string,
   showUpload: PropTypes.bool,
+  uploadPopoverPlacement: PropTypes.string,
+  uploadOverlayClassName: PropTypes.string,
   multiple: PropTypes.bool,
   closeUploadWhenBlur: PropTypes.bool,
   maxUpload: PropTypes.number,
   multiple: true,
   emojiPopoverPlacement: "bottomLeft",
   closeUploadWhenBlur: false,
+  uploadPopoverPlacement: "bottomLeft",
+  uploadOverlayClassName: "",
   maxUpload: 1,
   // btnSubmitText: "发表",
   btnLoading: false,

src/index.js

       console.log(c);
     },
     editorProps: {
-      // emojiPopoverPlacement: "bottom"
+      // emojiPopoverPlacement: "bottom",
+      uploadPopoverPlacement: "top"
     }
   });
 }