implement snap-free scroll constraints
This commit is contained in:
@@ -5,6 +5,17 @@ import { Excalidraw } from "@excalidraw/excalidraw";
|
|||||||
import "@excalidraw/excalidraw/index.css";
|
import "@excalidraw/excalidraw/index.css";
|
||||||
|
|
||||||
import App from "../../with-script-in-browser/components/ExampleApp";
|
import App from "../../with-script-in-browser/components/ExampleApp";
|
||||||
|
import type { ScrollConstraints } from "@excalidraw/excalidraw/types";
|
||||||
|
|
||||||
|
const scrollConstraints: ScrollConstraints = {
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 850,
|
||||||
|
height: 400,
|
||||||
|
lockZoom: true,
|
||||||
|
overscrollAllowance: 0,
|
||||||
|
viewportZoomFactor: 1,
|
||||||
|
};
|
||||||
|
|
||||||
const ExcalidrawWrapper: React.FC = () => {
|
const ExcalidrawWrapper: React.FC = () => {
|
||||||
return (
|
return (
|
||||||
@@ -14,7 +25,9 @@ const ExcalidrawWrapper: React.FC = () => {
|
|||||||
useCustom={(api: any, args?: any[]) => {}}
|
useCustom={(api: any, args?: any[]) => {}}
|
||||||
excalidrawLib={excalidrawLib}
|
excalidrawLib={excalidrawLib}
|
||||||
>
|
>
|
||||||
<Excalidraw />
|
<Excalidraw
|
||||||
|
// scrollConstraints={scrollConstraints}
|
||||||
|
/>
|
||||||
</App>
|
</App>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -820,6 +820,48 @@ export default function ExampleApp({
|
|||||||
/>
|
/>
|
||||||
Export with embed scene
|
Export with embed scene
|
||||||
</label>
|
</label>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
if (!excalidrawAPI) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const elements = excalidrawAPI.getSceneElements();
|
||||||
|
excalidrawAPI.scrollToContent(elements[0], {
|
||||||
|
animate: true,
|
||||||
|
fitToViewport: true,
|
||||||
|
viewportZoomFactor: 0.9,
|
||||||
|
scrollLock: {
|
||||||
|
lockZoom: true,
|
||||||
|
overscrollAllowance: 0,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Fit and lock first element
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
if (!excalidrawAPI) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const elements = excalidrawAPI.getSceneElements();
|
||||||
|
excalidrawAPI.scrollToContent(elements[1], {
|
||||||
|
animate: true,
|
||||||
|
fitToViewport: true,
|
||||||
|
viewportZoomFactor: 0.9,
|
||||||
|
scrollLock: {
|
||||||
|
lockZoom: true,
|
||||||
|
overscrollAllowance: 0,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Fit and lock second element
|
||||||
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
if (!excalidrawAPI) {
|
if (!excalidrawAPI) {
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ import {
|
|||||||
ZoomResetIcon,
|
ZoomResetIcon,
|
||||||
} from "../components/icons";
|
} from "../components/icons";
|
||||||
import { setCursor } from "../cursor";
|
import { setCursor } from "../cursor";
|
||||||
|
import { constrainScrollState } from "../scene/scrollConstraints";
|
||||||
|
|
||||||
import { t } from "../i18n";
|
import { t } from "../i18n";
|
||||||
import { getNormalizedZoom } from "../scene";
|
import { getNormalizedZoom } from "../scene";
|
||||||
@@ -51,6 +52,8 @@ import { register } from "./register";
|
|||||||
|
|
||||||
import type { AppState, Offsets } from "../types";
|
import type { AppState, Offsets } from "../types";
|
||||||
|
|
||||||
|
const canUseZoomActions = (appState: AppState) => !appState.scrollConstraints;
|
||||||
|
|
||||||
export const actionChangeViewBackgroundColor = register<Partial<AppState>>({
|
export const actionChangeViewBackgroundColor = register<Partial<AppState>>({
|
||||||
name: "changeViewBackgroundColor",
|
name: "changeViewBackgroundColor",
|
||||||
label: "labels.canvasBackground",
|
label: "labels.canvasBackground",
|
||||||
@@ -139,7 +142,7 @@ export const actionZoomIn = register({
|
|||||||
trackEvent: { category: "canvas" },
|
trackEvent: { category: "canvas" },
|
||||||
perform: (_elements, appState, _, app) => {
|
perform: (_elements, appState, _, app) => {
|
||||||
return {
|
return {
|
||||||
appState: {
|
appState: constrainScrollState({
|
||||||
...appState,
|
...appState,
|
||||||
...getStateForZoom(
|
...getStateForZoom(
|
||||||
{
|
{
|
||||||
@@ -150,7 +153,7 @@ export const actionZoomIn = register({
|
|||||||
appState,
|
appState,
|
||||||
),
|
),
|
||||||
userToFollow: null,
|
userToFollow: null,
|
||||||
},
|
}),
|
||||||
captureUpdate: CaptureUpdateAction.EVENTUALLY,
|
captureUpdate: CaptureUpdateAction.EVENTUALLY,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -180,7 +183,7 @@ export const actionZoomOut = register({
|
|||||||
trackEvent: { category: "canvas" },
|
trackEvent: { category: "canvas" },
|
||||||
perform: (_elements, appState, _, app) => {
|
perform: (_elements, appState, _, app) => {
|
||||||
return {
|
return {
|
||||||
appState: {
|
appState: constrainScrollState({
|
||||||
...appState,
|
...appState,
|
||||||
...getStateForZoom(
|
...getStateForZoom(
|
||||||
{
|
{
|
||||||
@@ -191,7 +194,7 @@ export const actionZoomOut = register({
|
|||||||
appState,
|
appState,
|
||||||
),
|
),
|
||||||
userToFollow: null,
|
userToFollow: null,
|
||||||
},
|
}),
|
||||||
captureUpdate: CaptureUpdateAction.EVENTUALLY,
|
captureUpdate: CaptureUpdateAction.EVENTUALLY,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -243,6 +246,7 @@ export const actionResetZoom = register({
|
|||||||
className="reset-zoom-button zoom-button"
|
className="reset-zoom-button zoom-button"
|
||||||
title={t("buttons.resetZoom")}
|
title={t("buttons.resetZoom")}
|
||||||
aria-label={t("buttons.resetZoom")}
|
aria-label={t("buttons.resetZoom")}
|
||||||
|
disabled={!canUseZoomActions(appState)}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
updateData(null);
|
updateData(null);
|
||||||
}}
|
}}
|
||||||
@@ -251,6 +255,7 @@ export const actionResetZoom = register({
|
|||||||
</ToolButton>
|
</ToolButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
),
|
),
|
||||||
|
predicate: (_elements, appState) => canUseZoomActions(appState),
|
||||||
keyTest: (event) =>
|
keyTest: (event) =>
|
||||||
(event.code === CODES.ZERO || event.code === CODES.NUM_ZERO) &&
|
(event.code === CODES.ZERO || event.code === CODES.NUM_ZERO) &&
|
||||||
(event[KEYS.CTRL_OR_CMD] || event.shiftKey),
|
(event[KEYS.CTRL_OR_CMD] || event.shiftKey),
|
||||||
@@ -274,7 +279,7 @@ const zoomValueToFitBoundsOnViewport = (
|
|||||||
return Math.min(adjustedZoomValue, 1);
|
return Math.min(adjustedZoomValue, 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const zoomToFitBounds = ({
|
export function resolveViewportForBounds({
|
||||||
bounds,
|
bounds,
|
||||||
appState,
|
appState,
|
||||||
canvasOffsets,
|
canvasOffsets,
|
||||||
@@ -292,7 +297,7 @@ export const zoomToFitBounds = ({
|
|||||||
viewportZoomFactor?: number;
|
viewportZoomFactor?: number;
|
||||||
minZoom?: number;
|
minZoom?: number;
|
||||||
maxZoom?: number;
|
maxZoom?: number;
|
||||||
}) => {
|
}) {
|
||||||
viewportZoomFactor = clamp(viewportZoomFactor, MIN_ZOOM, MAX_ZOOM);
|
viewportZoomFactor = clamp(viewportZoomFactor, MIN_ZOOM, MAX_ZOOM);
|
||||||
|
|
||||||
const [x1, y1, x2, y2] = bounds;
|
const [x1, y1, x2, y2] = bounds;
|
||||||
@@ -345,12 +350,58 @@ export const zoomToFitBounds = ({
|
|||||||
zoom: { value: newZoomValue },
|
zoom: { value: newZoomValue },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
bounds,
|
||||||
|
scrollX: centerScroll.scrollX,
|
||||||
|
scrollY: centerScroll.scrollY,
|
||||||
|
zoom: { value: newZoomValue },
|
||||||
|
viewportZoomFactor,
|
||||||
|
viewportDimensions: {
|
||||||
|
width: appState.width,
|
||||||
|
height: appState.height,
|
||||||
|
},
|
||||||
|
effectiveViewportDimensions: {
|
||||||
|
width: effectiveCanvasWidth,
|
||||||
|
height: effectiveCanvasHeight,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const zoomToFitBounds = ({
|
||||||
|
bounds,
|
||||||
|
appState,
|
||||||
|
canvasOffsets,
|
||||||
|
fitToViewport = false,
|
||||||
|
viewportZoomFactor = 1,
|
||||||
|
minZoom = -Infinity,
|
||||||
|
maxZoom = Infinity,
|
||||||
|
}: {
|
||||||
|
bounds: SceneBounds;
|
||||||
|
canvasOffsets?: Offsets;
|
||||||
|
appState: Readonly<AppState>;
|
||||||
|
/** whether to fit content to viewport (beyond >100%) */
|
||||||
|
fitToViewport: boolean;
|
||||||
|
/** zoom content to cover X of the viewport, when fitToViewport=true */
|
||||||
|
viewportZoomFactor?: number;
|
||||||
|
minZoom?: number;
|
||||||
|
maxZoom?: number;
|
||||||
|
}) => {
|
||||||
|
const resolvedViewport = resolveViewportForBounds({
|
||||||
|
bounds,
|
||||||
|
appState,
|
||||||
|
canvasOffsets,
|
||||||
|
fitToViewport,
|
||||||
|
viewportZoomFactor,
|
||||||
|
minZoom,
|
||||||
|
maxZoom,
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
appState: {
|
appState: {
|
||||||
...appState,
|
...appState,
|
||||||
scrollX: centerScroll.scrollX,
|
scrollX: resolvedViewport.scrollX,
|
||||||
scrollY: centerScroll.scrollY,
|
scrollY: resolvedViewport.scrollY,
|
||||||
zoom: { value: newZoomValue },
|
zoom: resolvedViewport.zoom,
|
||||||
},
|
},
|
||||||
captureUpdate: CaptureUpdateAction.EVENTUALLY,
|
captureUpdate: CaptureUpdateAction.EVENTUALLY,
|
||||||
};
|
};
|
||||||
@@ -408,6 +459,7 @@ export const actionZoomToFitSelectionInViewport = register({
|
|||||||
canvasOffsets: app.getEditorUIOffsets(),
|
canvasOffsets: app.getEditorUIOffsets(),
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
predicate: (_elements, appState) => canUseZoomActions(appState),
|
||||||
// NOTE shift-2 should have been assigned actionZoomToFitSelection.
|
// NOTE shift-2 should have been assigned actionZoomToFitSelection.
|
||||||
// TBD on how proceed
|
// TBD on how proceed
|
||||||
keyTest: (event) =>
|
keyTest: (event) =>
|
||||||
@@ -434,6 +486,7 @@ export const actionZoomToFitSelection = register({
|
|||||||
canvasOffsets: app.getEditorUIOffsets(),
|
canvasOffsets: app.getEditorUIOffsets(),
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
predicate: (_elements, appState) => canUseZoomActions(appState),
|
||||||
// NOTE this action should use shift-2 per figma, alas
|
// NOTE this action should use shift-2 per figma, alas
|
||||||
keyTest: (event) =>
|
keyTest: (event) =>
|
||||||
event.code === CODES.THREE &&
|
event.code === CODES.THREE &&
|
||||||
@@ -458,6 +511,7 @@ export const actionZoomToFit = register({
|
|||||||
fitToViewport: false,
|
fitToViewport: false,
|
||||||
canvasOffsets: app.getEditorUIOffsets(),
|
canvasOffsets: app.getEditorUIOffsets(),
|
||||||
}),
|
}),
|
||||||
|
predicate: (_elements, appState) => canUseZoomActions(appState),
|
||||||
keyTest: (event) =>
|
keyTest: (event) =>
|
||||||
event.code === CODES.ONE &&
|
event.code === CODES.ONE &&
|
||||||
event.shiftKey &&
|
event.shiftKey &&
|
||||||
|
|||||||
@@ -95,6 +95,13 @@ export class ActionManager {
|
|||||||
(action.name in canvasActions
|
(action.name in canvasActions
|
||||||
? canvasActions[action.name as keyof typeof canvasActions]
|
? canvasActions[action.name as keyof typeof canvasActions]
|
||||||
: true) &&
|
: true) &&
|
||||||
|
(!action.predicate ||
|
||||||
|
action.predicate(
|
||||||
|
this.getElementsIncludingDeleted(),
|
||||||
|
this.getAppState(),
|
||||||
|
this.app.props,
|
||||||
|
this.app,
|
||||||
|
)) &&
|
||||||
action.keyTest &&
|
action.keyTest &&
|
||||||
action.keyTest(
|
action.keyTest(
|
||||||
event,
|
event,
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ export const getDefaultAppState = (): Omit<
|
|||||||
objectsSnapModeEnabled: false,
|
objectsSnapModeEnabled: false,
|
||||||
userToFollow: null,
|
userToFollow: null,
|
||||||
followedBy: new Set(),
|
followedBy: new Set(),
|
||||||
|
scrollConstraints: null,
|
||||||
isCropping: false,
|
isCropping: false,
|
||||||
croppingElementId: null,
|
croppingElementId: null,
|
||||||
searchMatches: null,
|
searchMatches: null,
|
||||||
@@ -250,6 +251,7 @@ const APP_STATE_STORAGE_CONF = (<
|
|||||||
objectsSnapModeEnabled: { browser: true, export: false, server: false },
|
objectsSnapModeEnabled: { browser: true, export: false, server: false },
|
||||||
userToFollow: { browser: false, export: false, server: false },
|
userToFollow: { browser: false, export: false, server: false },
|
||||||
followedBy: { browser: false, export: false, server: false },
|
followedBy: { browser: false, export: false, server: false },
|
||||||
|
scrollConstraints: { browser: true, export: false, server: false },
|
||||||
isCropping: { browser: false, export: false, server: false },
|
isCropping: { browser: false, export: false, server: false },
|
||||||
croppingElementId: { browser: false, export: false, server: false },
|
croppingElementId: { browser: false, export: false, server: false },
|
||||||
searchMatches: { browser: false, export: false, server: false },
|
searchMatches: { browser: false, export: false, server: false },
|
||||||
|
|||||||
@@ -326,7 +326,10 @@ import {
|
|||||||
actionToggleCropEditor,
|
actionToggleCropEditor,
|
||||||
} from "../actions";
|
} from "../actions";
|
||||||
import { actionWrapTextInContainer } from "../actions/actionBoundText";
|
import { actionWrapTextInContainer } from "../actions/actionBoundText";
|
||||||
import { actionToggleHandTool, zoomToFit } from "../actions/actionCanvas";
|
import {
|
||||||
|
actionToggleHandTool,
|
||||||
|
resolveViewportForBounds,
|
||||||
|
} from "../actions/actionCanvas";
|
||||||
import { actionPaste } from "../actions/actionClipboard";
|
import { actionPaste } from "../actions/actionClipboard";
|
||||||
import { actionCopyElementLink } from "../actions/actionElementLink";
|
import { actionCopyElementLink } from "../actions/actionElementLink";
|
||||||
import { actionUnlockAllElements } from "../actions/actionElementLock";
|
import { actionUnlockAllElements } from "../actions/actionElementLock";
|
||||||
@@ -370,7 +373,7 @@ import {
|
|||||||
hasBackground,
|
hasBackground,
|
||||||
isSomeElementSelected,
|
isSomeElementSelected,
|
||||||
} from "../scene";
|
} from "../scene";
|
||||||
import { getStateForZoom } from "../scene/zoom";
|
import { getConstrainedZoomAnchor, getStateForZoom } from "../scene/zoom";
|
||||||
import {
|
import {
|
||||||
dataURLToString,
|
dataURLToString,
|
||||||
generateIdFromFile,
|
generateIdFromFile,
|
||||||
@@ -426,6 +429,12 @@ import { isMaybeMermaidDefinition } from "../mermaid";
|
|||||||
|
|
||||||
import { LassoTrail } from "../lasso";
|
import { LassoTrail } from "../lasso";
|
||||||
|
|
||||||
|
import {
|
||||||
|
constrainScrollState,
|
||||||
|
calculateConstrainedScrollCenter,
|
||||||
|
areCanvasTranslatesClose,
|
||||||
|
getScrollConstraintsForBounds,
|
||||||
|
} from "../scene/scrollConstraints";
|
||||||
import { EraserTrail } from "../eraser";
|
import { EraserTrail } from "../eraser";
|
||||||
|
|
||||||
import { getShortcutKey } from "../shortcut";
|
import { getShortcutKey } from "../shortcut";
|
||||||
@@ -488,6 +497,9 @@ import type {
|
|||||||
CollaboratorPointer,
|
CollaboratorPointer,
|
||||||
ToolType,
|
ToolType,
|
||||||
OnUserFollowedPayload,
|
OnUserFollowedPayload,
|
||||||
|
ScrollConstraints,
|
||||||
|
AnimateTranslateCanvasValues,
|
||||||
|
ScrollToContentOptions,
|
||||||
UnsubscribeCallback,
|
UnsubscribeCallback,
|
||||||
EmbedsValidationStatus,
|
EmbedsValidationStatus,
|
||||||
ElementsPendingErasure,
|
ElementsPendingErasure,
|
||||||
@@ -540,6 +552,7 @@ const ExcalidrawAppStateContext = React.createContext<AppState>({
|
|||||||
height: 0,
|
height: 0,
|
||||||
offsetLeft: 0,
|
offsetLeft: 0,
|
||||||
offsetTop: 0,
|
offsetTop: 0,
|
||||||
|
scrollConstraints: null,
|
||||||
});
|
});
|
||||||
ExcalidrawAppStateContext.displayName = "ExcalidrawAppStateContext";
|
ExcalidrawAppStateContext.displayName = "ExcalidrawAppStateContext";
|
||||||
|
|
||||||
@@ -594,6 +607,8 @@ let isDraggingScrollBar: boolean = false;
|
|||||||
let currentScrollBars: ScrollBars = { horizontal: null, vertical: null };
|
let currentScrollBars: ScrollBars = { horizontal: null, vertical: null };
|
||||||
let touchTimeout = 0;
|
let touchTimeout = 0;
|
||||||
let invalidateContextMenu = false;
|
let invalidateContextMenu = false;
|
||||||
|
let scrollConstraintsAnimationTimeout: ReturnType<typeof setTimeout> | null =
|
||||||
|
null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map of youtube embed video states
|
* Map of youtube embed video states
|
||||||
@@ -781,6 +796,8 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
onUserFollow: (cb) => this.onUserFollowEmitter.on(cb),
|
onUserFollow: (cb) => this.onUserFollowEmitter.on(cb),
|
||||||
onStateChange: this.onStateChange,
|
onStateChange: this.onStateChange,
|
||||||
onEvent: this.onEvent,
|
onEvent: this.onEvent,
|
||||||
|
app: this,
|
||||||
|
setScrollConstraints: this.setScrollConstraints,
|
||||||
};
|
};
|
||||||
return api;
|
return api;
|
||||||
}
|
}
|
||||||
@@ -795,6 +812,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
objectsSnapModeEnabled = false,
|
objectsSnapModeEnabled = false,
|
||||||
theme = defaultAppState.theme,
|
theme = defaultAppState.theme,
|
||||||
name = `${t("labels.untitled")}-${getDateTime()}`,
|
name = `${t("labels.untitled")}-${getDateTime()}`,
|
||||||
|
scrollConstraints,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
@@ -810,6 +828,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
name,
|
name,
|
||||||
width: window.innerWidth,
|
width: window.innerWidth,
|
||||||
height: window.innerHeight,
|
height: window.innerHeight,
|
||||||
|
scrollConstraints: scrollConstraints ?? null,
|
||||||
};
|
};
|
||||||
|
|
||||||
this.refreshEditorInterface();
|
this.refreshEditorInterface();
|
||||||
@@ -2945,7 +2964,12 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
toast: this.state.toast,
|
toast: this.state.toast,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (initialData?.scrollToContent) {
|
if (this.props.scrollConstraints) {
|
||||||
|
restoredAppState = {
|
||||||
|
...restoredAppState,
|
||||||
|
...calculateConstrainedScrollCenter(this.state, restoredAppState),
|
||||||
|
};
|
||||||
|
} else if (initialData?.scrollToContent) {
|
||||||
restoredAppState = {
|
restoredAppState = {
|
||||||
...restoredAppState,
|
...restoredAppState,
|
||||||
...calculateScrollCenter(restoredElements, {
|
...calculateScrollCenter(restoredElements, {
|
||||||
@@ -2954,10 +2978,18 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
height: this.state.height,
|
height: this.state.height,
|
||||||
offsetTop: this.state.offsetTop,
|
offsetTop: this.state.offsetTop,
|
||||||
offsetLeft: this.state.offsetLeft,
|
offsetLeft: this.state.offsetLeft,
|
||||||
|
scrollConstraints: this.state.scrollConstraints,
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (initialData?.scrollX != null) {
|
||||||
|
restoredAppState.scrollX = initialData.scrollX;
|
||||||
|
}
|
||||||
|
if (initialData?.scrollY != null) {
|
||||||
|
restoredAppState.scrollY = initialData.scrollY;
|
||||||
|
}
|
||||||
|
|
||||||
this.resetStore();
|
this.resetStore();
|
||||||
this.resetHistory();
|
this.resetHistory();
|
||||||
this.syncActionResult({
|
this.syncActionResult({
|
||||||
@@ -3208,7 +3240,11 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
.forEach((element) => ShapeCache.delete(element));
|
.forEach((element) => ShapeCache.delete(element));
|
||||||
this.refreshEditorInterface();
|
this.refreshEditorInterface();
|
||||||
this.updateDOMRect();
|
this.updateDOMRect();
|
||||||
this.setState({});
|
if (this.state.scrollConstraints) {
|
||||||
|
this.setState((state) => constrainScrollState(state));
|
||||||
|
} else {
|
||||||
|
this.setState({});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/** generally invoked only if fullscreen was invoked programmatically */
|
/** generally invoked only if fullscreen was invoked programmatically */
|
||||||
@@ -3518,6 +3554,33 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.props.onChange?.(elements, this.state, this.files);
|
this.props.onChange?.(elements, this.state, this.files);
|
||||||
this.onChangeEmitter.trigger(elements, this.state, this.files);
|
this.onChangeEmitter.trigger(elements, this.state, this.files);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.state.scrollConstraints?.animateOnNextUpdate) {
|
||||||
|
const newState = constrainScrollState(this.state, "rigid");
|
||||||
|
const fromValues = {
|
||||||
|
scrollX: this.state.scrollX,
|
||||||
|
scrollY: this.state.scrollY,
|
||||||
|
zoom: this.state.zoom.value,
|
||||||
|
};
|
||||||
|
const toValues = {
|
||||||
|
scrollX: newState.scrollX,
|
||||||
|
scrollY: newState.scrollY,
|
||||||
|
zoom: newState.zoom.value,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (areCanvasTranslatesClose(fromValues, toValues)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (scrollConstraintsAnimationTimeout) {
|
||||||
|
clearTimeout(scrollConstraintsAnimationTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
scrollConstraintsAnimationTimeout = setTimeout(() => {
|
||||||
|
this.cancelInProgressAnimation?.();
|
||||||
|
this.animateToConstrainedArea(fromValues, toValues);
|
||||||
|
}, 200);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderInteractiveSceneCallback = ({
|
private renderInteractiveSceneCallback = ({
|
||||||
@@ -4285,8 +4348,8 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
*/
|
*/
|
||||||
value: number,
|
value: number,
|
||||||
) => {
|
) => {
|
||||||
this.setState({
|
this.setState(
|
||||||
...getStateForZoom(
|
getStateForZoom(
|
||||||
{
|
{
|
||||||
viewportX: this.state.width / 2 + this.state.offsetLeft,
|
viewportX: this.state.width / 2 + this.state.offsetLeft,
|
||||||
viewportY: this.state.height / 2 + this.state.offsetTop,
|
viewportY: this.state.height / 2 + this.state.offsetTop,
|
||||||
@@ -4294,11 +4357,13 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
},
|
},
|
||||||
this.state,
|
this.state,
|
||||||
),
|
),
|
||||||
});
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
private cancelInProgressAnimation: (() => void) | null = null;
|
private cancelInProgressAnimation: (() => void) | null = null;
|
||||||
|
|
||||||
|
private scrollToContentRequestId = 0;
|
||||||
|
|
||||||
scrollToContent = (
|
scrollToContent = (
|
||||||
/**
|
/**
|
||||||
* target to scroll to
|
* target to scroll to
|
||||||
@@ -4310,29 +4375,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
| string
|
| string
|
||||||
| ExcalidrawElement
|
| ExcalidrawElement
|
||||||
| readonly ExcalidrawElement[] = this.scene.getNonDeletedElements(),
|
| readonly ExcalidrawElement[] = this.scene.getNonDeletedElements(),
|
||||||
opts?: (
|
opts?: ScrollToContentOptions,
|
||||||
| {
|
|
||||||
fitToContent?: boolean;
|
|
||||||
fitToViewport?: never;
|
|
||||||
viewportZoomFactor?: number;
|
|
||||||
animate?: boolean;
|
|
||||||
duration?: number;
|
|
||||||
}
|
|
||||||
| {
|
|
||||||
fitToContent?: never;
|
|
||||||
fitToViewport?: boolean;
|
|
||||||
/** when fitToViewport=true, how much screen should the content cover,
|
|
||||||
* between 0.1 (10%) and 1 (100%)
|
|
||||||
*/
|
|
||||||
viewportZoomFactor?: number;
|
|
||||||
animate?: boolean;
|
|
||||||
duration?: number;
|
|
||||||
}
|
|
||||||
) & {
|
|
||||||
minZoom?: number;
|
|
||||||
maxZoom?: number;
|
|
||||||
canvasOffsets?: Offsets;
|
|
||||||
},
|
|
||||||
) => {
|
) => {
|
||||||
if (typeof target === "string") {
|
if (typeof target === "string") {
|
||||||
let id: string | null;
|
let id: string | null;
|
||||||
@@ -4345,10 +4388,29 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
const elements = this.scene.getElementsFromId(id);
|
const elements = this.scene.getElementsFromId(id);
|
||||||
|
|
||||||
if (elements?.length) {
|
if (elements?.length) {
|
||||||
this.scrollToContent(elements, {
|
if (opts?.fitToViewport) {
|
||||||
fitToContent: opts?.fitToContent ?? true,
|
this.scrollToContent(elements, {
|
||||||
animate: opts?.animate ?? true,
|
fitToViewport: true,
|
||||||
});
|
viewportZoomFactor: opts.viewportZoomFactor,
|
||||||
|
animate: opts.animate ?? true,
|
||||||
|
duration: opts.duration,
|
||||||
|
scrollLock: opts.scrollLock,
|
||||||
|
minZoom: opts.minZoom,
|
||||||
|
maxZoom: opts.maxZoom,
|
||||||
|
canvasOffsets: opts.canvasOffsets,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.scrollToContent(elements, {
|
||||||
|
fitToContent: opts?.fitToContent ?? true,
|
||||||
|
viewportZoomFactor: opts?.viewportZoomFactor,
|
||||||
|
animate: opts?.animate ?? true,
|
||||||
|
duration: opts?.duration,
|
||||||
|
scrollLock: opts?.scrollLock,
|
||||||
|
minZoom: opts?.minZoom,
|
||||||
|
maxZoom: opts?.maxZoom,
|
||||||
|
canvasOffsets: opts?.canvasOffsets,
|
||||||
|
});
|
||||||
|
}
|
||||||
} else if (isElementLink(target)) {
|
} else if (isElementLink(target)) {
|
||||||
this.setState({
|
this.setState({
|
||||||
toast: {
|
toast: {
|
||||||
@@ -4363,27 +4425,45 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.cancelInProgressAnimation?.();
|
this.cancelInProgressAnimation?.();
|
||||||
|
this.scrollToContentRequestId += 1;
|
||||||
|
this.debounceConstrainScrollState.cancel();
|
||||||
|
|
||||||
|
if (scrollConstraintsAnimationTimeout) {
|
||||||
|
clearTimeout(scrollConstraintsAnimationTimeout);
|
||||||
|
scrollConstraintsAnimationTimeout = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts?.scrollLock && this.state.scrollConstraints) {
|
||||||
|
// Clear the previous lock before starting the next locked transition so
|
||||||
|
// stale constraint enforcement cannot snap us back mid-flight.
|
||||||
|
this.setState({ scrollConstraints: null });
|
||||||
|
}
|
||||||
|
|
||||||
// convert provided target into ExcalidrawElement[] if necessary
|
// convert provided target into ExcalidrawElement[] if necessary
|
||||||
const targetElements = Array.isArray(target) ? target : [target];
|
const targetElements = Array.isArray(target) ? target : [target];
|
||||||
|
|
||||||
|
if (!targetElements.length) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
let zoom = this.state.zoom;
|
let zoom = this.state.zoom;
|
||||||
let scrollX = this.state.scrollX;
|
let scrollX = this.state.scrollX;
|
||||||
let scrollY = this.state.scrollY;
|
let scrollY = this.state.scrollY;
|
||||||
|
const targetBounds = getCommonBounds(targetElements);
|
||||||
|
|
||||||
if (opts?.fitToContent || opts?.fitToViewport) {
|
if (opts?.fitToContent || opts?.fitToViewport) {
|
||||||
const { appState } = zoomToFit({
|
const resolvedViewport = resolveViewportForBounds({
|
||||||
|
bounds: targetBounds,
|
||||||
canvasOffsets: opts.canvasOffsets,
|
canvasOffsets: opts.canvasOffsets,
|
||||||
targetElements,
|
|
||||||
appState: this.state,
|
appState: this.state,
|
||||||
fitToViewport: !!opts?.fitToViewport,
|
fitToViewport: !!opts?.fitToViewport,
|
||||||
viewportZoomFactor: opts?.viewportZoomFactor,
|
viewportZoomFactor: opts?.viewportZoomFactor,
|
||||||
minZoom: opts?.minZoom,
|
minZoom: opts?.minZoom,
|
||||||
maxZoom: opts?.maxZoom,
|
maxZoom: opts?.maxZoom,
|
||||||
});
|
});
|
||||||
zoom = appState.zoom;
|
zoom = resolvedViewport.zoom;
|
||||||
scrollX = appState.scrollX;
|
scrollX = resolvedViewport.scrollX;
|
||||||
scrollY = appState.scrollY;
|
scrollY = resolvedViewport.scrollY;
|
||||||
} else {
|
} else {
|
||||||
// compute only the viewport location, without any zoom adjustment
|
// compute only the viewport location, without any zoom adjustment
|
||||||
const scroll = calculateScrollCenter(targetElements, this.state);
|
const scroll = calculateScrollCenter(targetElements, this.state);
|
||||||
@@ -4391,53 +4471,78 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
scrollY = scroll.scrollY;
|
scrollY = scroll.scrollY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const scrollConstraints = opts?.scrollLock
|
||||||
|
? getScrollConstraintsForBounds({
|
||||||
|
bounds: targetBounds,
|
||||||
|
zoom,
|
||||||
|
viewportDimensions: {
|
||||||
|
width: this.state.width,
|
||||||
|
height: this.state.height,
|
||||||
|
},
|
||||||
|
scrollLock: opts.scrollLock,
|
||||||
|
})
|
||||||
|
: null;
|
||||||
|
const requestId = this.scrollToContentRequestId;
|
||||||
|
|
||||||
|
const installScrollConstraints = () => {
|
||||||
|
if (!scrollConstraints || requestId !== this.scrollToContentRequestId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setState({
|
||||||
|
scrollConstraints,
|
||||||
|
viewModeEnabled: true,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
// when animating, we use RequestAnimationFrame to prevent the animation
|
// when animating, we use RequestAnimationFrame to prevent the animation
|
||||||
// from slowing down other processes
|
// from slowing down other processes
|
||||||
if (opts?.animate) {
|
if (opts?.animate) {
|
||||||
const origScrollX = this.state.scrollX;
|
const fromValues = {
|
||||||
const origScrollY = this.state.scrollY;
|
scrollX: this.state.scrollX,
|
||||||
const origZoom = this.state.zoom.value;
|
scrollY: this.state.scrollY,
|
||||||
|
zoom: this.state.zoom.value,
|
||||||
|
};
|
||||||
|
|
||||||
const cancel = easeToValuesRAF({
|
const toValues = { scrollX, scrollY, zoom: zoom.value };
|
||||||
fromValues: {
|
|
||||||
scrollX: origScrollX,
|
this.animateTranslateCanvas({
|
||||||
scrollY: origScrollY,
|
fromValues,
|
||||||
zoom: origZoom,
|
toValues,
|
||||||
},
|
duration: opts?.duration ?? 500,
|
||||||
toValues: { scrollX, scrollY, zoom: zoom.value },
|
|
||||||
interpolateValue: (from, to, progress, key) => {
|
|
||||||
// for zoom, use different easing
|
|
||||||
if (key === "zoom") {
|
|
||||||
return from * Math.pow(to / from, easeOut(progress));
|
|
||||||
}
|
|
||||||
// handle using default
|
|
||||||
return undefined;
|
|
||||||
},
|
|
||||||
onStep: ({ scrollX, scrollY, zoom }) => {
|
|
||||||
this.setState({
|
|
||||||
scrollX,
|
|
||||||
scrollY,
|
|
||||||
zoom: { value: zoom },
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onStart: () => {
|
onStart: () => {
|
||||||
this.setState({ shouldCacheIgnoreZoom: true });
|
this.setState({ shouldCacheIgnoreZoom: true });
|
||||||
},
|
},
|
||||||
onEnd: () => {
|
onEnd: () => {
|
||||||
this.setState({ shouldCacheIgnoreZoom: false });
|
if (requestId !== this.scrollToContentRequestId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setState(
|
||||||
|
{ shouldCacheIgnoreZoom: false },
|
||||||
|
installScrollConstraints,
|
||||||
|
);
|
||||||
},
|
},
|
||||||
onCancel: () => {
|
onCancel: () => {
|
||||||
|
if (requestId !== this.scrollToContentRequestId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.setState({ shouldCacheIgnoreZoom: false });
|
this.setState({ shouldCacheIgnoreZoom: false });
|
||||||
},
|
},
|
||||||
duration: opts?.duration ?? 500,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
this.cancelInProgressAnimation = () => {
|
|
||||||
cancel();
|
|
||||||
this.cancelInProgressAnimation = null;
|
|
||||||
};
|
|
||||||
} else {
|
} else {
|
||||||
this.setState({ scrollX, scrollY, zoom });
|
if (scrollConstraints) {
|
||||||
|
this.setState({
|
||||||
|
scrollX,
|
||||||
|
scrollY,
|
||||||
|
zoom,
|
||||||
|
scrollConstraints,
|
||||||
|
viewModeEnabled: true,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.setState({ scrollX, scrollY, zoom });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -4449,11 +4554,165 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
|
|
||||||
/** use when changing scrollX/scrollY/zoom based on user interaction */
|
/** use when changing scrollX/scrollY/zoom based on user interaction */
|
||||||
private translateCanvas: React.Component<any, AppState>["setState"] = (
|
private translateCanvas: React.Component<any, AppState>["setState"] = (
|
||||||
state,
|
stateUpdate,
|
||||||
) => {
|
) => {
|
||||||
this.cancelInProgressAnimation?.();
|
this.cancelInProgressAnimation?.();
|
||||||
this.maybeUnfollowRemoteUser();
|
this.maybeUnfollowRemoteUser();
|
||||||
this.setState(state);
|
|
||||||
|
if (scrollConstraintsAnimationTimeout) {
|
||||||
|
clearTimeout(scrollConstraintsAnimationTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
const partialNewState =
|
||||||
|
typeof stateUpdate === "function"
|
||||||
|
? (
|
||||||
|
stateUpdate as (
|
||||||
|
prevState: Readonly<AppState>,
|
||||||
|
props: Readonly<AppProps>,
|
||||||
|
) => AppState
|
||||||
|
)(this.state, this.props)
|
||||||
|
: stateUpdate;
|
||||||
|
|
||||||
|
const newState: AppState = {
|
||||||
|
...this.state,
|
||||||
|
...partialNewState,
|
||||||
|
...(this.state.scrollConstraints && {
|
||||||
|
// manually reset if setState in onCancel wasn't committed yet
|
||||||
|
shouldCacheIgnoreZoom: false,
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
|
||||||
|
// RULE: cannot go below the minimum zoom level if zoom lock is enabled
|
||||||
|
const constrainedState =
|
||||||
|
newState.scrollConstraints && newState.scrollConstraints.lockZoom
|
||||||
|
? constrainScrollState(newState, "elastic")
|
||||||
|
: newState;
|
||||||
|
if (constrainedState.zoom.value > newState.zoom.value) {
|
||||||
|
newState.zoom = constrainedState.zoom;
|
||||||
|
newState.scrollX = constrainedState.scrollX;
|
||||||
|
newState.scrollY = constrainedState.scrollY;
|
||||||
|
|
||||||
|
this.debounceConstrainScrollState(newState);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setState(newState);
|
||||||
|
if (this.state.scrollConstraints) {
|
||||||
|
if (newState.zoom.value < this.state.zoom.value) {
|
||||||
|
// zoom-out: debounce to allow centering on user's cursor position before constraining
|
||||||
|
this.debounceConstrainScrollState(newState);
|
||||||
|
} else {
|
||||||
|
// zoom-in or pan: valid range only expands on zoom-in, constrain immediately
|
||||||
|
this.setState(constrainScrollState(newState));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private debounceConstrainScrollState = debounce((state: AppState) => {
|
||||||
|
const newState = constrainScrollState(state, "rigid");
|
||||||
|
|
||||||
|
const fromValues = {
|
||||||
|
scrollX: this.state.scrollX,
|
||||||
|
scrollY: this.state.scrollY,
|
||||||
|
zoom: this.state.zoom.value,
|
||||||
|
};
|
||||||
|
const toValues = {
|
||||||
|
scrollX: newState.scrollX,
|
||||||
|
scrollY: newState.scrollY,
|
||||||
|
zoom: newState.zoom.value,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (areCanvasTranslatesClose(fromValues, toValues)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.cancelInProgressAnimation?.();
|
||||||
|
this.animateToConstrainedArea(fromValues, toValues);
|
||||||
|
}, 200);
|
||||||
|
|
||||||
|
private animateToConstrainedArea = (
|
||||||
|
fromValues: AnimateTranslateCanvasValues,
|
||||||
|
toValues: AnimateTranslateCanvasValues,
|
||||||
|
) => {
|
||||||
|
const cleanUp = () => {
|
||||||
|
this.setState((state) => ({
|
||||||
|
shouldCacheIgnoreZoom: false,
|
||||||
|
scrollConstraints: {
|
||||||
|
...state.scrollConstraints!,
|
||||||
|
animateOnNextUpdate: false,
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
|
this.animateTranslateCanvas({
|
||||||
|
fromValues,
|
||||||
|
toValues,
|
||||||
|
duration: 200,
|
||||||
|
onStart: () => {
|
||||||
|
this.setState((state) => {
|
||||||
|
return {
|
||||||
|
shouldCacheIgnoreZoom: true,
|
||||||
|
scrollConstraints: {
|
||||||
|
...state.scrollConstraints!,
|
||||||
|
animateOnNextUpdate: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onEnd: cleanUp,
|
||||||
|
onCancel: cleanUp,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
private animateTranslateCanvas = ({
|
||||||
|
fromValues,
|
||||||
|
toValues,
|
||||||
|
duration,
|
||||||
|
onStart,
|
||||||
|
onEnd,
|
||||||
|
onCancel,
|
||||||
|
}: {
|
||||||
|
fromValues: AnimateTranslateCanvasValues;
|
||||||
|
toValues: AnimateTranslateCanvasValues;
|
||||||
|
duration: number;
|
||||||
|
onStart: () => void;
|
||||||
|
onEnd: () => void;
|
||||||
|
onCancel: () => void;
|
||||||
|
}) => {
|
||||||
|
const cancel = easeToValuesRAF({
|
||||||
|
fromValues,
|
||||||
|
toValues,
|
||||||
|
interpolateValue: (from, to, progress, key) => {
|
||||||
|
// for zoom, use different easing
|
||||||
|
if (key === "zoom") {
|
||||||
|
return from * Math.pow(to / from, easeOut(progress));
|
||||||
|
}
|
||||||
|
// handle using default
|
||||||
|
return undefined;
|
||||||
|
},
|
||||||
|
onStep: ({ scrollX, scrollY, zoom }) => {
|
||||||
|
this.setState({
|
||||||
|
scrollX,
|
||||||
|
scrollY,
|
||||||
|
zoom: { value: zoom },
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onStart,
|
||||||
|
onEnd: () => {
|
||||||
|
this.cancelInProgressAnimation = null;
|
||||||
|
onEnd();
|
||||||
|
},
|
||||||
|
onCancel: () => {
|
||||||
|
this.cancelInProgressAnimation = null;
|
||||||
|
onCancel();
|
||||||
|
},
|
||||||
|
duration,
|
||||||
|
});
|
||||||
|
|
||||||
|
this.cancelInProgressAnimation = () => {
|
||||||
|
cancel();
|
||||||
|
this.cancelInProgressAnimation = null;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
setToast = (toast: AppState["toast"]) => {
|
setToast = (toast: AppState["toast"]) => {
|
||||||
@@ -5634,16 +5893,22 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
|
|
||||||
const initialScale = gesture.initialScale;
|
const initialScale = gesture.initialScale;
|
||||||
if (initialScale) {
|
if (initialScale) {
|
||||||
this.setState((state) => ({
|
this.setState((state) =>
|
||||||
...getStateForZoom(
|
constrainScrollState(
|
||||||
{
|
{
|
||||||
viewportX: this.lastViewportPosition.x,
|
...state,
|
||||||
viewportY: this.lastViewportPosition.y,
|
...getStateForZoom(
|
||||||
nextZoom: getNormalizedZoom(initialScale * event.scale),
|
{
|
||||||
|
viewportX: this.lastViewportPosition.x,
|
||||||
|
viewportY: this.lastViewportPosition.y,
|
||||||
|
nextZoom: getNormalizedZoom(initialScale * event.scale),
|
||||||
|
},
|
||||||
|
state,
|
||||||
|
),
|
||||||
},
|
},
|
||||||
state,
|
"loose",
|
||||||
),
|
),
|
||||||
}));
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -12620,17 +12885,21 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
// reduced amplification for small deltas (small movements on a trackpad)
|
// reduced amplification for small deltas (small movements on a trackpad)
|
||||||
Math.min(1, absDelta / 20);
|
Math.min(1, absDelta / 20);
|
||||||
|
|
||||||
this.translateCanvas((state) => ({
|
this.translateCanvas((state) => {
|
||||||
...getStateForZoom(
|
const nextZoom = getNormalizedZoom(newZoom);
|
||||||
|
const anchor = getConstrainedZoomAnchor(
|
||||||
{
|
{
|
||||||
viewportX: this.lastViewportPosition.x,
|
viewportX: this.lastViewportPosition.x,
|
||||||
viewportY: this.lastViewportPosition.y,
|
viewportY: this.lastViewportPosition.y,
|
||||||
nextZoom: getNormalizedZoom(newZoom),
|
nextZoom,
|
||||||
},
|
},
|
||||||
state,
|
state,
|
||||||
),
|
);
|
||||||
shouldCacheIgnoreZoom: true,
|
return {
|
||||||
}));
|
...getStateForZoom({ ...anchor, nextZoom }, state),
|
||||||
|
shouldCacheIgnoreZoom: true,
|
||||||
|
};
|
||||||
|
});
|
||||||
this.resetShouldCacheIgnoreZoomDebounced();
|
this.resetShouldCacheIgnoreZoomDebounced();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -12788,6 +13057,51 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
await setLanguage(currentLang);
|
await setLanguage(currentLang);
|
||||||
this.setAppState({});
|
this.setAppState({});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the scroll constraints of the application state.
|
||||||
|
*
|
||||||
|
* @param scrollConstraints - The new scroll constraints.
|
||||||
|
*/
|
||||||
|
public setScrollConstraints = (
|
||||||
|
scrollConstraints: ScrollConstraints | null,
|
||||||
|
) => {
|
||||||
|
if (scrollConstraints) {
|
||||||
|
this.setState(
|
||||||
|
{
|
||||||
|
scrollConstraints,
|
||||||
|
viewModeEnabled: true,
|
||||||
|
},
|
||||||
|
() => {
|
||||||
|
const newState = constrainScrollState(
|
||||||
|
{
|
||||||
|
...this.state,
|
||||||
|
scrollConstraints,
|
||||||
|
},
|
||||||
|
"rigid",
|
||||||
|
);
|
||||||
|
|
||||||
|
this.animateToConstrainedArea(
|
||||||
|
{
|
||||||
|
scrollX: this.state.scrollX,
|
||||||
|
scrollY: this.state.scrollY,
|
||||||
|
zoom: this.state.zoom.value,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
scrollX: newState.scrollX,
|
||||||
|
scrollY: newState.scrollY,
|
||||||
|
zoom: newState.zoom.value,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
this.setState({
|
||||||
|
scrollConstraints: null,
|
||||||
|
viewModeEnabled: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -0,0 +1,590 @@
|
|||||||
|
import { MAX_ZOOM } from "@excalidraw/common";
|
||||||
|
|
||||||
|
import { isShallowEqual } from "@excalidraw/common";
|
||||||
|
|
||||||
|
import { clamp } from "@excalidraw/math";
|
||||||
|
|
||||||
|
import { getNormalizedZoom } from "./normalize";
|
||||||
|
|
||||||
|
import type {
|
||||||
|
AnimateTranslateCanvasValues,
|
||||||
|
AppState,
|
||||||
|
ScrollConstraints,
|
||||||
|
ScrollToContentLockOptions,
|
||||||
|
} from "../types";
|
||||||
|
|
||||||
|
// Constants for viewport zoom factor and overscroll allowance
|
||||||
|
const MIN_VIEWPORT_ZOOM_FACTOR = 0.1;
|
||||||
|
const MAX_VIEWPORT_ZOOM_FACTOR = MAX_ZOOM;
|
||||||
|
const DEFAULT_VIEWPORT_ZOOM_FACTOR = 0.2;
|
||||||
|
const DEFAULT_OVERSCROLL_ALLOWANCE = 0.2;
|
||||||
|
|
||||||
|
// Memoization variable to cache constraints for performance optimization
|
||||||
|
let memoizedValues: {
|
||||||
|
previousState: Pick<
|
||||||
|
AppState,
|
||||||
|
"zoom" | "width" | "height" | "scrollConstraints"
|
||||||
|
>;
|
||||||
|
constraints: ReturnType<typeof calculateConstraints>;
|
||||||
|
allowOverscroll: boolean;
|
||||||
|
} | null = null;
|
||||||
|
|
||||||
|
type CanvasTranslate = Pick<AppState, "scrollX" | "scrollY" | "zoom">;
|
||||||
|
|
||||||
|
export const getScrollConstraintsForBounds = ({
|
||||||
|
bounds,
|
||||||
|
zoom,
|
||||||
|
viewportDimensions,
|
||||||
|
scrollLock,
|
||||||
|
}: {
|
||||||
|
bounds: readonly [number, number, number, number];
|
||||||
|
zoom: AppState["zoom"];
|
||||||
|
viewportDimensions: Pick<AppState, "width" | "height">;
|
||||||
|
scrollLock?: boolean | ScrollToContentLockOptions;
|
||||||
|
}): ScrollConstraints => {
|
||||||
|
const [x1, y1, x2, y2] = bounds;
|
||||||
|
const width = x2 - x1;
|
||||||
|
const height = y2 - y1;
|
||||||
|
const baseZoom = Math.min(
|
||||||
|
viewportDimensions.width / width,
|
||||||
|
viewportDimensions.height / height,
|
||||||
|
);
|
||||||
|
const lockOptions =
|
||||||
|
scrollLock && typeof scrollLock === "object" ? scrollLock : undefined;
|
||||||
|
const viewportZoomFactor =
|
||||||
|
lockOptions?.viewportZoomFactor ?? zoom.value / baseZoom;
|
||||||
|
|
||||||
|
return {
|
||||||
|
x: x1,
|
||||||
|
y: y1,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
animateOnNextUpdate: false,
|
||||||
|
lockZoom: !!lockOptions?.lockZoom,
|
||||||
|
overscrollAllowance: lockOptions?.overscrollAllowance,
|
||||||
|
viewportZoomFactor,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculates the zoom levels necessary to fit the constrained scrollable area within the viewport on the X and Y axes.
|
||||||
|
*
|
||||||
|
* The function considers the dimensions of the scrollable area, the dimensions of the viewport, the viewport zoom factor,
|
||||||
|
* and whether the zoom should be locked. It then calculates the necessary zoom levels for the X and Y axes separately.
|
||||||
|
* If the zoom should be locked, it calculates the maximum zoom level that fits the scrollable area within the viewport,
|
||||||
|
* factoring in the viewport zoom factor. If the zoom should not be locked, the maximum zoom level is set to null.
|
||||||
|
*
|
||||||
|
* @param scrollConstraints - The constraints of the scrollable area including width, height, and position.
|
||||||
|
* @param width - The width of the viewport.
|
||||||
|
* @param height - The height of the viewport.
|
||||||
|
* @returns An object containing the calculated zoom levels for the X and Y axes, and the initial zoom level.
|
||||||
|
*/
|
||||||
|
const calculateZoomLevel = (
|
||||||
|
scrollConstraints: ScrollConstraints,
|
||||||
|
width: AppState["width"],
|
||||||
|
height: AppState["height"],
|
||||||
|
) => {
|
||||||
|
const viewportZoomFactor = scrollConstraints.viewportZoomFactor
|
||||||
|
? clamp(
|
||||||
|
scrollConstraints.viewportZoomFactor,
|
||||||
|
MIN_VIEWPORT_ZOOM_FACTOR,
|
||||||
|
MAX_VIEWPORT_ZOOM_FACTOR,
|
||||||
|
)
|
||||||
|
: DEFAULT_VIEWPORT_ZOOM_FACTOR;
|
||||||
|
|
||||||
|
const scrollableWidth = scrollConstraints.width;
|
||||||
|
const scrollableHeight = scrollConstraints.height;
|
||||||
|
const zoomLevelX = width / scrollableWidth;
|
||||||
|
const zoomLevelY = height / scrollableHeight;
|
||||||
|
const initialZoomLevel = getNormalizedZoom(
|
||||||
|
Math.min(zoomLevelX, zoomLevelY) * viewportZoomFactor,
|
||||||
|
);
|
||||||
|
return { zoomLevelX, zoomLevelY, initialZoomLevel };
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculates the effective zoom level based on the scroll constraints and current zoom.
|
||||||
|
*
|
||||||
|
* @param params - Object containing scrollConstraints, width, height, and zoom.
|
||||||
|
* @returns An object with the effective zoom level, initial zoom level, and zoom levels for X and Y axes.
|
||||||
|
*/
|
||||||
|
const calculateZoom = ({
|
||||||
|
scrollConstraints,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
zoom,
|
||||||
|
}: {
|
||||||
|
scrollConstraints: ScrollConstraints;
|
||||||
|
width: AppState["width"];
|
||||||
|
height: AppState["height"];
|
||||||
|
zoom: AppState["zoom"];
|
||||||
|
}) => {
|
||||||
|
const { zoomLevelX, zoomLevelY, initialZoomLevel } = calculateZoomLevel(
|
||||||
|
scrollConstraints,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
);
|
||||||
|
const effectiveZoom = scrollConstraints.lockZoom
|
||||||
|
? Math.max(initialZoomLevel, zoom.value)
|
||||||
|
: zoom.value;
|
||||||
|
return {
|
||||||
|
effectiveZoom: getNormalizedZoom(effectiveZoom),
|
||||||
|
initialZoomLevel,
|
||||||
|
zoomLevelX,
|
||||||
|
zoomLevelY,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculates the scroll bounds (min and max scroll values) based on the scroll constraints and zoom level.
|
||||||
|
*
|
||||||
|
* @param params - Object containing scrollConstraints, width, height, effectiveZoom, zoomLevelX, zoomLevelY, and allowOverscroll.
|
||||||
|
* @returns An object with min and max scroll values for X and Y axes.
|
||||||
|
*/
|
||||||
|
const calculateScrollBounds = ({
|
||||||
|
scrollConstraints,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
effectiveZoom,
|
||||||
|
zoomLevelX,
|
||||||
|
zoomLevelY,
|
||||||
|
allowOverscroll,
|
||||||
|
}: {
|
||||||
|
scrollConstraints: ScrollConstraints;
|
||||||
|
width: AppState["width"];
|
||||||
|
height: AppState["height"];
|
||||||
|
effectiveZoom: number;
|
||||||
|
zoomLevelX: number;
|
||||||
|
zoomLevelY: number;
|
||||||
|
allowOverscroll: boolean;
|
||||||
|
}) => {
|
||||||
|
const overscrollAllowance =
|
||||||
|
scrollConstraints.overscrollAllowance ?? DEFAULT_OVERSCROLL_ALLOWANCE;
|
||||||
|
const validatedOverscroll = clamp(overscrollAllowance, 0, 1);
|
||||||
|
|
||||||
|
const calculateCenter = (zoom: number) => {
|
||||||
|
const centerX =
|
||||||
|
scrollConstraints.x + (scrollConstraints.width - width / zoom) / -2;
|
||||||
|
const centerY =
|
||||||
|
scrollConstraints.y + (scrollConstraints.height - height / zoom) / -2;
|
||||||
|
return { centerX, centerY };
|
||||||
|
};
|
||||||
|
|
||||||
|
const { centerX, centerY } = calculateCenter(effectiveZoom);
|
||||||
|
|
||||||
|
const overscrollValue = Math.min(
|
||||||
|
validatedOverscroll * scrollConstraints.width,
|
||||||
|
validatedOverscroll * scrollConstraints.height,
|
||||||
|
);
|
||||||
|
|
||||||
|
const fitsX = effectiveZoom <= zoomLevelX;
|
||||||
|
const fitsY = effectiveZoom <= zoomLevelY;
|
||||||
|
|
||||||
|
const getScrollRange = (
|
||||||
|
axis: "x" | "y",
|
||||||
|
fits: boolean,
|
||||||
|
constraint: ScrollConstraints,
|
||||||
|
viewportSize: number,
|
||||||
|
zoom: number,
|
||||||
|
overscroll: number,
|
||||||
|
) => {
|
||||||
|
const { pos, size } =
|
||||||
|
axis === "x"
|
||||||
|
? { pos: constraint.x, size: constraint.width }
|
||||||
|
: { pos: constraint.y, size: constraint.height };
|
||||||
|
const center = axis === "x" ? centerX : centerY;
|
||||||
|
if (allowOverscroll) {
|
||||||
|
return fits
|
||||||
|
? { min: center - overscroll, max: center + overscroll }
|
||||||
|
: {
|
||||||
|
min: pos - size + viewportSize / zoom - overscroll,
|
||||||
|
max: pos + overscroll,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return fits
|
||||||
|
? { min: center, max: center }
|
||||||
|
: { min: pos - size + viewportSize / zoom, max: pos };
|
||||||
|
};
|
||||||
|
|
||||||
|
const xRange = getScrollRange(
|
||||||
|
"x",
|
||||||
|
fitsX,
|
||||||
|
scrollConstraints,
|
||||||
|
width,
|
||||||
|
effectiveZoom,
|
||||||
|
overscrollValue,
|
||||||
|
);
|
||||||
|
const yRange = getScrollRange(
|
||||||
|
"y",
|
||||||
|
fitsY,
|
||||||
|
scrollConstraints,
|
||||||
|
height,
|
||||||
|
effectiveZoom,
|
||||||
|
overscrollValue,
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
minScrollX: xRange.min,
|
||||||
|
maxScrollX: xRange.max,
|
||||||
|
minScrollY: yRange.min,
|
||||||
|
maxScrollY: yRange.max,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculates the scroll constraints including min and max scroll values and the effective zoom level.
|
||||||
|
*
|
||||||
|
* @param params - Object containing scrollConstraints, width, height, zoom, and allowOverscroll.
|
||||||
|
* @returns An object with min and max scroll values, effective zoom, and initial zoom level.
|
||||||
|
*/
|
||||||
|
const calculateConstraints = ({
|
||||||
|
scrollConstraints,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
zoom,
|
||||||
|
allowOverscroll,
|
||||||
|
}: {
|
||||||
|
scrollConstraints: ScrollConstraints;
|
||||||
|
width: AppState["width"];
|
||||||
|
height: AppState["height"];
|
||||||
|
zoom: AppState["zoom"];
|
||||||
|
allowOverscroll: boolean;
|
||||||
|
}) => {
|
||||||
|
const { effectiveZoom, initialZoomLevel, zoomLevelX, zoomLevelY } =
|
||||||
|
calculateZoom({ scrollConstraints, width, height, zoom });
|
||||||
|
const scrollBounds = calculateScrollBounds({
|
||||||
|
scrollConstraints,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
effectiveZoom,
|
||||||
|
zoomLevelX,
|
||||||
|
zoomLevelY,
|
||||||
|
allowOverscroll,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
...scrollBounds,
|
||||||
|
effectiveZoom: { value: effectiveZoom },
|
||||||
|
initialZoomLevel,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constrains the scroll values within the provided min and max bounds.
|
||||||
|
*
|
||||||
|
* @param params - Object containing scrollX, scrollY, minScrollX, maxScrollX, minScrollY, maxScrollY, and constrainedZoom.
|
||||||
|
* @returns An object with constrained scrollX, scrollY, and zoom.
|
||||||
|
*/
|
||||||
|
const constrainScrollValues = ({
|
||||||
|
scrollX,
|
||||||
|
scrollY,
|
||||||
|
minScrollX,
|
||||||
|
maxScrollX,
|
||||||
|
minScrollY,
|
||||||
|
maxScrollY,
|
||||||
|
constrainedZoom,
|
||||||
|
}: {
|
||||||
|
scrollX: number;
|
||||||
|
scrollY: number;
|
||||||
|
minScrollX: number;
|
||||||
|
maxScrollX: number;
|
||||||
|
minScrollY: number;
|
||||||
|
maxScrollY: number;
|
||||||
|
constrainedZoom: AppState["zoom"];
|
||||||
|
}): CanvasTranslate => {
|
||||||
|
const constrainedScrollX = clamp(scrollX, minScrollX, maxScrollX);
|
||||||
|
const constrainedScrollY = clamp(scrollY, minScrollY, maxScrollY);
|
||||||
|
return {
|
||||||
|
scrollX: constrainedScrollX,
|
||||||
|
scrollY: constrainedScrollY,
|
||||||
|
zoom: constrainedZoom,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Inverts the scroll constraints to align with the state scrollX and scrollY values, which are inverted.
|
||||||
|
* This is a temporary fix and should be removed once issue #5965 is resolved.
|
||||||
|
*
|
||||||
|
* @param originalScrollConstraints - The original scroll constraints.
|
||||||
|
* @returns The aligned scroll constraints with inverted x and y coordinates.
|
||||||
|
*/
|
||||||
|
const alignScrollConstraints = (
|
||||||
|
originalScrollConstraints: ScrollConstraints,
|
||||||
|
): ScrollConstraints => {
|
||||||
|
return {
|
||||||
|
...originalScrollConstraints,
|
||||||
|
x: originalScrollConstraints.x * -1,
|
||||||
|
y: originalScrollConstraints.y * -1,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines whether the current viewport is outside the constrained area.
|
||||||
|
*
|
||||||
|
* @param state - The application state.
|
||||||
|
* @returns True if the viewport is outside the constrained area, false otherwise.
|
||||||
|
*/
|
||||||
|
const isViewportOutsideOfConstrainedArea = (state: AppState): boolean => {
|
||||||
|
if (!state.scrollConstraints) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const {
|
||||||
|
scrollX,
|
||||||
|
scrollY,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
scrollConstraints: inverseScrollConstraints,
|
||||||
|
zoom,
|
||||||
|
} = state;
|
||||||
|
|
||||||
|
const scrollConstraints = alignScrollConstraints(inverseScrollConstraints);
|
||||||
|
|
||||||
|
const adjustedWidth = width / zoom.value;
|
||||||
|
const adjustedHeight = height / zoom.value;
|
||||||
|
|
||||||
|
return (
|
||||||
|
scrollX > scrollConstraints.x ||
|
||||||
|
scrollX - adjustedWidth < scrollConstraints.x - scrollConstraints.width ||
|
||||||
|
scrollY > scrollConstraints.y ||
|
||||||
|
scrollY - adjustedHeight < scrollConstraints.y - scrollConstraints.height
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculates the scroll center coordinates and the optimal zoom level to fit the constrained scrollable area within the viewport.
|
||||||
|
*
|
||||||
|
* @param state - The application state.
|
||||||
|
* @param scroll - Object containing current scrollX and scrollY.
|
||||||
|
* @returns An object with the calculated scrollX, scrollY, and zoom.
|
||||||
|
*/
|
||||||
|
export const calculateConstrainedScrollCenter = (
|
||||||
|
state: AppState,
|
||||||
|
{ scrollX, scrollY }: Pick<AppState, "scrollX" | "scrollY">,
|
||||||
|
): CanvasTranslate => {
|
||||||
|
const { width, height, scrollConstraints } = state;
|
||||||
|
if (!scrollConstraints) {
|
||||||
|
return { scrollX, scrollY, zoom: state.zoom };
|
||||||
|
}
|
||||||
|
|
||||||
|
const adjustedConstraints = alignScrollConstraints(scrollConstraints);
|
||||||
|
const zoomLevels = calculateZoomLevel(adjustedConstraints, width, height);
|
||||||
|
const initialZoom = { value: zoomLevels.initialZoomLevel };
|
||||||
|
const constraints = calculateConstraints({
|
||||||
|
scrollConstraints: adjustedConstraints,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
zoom: initialZoom,
|
||||||
|
allowOverscroll: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
scrollX: constraints.minScrollX,
|
||||||
|
scrollY: constraints.minScrollY,
|
||||||
|
zoom: constraints.effectiveZoom,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Encodes scroll constraints into a compact string.
|
||||||
|
*
|
||||||
|
* @param constraints - The scroll constraints to encode.
|
||||||
|
* @returns A compact encoded string representing the scroll constraints.
|
||||||
|
*/
|
||||||
|
export const encodeConstraints = (constraints: ScrollConstraints): string => {
|
||||||
|
const payload = {
|
||||||
|
x: constraints.x,
|
||||||
|
y: constraints.y,
|
||||||
|
w: constraints.width,
|
||||||
|
h: constraints.height,
|
||||||
|
a: !!constraints.animateOnNextUpdate,
|
||||||
|
l: !!constraints.lockZoom,
|
||||||
|
v: constraints.viewportZoomFactor ?? 1,
|
||||||
|
oa: constraints.overscrollAllowance ?? DEFAULT_OVERSCROLL_ALLOWANCE,
|
||||||
|
};
|
||||||
|
const serialized = JSON.stringify(payload);
|
||||||
|
return encodeURIComponent(window.btoa(serialized).replace(/=+/, ""));
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Decodes a compact string back into scroll constraints.
|
||||||
|
*
|
||||||
|
* @param encoded - The encoded string representing the scroll constraints.
|
||||||
|
* @returns The decoded scroll constraints object.
|
||||||
|
*/
|
||||||
|
export const decodeConstraints = (encoded: string): ScrollConstraints => {
|
||||||
|
try {
|
||||||
|
const decodedStr = window.atob(decodeURIComponent(encoded));
|
||||||
|
const parsed = JSON.parse(decodedStr) as {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
w: number;
|
||||||
|
h: number;
|
||||||
|
a: boolean;
|
||||||
|
l: boolean;
|
||||||
|
v: number;
|
||||||
|
oa: number;
|
||||||
|
};
|
||||||
|
return {
|
||||||
|
x: parsed.x || 0,
|
||||||
|
y: parsed.y || 0,
|
||||||
|
width: parsed.w || 0,
|
||||||
|
height: parsed.h || 0,
|
||||||
|
lockZoom: parsed.l || false,
|
||||||
|
viewportZoomFactor: parsed.v || 1,
|
||||||
|
animateOnNextUpdate: parsed.a || false,
|
||||||
|
overscrollAllowance: parsed.oa || DEFAULT_OVERSCROLL_ALLOWANCE,
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
return {
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
width: 0,
|
||||||
|
height: 0,
|
||||||
|
animateOnNextUpdate: false,
|
||||||
|
lockZoom: false,
|
||||||
|
viewportZoomFactor: 1,
|
||||||
|
overscrollAllowance: DEFAULT_OVERSCROLL_ALLOWANCE,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
type Options = { allowOverscroll: boolean; disableAnimation: boolean };
|
||||||
|
const DEFAULT_OPTION: Options = {
|
||||||
|
allowOverscroll: true,
|
||||||
|
disableAnimation: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constrains the AppState scroll values within the defined scroll constraints.
|
||||||
|
*
|
||||||
|
* constraintMode can be "elastic", "rigid", or "loose":
|
||||||
|
* - "elastic": snaps to constraints but allows overscroll
|
||||||
|
* - "rigid": snaps to constraints without overscroll
|
||||||
|
* - "loose": allows overscroll and disables animation/snapping to constraints
|
||||||
|
*
|
||||||
|
* @param state - The original AppState.
|
||||||
|
* @param options - Options for allowing overscroll and disabling animation.
|
||||||
|
* @returns A new AppState object with constrained scroll values.
|
||||||
|
*/
|
||||||
|
export const constrainScrollState = (
|
||||||
|
state: AppState,
|
||||||
|
constraintMode: "elastic" | "rigid" | "loose" = "elastic",
|
||||||
|
): AppState => {
|
||||||
|
if (!state.scrollConstraints) {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
const {
|
||||||
|
scrollX,
|
||||||
|
scrollY,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
scrollConstraints: inverseScrollConstraints,
|
||||||
|
zoom,
|
||||||
|
} = state;
|
||||||
|
|
||||||
|
let allowOverscroll: boolean;
|
||||||
|
let disableAnimation: boolean;
|
||||||
|
|
||||||
|
switch (constraintMode) {
|
||||||
|
case "elastic":
|
||||||
|
({ allowOverscroll, disableAnimation } = DEFAULT_OPTION);
|
||||||
|
break;
|
||||||
|
case "rigid":
|
||||||
|
allowOverscroll = false;
|
||||||
|
disableAnimation = false;
|
||||||
|
break;
|
||||||
|
case "loose":
|
||||||
|
allowOverscroll = true;
|
||||||
|
disableAnimation = true;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
({ allowOverscroll, disableAnimation } = DEFAULT_OPTION);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
const scrollConstraints = alignScrollConstraints(inverseScrollConstraints);
|
||||||
|
|
||||||
|
const canUseMemoizedValues =
|
||||||
|
memoizedValues &&
|
||||||
|
memoizedValues.previousState.scrollConstraints &&
|
||||||
|
memoizedValues.allowOverscroll === allowOverscroll &&
|
||||||
|
isShallowEqual(
|
||||||
|
state.scrollConstraints,
|
||||||
|
memoizedValues.previousState.scrollConstraints,
|
||||||
|
) &&
|
||||||
|
isShallowEqual(
|
||||||
|
{ zoom: zoom.value, width, height },
|
||||||
|
{
|
||||||
|
zoom: memoizedValues.previousState.zoom.value,
|
||||||
|
width: memoizedValues.previousState.width,
|
||||||
|
height: memoizedValues.previousState.height,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
const constraints = canUseMemoizedValues
|
||||||
|
? memoizedValues!.constraints
|
||||||
|
: calculateConstraints({
|
||||||
|
scrollConstraints,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
zoom,
|
||||||
|
allowOverscroll,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!canUseMemoizedValues) {
|
||||||
|
memoizedValues = {
|
||||||
|
previousState: {
|
||||||
|
zoom: state.zoom,
|
||||||
|
width: state.width,
|
||||||
|
height: state.height,
|
||||||
|
scrollConstraints: state.scrollConstraints,
|
||||||
|
},
|
||||||
|
constraints,
|
||||||
|
allowOverscroll,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const constrainedValues =
|
||||||
|
zoom.value >= constraints.effectiveZoom.value
|
||||||
|
? constrainScrollValues({
|
||||||
|
scrollX,
|
||||||
|
scrollY,
|
||||||
|
minScrollX: constraints.minScrollX,
|
||||||
|
maxScrollX: constraints.maxScrollX,
|
||||||
|
minScrollY: constraints.minScrollY,
|
||||||
|
maxScrollY: constraints.maxScrollY,
|
||||||
|
constrainedZoom: constraints.effectiveZoom,
|
||||||
|
})
|
||||||
|
: calculateConstrainedScrollCenter(state, { scrollX, scrollY });
|
||||||
|
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
scrollConstraints: {
|
||||||
|
...state.scrollConstraints,
|
||||||
|
animateOnNextUpdate: disableAnimation
|
||||||
|
? false
|
||||||
|
: isViewportOutsideOfConstrainedArea(state),
|
||||||
|
},
|
||||||
|
...constrainedValues,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if two canvas translate values are close within a threshold.
|
||||||
|
*
|
||||||
|
* @param from - First set of canvas translate values.
|
||||||
|
* @param to - Second set of canvas translate values.
|
||||||
|
* @returns True if the values are close, false otherwise.
|
||||||
|
*/
|
||||||
|
export const areCanvasTranslatesClose = (
|
||||||
|
from: AnimateTranslateCanvasValues,
|
||||||
|
to: AnimateTranslateCanvasValues,
|
||||||
|
): boolean => {
|
||||||
|
const threshold = 0.1;
|
||||||
|
return (
|
||||||
|
Math.abs(from.scrollX - to.scrollX) < threshold &&
|
||||||
|
Math.abs(from.scrollY - to.scrollY) < threshold &&
|
||||||
|
Math.abs(from.zoom - to.zoom) < threshold
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,4 +1,57 @@
|
|||||||
import type { AppState, NormalizedZoomValue } from "../types";
|
import type { AppState, NormalizedZoomValue } from "../types";
|
||||||
|
import { constrainScrollState } from "./scrollConstraints";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When zooming out with scroll constraints active, the cursor-anchored zoom may
|
||||||
|
* produce a scroll position outside the valid bounds, causing a snap-back.
|
||||||
|
*
|
||||||
|
* This function adjusts the effective zoom anchor point so the resulting scroll
|
||||||
|
* stays within bounds — silently, without any snap. When no adjustment is needed
|
||||||
|
* (zoom-in, no constraints, or already within bounds) it returns the original
|
||||||
|
* viewport position unchanged.
|
||||||
|
*/
|
||||||
|
export const getConstrainedZoomAnchor = (
|
||||||
|
{
|
||||||
|
viewportX,
|
||||||
|
viewportY,
|
||||||
|
nextZoom,
|
||||||
|
}: { viewportX: number; viewportY: number; nextZoom: NormalizedZoomValue },
|
||||||
|
state: AppState,
|
||||||
|
): { viewportX: number; viewportY: number } => {
|
||||||
|
if (!state.scrollConstraints || nextZoom >= state.zoom.value) {
|
||||||
|
return { viewportX, viewportY };
|
||||||
|
}
|
||||||
|
|
||||||
|
const appLayerX = viewportX - state.offsetLeft;
|
||||||
|
const appLayerY = viewportY - state.offsetTop;
|
||||||
|
const factor = 1 / nextZoom - 1 / state.zoom.value;
|
||||||
|
|
||||||
|
const newScrollX = state.scrollX + appLayerX * factor;
|
||||||
|
const newScrollY = state.scrollY + appLayerY * factor;
|
||||||
|
|
||||||
|
const constrained = constrainScrollState(
|
||||||
|
{ ...state, scrollX: newScrollX, scrollY: newScrollY, zoom: { value: nextZoom } },
|
||||||
|
"rigid",
|
||||||
|
);
|
||||||
|
|
||||||
|
if (constrained.scrollX === newScrollX && constrained.scrollY === newScrollY) {
|
||||||
|
return { viewportX, viewportY };
|
||||||
|
}
|
||||||
|
|
||||||
|
const adjustedAppLayerX =
|
||||||
|
constrained.scrollX !== newScrollX
|
||||||
|
? (constrained.scrollX - state.scrollX) / factor
|
||||||
|
: appLayerX;
|
||||||
|
const adjustedAppLayerY =
|
||||||
|
constrained.scrollY !== newScrollY
|
||||||
|
? (constrained.scrollY - state.scrollY) / factor
|
||||||
|
: appLayerY;
|
||||||
|
|
||||||
|
return {
|
||||||
|
viewportX: adjustedAppLayerX + state.offsetLeft,
|
||||||
|
viewportY: adjustedAppLayerY + state.offsetTop,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export const getStateForZoom = (
|
export const getStateForZoom = (
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -454,6 +454,7 @@ export interface AppState {
|
|||||||
userToFollow: UserToFollow | null;
|
userToFollow: UserToFollow | null;
|
||||||
/** the socket ids of the users following the current user */
|
/** the socket ids of the users following the current user */
|
||||||
followedBy: Set<SocketId>;
|
followedBy: Set<SocketId>;
|
||||||
|
scrollConstraints: ScrollConstraints | null;
|
||||||
|
|
||||||
/** image cropping */
|
/** image cropping */
|
||||||
isCropping: boolean;
|
isCropping: boolean;
|
||||||
@@ -546,6 +547,8 @@ export type ExcalidrawInitialDataState = Merge<
|
|||||||
ImportedDataState,
|
ImportedDataState,
|
||||||
{
|
{
|
||||||
libraryItems?: MaybePromise<Required<ImportedDataState>["libraryItems"]>;
|
libraryItems?: MaybePromise<Required<ImportedDataState>["libraryItems"]>;
|
||||||
|
scrollX?: number;
|
||||||
|
scrollY?: number;
|
||||||
}
|
}
|
||||||
>;
|
>;
|
||||||
|
|
||||||
@@ -662,6 +665,7 @@ export interface ExcalidrawProps {
|
|||||||
onScrollChange?: (scrollX: number, scrollY: number, zoom: Zoom) => void;
|
onScrollChange?: (scrollX: number, scrollY: number, zoom: Zoom) => void;
|
||||||
onUserFollow?: (payload: OnUserFollowedPayload) => void;
|
onUserFollow?: (payload: OnUserFollowedPayload) => void;
|
||||||
children?: React.ReactNode;
|
children?: React.ReactNode;
|
||||||
|
scrollConstraints?: AppState["scrollConstraints"];
|
||||||
validateEmbeddable?:
|
validateEmbeddable?:
|
||||||
| boolean
|
| boolean
|
||||||
| string[]
|
| string[]
|
||||||
@@ -988,6 +992,8 @@ export interface ExcalidrawImperativeAPI {
|
|||||||
) => UnsubscribeCallback;
|
) => UnsubscribeCallback;
|
||||||
onStateChange: InstanceType<typeof App>["onStateChange"];
|
onStateChange: InstanceType<typeof App>["onStateChange"];
|
||||||
onEvent: InstanceType<typeof App>["onEvent"];
|
onEvent: InstanceType<typeof App>["onEvent"];
|
||||||
|
app: InstanceType<typeof App>;
|
||||||
|
setScrollConstraints: InstanceType<typeof App>["setScrollConstraints"];
|
||||||
}
|
}
|
||||||
|
|
||||||
export type FrameNameBounds = {
|
export type FrameNameBounds = {
|
||||||
@@ -1054,3 +1060,69 @@ export type Offsets = Partial<{
|
|||||||
bottom: number;
|
bottom: number;
|
||||||
left: number;
|
left: number;
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
|
export type ScrollConstraints = {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
width: number;
|
||||||
|
height: number;
|
||||||
|
animateOnNextUpdate?: boolean;
|
||||||
|
/**
|
||||||
|
* A factor that determines the minimum zoom level that should fit the
|
||||||
|
* constrained area into the viewport.
|
||||||
|
*/
|
||||||
|
viewportZoomFactor?: number;
|
||||||
|
/**
|
||||||
|
* If true, the user will not be able to zoom out beyond the scroll
|
||||||
|
* constraints (taking into account the viewportZoomFactor).
|
||||||
|
*/
|
||||||
|
lockZoom?: boolean;
|
||||||
|
/**
|
||||||
|
* <0-1> - how much can you scroll beyond the constrained area within the
|
||||||
|
* timeout window. Note you will still be snapped back to the constrained area
|
||||||
|
* after the timeout.
|
||||||
|
*/
|
||||||
|
overscrollAllowance?: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optional scroll constraint settings derived from the final viewport computed
|
||||||
|
* by `scrollToContent()`.
|
||||||
|
*/
|
||||||
|
export type ScrollToContentLockOptions = {
|
||||||
|
lockZoom?: boolean;
|
||||||
|
overscrollAllowance?: number;
|
||||||
|
viewportZoomFactor?: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type ScrollToContentOptions =
|
||||||
|
| ({
|
||||||
|
fitToContent?: boolean;
|
||||||
|
fitToViewport?: never;
|
||||||
|
viewportZoomFactor?: number;
|
||||||
|
animate?: boolean;
|
||||||
|
duration?: number;
|
||||||
|
scrollLock?: boolean | ScrollToContentLockOptions;
|
||||||
|
} & {
|
||||||
|
minZoom?: number;
|
||||||
|
maxZoom?: number;
|
||||||
|
canvasOffsets?: Offsets;
|
||||||
|
})
|
||||||
|
| ({
|
||||||
|
fitToContent?: never;
|
||||||
|
fitToViewport?: boolean;
|
||||||
|
viewportZoomFactor?: number;
|
||||||
|
animate?: boolean;
|
||||||
|
duration?: number;
|
||||||
|
scrollLock?: boolean | ScrollToContentLockOptions;
|
||||||
|
} & {
|
||||||
|
minZoom?: number;
|
||||||
|
maxZoom?: number;
|
||||||
|
canvasOffsets?: Offsets;
|
||||||
|
});
|
||||||
|
|
||||||
|
export type AnimateTranslateCanvasValues = {
|
||||||
|
scrollX: AppState["scrollX"];
|
||||||
|
scrollY: AppState["scrollY"];
|
||||||
|
zoom: AppState["zoom"]["value"];
|
||||||
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user