Merge branch 'refs/heads/recogito#127-annotating-enabled-reactive' in…

…to staging
oleksandr-danylchenko · Nov 11, 2024 · ef576a2 · ef576a2
2 parents b627479 + 4249cc1
commit ef576a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/packages/text-annotator/src/SelectionHandler.ts b/packages/text-annotator/src/SelectionHandler.ts
@@ -54,7 +54,7 @@ export const createSelectionHandler = (
 
   let lastDownEvent: Selection['event'] | undefined;
 
-  let currentAnnotatingEnabled = true;
+  let currentAnnotatingEnabled = annotatingEnabled;
 
   const setAnnotatingEnabled = (enabled: boolean) => {
     currentAnnotatingEnabled = enabled;

diff --git a/packages/text-annotator/src/TextAnnotatorOptions.ts b/packages/text-annotator/src/TextAnnotatorOptions.ts
@@ -30,12 +30,8 @@ export type RendererType = 'SPANS' | 'CANVAS' | 'CSS_HIGHLIGHTS';
 export const fillDefaults = <I extends TextAnnotation = TextAnnotation, E extends unknown = TextAnnotation>(
   opts: TextAnnotatorOptions<I, E>,
   defaults: TextAnnotatorOptions<I, E>
-): TextAnnotatorOptions<I, E> => {
-
-  return {
-    ...opts,
-    annotatingEnabled: opts.annotatingEnabled ?? defaults.annotatingEnabled,
-    user: opts.user || defaults.user
-  };
-
-};
+): TextAnnotatorOptions<I, E> => ({
+  ...opts,
+  annotatingEnabled: opts.annotatingEnabled ?? defaults.annotatingEnabled,
+  user: opts.user || defaults.user
+});