فهرست منبع

Merge pull request #3051 from weseek/fix/draft-tooltip-id

use index to generate dom id
Yuki Takei 5 سال پیش
والد
کامیت
b5fb9d8911
2فایلهای تغییر یافته به همراه6 افزوده شده و 5 حذف شده
  1. 4 4
      src/client/js/components/MyDraftList/Draft.jsx
  2. 2 1
      src/client/js/components/MyDraftList/MyDraftList.jsx

+ 4 - 4
src/client/js/components/MyDraftList/Draft.jsx

@@ -105,10 +105,9 @@ class Draft extends React.Component {
   }
   }
 
 
   renderControls() {
   renderControls() {
-    const { t, path } = this.props;
+    const { t, path, index } = this.props;
 
 
-    const encodedPath = path.replace(/\//g, '-');
-    const tooltipTargetId = `draft-copied-tooltip_${encodedPath}`;
+    const tooltipTargetId = `draft-copied-tooltip_${index}`;
 
 
     return (
     return (
       <div className="icon-container">
       <div className="icon-container">
@@ -116,7 +115,7 @@ class Draft extends React.Component {
           ? null
           ? null
           : (
           : (
             <a
             <a
-              href={`${this.props.path}#edit`}
+              href={`${path}#edit`}
               target="_blank"
               target="_blank"
               rel="noopener noreferrer"
               rel="noopener noreferrer"
               data-toggle="tooltip"
               data-toggle="tooltip"
@@ -203,6 +202,7 @@ Draft.propTypes = {
   t: PropTypes.func.isRequired,
   t: PropTypes.func.isRequired,
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
 
 
+  index: PropTypes.number.isRequired,
   path: PropTypes.string.isRequired,
   path: PropTypes.string.isRequired,
   markdown: PropTypes.string.isRequired,
   markdown: PropTypes.string.isRequired,
   isExist: PropTypes.bool.isRequired,
   isExist: PropTypes.bool.isRequired,

+ 2 - 1
src/client/js/components/MyDraftList/MyDraftList.jsx

@@ -91,9 +91,10 @@ class MyDraftList extends React.Component {
    *
    *
    */
    */
   generateDraftList(drafts) {
   generateDraftList(drafts) {
-    return drafts.map((draft) => {
+    return drafts.map((draft, index) => {
       return (
       return (
         <Draft
         <Draft
+          index={index}
           key={draft.path}
           key={draft.path}
           path={draft.path}
           path={draft.path}
           markdown={draft.markdown}
           markdown={draft.markdown}