bugfix + PopinFixedOption now accepts childrens + added disabled btn props for PopinFixed

src/component/Input/SelectStatus/SelectStatus.jsx

@@ -17,6 +17,7 @@ export const SelectStatus = props => {
         aria-haspopup='true'
         aria-expanded='false'
         style={{color: props.selectedStatus ? props.selectedStatus.hexcolor : 'transparent'}}
+        disabled={props.disabled}
       >
         {props.selectedStatus ? props.selectedStatus.label : ''}
         <div className='selectStatus__dropdownbtn__icon'>

src/component/OptionComponent/EditContent.jsx → src/component/OptionComponent/ArchiveDeleteContent.jsx

@@ -1,12 +1,13 @@
 import React from 'react'
 
-const EditContent = props => {
+const ArchiveDeleteContent = props => {
   return (
     <div className='d-flex align-items-center'>
       <button
         type='button'
         className='wsContentGeneric__option__menu__action optionicon d-none d-sm-block'
         onClick={props.onClickArchiveBtn}
+        disabled={props.disabled}
       >
         <i className='fa fa-fw fa-archive' />
       </button>
@@ -14,6 +15,7 @@ const EditContent = props => {
         type='button'
         className='wsContentGeneric__option__menu__action optionicon d-none d-sm-block'
         onClick={props.onClickDeleteBtn}
+        disabled={props.disabled}
       >
         <i className='fa fa-fw fa-trash' />
       </button>
@@ -21,4 +23,4 @@ const EditContent = props => {
   )
 }
 
-export default EditContent
+export default ArchiveDeleteContent

src/component/OptionComponent/NewVersionBtn.jsx

@@ -2,13 +2,14 @@ import React from 'react'
 
 const NewVersionBtn = props => {
   return (
-    <div
+    <button
       className='wsContentGeneric__option__menu__addversion newversionbtn btn btn-outline-primary mr-auto'
       onClick={props.onClickNewVersionBtn}
+      disabled={props.disabled}
     >
       Nouvelle version
       <i className='fa fa-plus-circle ml-3' />
-    </div>
+    </button>
   )
 }
 

src/component/PopinFixed/PopinFixed.styl

@@ -57,8 +57,9 @@
       font-size 25px
       cursor pointer
     &__menu
-      display flex
-      align-items center
+      & > div
+        display flex
+        align-items center
       &__addversion
         display flex
         align-items center

src/component/PopinFixed/PopinFixedOption.jsx

@@ -3,9 +3,6 @@ import classnames from 'classnames'
 import PropTypes from 'prop-types'
 import { translate } from 'react-i18next'
 import i18n from '../../i18n.js'
-import NewVersionBtn from '../OptionComponent/NewVersionBtn.jsx'
-import EditContent from '../OptionComponent/EditContent.jsx'
-import SelectStatus from '../Input/SelectStatus/SelectStatus.jsx'
 
 const PopinFixedOption = props => {
   translate.setI18n(props.i18n ? props.i18n : i18n) // mandatory to allow Apps to overrides trad
@@ -13,20 +10,7 @@ const PopinFixedOption = props => {
   return (
     <div className={classnames('wsContentGeneric__option', `${props.customClass}__option`)}>
       <div className={classnames('wsContentGeneric__option__menu', `${props.customClass}__option__menu`)}>
-
-        <NewVersionBtn onClickNewVersionBtn={props.onClickNewVersionBtn} />
-
-        <SelectStatus
-          selectedStatus={props.selectedStatus}
-          availableStatus={props.availableStatus}
-          onChangeStatus={props.onChangeStatus}
-        />
-
-        <EditContent
-          onClickArchiveBtn={props.onClickArchive}
-          onClickDeleteBtn={props.onClickDelete}
-        />
-
+        {props.children}
       </div>
     </div>
   )

src/component/Timeline/Revision.jsx

@@ -3,10 +3,14 @@ import classnames from 'classnames'
 
 const Revision = props => (
   <li className={classnames(`${props.customClass}__messagelist__version`, 'timeline__messagelist__version')} >
-    <div className={classnames(`${props.customClass}__messagelist__version__btn`, 'timeline__messagelist__version__btn btn')}>
+    <button
+      type='button'
+      className={classnames(`${props.customClass}__messagelist__version__btn`, 'timeline__messagelist__version__btn btn')}
+      onClick={props.onClickRevision}
+    >
       <i className='fa fa-code-fork' />
       version {props.number}
-    </div>
+    </button>
 
     <div className={classnames(`${props.customClass}__messagelist__version__date`, 'timeline__messagelist__version__date')}>
       Créer le {props.createdAt}

src/component/Timeline/Timeline.jsx

@@ -48,8 +48,9 @@ class Timeline extends React.Component {
                 return <Revision
                   customClass={props.customClass}
                   createdAt={content.created}
-                  number={props.timelineData.filter(c => c.timelineType === 'revision' && c.revision_id <= content.revision_id).length}
+                  number={content.number}
                   key={`revision_${content.revision_id}`}
+                  onClickRevision={() => props.onClickRevisionBtn(content)}
                 />
             }
           })}
@@ -63,6 +64,7 @@ class Timeline extends React.Component {
               placeholder='Taper votre message ici'
               value={props.newComment}
               onChange={props.onChangeNewComment}
+              disabled={props.disableComment}
             />
           </div>
 
@@ -74,6 +76,7 @@ class Timeline extends React.Component {
                   `${props.customClass}__texteditor__advancedtext__btn timeline__texteditor__advancedtext__btn btn btn-outline-primary`
                 )}
                 onClick={props.onClickWysiwygBtn}
+                disabled={props.disableComment}
               >
                 {props.wysiwyg ? 'Text Simple' : 'Texte Avancé'}
               </button>
@@ -84,6 +87,7 @@ class Timeline extends React.Component {
                 type='button'
                 className={classnames(`${props.customClass}__texteditor__submit__btn`, 'timeline__texteditor__submit__btn btn')}
                 onClick={props.onClickValidateNewCommentBtn}
+                disabled={props.disableComment}
               >
                 Envoyer
                 <div
@@ -106,13 +110,16 @@ Timeline.propTypes = {
   newComment: PropTypes.string.isRequired,
   onChangeNewComment: PropTypes.func.isRequired,
   onClickValidateNewCommentBtn: PropTypes.func.isRequired,
+  disableComment: PropTypes.bool,
   customClass: PropTypes.string,
   loggedUser: PropTypes.object,
   wysiwyg: PropTypes.bool,
-  onClickWysiwygBtn: PropTypes.func
+  onClickWysiwygBtn: PropTypes.func,
+  onClickRevisionBtn: PropTypes.func
 }
 
 Timeline.defaultProps = {
+  disableComment: false,
   customClass: '',
   loggedUser: {
     id: '',

src/index.js

@@ -17,6 +17,10 @@ import libDelimiter from './component/Delimiter/Delimiter.jsx'
 import libCardPopup from './component/CardPopup/CardPopup.jsx'
 import libCardPopupCreateContent from './component/CardPopup/CardPopupCreateContent.jsx'
 
+import libNewVersionBtn from './component/OptionComponent/NewVersionBtn.jsx'
+import libArchiveDeleteContent from './component/OptionComponent/ArchiveDeleteContent.jsx'
+import libSelectStatus from './component/Input/SelectStatus/SelectStatus.jsx'
+
 export const langFr = fr
 export const langEn = en
 
@@ -36,3 +40,7 @@ export const Delimiter = libDelimiter
 
 export const CardPopup = libCardPopup
 export const CardPopupCreateContent = libCardPopupCreateContent
+
+export const NewVersionBtn = libNewVersionBtn
+export const ArchiveDeleteContent = libArchiveDeleteContent
+export const SelectStatus = libSelectStatus