yusuketk 5 лет назад
Родитель
Сommit
4d2ad7c034

+ 25 - 5
src/client/js/components/PageEditor/LinkEditModal.jsx

@@ -104,17 +104,38 @@ export default class LinkEditModal extends React.PureComponent {
               <div className="link-edit-tabs">
                 <ul className="nav nav-tabs" role="tabist">
                   <li className="nav-item">
-                    <a className="nav-link active" name="pukiwikiLink" onClick={this.handleSelecteLinkerType} href="#Pukiwiki" role="tab" data-toggle="tab">
+                    <a
+                      className="nav-link active"
+                      name="pukiwikiLink"
+                      onClick={e => this.handleSelecteLinkerType(e.target.name)}
+                      href="#Pukiwiki"
+                      role="tab"
+                      data-toggle="tab"
+                    >
                       Pukiwiki
                     </a>
                   </li>
                   <li className="nav-item">
-                    <a className="nav-link" name="growiLink" onClick={this.handleSelecteLinkerType} href="#Growi" role="tab" data-toggle="tab">
+                    <a
+                      className="nav-link"
+                      name="growiLink"
+                      onClick={e => this.handleSelecteLinkerType(e.target.name)}
+                      href="#Growi"
+                      role="tab"
+                      data-toggle="tab"
+                    >
                       Growi Original
                     </a>
                   </li>
                   <li className="nav-item">
-                    <a className="nav-link" name="mdLink" onClick={this.handleSelecteLinkerType} href="#MD" role="tab" data-toggle="tab">
+                    <a
+                      className="nav-link"
+                      name="mdLink"
+                      onClick={e => this.handleSelecteLinkerType(e.target.name)}
+                      href="#MD"
+                      role="tab"
+                      data-toggle="tab"
+                    >
                       Markdown
                     </a>
                   </li>
@@ -132,9 +153,8 @@ export default class LinkEditModal extends React.PureComponent {
                         onChange={e => this.handleChangeLabelInput(e.target.value)}
                         disabled={this.state.linkerType === 'growiLink'}
                       />
+                      <PublishLink link={this.state.inputValue} label={this.state.labelInputValue} type={this.state.linkerType} />
                     </div>
-                    <PublishLink link={this.state.inputValue} label={this.state.labelInputValue} type={this.state.linkerType} />
-                    <div></div>
                     <div className="form-inline">
                       <div className="custom-control custom-checkbox custom-checkbox-info">
                         <input

+ 2 - 2
src/client/js/components/PageEditor/PublishLink.jsx

@@ -22,7 +22,7 @@ export default class PublishLink extends React.PureComponent {
     if (type === 'growiLink') {
       linker = `[${link}]`;
     }
-    if (type === 'MDLink') {
+    if (type === 'mdLink') {
       linker = `[${label}](${link})`;
     }
 
@@ -42,6 +42,6 @@ export default class PublishLink extends React.PureComponent {
 PublishLink.propTypes = {
   link: PropTypes.string.isRequired,
   label: PropTypes.string,
-  type: PropTypes.oneOf(['pukiwikiLink', 'growiLink', 'MDLink']).isRequired,
+  type: PropTypes.oneOf(['pukiwikiLink', 'growiLink', 'mdLink']).isRequired,
   isUseRelativePath: PropTypes.bool,
 };