Added optional FloatingArrow to TextAnnotatorPopup

recogito · Nov 8, 2024 · ce7014d · ce7014d
1 parent 5abe652
commit ce7014d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/packages/text-annotator-react/src/TextAnnotatorPopup/TextAnnotatorPopup.tsx b/packages/text-annotator-react/src/TextAnnotatorPopup/TextAnnotatorPopup.tsx
@@ -1,10 +1,13 @@
-import { ReactNode, useEffect, useMemo, useState } from 'react';
+import { ReactNode, useEffect, useMemo, useRef, useState } from 'react';
 import { useAnnotator, useSelection } from '@annotorious/react';
 import { isRevived, NOT_ANNOTATABLE_CLASS, TextAnnotation, TextAnnotator } from '@recogito/text-annotator';
 import { isMobile } from './isMobile';
 import {
+  arrow,
   autoUpdate,
   flip,
+  FloatingArrow,
+  FloatingArrowProps,
   FloatingFocusManager,
   FloatingPortal,
   inline,
@@ -22,6 +25,10 @@ interface TextAnnotationPopupProps {
 
   ariaCloseWarning?: string;
 
+  arrow?: boolean;
+
+  arrowProps?: Omit<FloatingArrowProps, 'context' | 'ref'>;
+
   popup(props: TextAnnotationPopupContentProps): ReactNode;
 
 }
@@ -46,6 +53,22 @@ export const TextAnnotatorPopup = (props: TextAnnotationPopupProps) => {
 
   const [isOpen, setOpen] = useState(selected?.length > 0);
 
+  const arrowRef = useRef(null);
+
+  // Conditional floating-ui middleware
+  const middleware = useMemo(() => {
+    const m = [
+      inline(),
+      offset(10),
+      flip({ crossAxis: true }),
+      shift({ crossAxis: true, padding: 10 })
+    ];
+
+    return props.arrow 
+      ? [...m, arrow({ element: arrowRef }) ] 
+      : m;
+  }, [props.arrow]);
+
   const { refs, floatingStyles, update, context } = useFloating({
     placement: isMobile() ? 'bottom' : 'top',
     open: isOpen,
@@ -55,12 +78,7 @@ export const TextAnnotatorPopup = (props: TextAnnotationPopupProps) => {
         r?.cancelSelected();
       }
     },
-    middleware: [
-      offset(10),
-      inline(),
-      flip(),
-      shift({ mainAxis: false, crossAxis: true, padding: 10 })
-    ],
+    middleware,
     whileElementsMounted: autoUpdate
   });
 
@@ -132,6 +150,13 @@ export const TextAnnotatorPopup = (props: TextAnnotationPopupProps) => {
             event
           })}
 
+          {props.arrow && (
+            <FloatingArrow 
+              ref={arrowRef}
+              context={context} 
+              {...(props.arrowProps || {})} />
+          )}
+
           <button className="r6o-popup-sr-only" aria-live="assertive" onClick={onClose}>
             {props.ariaCloseWarning || 'Click or leave this dialog to close it.'}
           </button>

diff --git a/packages/text-annotator-react/test/App.tsx b/packages/text-annotator-react/test/App.tsx
@@ -190,6 +190,10 @@ export const App: FC = () => {
       </TextAnnotator>
 
       <TextAnnotatorPopup
+        arrow
+        arrowProps={{
+          fill: '#000000'
+        }}
         popup={
           props => (<TestPopup {...props} />)
         }

diff --git a/packages/text-annotator-react/test/index.html b/packages/text-annotator-react/test/index.html
@@ -26,6 +26,7 @@
       p {
         font-size: 17px;
         line-height: 160%;
+        min-width: 600px;
       }
 
       .r6o-popup {