@fiduswriter/editor 0.1.70 → 0.1.72

package/src/marginboxes/templates.ts

@@ -108,6 +108,26 @@ interface MarginBoxOptionComment {
     resolved?: boolean
 }
 
+/** A template for an answer to a comment */
+const COMMENT_SHOW_MORE_THRESHOLD = 120
+const COMMENT_TRUNCATE_LENGTH = 110
+
+function commentContentTemplate({
+    serialized,
+    isGlobal
+}: {
+    serialized: {html: string; text: string}
+    isGlobal: boolean
+}): string {
+    if (isGlobal || serialized.text.length <= COMMENT_SHOW_MORE_THRESHOLD) {
+        return `<p class="comment-p">${serialized.html}</p>`
+    }
+    const truncatedText = `${escapeText(
+        serialized.text.slice(0, COMMENT_TRUNCATE_LENGTH - 1)
+    )}…`
+    return `<div class="comment-truncated"><p class="comment-p">${truncatedText}</p></div><div class="comment-full" style="display:none"><p class="comment-p">${serialized.html}</p></div>`
+}
+
 /** A template for an answer to a comment */
 const answerCommentTemplate = ({
     answer,
@@ -115,7 +135,8 @@ const answerCommentTemplate = ({
     commentId,
     activeCommentAnswerId,
     active,
-    user
+    user,
+    isGlobal
 }: {
     answer: CommentAnswer
     author: ContactPerson | undefined
@@ -123,8 +144,10 @@ const answerCommentTemplate = ({
     activeCommentAnswerId: number | string | undefined
     active: boolean
     user: EditorUser
-}) =>
-    `<div class="comment-item comment-answer collapse ${active ? "show" : ""}" id="comment-answer-${answer.id}">
+    isGlobal: boolean
+}) => {
+    const serialized = serializeComment(answer.answer)
+    return `<div class="comment-item comment-answer collapse ${active ? "show" : ""}" id="comment-answer-${answer.id}">
         <div class="comment-user">
             ${author ? avatarTemplate({user: author}) : '<span class="fw-string-avatar"></span>'}
             <h5 class="comment-user-name">${escapeText(author?.name || answer.username)}</h5>
@@ -138,11 +161,13 @@ const answerCommentTemplate = ({
                 </div>
            </div>`
                 : `<div class="comment-text-wrapper">
-               <div class="comment-p">${serializeComment(answer.answer).html}</div>
+               ${commentContentTemplate({serialized, isGlobal})}
            </div>
         <div class="comment-collapsible-buttons">
                 ${
-                    serializeComment(answer.answer).text.length > 68
+                    !isGlobal &&
+                    serialized.text.length >
+                        COMMENT_SHOW_MORE_THRESHOLD
                         ? `<a type="button" class="comment-expand-compress show-more-less">${gettext("show more")}</a>`
                         : ""
                 }
@@ -154,6 +179,7 @@ const answerCommentTemplate = ({
            }`
         }
     </div>`
+}
 
 interface SingleCommentTemplateProps {
     comment: Comment
@@ -168,8 +194,9 @@ const singleCommentTemplate = ({
     author,
     active,
     editComment
-}: SingleCommentTemplateProps) =>
-    `<div class="comment-item">
+}: SingleCommentTemplateProps) => {
+    const serialized = serializeComment(comment.comment)
+    return `<div class="comment-item">
         <div class="comment-user">
             ${author ? avatarTemplate({user: author}) : '<span class="fw-string-avatar"></span>'}
             <h5 class="comment-user-name">${escapeText(author?.name || comment.username)}</h5>
@@ -179,13 +206,18 @@ const singleCommentTemplate = ({
             ${
                 active && editComment
                     ? '<div id="comment-editor"></div>'
-                    : `<p class="comment-p">${serializeComment(comment.comment).html}</p>`
+                    : `${commentContentTemplate({
+                          serialized,
+                          isGlobal: !!comment.isGlobal
+                      })}`
             }
         </div>
         <div class="comment-collapsible-buttons">
                 ${
                     !editComment &&
-                    serializeComment(comment.comment).text.length > 68
+                    !comment.isGlobal &&
+                    serialized.text.length >
+                        COMMENT_SHOW_MORE_THRESHOLD
                         ? `<a type="button" class="comment-expand-compress show-more-less">${gettext("show more")}</a>`
                         : ""
                 }
@@ -196,6 +228,7 @@ const singleCommentTemplate = ({
                 }
             </div>
     </div>`
+}
 
 /** A template for the editor of a first comment before it has been saved (not an answer to a comment). */
 const firstCommentTemplate = ({
@@ -330,7 +363,8 @@ ${
                           commentId: comment.id,
                           active,
                           activeCommentAnswerId,
-                          user
+                          user,
+                          isGlobal: !!comment.isGlobal
                       })
                   )
                   .join("")

package/src/state_plugins/track/find_selected_changes.ts

@@ -98,7 +98,7 @@ export function findSelectedChanges(state: EditorState): SelectedChanges {
                     }
                 }
             }
-            return false
+            return true
         })
     }
     if (insertionMark && insertionPos !== false) {

package/src/state_plugins/track/plugin.ts

@@ -84,7 +84,7 @@ export function trackPlugin(options: {editor: Editor}) {
                     decos: DecorationSet.empty
                 }
             },
-            apply(tr, _prev, _oldState, state) {
+            apply(tr, _prev, oldState, state) {
                 const meta = tr.getMeta(key)
                 if (meta) {
                     // There has been an update, return values from meta instead
@@ -92,7 +92,7 @@ export function trackPlugin(options: {editor: Editor}) {
                     return meta
                 }
 
-                const oldPluginState = key.getState(state) as {decos: DecorationSet} | undefined
+                const oldPluginState = key.getState(oldState) as {decos: DecorationSet} | undefined
                 if (!oldPluginState) {
                     return {decos: DecorationSet.empty}
                 }

package/src/static_app.ts

@@ -77,6 +77,11 @@ export interface StaticAppConfig {
         json: Record<string, unknown>
         status: number
     }>
+    /**
+     * Optional user preferences that control inline editing helpers.
+     * Recognized keys include `inline_references` and `inline_math`.
+     */
+    userPreferences?: Record<string, boolean>
 }
 
 interface StoredImage {
@@ -340,6 +345,11 @@ export async function createStaticApp(
             LANGUAGE: config.locale
         },
         csl: config.csl,
+        config: {
+            user: {
+                preferences: config.userPreferences ?? {}
+            }
+        },
         apiConnectors: {
             document: documentApi,
             documentImport: documentImportApi,

package/src/static_editor.ts

@@ -36,6 +36,11 @@ export interface StaticEditorConfig
     }>
     /** Optional extra editor plugins. */
     plugins?: Array<[string, Record<string, unknown>]>
+    /**
+     * Optional user preferences that control inline editing helpers.
+     * Recognized keys include `inline_references` and `inline_math`.
+     */
+    userPreferences?: Record<string, boolean>
 }
 
 async function loadLocaleCatalog(

package/src/types.ts

@@ -122,6 +122,11 @@ export interface EditorApp {
     csl: CSL
     bibDB?: EditorBibDB
     imageDB: EditorImageDB
+    config?: {
+        user?: {
+            preferences?: Record<string, boolean>
+        }
+    }
     apiConnectors: {
         document: EditorDocumentApi
         documentImport: EditorDocumentImportApi