tycho-components 0.41.1 → 0.41.3

package/dist/features/Comments/CommentUtils.d.ts

@@ -10,7 +10,9 @@ declare const CommentUtils: {
     persistDrawerWidth: (width: number) => void;
     persistDrawerHeight: (height: number) => void;
     readStoredDockPosition: () => DockPosition;
-    persistDockPosition: (position: DockedPosition) => void;
+    persistDockPosition: (position: DockPosition) => void;
+    readStoredLastDocked: () => DockedPosition;
+    persistLastDocked: (position: DockedPosition) => void;
     getUndockedPopupSize: () => {
         width: number;
         height: number;

package/dist/features/Comments/CommentUtils.js

@@ -1,6 +1,7 @@
 const DRAWER_WIDTH_STORAGE_KEY = 'tycho-comments-drawer-width';
 const DRAWER_HEIGHT_STORAGE_KEY = 'tycho-comments-drawer-height';
 const DOCK_POSITION_STORAGE_KEY = 'tycho-comments-dock-position';
+const LAST_DOCKED_STORAGE_KEY = 'tycho-comments-last-docked';
 const DRAWER_MIN_WIDTH = 320;
 const DRAWER_MIN_HEIGHT = 200;
 const POPUP_NAME = 'tycho-comments';
@@ -87,7 +88,7 @@ const persistDrawerHeight = (height) => {
 const readStoredDockPosition = () => {
     try {
         const stored = localStorage.getItem(DOCK_POSITION_STORAGE_KEY);
-        if (isDockPosition(stored) && stored !== 'undocked') {
+        if (isDockPosition(stored)) {
             return stored;
         }
     }
@@ -104,6 +105,30 @@ const persistDockPosition = (position) => {
         // ignore storage access errors
     }
 };
+const readStoredLastDocked = () => {
+    try {
+        const stored = localStorage.getItem(LAST_DOCKED_STORAGE_KEY);
+        if (stored === 'left' || stored === 'right' || stored === 'bottom') {
+            return stored;
+        }
+        const dock = localStorage.getItem(DOCK_POSITION_STORAGE_KEY);
+        if (dock === 'left' || dock === 'right' || dock === 'bottom') {
+            return dock;
+        }
+    }
+    catch {
+        // ignore storage access errors
+    }
+    return 'right';
+};
+const persistLastDocked = (position) => {
+    try {
+        localStorage.setItem(LAST_DOCKED_STORAGE_KEY, position);
+    }
+    catch {
+        // ignore storage access errors
+    }
+};
 const getUndockedPopupSize = () => {
     if (typeof window === 'undefined') {
         return { width: POPUP_MIN_WIDTH, height: POPUP_MIN_HEIGHT };
@@ -168,6 +193,8 @@ const CommentUtils = {
     persistDrawerHeight,
     readStoredDockPosition,
     persistDockPosition,
+    readStoredLastDocked,
+    persistLastDocked,
     getUndockedPopupSize,
     copyStylesToPopup,
     openCommentsPopup,

package/dist/features/Comments/Comments.js

@@ -41,12 +41,11 @@ export default function Comments({ uid, keywords, references, mode, onClose, onC
     const popupRef = useRef(null);
     const popupPollRef = useRef(null);
     const ignorePopupCloseRef = useRef(false);
+    const popupCloseHandledRef = useRef(false);
+    const restoredUndockRef = useRef(false);
     const lastDockedRef = useRef(null);
     if (lastDockedRef.current === null) {
-        const initial = CommentUtils.readStoredDockPosition();
-        lastDockedRef.current = CommentUtils.isDockedPosition(initial)
-            ? initial
-            : 'right';
+        lastDockedRef.current = CommentUtils.readStoredLastDocked();
     }
     const load = async () => {
         try {
@@ -70,22 +69,21 @@ export default function Comments({ uid, keywords, references, mode, onClose, onC
             popupPollRef.current = null;
         }
     }, []);
-    const redockFromPopup = useCallback(() => {
+    const handlePopupClosed = useCallback(() => {
         clearPopupPoll();
         popupRef.current = null;
         setExternalContainer(null);
         if (ignorePopupCloseRef.current) {
             ignorePopupCloseRef.current = false;
+            popupCloseHandledRef.current = true;
             return;
         }
-        setDockPosition((prev) => {
-            if (prev !== 'undocked')
-                return prev;
-            const next = lastDockedRef.current ?? 'right';
-            CommentUtils.persistDockPosition(next);
-            return next;
-        });
-    }, [clearPopupPoll]);
+        if (popupCloseHandledRef.current)
+            return;
+        popupCloseHandledRef.current = true;
+        // Do not redock — keep undocked so the main Drawer stays closed.
+        onClose();
+    }, [clearPopupPoll, onClose]);
     const closePopup = useCallback(() => {
         clearPopupPoll();
         const popup = popupRef.current;
@@ -105,6 +103,7 @@ export default function Comments({ uid, keywords, references, mode, onClose, onC
         if (existing && !existing.closed) {
             existing.focus();
             setDockPosition('undocked');
+            CommentUtils.persistDockPosition('undocked');
             return;
         }
         const opened = CommentUtils.openCommentsPopup();
@@ -112,22 +111,25 @@ export default function Comments({ uid, keywords, references, mode, onClose, onC
             return;
         const { popup, container } = opened;
         ignorePopupCloseRef.current = false;
+        popupCloseHandledRef.current = false;
         popupRef.current = popup;
         setExternalContainer(container);
         setDockPosition('undocked');
+        CommentUtils.persistDockPosition('undocked');
         popup.addEventListener('beforeunload', () => {
-            redockFromPopup();
+            handlePopupClosed();
         });
         clearPopupPoll();
         popupPollRef.current = window.setInterval(() => {
             if (!popupRef.current || popupRef.current.closed) {
-                redockFromPopup();
+                handlePopupClosed();
             }
         }, 500);
-    }, [clearPopupPoll, redockFromPopup]);
+    }, [clearPopupPoll, handlePopupClosed]);
     const setDockedPosition = useCallback((position) => {
         lastDockedRef.current = position;
         CommentUtils.persistDockPosition(position);
+        CommentUtils.persistLastDocked(position);
         closePopup();
         setDockPosition(position);
     }, [closePopup]);
@@ -176,6 +178,14 @@ export default function Comments({ uid, keywords, references, mode, onClose, onC
     useEffect(() => {
         load();
     }, []);
+    useEffect(() => {
+        if (restoredUndockRef.current)
+            return;
+        if (CommentUtils.readStoredDockPosition() !== 'undocked')
+            return;
+        restoredUndockRef.current = true;
+        openUndockedWindow();
+    }, [openUndockedWindow]);
     useEffect(() => {
         if (!openAddComment || !comments)
             return;

package/dist/features/PageRender/PageRenderView.d.ts

@@ -1,3 +1,4 @@
 import './style.scss';
-import { PageRenderViewProps } from './types';
+import { CollapsedPageRenderElement, PageRenderViewProps } from './types';
 export default function PageRenderView({ elements, selectedTier, corpus, displayTags, showLineNumbers, highlightSentenceUid, activeTokenKey, selectedTokenKeys, tokenSelectionKey, getDisplayValue, getTokenStyle, getTokenClassName, isTokenEdited, getParticipantName, getParticipantColor, onTokenClick, onTokenHover, onParticipantHover, wrapToken, renderTokenSuffix, }: PageRenderViewProps): import("react").JSX.Element;
+export declare function findPunctuationAfterCollapsedJunction(items: CollapsedPageRenderElement[], junctionIndex: number): number | undefined;

package/dist/features/PageRender/PageRenderView.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Fragment } from 'react';
 import cx from 'classnames';
 import './style.scss';
 import collapseElementsForTier from './collapseElementsForTier';
@@ -6,8 +7,51 @@ import isTokenRefVisible, { tokenRefToToken } from './tokenUtils';
 import { PageRenderElementType, } from './types';
 export default function PageRenderView({ elements, selectedTier, corpus, displayTags = false, showLineNumbers = true, highlightSentenceUid, activeTokenKey, selectedTokenKeys, tokenSelectionKey, getDisplayValue, getTokenStyle, getTokenClassName, isTokenEdited, getParticipantName, getParticipantColor, onTokenClick, onTokenHover, onParticipantHover, wrapToken, renderTokenSuffix, }) {
     const collapsed = collapseElementsForTier(elements, selectedTier, corpus);
-    return (_jsx("div", { className: "page-render-elements", children: collapsed.map((item) => (_jsx(PageRenderElementItem, { item: item, highlight: highlightSentenceUid != null &&
-                sentenceUidForItem(item) === highlightSentenceUid, showLineNumbers: showLineNumbers, displayTags: displayTags, activeTokenKey: activeTokenKey, selectedTokenKeys: selectedTokenKeys, tokenSelectionKey: tokenSelectionKey, getDisplayValue: getDisplayValue, getTokenStyle: getTokenStyle, getTokenClassName: getTokenClassName, isTokenEdited: isTokenEdited, getParticipantName: getParticipantName, getParticipantColor: getParticipantColor, onTokenClick: onTokenClick, onTokenHover: onTokenHover, onParticipantHover: onParticipantHover, wrapToken: wrapToken, renderTokenSuffix: renderTokenSuffix }, item.key))) }));
+    const punctuationBeforeBreak = new Map();
+    const punctuationIndexes = new Set();
+    collapsed.forEach((item, index) => {
+        const punctuationIndex = findPunctuationAfterCollapsedJunction(collapsed, index);
+        if (punctuationIndex === undefined)
+            return;
+        punctuationBeforeBreak.set(index, punctuationIndex);
+        punctuationIndexes.add(punctuationIndex);
+    });
+    const renderItem = (item) => (_jsx(PageRenderElementItem, { item: item, highlight: highlightSentenceUid != null &&
+            sentenceUidForItem(item) === highlightSentenceUid, showLineNumbers: showLineNumbers, displayTags: displayTags, activeTokenKey: activeTokenKey, selectedTokenKeys: selectedTokenKeys, tokenSelectionKey: tokenSelectionKey, getDisplayValue: getDisplayValue, getTokenStyle: getTokenStyle, getTokenClassName: getTokenClassName, isTokenEdited: isTokenEdited, getParticipantName: getParticipantName, getParticipantColor: getParticipantColor, onTokenClick: onTokenClick, onTokenHover: onTokenHover, onParticipantHover: onParticipantHover, wrapToken: wrapToken, renderTokenSuffix: renderTokenSuffix }, item.key));
+    return (_jsx("div", { className: "page-render-elements", children: collapsed.map((item, index) => {
+            if (punctuationIndexes.has(index))
+                return null;
+            const punctuationIndex = punctuationBeforeBreak.get(index);
+            return (_jsxs(Fragment, { children: [renderItem(item), punctuationIndex !== undefined &&
+                        renderItem(collapsed[punctuationIndex])] }, item.key));
+        }) }));
+}
+export function findPunctuationAfterCollapsedJunction(items, junctionIndex) {
+    const junction = items[junctionIndex];
+    if (junction?.kind !== 'collapsedJunction')
+        return undefined;
+    let hasLineBreak = false;
+    for (let index = junctionIndex + 1; index < items.length; index += 1) {
+        const item = items[index];
+        if (item.kind === 'single') {
+            if (item.element.type === PageRenderElementType.LINE_BREAK) {
+                hasLineBreak = true;
+                continue;
+            }
+            if (item.element.type === PageRenderElementType.LINE_NUMBER) {
+                continue;
+            }
+            if (hasLineBreak &&
+                item.element.type === PageRenderElementType.TOKEN &&
+                item.element.token?.t === 'PUNC' &&
+                item.element.token.uid === junction.token.uid &&
+                item.element.token.p > junction.token.p) {
+                return index;
+            }
+        }
+        return undefined;
+    }
+    return undefined;
 }
 function sentenceUidForItem(item) {
     if (item.kind === 'collapsedJunction')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tycho-components",
   "private": false,
-  "version": "0.41.1",
+  "version": "0.41.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {