diff --git a/packages/element/src/arrows/focus.ts b/packages/element/src/arrows/focus.ts index fa8018adbe..d641fbe444 100644 --- a/packages/element/src/arrows/focus.ts +++ b/packages/element/src/arrows/focus.ts @@ -258,8 +258,8 @@ export const handleFocusPointDrag = ( switchToInsideBinding && arrow[bindingField]?.mode === "orbit" ? "inside" : !switchToInsideBinding && arrow[bindingField]?.mode === "inside" - ? "orbit" - : null; + ? "orbit" + : null; // If no existing binding, create it if (!arrow[bindingField] || newMode) { @@ -473,7 +473,7 @@ export const handleFocusPointPointerUp = ( if (boundElement) { scene.mutateElement(boundElement, { boundElements: [ - ...(boundElement.boundElements || [])?.filter( + ...(boundElement.boundElements || []).filter( ({ id }) => id !== arrow.id, ), { diff --git a/packages/element/src/binding.ts b/packages/element/src/binding.ts index 9c22eeb255..7146e3de43 100644 --- a/packages/element/src/binding.ts +++ b/packages/element/src/binding.ts @@ -825,20 +825,20 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = ( focusPoint: appState.selectedLinearElement.initialState.altFocusPoint, } : opts?.angleLocked && otherBindableElement - ? { - mode: "orbit", - element: otherBindableElement, - focusPoint: - projectFixedPointOntoDiagonal( - arrow, - otherEndpoint, - otherBindableElement, - startDragged ? "end" : "start", - elementsMap, - appState.zoom, - ) || otherEndpoint, - } - : { mode: undefined } + ? { + mode: "orbit", + element: otherBindableElement, + focusPoint: + projectFixedPointOntoDiagonal( + arrow, + otherEndpoint, + otherBindableElement, + startDragged ? "end" : "start", + elementsMap, + appState.zoom, + ) || otherEndpoint, + } + : { mode: undefined } : { mode: undefined }; return { @@ -1849,8 +1849,8 @@ export const updateBoundPoint = ( return LinearElementEditor.createPointAt( arrow, elementsMap, - arrowTooShort ? focusPoint[0] : outlinePoint?.[0] ?? focusPoint[0], - arrowTooShort ? focusPoint[1] : outlinePoint?.[1] ?? focusPoint[1], + arrowTooShort ? focusPoint[0] : (outlinePoint?.[0] ?? focusPoint[0]), + arrowTooShort ? focusPoint[1] : (outlinePoint?.[1] ?? focusPoint[1]), null, ); } diff --git a/packages/element/src/embeddable.ts b/packages/element/src/embeddable.ts index 89489720af..a437910ba8 100644 --- a/packages/element/src/embeddable.ts +++ b/packages/element/src/embeddable.ts @@ -125,7 +125,7 @@ const parseGoogleDriveVideoLink = ( // normalize to seconds for a stable preview URL. timestamp: timestamp > 0 ? timestamp : undefined, }; - } catch (error) { + } catch { return null; } }; diff --git a/packages/element/src/linearElementEditor.ts b/packages/element/src/linearElementEditor.ts index 754f1d03d5..e40e4c224b 100644 --- a/packages/element/src/linearElementEditor.ts +++ b/packages/element/src/linearElementEditor.ts @@ -615,10 +615,10 @@ export class LinearElementEditor { updates?.suggestedBinding?.element.id !== startBindingElement.id // The end point is not hovering the start bindable + it's binding gap ? startBindingElement : startIsSelected && // The "other" end (i.e. "start") is dragged - endBindingElement && - updates?.suggestedBinding?.element.id !== endBindingElement.id // The start point is not hovering the end bindable + it's binding gap - ? endBindingElement - : null; + endBindingElement && + updates?.suggestedBinding?.element.id !== endBindingElement.id // The start point is not hovering the end bindable + it's binding gap + ? endBindingElement + : null; const newLinearElementEditor: LinearElementEditor = { ...linearElementEditor, @@ -2137,8 +2137,8 @@ const pointDraggingUpdates = ( const suggestedBindingElement = startIsDragged ? start.element : endIsDragged - ? end.element - : null; + ? end.element + : null; return { positions: naiveDraggingPoints, @@ -2364,19 +2364,19 @@ const pointDraggingUpdates = ( const endLocalPoint = startIsDraggingOverEndElement ? nextArrow.points[nextArrow.points.length - 1] : endIsDraggingOverStartElement && - app.state.bindMode !== "inside" && - getFeatureFlag("COMPLEX_BINDINGS") - ? nextArrow.points[0] - : endBindable - ? updateBoundPoint( - element, - "endBinding", - nextArrow.endBinding, - endBindable, - elementsMap, - endIsDragged, - ) || nextArrow.points[nextArrow.points.length - 1] - : nextArrow.points[nextArrow.points.length - 1]; + app.state.bindMode !== "inside" && + getFeatureFlag("COMPLEX_BINDINGS") + ? nextArrow.points[0] + : endBindable + ? updateBoundPoint( + element, + "endBinding", + nextArrow.endBinding, + endBindable, + elementsMap, + endIsDragged, + ) || nextArrow.points[nextArrow.points.length - 1] + : nextArrow.points[nextArrow.points.length - 1]; // We need to keep the simulated next arrow up-to-date, because // updateBoundPoint looks at the opposite point @@ -2395,19 +2395,19 @@ const pointDraggingUpdates = ( endIsDraggingOverStartElement && getFeatureFlag("COMPLEX_BINDINGS") ? nextArrow.points[0] : startIsDraggingOverEndElement && - app.state.bindMode !== "inside" && - getFeatureFlag("COMPLEX_BINDINGS") - ? endLocalPoint - : startBindable - ? updateBoundPoint( - element, - "startBinding", - nextArrow.startBinding, - startBindable, - elementsMap, - startIsDragged, - ) || nextArrow.points[0] - : nextArrow.points[0]; + app.state.bindMode !== "inside" && + getFeatureFlag("COMPLEX_BINDINGS") + ? endLocalPoint + : startBindable + ? updateBoundPoint( + element, + "startBinding", + nextArrow.startBinding, + startBindable, + elementsMap, + startIsDragged, + ) || nextArrow.points[0] + : nextArrow.points[0]; const endChanged = !startIsDraggingOverEndElement && diff --git a/packages/element/src/utils.ts b/packages/element/src/utils.ts index 7013acf2f1..23bb6af3d9 100644 --- a/packages/element/src/utils.ts +++ b/packages/element/src/utils.ts @@ -343,7 +343,6 @@ export function deconstructRectanguloidElement( export function getDiamondBaseCorners( element: ExcalidrawDiamondElement, - offset: number = 0, ): Curve[] { const [topX, topY, rightX, rightY, bottomX, bottomY, leftX, leftY] = getDiamondPoints(element); diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx index f91aca4110..0f2c5abe0e 100644 --- a/packages/excalidraw/components/App.tsx +++ b/packages/excalidraw/components/App.tsx @@ -4906,8 +4906,8 @@ class App extends React.Component { prevState.currentItemArrowType === ARROW_TYPE.sharp ? ARROW_TYPE.round : prevState.currentItemArrowType === ARROW_TYPE.round - ? ARROW_TYPE.elbow - : ARROW_TYPE.sharp, + ? ARROW_TYPE.elbow + : ARROW_TYPE.sharp, })); } diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss b/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss index 939ef763ce..c579414ce6 100644 --- a/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss +++ b/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss @@ -68,7 +68,8 @@ max-height: calc(100svh - var(--editor-container-padding) * 2 - 2.25rem); @at-root .excalidraw.theme--dark#{&} { - box-shadow: var(--box-shadow, var(--shadow-island)), + box-shadow: + var(--box-shadow, var(--shadow-island)), 0 0 0 1px rgba(0, 0, 0, 0.15); } } diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemLink.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenuItemLink.tsx index 7c792aeb96..af1045b841 100644 --- a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemLink.tsx +++ b/packages/excalidraw/components/dropdownMenu/DropdownMenuItemLink.tsx @@ -41,9 +41,9 @@ const DropdownMenuItemLink = ({ diff --git a/packages/excalidraw/package.json b/packages/excalidraw/package.json index 0dc9bf618a..4840524dd3 100644 --- a/packages/excalidraw/package.json +++ b/packages/excalidraw/package.json @@ -62,7 +62,6 @@ "@excalidraw/math": "0.18.0", "@excalidraw/mermaid-to-excalidraw": "2.0.0-rfc3", "@excalidraw/random-username": "1.1.0", - "radix-ui": "1.4.3", "browser-fs-access": "0.29.1", "canvas-roundrect-polyfill": "0.0.1", "clsx": "1.1.1", @@ -84,6 +83,7 @@ "png-chunks-extract": "1.0.0", "points-on-curve": "1.0.1", "pwacompat": "2.0.17", + "radix-ui": "1.4.3", "roughjs": "4.6.4", "sass": "1.51.0", "tunnel-rat": "0.1.2"