fix: plain editor revision rendering and revision list sorting (#878)

standardnotes · Feb 18, 2022 · 1887d5d · 1887d5d
1 parent 1c57b52
commit 1887d5d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/app/assets/javascripts/components/NotesOptions/NotesOptions.tsx b/app/assets/javascripts/components/NotesOptions/NotesOptions.tsx
@@ -560,7 +560,7 @@ export const NotesOptions = observer(
               }}
             >
               <Icon type="trash" className={iconClass} />
-              Move to Trash
+              Move to trash
             </button>
           ))}
         {trashed && (

diff --git a/app/assets/javascripts/components/RevisionHistoryModal/SelectedRevisionContent.tsx b/app/assets/javascripts/components/RevisionHistoryModal/SelectedRevisionContent.tsx
@@ -66,7 +66,7 @@ export const SelectedRevisionContent: FunctionComponent<SelectedRevisionContentP
           {!componentViewer && (
             <div className="relative flex-grow min-h-0 overflow-x-hidden overflow-y-auto">
               {selectedRevision.payload.content.text.length ? (
-                <p className="p-4 pt-0">
+                <p className="p-4 pt-0 color-text text-editor font-editor">
                   {selectedRevision.payload.content.text}
                 </p>
               ) : (

diff --git a/app/assets/javascripts/components/RevisionHistoryModal/utils.ts b/app/assets/javascripts/components/RevisionHistoryModal/utils.ts
@@ -84,13 +84,17 @@ export const sortRevisionListIntoGroups = <EntryType extends RevisionEntry>(
     },
   ];
 
+  const addBeforeLastGroup = (group: ListGroup<EntryType>) => {
+    sortedGroups.splice(sortedGroups.length - 1, 0, group);
+  };
+
   revisionList?.forEach((entry) => {
     const groupIndex = getGroupIndexForEntry(entry, sortedGroups);
 
     if (groupIndex > -1) {
       sortedGroups[groupIndex]?.entries?.push(entry);
     } else {
-      sortedGroups.push({
+      addBeforeLastGroup({
         title: formatDateAsMonthYearString(
           new Date(
             (entry as RevisionListEntry).created_at ??

diff --git a/app/assets/stylesheets/_sn.scss b/app/assets/stylesheets/_sn.scss
@@ -946,3 +946,7 @@
 .sn-component .border-t-0 {
   border-top-width: 0;
 }
+
+.text-editor {
+  font-size: var(--sn-stylekit-font-size-editor);
+}