Merge branch 'master' into nathan-starter

3 files changed, 14 insertions, 3 deletions

diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index fe044c035..1b3d963e8 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -185,6 +185,7 @@ export function ActiveArrowScale(): number { return NumCast(ActiveInkPen()?.acti
 export function ActiveDash(): string { return StrCast(ActiveInkPen()?.activeDash, '0'); } // prettier-ignore
 export function ActiveInkWidth(): number { return Number(ActiveInkPen()?.activeInkWidth); } // prettier-ignore
 export function ActiveInkBezierApprox(): string { return StrCast(ActiveInkPen()?.activeInkBezier); } // prettier-ignore
+export function ActiveEraserWidth(): number { return Number(ActiveInkPen()?.eraserWidth); } // prettier-ignore
 
 export function SetActiveInkWidth(width: string): void {
     !isNaN(parseInt(width)) && ActiveInkPen() && (ActiveInkPen().activeInkWidth = width);
@@ -216,6 +217,9 @@ export function SetActiveArrowScale(value: number) {
 export function SetActiveDash(dash: string): void {
     !isNaN(parseInt(dash)) && ActiveInkPen() && (ActiveInkPen().activeDash = dash);
 }
+export function SetEraserWidth(width: number): void {
+    ActiveInkPen() && (ActiveInkPen().eraserWidth = width);
+}
 
 @scriptingGlobal
 @Deserializable('Doc', updateCachedAcls, ['id'])
@@ -1297,10 +1301,12 @@ export namespace Doc {
         document.removeEventListener('pointerdown', linkFollowUnhighlight);
         document.addEventListener('pointerdown', linkFollowUnhighlight);
         if (UnhighlightTimer) clearTimeout(UnhighlightTimer);
+        const presTransition = Number(presentationEffect?.presentation_transition);
+        const duration = isNaN(presTransition) ? 5000 : presTransition;
         UnhighlightTimer = window.setTimeout(() => {
             linkFollowUnhighlight();
             UnhighlightTimer = 0;
-        }, 5000);
+        }, duration);
     }
 
     export const highlightedDocs = new ObservableSet<Doc>();
diff --git a/src/fields/InkField.ts b/src/fields/InkField.ts
index 46704eb2b..32abf0076 100644
--- a/src/fields/InkField.ts
+++ b/src/fields/InkField.ts
@@ -11,7 +11,9 @@ export enum InkTool {
     None = 'none',
     Pen = 'pen',
     Highlighter = 'highlighter',
-    Eraser = 'eraser',
+    StrokeEraser = 'strokeeraser',
+    SegmentEraser = 'segmenteraser',
+    RadiusEraser = 'radiuseraser',
     Stamp = 'stamp',
     Write = 'write',
     PresentationPin = 'presentationpin',
diff --git a/src/fields/Types.ts b/src/fields/Types.ts
index 26196d15d..ef79f72e4 100644
--- a/src/fields/Types.ts
+++ b/src/fields/Types.ts
@@ -5,7 +5,7 @@ import { ProxyField } from './Proxy';
 import { RefField } from './RefField';
 import { RichTextField } from './RichTextField';
 import { ScriptField } from './ScriptField';
-import { CsvField, ImageField, WebField } from './URLField';
+import { CsvField, ImageField, PdfField, WebField } from './URLField';
 
 // eslint-disable-next-line no-use-before-define
 export type ToConstructor<T extends FieldType> = T extends string ? 'string' : T extends number ? 'number' : T extends boolean ? 'boolean' : T extends List<infer U> ? ListSpec<U> : new (...args: any[]) => T;
@@ -122,6 +122,9 @@ export function CsvCast(field: FieldResult, defaultVal: CsvField | null = null)
 export function WebCast(field: FieldResult, defaultVal: WebField | null = null) {
     return Cast(field, WebField, defaultVal);
 }
+export function PDFCast(field: FieldResult, defaultVal: PdfField | null = null) {
+    return Cast(field, PdfField, defaultVal);
+}
 export function ImageCast(field: FieldResult, defaultVal: ImageField | null = null) {
     return Cast(field, ImageField, defaultVal);
 }