marcel/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-11-25 23:24:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mtolmacs/feat/fixed-point-simple-arrow-binding

Browse Source
This commit is contained in:
Márk Tolmács
2025-11-23 21:14:23 +01:00
committed by GitHub
parent 51b3bb8370 b660478164
commit fa5cacfeec
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/common/src/constants.ts
View File

@@ -105,6 +105,7 @@ export const CLASSES = {
SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper", SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper",
CONVERT_ELEMENT_TYPE_POPUP: "ConvertElementTypePopup", CONVERT_ELEMENT_TYPE_POPUP: "ConvertElementTypePopup",
SHAPE_ACTIONS_THEME_SCOPE: "shape-actions-theme-scope", SHAPE_ACTIONS_THEME_SCOPE: "shape-actions-theme-scope",
FRAME_NAME: "frame-name",
}; };
export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai"; export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai";

9
packages/excalidraw/components/App.tsx
View File

@@ -1800,6 +1800,7 @@ class App extends React.Component<AppProps, AppState> {
return ( return (
<div <div
id={this.getFrameNameDOMId(f)} id={this.getFrameNameDOMId(f)}
className={CLASSES.FRAME_NAME}
key={f.id} key={f.id}
style={{ style={{
position: "absolute", position: "absolute",
@@ -1898,7 +1899,8 @@ class App extends React.Component<AppProps, AppState> {
return ( return (
<div <div
className={clsx("excalidraw excalidraw-container", { translate="no"
className={clsx("excalidraw excalidraw-container notranslate", {
"excalidraw--view-mode": "excalidraw--view-mode":
this.state.viewModeEnabled || this.state.viewModeEnabled ||
this.state.openDialog?.name === "elementLinkSelector", this.state.openDialog?.name === "elementLinkSelector",
@@ -11888,12 +11890,13 @@ class App extends React.Component<AppProps, AppState> {
( (
event: WheelEvent | React.WheelEvent<HTMLDivElement | HTMLCanvasElement>, event: WheelEvent | React.WheelEvent<HTMLDivElement | HTMLCanvasElement>,
) => { ) => {
// if not scrolling on canvas/wysiwyg, ignore
if ( if (
!( !(
event.target instanceof HTMLCanvasElement || event.target instanceof HTMLCanvasElement ||
event.target instanceof HTMLTextAreaElement || event.target instanceof HTMLTextAreaElement ||
event.target instanceof HTMLIFrameElement event.target instanceof HTMLIFrameElement ||
(event.target instanceof HTMLElement &&
event.target.classList.contains(CLASSES.FRAME_NAME))
) )
) { ) {
// prevent zooming the browser (but allow scrolling DOM) // prevent zooming the browser (but allow scrolling DOM)