Просмотр исходного кода

Merge pull request #13009 from overleaf/ii-history-react-sticky-date-headings

[web] Improve the sticky date headings

GitOrigin-RevId: 0ba4c4d589b01d250198ecf97f7937200d393fe2
ilkin-overleaf 3 лет назад
Родитель
Сommit
a94f241dcb

+ 6 - 0
services/web/frontend/js/features/history/components/change-list/all-history-list.tsx

@@ -4,6 +4,7 @@ import HistoryVersion from './history-version'
 import LoadingSpinner from '../../../../shared/components/loading-spinner'
 import { OwnerPaywallPrompt } from './owner-paywall-prompt'
 import { NonOwnerPaywallPrompt } from './non-owner-paywall-prompt'
+import { relativeDate } from '../../../utils/format-date'
 
 function AllHistoryList() {
   const { updatesInfo, fetchNextBatchOfUpdates, currentUserIsOwner } =
@@ -77,6 +78,11 @@ function AllHistoryList() {
             {update.meta.first_in_day && index > 0 && (
               <hr className="history-version-divider" />
             )}
+            {update.meta.first_in_day && (
+              <time className="history-version-day">
+                {relativeDate(update.meta.end_ts)}
+              </time>
+            )}
             <HistoryVersion
               update={update}
               faded={

+ 1 - 6
services/web/frontend/js/features/history/components/change-list/history-version.tsx

@@ -7,7 +7,7 @@ import HistoryVersionDropdown from './dropdown/history-version-dropdown'
 import { useUserContext } from '../../../../shared/context/user-context'
 import { useHistoryContext } from '../../context/history-context'
 import { isVersionSelected } from '../../utils/history-details'
-import { relativeDate, formatTime } from '../../../utils/format-date'
+import { formatTime } from '../../../utils/format-date'
 import { orderBy } from 'lodash'
 import { LoadedUpdate } from '../../services/types/update'
 import classNames from 'classnames'
@@ -31,11 +31,6 @@ function HistoryVersion({ update, faded }: HistoryEntryProps) {
         'history-version-faded': faded,
       })}
     >
-      {update.meta.first_in_day && (
-        <time className="history-version-day">
-          {relativeDate(update.meta.end_ts)}
-        </time>
-      )}
       <HistoryVersionDetails
         fromV={update.fromV}
         toV={update.toV}