Merge branch 'release/32.x'

* release/32.x: #4747 - Cannot re-use AnnotationDetailPopOver in downstream code #4738 - Filtering documents on open in curation mode
inception-project · Apr 21, 2024 · 998d686 · 998d686
2 parents 8e916bb + d59aa7f
commit 998d686
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.../java/de/tudarmstadt/ukp/inception/annotation/filters/SourceDocumentStateFilterPanel.java b/.../java/de/tudarmstadt/ukp/inception/annotation/filters/SourceDocumentStateFilterPanel.java
@@ -43,14 +43,15 @@ public class SourceDocumentStateFilterPanel
     public SourceDocumentStateFilterPanel(String aId, IModel<List<SourceDocumentState>> aModel)
     {
         this(aId, aModel, SourceDocumentState.values());
-        setOutputMarkupId(true);
     }
 
     public SourceDocumentStateFilterPanel(String aId, IModel<List<SourceDocumentState>> aModel,
             SourceDocumentState... aStates)
     {
         super(aId, aModel);
 
+        setOutputMarkupId(true);
+
         var listview = new ListView<>("stateFilter", asList(aStates))
         {
             private static final long serialVersionUID = -2292408105823066466L;

diff --git a/...-apache-annotator-editor/src/main/ts/src/apache-annotator/ApacheAnnotatorEditorFactory.ts b/...-apache-annotator-editor/src/main/ts/src/apache-annotator/ApacheAnnotatorEditorFactory.ts
@@ -69,7 +69,7 @@ export class ApacheAnnotatorEditorFactory implements AnnotationEditorFactory {
       body.style.width = '100vw'
       body.style.overflow = 'hidden'
     }
-    
+
     const sectionElementLocalNames = new Set<string>(props.sectionElements || [])
 
     element[PROP_EDITOR] = new ApacheAnnotatorEditor(targetElement, ajax, props.userPreferencesKey, sectionElementLocalNames)

diff --git a/...l-apache-annotator-editor/src/main/ts/src/apache-annotator/SectionAnnotationVisualizer.ts b/...l-apache-annotator-editor/src/main/ts/src/apache-annotator/SectionAnnotationVisualizer.ts
@@ -76,7 +76,7 @@ export class SectionAnnotationVisualizer {
       const spacerRect = spacer.getBoundingClientRect() // Dimensions same as panel
 
       const sectionLeavingViewport = sectionRect.bottom - spacerRect.height < rootRect.top
-      console.log(`Leaving viewport = ${sectionLeavingViewport}`)
+      // console.log(`Leaving viewport = ${sectionLeavingViewport}`)
       if (sectionLeavingViewport) {
         const hiddenUnderHigherLevelPanel = lastSectionPanelBottom && (sectionRect.bottom + rootRect.top - spacerRect.height) < lastSectionPanelBottom
         if (hiddenUnderHigherLevelPanel) {

diff --git a/inception/inception-js-api/src/main/ts/src/widget/AnnotationDetailPopOver.svelte b/inception/inception-js-api/src/main/ts/src/widget/AnnotationDetailPopOver.svelte
@@ -227,7 +227,7 @@
 
 <!-- svelte-ignore css-unused-selector -->
 <style lang="scss">
-    @import "../../node_modules/bootstrap/scss/bootstrap.scss";
+    @import "bootstrap/scss/bootstrap.scss";
     @import "../style/InceptionEditorIcons.scss";
     @import "../style/InceptionEditorColors.scss";