jam411 3 лет назад
Родитель
Сommit
5102e21c43

+ 1 - 0
packages/app/src/components/PageHistory.tsx

@@ -74,6 +74,7 @@ export const PageHistory: React.FC<{ onClose: () => void }> = ({ onClose }) => {
         sourceRevision={sourceRevision}
         targetRevision={targetRevision}
         currentPageId={currentPageId}
+        onClose={onClose}
       />
     </div>
   );

+ 6 - 3
packages/app/src/components/PageHistory/RevisionDiff.tsx

@@ -16,12 +16,15 @@ type RevisioinDiffProps = {
   currentRevision: IRevisionHasPageId,
   previousRevision: IRevisionHasPageId,
   revisionDiffOpened: boolean,
+  onClose: () => void,
 }
 
 export const RevisionDiff = (props: RevisioinDiffProps): JSX.Element => {
   const { t } = useTranslation();
 
-  const { currentRevision, previousRevision, revisionDiffOpened } = props;
+  const {
+    currentRevision, previousRevision, revisionDiffOpened, onClose,
+  } = props;
 
   const previousText = (currentRevision._id === previousRevision._id) ? '' : previousRevision.body;
 
@@ -48,7 +51,7 @@ export const RevisionDiff = (props: RevisioinDiffProps): JSX.Element => {
             <div className="col comparison-source-wrapper pt-1 px-0">
               <span className="comparison-source pr-3">{t('page_history.comparing_source')}</span><UserDate dateTime={previousRevision.createdAt} />
               <Link href={`?revisionId=${previousRevision._id}`}>
-                <a className="ml-3">
+                <a className="ml-3" onClick={onClose}>
                   <i className="icon-login"></i>
                 </a>
               </Link>
@@ -56,7 +59,7 @@ export const RevisionDiff = (props: RevisioinDiffProps): JSX.Element => {
             <div className="col comparison-target-wrapper pt-1">
               <span className="comparison-target pr-3">{t('page_history.comparing_target')}</span><UserDate dateTime={currentRevision.createdAt} />
               <Link href={`?revisionId=${currentRevision._id}`}>
-                <a className="ml-3">
+                <a className="ml-3" onClick={onClose}>
                   <i className="icon-login"></i>
                 </a>
               </Link>

+ 3 - 1
packages/app/src/components/RevisionComparer/RevisionComparer.tsx

@@ -26,13 +26,14 @@ type RevisionComparerProps = {
   sourceRevision: IRevisionHasPageId
   targetRevision: IRevisionHasPageId
   currentPageId?: string
+  onClose: () => void
 }
 
 export const RevisionComparer = (props: RevisionComparerProps): JSX.Element => {
   const { t } = useTranslation(['translation', 'commons']);
 
   const {
-    sourceRevision, targetRevision, currentPageId,
+    sourceRevision, targetRevision, currentPageId, onClose,
   } = props;
 
   const { data: currentPagePath } = useCurrentPagePath();
@@ -104,6 +105,7 @@ export const RevisionComparer = (props: RevisionComparerProps): JSX.Element => {
               revisionDiffOpened
               previousRevision={sourceRevision}
               currentRevision={targetRevision}
+              onClose={onClose}
             />
           )
         }