tycho-components 0.41.2 → 0.41.4

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.2",
+  "version": "0.41.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {