Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

editor: disable resizing of floating images

Abdullah Atta799ae111ae26
diff --git a/packages/editor/src/components/resizer/index.tsx b/packages/editor/src/components/resizer/index.tsx
index 1984e1036..c7d598f0c 100644
--- a/packages/editor/src/components/resizer/index.tsx
+++ b/packages/editor/src/components/resizer/index.tsx
@@ -22,11 +22,11 @@ import { Resizable } from "re-resizable";
import { PropsWithChildren } from "react";
import { Icons } from "../../toolbar";
import { Icon } from "@notesnook/ui";
-import { Editor } from "../../types";
import { Flex } from "@theme-ui/components";
+import { getEditorDOM } from "../../toolbar/utils/dom";
type ResizerProps = {
- editor: Editor;
+ enabled: boolean;
selected: boolean;
width?: number;
height?: number;
@@ -36,7 +36,7 @@ type ResizerProps = {
};
export function Resizer(props: PropsWithChildren<ResizerProps>) {
const {
- editor,
+ enabled,
selected,
onResize,
width,
@@ -46,7 +46,7 @@ export function Resizer(props: PropsWithChildren<ResizerProps>) {
style
} = props;
- if (!editor.isEditable)
+ if (!enabled)
return <Flex sx={{ position: "relative", width }}>{children}</Flex>;
return (
@@ -68,6 +68,7 @@ export function Resizer(props: PropsWithChildren<ResizerProps>) {
}}
className="resizer"
maxWidth={"100%"}
+ bounds={getEditorDOM()}
minWidth={135}
handleStyles={{
bottomRight: {
@@ -98,6 +99,7 @@ export function Resizer(props: PropsWithChildren<ResizerProps>) {
// ignore
}
}}
+ onResizeStart={(e) => e.preventDefault()}
lockAspectRatio={true}
>
{children}
diff --git a/packages/editor/src/extensions/embed/component.tsx b/packages/editor/src/extensions/embed/component.tsx
index ced770817..840592d00 100644
--- a/packages/editor/src/extensions/embed/component.tsx
+++ b/packages/editor/src/extensions/embed/component.tsx
@@ -50,7 +50,7 @@ export function EmbedComponent(
>
<Resizer
handleColor="accent"
- editor={editor}
+ enabled={editor.isEditable}
selected={selected}
width={width}
onResize={(width, height) => {
diff --git a/packages/editor/src/extensions/image/component.tsx b/packages/editor/src/extensions/image/component.tsx
index 6ac0226f2..36e138c77 100644
--- a/packages/editor/src/extensions/image/component.tsx
+++ b/packages/editor/src/extensions/image/component.tsx
@@ -79,7 +79,6 @@ export function ImageComponent(
ml: float ? (align === "right" ? 2 : 0) : 0,
mr: float ? (align === "left" ? 2 : 0) : 0,
float: float ? (align as "left" | "right") : "none",
- width: float ? "100%" : "unset",
justifyContent: float
? "stretch"
: align === "center"
@@ -124,7 +123,7 @@ export function ImageComponent(
)}
<Resizer
style={{ marginTop: 5 }}
- editor={editor}
+ enabled={editor.isEditable && !float}
selected={selected}
width={width}
height={height || relativeHeight}
@@ -200,6 +199,7 @@ export function ImageComponent(
}
title={title}
sx={{
+ objectFit: "contain",
width: editor.isEditable ? "100%" : width,
height: editor.isEditable ? "100%" : height,
border: selected