docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> document.removeEventListener("keydown", this.onKeyDown, false);
<mask> document.removeEventListener(
<mask> "mousemove",
<mask> this.getCurrentCursorPosition,
<mask> false,
<mask> );
<mask> window.removeEventListener("resize", this.onResize, false);
<mask> window.removeEventListener("unload", this.onUnload, false);
<mask> }
</s> Do not store cursor position in state (#557)
* Do not store cursor position in state
Storing it in state causes a full re-render. The only time we use the cursor position is for pasting. This halves the number of renders on drag.
* remove passive change </s> remove document.addEventListener("mousemove", this.getCurrentCursorPosition);
</s> add document.addEventListener("mousemove", this.updateCurrentCursorPosition); </s> add let cursorX = 0;
let cursorY = 0;
</s> remove this.state.cursorY -
</s> add cursorY - </s> remove this.state.cursorX -
</s> add cursorX - </s> remove private getCurrentCursorPosition = (e: MouseEvent) => {
this.setState({ cursorX: e.x, cursorY: e.y });
</s> add private updateCurrentCursorPosition = (e: MouseEvent) => {
cursorX = e.x;
cursorY = e.y;
|
https://github.com/excalidraw/excalidraw/commit/c697938350db53bc4c03d2f090c50465a4668944
|
src/index.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> private onResize = () => {
<mask> this.forceUpdate();
<mask> };
<mask>
<mask> private getCurrentCursorPosition = (e: MouseEvent) => {
<mask> this.setState({ cursorX: e.x, cursorY: e.y });
<mask> };
<mask>
<mask> private onKeyDown = (event: KeyboardEvent) => {
<mask> if (event.key === KEYS.ESCAPE) {
<mask> elements = clearSelection(elements);
</s> Do not store cursor position in state (#557)
* Do not store cursor position in state
Storing it in state causes a full re-render. The only time we use the cursor position is for pasting. This halves the number of renders on drag.
* remove passive change </s> add let cursorX = 0;
let cursorY = 0;
</s> remove this.state.cursorY -
</s> add cursorY - </s> remove this.state.cursorX -
</s> add cursorX - </s> remove document.addEventListener("mousemove", this.getCurrentCursorPosition);
</s> add document.addEventListener("mousemove", this.updateCurrentCursorPosition); </s> remove this.getCurrentCursorPosition,
</s> add this.updateCurrentCursorPosition,
|
https://github.com/excalidraw/excalidraw/commit/c697938350db53bc4c03d2f090c50465a4668944
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep replace
|
<mask> const elementsCenterX = distance(subCanvasX1, subCanvasX2) / 2;
<mask> const elementsCenterY = distance(subCanvasY1, subCanvasY2) / 2;
<mask>
<mask> const dx =
<mask> this.state.cursorX -
<mask> this.state.scrollX -
<mask> CANVAS_WINDOW_OFFSET_LEFT -
<mask> elementsCenterX;
<mask> const dy =
<mask> this.state.cursorY -
</s> Do not store cursor position in state (#557)
* Do not store cursor position in state
Storing it in state causes a full re-render. The only time we use the cursor position is for pasting. This halves the number of renders on drag.
* remove passive change </s> remove private getCurrentCursorPosition = (e: MouseEvent) => {
this.setState({ cursorX: e.x, cursorY: e.y });
</s> add private updateCurrentCursorPosition = (e: MouseEvent) => {
cursorX = e.x;
cursorY = e.y; </s> add let cursorX = 0;
let cursorY = 0;
</s> remove document.addEventListener("mousemove", this.getCurrentCursorPosition);
</s> add document.addEventListener("mousemove", this.updateCurrentCursorPosition); </s> remove this.getCurrentCursorPosition,
</s> add this.updateCurrentCursorPosition,
|
https://github.com/excalidraw/excalidraw/commit/c697938350db53bc4c03d2f090c50465a4668944
|
src/index.tsx
|
add keep keep keep keep keep keep
|
<mask> import React from "react";
<mask> import {
<mask> ExcalidrawElement,
<mask> ExcalidrawTextElement,
<mask> TextAlign,
<mask> FontFamily,
<mask> ExcalidrawLinearElement,
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove import { ButtonIconCycle } from "../components/ButtonIconCycle";
</s> add import { IconPicker } from "../components/IconPicker"; </s> remove ArrowArrowheadIcon,
</s> add ArrowheadArrowIcon,
ArrowheadBarIcon,
ArrowheadDotIcon,
ArrowheadNoneIcon, </s> add .iconSelectList {
flex-wrap: wrap;
position: relative;
}
</s> add "arrowhead_bar": "Bar",
"arrowhead_dot": "Dot", </s> add .panelColumn {
padding: 8px 8px 0px 8px;
} </s> remove export const ArrowArrowheadIcon = React.memo(
</s> add export const ArrowheadNoneIcon = React.memo(
({ appearance }: { appearance: "light" | "dark" }) =>
createIcon(
<path
d="M6 10H34"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>,
{
width: 40,
height: 20,
},
),
);
export const ArrowheadArrowIcon = React.memo(
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/actions/actionProperties.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> canHaveArrowheads,
<mask> } from "../scene";
<mask> import { ButtonSelect } from "../components/ButtonSelect";
<mask> import { ButtonIconSelect } from "../components/ButtonIconSelect";
<mask> import { ButtonIconCycle } from "../components/ButtonIconCycle";
<mask> import {
<mask> isTextElement,
<mask> redrawTextBoundingBox,
<mask> getNonDeletedElements,
<mask> } from "../element";
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> add import { getLanguage } from "../i18n"; </s> remove ArrowArrowheadIcon,
</s> add ArrowheadArrowIcon,
ArrowheadBarIcon,
ArrowheadDotIcon,
ArrowheadNoneIcon, </s> add .iconSelectList {
flex-wrap: wrap;
position: relative;
}
</s> add .panelColumn {
padding: 8px 8px 0px 8px;
} </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
} </s> add padding: 8px;
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/actions/actionProperties.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> EdgeRoundIcon,
<mask> SloppinessArchitectIcon,
<mask> SloppinessArtistIcon,
<mask> SloppinessCartoonistIcon,
<mask> ArrowArrowheadIcon,
<mask> } from "../components/icons";
<mask> import { EVENT_CHANGE, trackEvent } from "../analytics";
<mask> import colors from "../colors";
<mask>
<mask> const changeProperty = (
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove import { ButtonIconCycle } from "../components/ButtonIconCycle";
</s> add import { IconPicker } from "../components/IconPicker"; </s> add import { getLanguage } from "../i18n"; </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
} </s> add .panelColumn {
padding: 8px 8px 0px 8px;
} </s> add .iconSelectList {
flex-wrap: wrap;
position: relative;
}
</s> remove PanelComponent: ({ elements, appState, updateData }) => (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="buttonList buttonListIcon">
<ButtonIconCycle
group="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowArrowheadIcon
appearance={appState.appearance}
flip={true}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<ButtonIconCycle
group="arrowhead_end"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: <ArrowArrowheadIcon appearance={appState.appearance} />,
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
),
</s> add PanelComponent: ({ elements, appState, updateData }) => {
const isRTL = getLanguage().rtl;
return (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="iconSelectList">
<IconPicker
label="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
keyBinding: "q",
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "w",
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "e",
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "r",
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<IconPicker
label="arrowhead_end"
group="arrowheads"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
keyBinding: "q",
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
keyBinding: "w",
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
keyBinding: "e",
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
keyBinding: "r",
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
);
},
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/actions/actionProperties.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep
|
<mask> },
<mask> commitToHistory: true,
<mask> };
<mask> },
<mask> PanelComponent: ({ elements, appState, updateData }) => (
<mask> <fieldset>
<mask> <legend>{t("labels.arrowheads")}</legend>
<mask> <div className="buttonList buttonListIcon">
<mask> <ButtonIconCycle
<mask> group="arrowhead_start"
<mask> options={[
<mask> {
<mask> value: null,
<mask> text: t("labels.arrowhead_none"),
<mask> icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
<mask> },
<mask> {
<mask> value: "arrow",
<mask> text: t("labels.arrowhead_arrow"),
<mask> icon: (
<mask> <ArrowArrowheadIcon
<mask> appearance={appState.appearance}
<mask> flip={true}
<mask> />
<mask> ),
<mask> },
<mask> ]}
<mask> value={getFormValue<Arrowhead | null>(
<mask> elements,
<mask> appState,
<mask> (element) =>
<mask> isLinearElement(element) && canHaveArrowheads(element.type)
<mask> ? element.startArrowhead
<mask> : appState.currentItemArrowheads.start,
<mask> appState.currentItemArrowheads.start,
<mask> )}
<mask> onChange={(value) => updateData({ position: "start", type: value })}
<mask> />
<mask> <ButtonIconCycle
<mask> group="arrowhead_end"
<mask> options={[
<mask> {
<mask> value: null,
<mask> text: t("labels.arrowhead_none"),
<mask> icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
<mask> },
<mask> {
<mask> value: "arrow",
<mask> text: t("labels.arrowhead_arrow"),
<mask> icon: <ArrowArrowheadIcon appearance={appState.appearance} />,
<mask> },
<mask> ]}
<mask> value={getFormValue<Arrowhead | null>(
<mask> elements,
<mask> appState,
<mask> (element) =>
<mask> isLinearElement(element) && canHaveArrowheads(element.type)
<mask> ? element.endArrowhead
<mask> : appState.currentItemArrowheads.end,
<mask> appState.currentItemArrowheads.end,
<mask> )}
<mask> onChange={(value) => updateData({ position: "end", type: value })}
<mask> />
<mask> </div>
<mask> </fieldset>
<mask> ),
<mask> });
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove { width: 40, height: 20, mirror: true },
</s> add { width: 40, height: 20 },
),
);
export const ArrowheadDotIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g
stroke={iconFillColor(appearance)}
fill={iconFillColor(appearance)}
transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
>
<path d="M32 10L6 10" strokeWidth={2} />
<circle r="4" transform="matrix(-1 0 0 1 30 10)" />
</g>,
{ width: 40, height: 20 },
),
);
export const ArrowheadBarIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
<path
d="M34 10H5.99996M34 10L34 5M34 10L34 15"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>
</g>,
{ width: 40, height: 20 }, </s> remove export const ArrowArrowheadIcon = React.memo(
</s> add export const ArrowheadNoneIcon = React.memo(
({ appearance }: { appearance: "light" | "dark" }) =>
createIcon(
<path
d="M6 10H34"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>,
{
width: 40,
height: 20,
},
),
);
export const ArrowheadArrowIcon = React.memo( </s> remove const size = 30; // pixels (will differ for each arrowhead)
</s> add const size = {
arrow: 30,
bar: 15,
dot: 15,
}[arrowhead]; // pixels (will differ for each arrowhead) </s> remove export type Arrowhead = "arrow";
</s> add export type Arrowhead = "arrow" | "bar" | "dot"; </s> add .iconSelectList {
flex-wrap: wrap;
position: relative;
}
</s> remove <Island padding={3}>
</s> add <Island padding={0}>
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/actions/actionProperties.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> marginLeft: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
<mask> marginRight: SCROLLBAR_WIDTH + SCROLLBAR_MARGIN * 2,
<mask> }}
<mask> >
<mask> <Island padding={3}>
<mask> {appState.openMenu === "canvas" ? (
<mask> <Section className="App-mobile-menu" heading="canvasActions">
<mask> <div className="panelColumn">
<mask> <Stack.Col gap={4}>
<mask> {actionManager.renderAction("loadScene")}
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove const angle = 20; // degrees
</s> add if (arrowhead === "dot") {
const r = Math.hypot(ys - y2, xs - x2);
return [x2, y2, r];
}
const angle = {
arrow: 20,
bar: 90,
}[arrowhead]; // degrees </s> remove const size = 30; // pixels (will differ for each arrowhead)
</s> add const size = {
arrow: 30,
bar: 15,
dot: 15,
}[arrowhead]; // pixels (will differ for each arrowhead) </s> remove PanelComponent: ({ elements, appState, updateData }) => (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="buttonList buttonListIcon">
<ButtonIconCycle
group="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowArrowheadIcon
appearance={appState.appearance}
flip={true}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<ButtonIconCycle
group="arrowhead_end"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: <ArrowArrowheadIcon appearance={appState.appearance} />,
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
),
</s> add PanelComponent: ({ elements, appState, updateData }) => {
const isRTL = getLanguage().rtl;
return (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="iconSelectList">
<IconPicker
label="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
keyBinding: "q",
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "w",
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "e",
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "r",
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<IconPicker
label="arrowhead_end"
group="arrowheads"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
keyBinding: "q",
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
keyBinding: "w",
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
keyBinding: "e",
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
keyBinding: "r",
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
);
}, </s> remove { width: 40, height: 20, mirror: true },
</s> add { width: 40, height: 20 },
),
);
export const ArrowheadDotIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g
stroke={iconFillColor(appearance)}
fill={iconFillColor(appearance)}
transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
>
<path d="M32 10L6 10" strokeWidth={2} />
<circle r="4" transform="matrix(-1 0 0 1 30 10)" />
</g>,
{ width: 40, height: 20 },
),
);
export const ArrowheadBarIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
<path
d="M34 10H5.99996M34 10L34 5M34 10L34 15"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>
</g>,
{ width: 40, height: 20 }, </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
} </s> remove ArrowArrowheadIcon,
</s> add ArrowheadArrowIcon,
ArrowheadBarIcon,
ArrowheadDotIcon,
ArrowheadNoneIcon,
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> { width: 40, height: 20, mirror: true },
<mask> ),
<mask> );
<mask>
<mask> export const ArrowArrowheadIcon = React.memo(
<mask> ({
<mask> appearance,
<mask> flip = false,
<mask> }: {
<mask> appearance: "light" | "dark";
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove { width: 40, height: 20, mirror: true },
</s> add { width: 40, height: 20 },
),
);
export const ArrowheadDotIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g
stroke={iconFillColor(appearance)}
fill={iconFillColor(appearance)}
transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
>
<path d="M32 10L6 10" strokeWidth={2} />
<circle r="4" transform="matrix(-1 0 0 1 30 10)" />
</g>,
{ width: 40, height: 20 },
),
);
export const ArrowheadBarIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
<path
d="M34 10H5.99996M34 10L34 5M34 10L34 15"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>
</g>,
{ width: 40, height: 20 }, </s> remove PanelComponent: ({ elements, appState, updateData }) => (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="buttonList buttonListIcon">
<ButtonIconCycle
group="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowArrowheadIcon
appearance={appState.appearance}
flip={true}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<ButtonIconCycle
group="arrowhead_end"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: <ArrowArrowheadIcon appearance={appState.appearance} />,
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
),
</s> add PanelComponent: ({ elements, appState, updateData }) => {
const isRTL = getLanguage().rtl;
return (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="iconSelectList">
<IconPicker
label="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
keyBinding: "q",
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "w",
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "e",
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "r",
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<IconPicker
label="arrowhead_end"
group="arrowheads"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
keyBinding: "q",
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
keyBinding: "w",
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
keyBinding: "e",
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
keyBinding: "r",
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
);
}, </s> remove export type Arrowhead = "arrow";
</s> add export type Arrowhead = "arrow" | "bar" | "dot"; </s> remove const angle = 20; // degrees
</s> add if (arrowhead === "dot") {
const r = Math.hypot(ys - y2, xs - x2);
return [x2, y2, r];
}
const angle = {
arrow: 20,
bar: 90,
}[arrowhead]; // degrees </s> remove const size = 30; // pixels (will differ for each arrowhead)
</s> add const size = {
arrow: 30,
bar: 15,
dot: 15,
}[arrowhead]; // pixels (will differ for each arrowhead) </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
}
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/components/icons.tsx
|
keep keep keep keep replace keep keep
|
<mask> >
<mask> <path d="M34 10H6M34 10L27 5M34 10L27 15" />
<mask> <path d="M27.5 5L34.5 10L27.5 15" />
<mask> </g>,
<mask> { width: 40, height: 20, mirror: true },
<mask> ),
<mask> );
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove export const ArrowArrowheadIcon = React.memo(
</s> add export const ArrowheadNoneIcon = React.memo(
({ appearance }: { appearance: "light" | "dark" }) =>
createIcon(
<path
d="M6 10H34"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>,
{
width: 40,
height: 20,
},
),
);
export const ArrowheadArrowIcon = React.memo( </s> remove PanelComponent: ({ elements, appState, updateData }) => (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="buttonList buttonListIcon">
<ButtonIconCycle
group="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowArrowheadIcon
appearance={appState.appearance}
flip={true}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<ButtonIconCycle
group="arrowhead_end"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: <ArrowArrowheadIcon appearance={appState.appearance} />,
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
),
</s> add PanelComponent: ({ elements, appState, updateData }) => {
const isRTL = getLanguage().rtl;
return (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="iconSelectList">
<IconPicker
label="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
keyBinding: "q",
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "w",
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "e",
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "r",
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<IconPicker
label="arrowhead_end"
group="arrowheads"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
keyBinding: "q",
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
keyBinding: "w",
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
keyBinding: "e",
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
keyBinding: "r",
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
);
}, </s> remove const size = 30; // pixels (will differ for each arrowhead)
</s> add const size = {
arrow: 30,
bar: 15,
dot: 15,
}[arrowhead]; // pixels (will differ for each arrowhead) </s> add .panelColumn {
padding: 8px 8px 0px 8px;
} </s> add padding: 8px; </s> remove const angle = 20; // degrees
</s> add if (arrowhead === "dot") {
const r = Math.hypot(ys - y2, xs - x2);
return [x2, y2, r];
}
const angle = {
arrow: 20,
bar: 90,
}[arrowhead]; // degrees
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/components/icons.tsx
|
keep add keep keep keep keep
|
<mask> }
<mask>
<mask> .buttonList {
<mask> flex-wrap: wrap;
<mask>
<mask> label {
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove import { ButtonIconCycle } from "../components/ButtonIconCycle";
</s> add import { IconPicker } from "../components/IconPicker"; </s> add .panelColumn {
padding: 8px 8px 0px 8px;
} </s> add import { getLanguage } from "../i18n"; </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
} </s> add padding: 8px; </s> remove ArrowArrowheadIcon,
</s> add ArrowheadArrowIcon,
ArrowheadBarIcon,
ArrowheadDotIcon,
ArrowheadNoneIcon,
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/css/styles.scss
|
keep add keep keep keep keep keep
|
<mask> flex-direction: column;
<mask> pointer-events: initial;
<mask> }
<mask> }
<mask>
<mask> .App-toolbar {
<mask> width: 100%;
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> add padding: 8px; </s> remove import { ButtonIconCycle } from "../components/ButtonIconCycle";
</s> add import { IconPicker } from "../components/IconPicker"; </s> add .iconSelectList {
flex-wrap: wrap;
position: relative;
}
</s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
} </s> remove ArrowArrowheadIcon,
</s> add ArrowheadArrowIcon,
ArrowheadBarIcon,
ArrowheadDotIcon,
ArrowheadNoneIcon, </s> add import { getLanguage } from "../i18n";
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/css/styles.scss
|
keep add keep keep keep keep
|
<mask> align-items: center;
<mask> justify-content: space-between;
<mask> }
<mask>
<mask> .App-mobile-menu {
<mask> width: 100%;
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> add .panelColumn {
padding: 8px 8px 0px 8px;
} </s> remove export const ArrowArrowheadIcon = React.memo(
</s> add export const ArrowheadNoneIcon = React.memo(
({ appearance }: { appearance: "light" | "dark" }) =>
createIcon(
<path
d="M6 10H34"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>,
{
width: 40,
height: 20,
},
),
);
export const ArrowheadArrowIcon = React.memo( </s> remove { width: 40, height: 20, mirror: true },
</s> add { width: 40, height: 20 },
),
);
export const ArrowheadDotIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g
stroke={iconFillColor(appearance)}
fill={iconFillColor(appearance)}
transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
>
<path d="M32 10L6 10" strokeWidth={2} />
<circle r="4" transform="matrix(-1 0 0 1 30 10)" />
</g>,
{ width: 40, height: 20 },
),
);
export const ArrowheadBarIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
<path
d="M34 10H5.99996M34 10L34 5M34 10L34 15"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>
</g>,
{ width: 40, height: 20 }, </s> remove import { ButtonIconCycle } from "../components/ButtonIconCycle";
</s> add import { IconPicker } from "../components/IconPicker"; </s> add .iconSelectList {
flex-wrap: wrap;
position: relative;
}
</s> add import { getLanguage } from "../i18n";
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/css/styles.scss
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const distance = Math.hypot(x2 - x1, y2 - y1);
<mask> const nx = (x2 - x1) / distance;
<mask> const ny = (y2 - y1) / distance;
<mask>
<mask> const size = 30; // pixels (will differ for each arrowhead)
<mask>
<mask> const length = element.points.reduce((total, [cx, cy], idx, points) => {
<mask> const [px, py] = idx > 0 ? points[idx - 1] : [0, 0];
<mask> return total + Math.hypot(cx - px, cy - py);
<mask> }, 0);
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove const angle = 20; // degrees
</s> add if (arrowhead === "dot") {
const r = Math.hypot(ys - y2, xs - x2);
return [x2, y2, r];
}
const angle = {
arrow: 20,
bar: 90,
}[arrowhead]; // degrees </s> remove { width: 40, height: 20, mirror: true },
</s> add { width: 40, height: 20 },
),
);
export const ArrowheadDotIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g
stroke={iconFillColor(appearance)}
fill={iconFillColor(appearance)}
transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
>
<path d="M32 10L6 10" strokeWidth={2} />
<circle r="4" transform="matrix(-1 0 0 1 30 10)" />
</g>,
{ width: 40, height: 20 },
),
);
export const ArrowheadBarIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
<path
d="M34 10H5.99996M34 10L34 5M34 10L34 15"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>
</g>,
{ width: 40, height: 20 }, </s> remove export const ArrowArrowheadIcon = React.memo(
</s> add export const ArrowheadNoneIcon = React.memo(
({ appearance }: { appearance: "light" | "dark" }) =>
createIcon(
<path
d="M6 10H34"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>,
{
width: 40,
height: 20,
},
),
);
export const ArrowheadArrowIcon = React.memo( </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
} </s> remove PanelComponent: ({ elements, appState, updateData }) => (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="buttonList buttonListIcon">
<ButtonIconCycle
group="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowArrowheadIcon
appearance={appState.appearance}
flip={true}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<ButtonIconCycle
group="arrowhead_end"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: <ArrowArrowheadIcon appearance={appState.appearance} />,
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
),
</s> add PanelComponent: ({ elements, appState, updateData }) => {
const isRTL = getLanguage().rtl;
return (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="iconSelectList">
<IconPicker
label="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
keyBinding: "q",
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "w",
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "e",
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "r",
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<IconPicker
label="arrowhead_end"
group="arrowheads"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
keyBinding: "q",
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
keyBinding: "w",
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
keyBinding: "e",
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
keyBinding: "r",
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
);
}, </s> remove ArrowArrowheadIcon,
</s> add ArrowheadArrowIcon,
ArrowheadBarIcon,
ArrowheadDotIcon,
ArrowheadNoneIcon,
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/element/bounds.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const minSize = Math.min(size, length / 2);
<mask> const xs = x2 - nx * minSize;
<mask> const ys = y2 - ny * minSize;
<mask>
<mask> const angle = 20; // degrees
<mask>
<mask> // Return points
<mask> const [x3, y3] = rotate(xs, ys, x2, y2, (-angle * Math.PI) / 180);
<mask> const [x4, y4] = rotate(xs, ys, x2, y2, (angle * Math.PI) / 180);
<mask> return [x2, y2, x3, y3, x4, y4];
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove const size = 30; // pixels (will differ for each arrowhead)
</s> add const size = {
arrow: 30,
bar: 15,
dot: 15,
}[arrowhead]; // pixels (will differ for each arrowhead) </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
} </s> remove <Island padding={3}>
</s> add <Island padding={0}> </s> remove export const ArrowArrowheadIcon = React.memo(
</s> add export const ArrowheadNoneIcon = React.memo(
({ appearance }: { appearance: "light" | "dark" }) =>
createIcon(
<path
d="M6 10H34"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>,
{
width: 40,
height: 20,
},
),
);
export const ArrowheadArrowIcon = React.memo( </s> remove export type Arrowhead = "arrow";
</s> add export type Arrowhead = "arrow" | "bar" | "dot"; </s> remove { width: 40, height: 20, mirror: true },
</s> add { width: 40, height: 20 },
),
);
export const ArrowheadDotIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g
stroke={iconFillColor(appearance)}
fill={iconFillColor(appearance)}
transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
>
<path d="M32 10L6 10" strokeWidth={2} />
<circle r="4" transform="matrix(-1 0 0 1 30 10)" />
</g>,
{ width: 40, height: 20 },
),
);
export const ArrowheadBarIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
<path
d="M34 10H5.99996M34 10L34 5M34 10L34 15"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>
</g>,
{ width: 40, height: 20 },
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/element/bounds.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> focus: number;
<mask> gap: number;
<mask> };
<mask>
<mask> export type Arrowhead = "arrow";
<mask>
<mask> export type ExcalidrawLinearElement = _ExcalidrawElementBase &
<mask> Readonly<{
<mask> type: "line" | "draw" | "arrow";
<mask> points: readonly Point[];
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove export const ArrowArrowheadIcon = React.memo(
</s> add export const ArrowheadNoneIcon = React.memo(
({ appearance }: { appearance: "light" | "dark" }) =>
createIcon(
<path
d="M6 10H34"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>,
{
width: 40,
height: 20,
},
),
);
export const ArrowheadArrowIcon = React.memo( </s> remove { width: 40, height: 20, mirror: true },
</s> add { width: 40, height: 20 },
),
);
export const ArrowheadDotIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g
stroke={iconFillColor(appearance)}
fill={iconFillColor(appearance)}
transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}
>
<path d="M32 10L6 10" strokeWidth={2} />
<circle r="4" transform="matrix(-1 0 0 1 30 10)" />
</g>,
{ width: 40, height: 20 },
),
);
export const ArrowheadBarIcon = React.memo(
({
appearance,
flip = false,
}: {
appearance: "light" | "dark";
flip?: boolean;
}) =>
createIcon(
<g transform={flip ? "translate(40, 0) scale(-1, 1)" : ""}>
<path
d="M34 10H5.99996M34 10L34 5M34 10L34 15"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>
</g>,
{ width: 40, height: 20 }, </s> remove PanelComponent: ({ elements, appState, updateData }) => (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="buttonList buttonListIcon">
<ButtonIconCycle
group="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowArrowheadIcon
appearance={appState.appearance}
flip={true}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<ButtonIconCycle
group="arrowhead_end"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <StrokeStyleSolidIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: <ArrowArrowheadIcon appearance={appState.appearance} />,
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
),
</s> add PanelComponent: ({ elements, appState, updateData }) => {
const isRTL = getLanguage().rtl;
return (
<fieldset>
<legend>{t("labels.arrowheads")}</legend>
<div className="iconSelectList">
<IconPicker
label="arrowhead_start"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
keyBinding: "q",
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "w",
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "e",
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={!isRTL}
/>
),
keyBinding: "r",
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.startArrowhead
: appState.currentItemArrowheads.start,
appState.currentItemArrowheads.start,
)}
onChange={(value) => updateData({ position: "start", type: value })}
/>
<IconPicker
label="arrowhead_end"
group="arrowheads"
options={[
{
value: null,
text: t("labels.arrowhead_none"),
keyBinding: "q",
icon: <ArrowheadNoneIcon appearance={appState.appearance} />,
},
{
value: "arrow",
text: t("labels.arrowhead_arrow"),
keyBinding: "w",
icon: (
<ArrowheadArrowIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "bar",
text: t("labels.arrowhead_bar"),
keyBinding: "e",
icon: (
<ArrowheadBarIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
{
value: "dot",
text: t("labels.arrowhead_dot"),
keyBinding: "r",
icon: (
<ArrowheadDotIcon
appearance={appState.appearance}
flip={isRTL}
/>
),
},
]}
value={getFormValue<Arrowhead | null>(
elements,
appState,
(element) =>
isLinearElement(element) && canHaveArrowheads(element.type)
? element.endArrowhead
: appState.currentItemArrowheads.end,
appState.currentItemArrowheads.end,
)}
onChange={(value) => updateData({ position: "end", type: value })}
/>
</div>
</fieldset>
);
}, </s> remove const angle = 20; // degrees
</s> add if (arrowhead === "dot") {
const r = Math.hypot(ys - y2, xs - x2);
return [x2, y2, r];
}
const angle = {
arrow: 20,
bar: 90,
}[arrowhead]; // degrees </s> remove const size = 30; // pixels (will differ for each arrowhead)
</s> add const size = {
arrow: 30,
bar: 15,
dot: 15,
}[arrowhead]; // pixels (will differ for each arrowhead) </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
}
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/element/types.ts
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "round": "Round",
<mask> "arrowheads": "Arrowheads",
<mask> "arrowhead_none": "None",
<mask> "arrowhead_arrow": "Arrow",
<mask> "fontSize": "Font size",
<mask> "fontFamily": "Font family",
<mask> "onlySelected": "Only selected",
<mask> "withBackground": "With Background",
<mask> "exportEmbedScene": "Embed scene into exported file",
<mask> "exportEmbedScene_details": "Scene data will be saved into the exported PNG/SVG file so that the scene can be restored from it.\nWill increase exported file size.",
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove import { ButtonIconCycle } from "../components/ButtonIconCycle";
</s> add import { IconPicker } from "../components/IconPicker"; </s> remove ArrowArrowheadIcon,
</s> add ArrowheadArrowIcon,
ArrowheadBarIcon,
ArrowheadDotIcon,
ArrowheadNoneIcon, </s> add import { getLanguage } from "../i18n"; </s> add if (arrowhead === "dot") {
const [x, y, r] = arrowheadPoints;
return [
generator.circle(x, y, r, {
...options,
fill: element.strokeColor,
fillStyle: "solid",
}),
];
} </s> remove export type Arrowhead = "arrow";
</s> add export type Arrowhead = "arrow" | "bar" | "dot"; </s> remove const angle = 20; // degrees
</s> add if (arrowhead === "dot") {
const r = Math.hypot(ys - y2, xs - x2);
return [x2, y2, r];
}
const angle = {
arrow: 20,
bar: 90,
}[arrowhead]; // degrees
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/locales/en.json
|
keep keep add keep keep keep keep
|
<mask> }
<mask>
<mask> // Other arrowheads here...
<mask>
<mask> // Arrow arrowheads
<mask> const [x2, y2, x3, y3, x4, y4] = arrowheadPoints;
<mask> if (element.strokeStyle === "dotted") {
</s> More Arrowheads: dot, bar (#2486)
Co-authored-by: Jed Fox <[email protected]>
Co-authored-by: Lipis <[email protected]> </s> remove const angle = 20; // degrees
</s> add if (arrowhead === "dot") {
const r = Math.hypot(ys - y2, xs - x2);
return [x2, y2, r];
}
const angle = {
arrow: 20,
bar: 90,
}[arrowhead]; // degrees </s> remove const size = 30; // pixels (will differ for each arrowhead)
</s> add const size = {
arrow: 30,
bar: 15,
dot: 15,
}[arrowhead]; // pixels (will differ for each arrowhead) </s> remove ArrowArrowheadIcon,
</s> add ArrowheadArrowIcon,
ArrowheadBarIcon,
ArrowheadDotIcon,
ArrowheadNoneIcon, </s> remove import { ButtonIconCycle } from "../components/ButtonIconCycle";
</s> add import { IconPicker } from "../components/IconPicker"; </s> remove export const ArrowArrowheadIcon = React.memo(
</s> add export const ArrowheadNoneIcon = React.memo(
({ appearance }: { appearance: "light" | "dark" }) =>
createIcon(
<path
d="M6 10H34"
stroke={iconFillColor(appearance)}
strokeWidth={2}
fill="none"
/>,
{
width: 40,
height: 20,
},
),
);
export const ArrowheadArrowIcon = React.memo( </s> add .iconSelectList {
flex-wrap: wrap;
position: relative;
}
|
https://github.com/excalidraw/excalidraw/commit/c742225f43680898ec3a1e1fac8efb71b09ddd3a
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { isBindingElement } from "../element/typeChecks";
<mask>
<mask> export const actionFinalize = register({
<mask> name: "finalize",
<mask> perform: (elements, appState) => {
<mask> if (appState.editingLinearElement) {
<mask> const {
<mask> elementId,
<mask> startBindingElement,
<mask> endBindingElement,
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove import { getCursorForResizingElement } from "./resizeTest";
</s> add </s> remove import { resetCursor } from "../utils";
</s> add </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove export const resetCursor = () => {
document.documentElement.style.cursor = "";
</s> add export const resetCursor = (canvas: HTMLCanvasElement | null) => {
if (canvas) {
canvas.style.cursor = "";
}
};
export const setCursor = (canvas: HTMLCanvasElement | null, cursor: string) => {
if (canvas) {
canvas.style.cursor = cursor;
} </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove resetCursor();
</s> add resetCursor(canvas);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/actions/actionFinalize.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (
<mask> (!appState.elementLocked && appState.elementType !== "draw") ||
<mask> !multiPointElement
<mask> ) {
<mask> resetCursor();
<mask> }
<mask> return {
<mask> elements: newElements,
<mask> appState: {
<mask> ...appState,
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove document.documentElement.style.cursor = getCursorForResizingElement(
elementWithTransformHandleType,
</s> add setCursor(
this.canvas,
getCursorForResizingElement(elementWithTransformHandleType), </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/actions/actionFinalize.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> );
<mask>
<mask> export const ShapesSwitcher = ({
<mask> elementType,
<mask> setAppState,
<mask> isLibraryOpen,
<mask> }: {
<mask> canvas: HTMLCanvasElement | null;
<mask> elementType: ExcalidrawElement["type"];
</s> fix: cursor being leaked outside of canvas (#3161) </s> add canvas: HTMLCanvasElement | null; </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove export const resetCursor = () => {
document.documentElement.style.cursor = "";
</s> add export const resetCursor = (canvas: HTMLCanvasElement | null) => {
if (canvas) {
canvas.style.cursor = "";
}
};
export const setCursor = (canvas: HTMLCanvasElement | null, cursor: string) => {
if (canvas) {
canvas.style.cursor = cursor;
} </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/Actions.tsx
|
keep keep keep add keep keep keep keep keep
|
<mask> elementType,
<mask> setAppState,
<mask> isLibraryOpen,
<mask> }: {
<mask> elementType: ExcalidrawElement["type"];
<mask> setAppState: React.Component<any, AppState>["setState"];
<mask> isLibraryOpen: boolean;
<mask> }) => (
<mask> <>
</s> fix: cursor being leaked outside of canvas (#3161) </s> add canvas, </s> remove perform: (elements, appState) => {
</s> add perform: (elements, appState, _, { canvas }) => { </s> remove import { resetCursor } from "../utils";
</s> add </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove resetCursor();
</s> add resetCursor(this.canvas);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/Actions.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> elementType: value,
<mask> multiElement: null,
<mask> selectedElementIds: {},
<mask> });
<mask> setCursorForShape(value);
<mask> setAppState({});
<mask> }}
<mask> />
<mask> );
<mask> })}
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> add canvas={canvas} </s> add canvas,
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/Actions.tsx
|
keep keep keep add keep keep keep keep keep
|
<mask> resetCursor,
<mask> ResolvablePromise,
<mask> resolvablePromise,
<mask> sceneCoordsToViewportCoords,
<mask> setCursorForShape,
<mask> tupleToCoors,
<mask> viewportCoordsToSceneCoords,
<mask> withBatchedUpdates,
<mask> } from "../utils";
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove import { getCursorForResizingElement } from "./resizeTest";
</s> add </s> remove import { resetCursor } from "../utils";
</s> add </s> remove perform: (elements, appState) => {
</s> add perform: (elements, appState, _, { canvas }) => { </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask> if (event.key === KEYS.SPACE && gesture.pointers.size === 0) {
<mask> isHoldingSpace = true;
<mask> document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
<mask> }
<mask> });
<mask>
<mask> private onKeyUp = withBatchedUpdates((event: KeyboardEvent) => {
<mask> if (event.key === KEYS.SPACE) {
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove resetCursor();
</s> add resetCursor(canvas); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove // update cursor
// FIXME it is not very nice to have this here
document.documentElement.style.cursor = getCursorForResizingElement({
element,
transformHandleType,
});
</s> add
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep replace keep keep
|
<mask>
<mask> private onKeyUp = withBatchedUpdates((event: KeyboardEvent) => {
<mask> if (event.key === KEYS.SPACE) {
<mask> if (this.state.elementType === "selection") {
<mask> resetCursor();
<mask> } else {
<mask> setCursorForShape(this.state.elementType);
<mask> this.setState({
<mask> selectedElementIds: {},
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
</s> add setCursor(this.canvas, CURSOR_TYPE.GRABBING); </s> remove resetCursor();
</s> add resetCursor(canvas); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove resetCursor();
</s> add resetCursor(this.canvas);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> });
<mask>
<mask> private selectShapeTool(elementType: AppState["elementType"]) {
<mask> if (!isHoldingSpace) {
<mask> setCursorForShape(elementType);
<mask> }
<mask> if (isToolIcon(document.activeElement)) {
<mask> document.activeElement.blur();
<mask> }
<mask> if (!isLinearElementType(elementType)) {
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
</s> add setCursor(this.canvas, CURSOR_TYPE.GRABBING); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> draggingElement: null,
<mask> editingElement: null,
<mask> });
<mask> if (this.state.elementLocked) {
<mask> setCursorForShape(this.state.elementType);
<mask> }
<mask> }),
<mask> element,
<mask> });
<mask> // deselect all other elements when inserting text
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove // update cursor
// FIXME it is not very nice to have this here
document.documentElement.style.cursor = getCursorForResizingElement({
element,
transformHandleType,
});
</s> add </s> remove document.documentElement.style.cursor = getCursorForResizingElement({
transformHandleType,
});
</s> add setCursor(
this.canvas,
getCursorForResizingElement({
transformHandleType,
}),
); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> return;
<mask> }
<mask>
<mask> resetCursor();
<mask>
<mask> const { x: sceneX, y: sceneY } = viewportCoordsToSceneCoords(
<mask> event,
<mask> this.state,
<mask> );
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove document.documentElement.style.cursor = getCursorForResizingElement({
transformHandleType,
});
</s> add setCursor(
this.canvas,
getCursorForResizingElement({
transformHandleType,
}),
); </s> remove document.documentElement.style.cursor = getCursorForResizingElement(
elementWithTransformHandleType,
</s> add setCursor(
this.canvas,
getCursorForResizingElement(elementWithTransformHandleType), </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
}
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return;
<mask> }
<mask> }
<mask>
<mask> resetCursor();
<mask>
<mask> if (!event[KEYS.CTRL_OR_CMD]) {
<mask> this.startTextEditing({
<mask> sceneX,
<mask> sceneY,
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove document.documentElement.style.cursor = getCursorForResizingElement(
elementWithTransformHandleType,
</s> add setCursor(
this.canvas,
getCursorForResizingElement(elementWithTransformHandleType), </s> remove document.documentElement.style.cursor = getCursorForResizingElement({
transformHandleType,
});
</s> add setCursor(
this.canvas,
getCursorForResizingElement({
transformHandleType,
}),
); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep replace keep replace keep keep
|
<mask> if (isOverScrollBar) {
<mask> resetCursor();
<mask> } else {
<mask> setCursorForShape(this.state.elementType);
<mask> }
<mask> }
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursor(
this.canvas,
isTextElement(hitElement) ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR,
); </s> remove resetCursor();
</s> add resetCursor(this.canvas);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> const { points, lastCommittedPoint } = multiElement;
<mask> const lastPoint = points[points.length - 1];
<mask>
<mask> setCursorForShape(this.state.elementType);
<mask>
<mask> if (lastPoint === lastCommittedPoint) {
<mask> // if we haven't yet created a temp point and we're beyond commit-zone
<mask> // threshold, add a point
<mask> if (
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> mutateElement(multiElement, {
<mask> points: [...points, [scenePointerX - rx, scenePointerY - ry]],
<mask> });
<mask> } else {
<mask> document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
<mask> // in this branch, we're inside the commit zone, and no uncommitted
<mask> // point exists. Thus do nothing (don't add/remove points).
<mask> }
<mask> } else if (
<mask> points.length > 2 &&
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove // update cursor
// FIXME it is not very nice to have this here
document.documentElement.style.cursor = getCursorForResizingElement({
element,
transformHandleType,
});
</s> add </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = getCursorForResizingElement(
elementWithTransformHandleType,
</s> add setCursor(
this.canvas,
getCursorForResizingElement(elementWithTransformHandleType),
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> lastCommittedPoint[0],
<mask> lastCommittedPoint[1],
<mask> ) < LINE_CONFIRM_THRESHOLD
<mask> ) {
<mask> document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
<mask> mutateElement(multiElement, {
<mask> points: points.slice(0, -1),
<mask> });
<mask> } else {
<mask> if (isPathALoop(points, this.state.zoom.value)) {
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.MOVE;
</s> add setCursor(this.canvas, CURSOR_TYPE.MOVE); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove document.documentElement.style.cursor = getCursorForResizingElement(
elementWithTransformHandleType,
</s> add setCursor(
this.canvas,
getCursorForResizingElement(elementWithTransformHandleType),
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> points: points.slice(0, -1),
<mask> });
<mask> } else {
<mask> if (isPathALoop(points, this.state.zoom.value)) {
<mask> document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
<mask> }
<mask> // update last uncommitted point
<mask> mutateElement(multiElement, {
<mask> points: [
<mask> ...points.slice(0, -1),
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove // update cursor
// FIXME it is not very nice to have this here
document.documentElement.style.cursor = getCursorForResizingElement({
element,
transformHandleType,
});
</s> add </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> if (
<mask> elementWithTransformHandleType &&
<mask> elementWithTransformHandleType.transformHandleType
<mask> ) {
<mask> document.documentElement.style.cursor = getCursorForResizingElement(
<mask> elementWithTransformHandleType,
<mask> );
<mask> return;
<mask> }
<mask> } else if (selectedElements.length > 1 && !isOverScrollBar) {
<mask> const transformHandleType = getTransformHandleTypeFromCoords(
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove // update cursor
// FIXME it is not very nice to have this here
document.documentElement.style.cursor = getCursorForResizingElement({
element,
transformHandleType,
});
</s> add </s> remove resetCursor();
</s> add resetCursor(canvas); </s> remove document.documentElement.style.cursor = getCursorForResizingElement({
transformHandleType,
});
</s> add setCursor(
this.canvas,
getCursorForResizingElement({
transformHandleType,
}),
);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> this.state.zoom,
<mask> event.pointerType,
<mask> );
<mask> if (transformHandleType) {
<mask> document.documentElement.style.cursor = getCursorForResizingElement({
<mask> transformHandleType,
<mask> });
<mask> return;
<mask> }
<mask> }
<mask>
<mask> const hitElement = this.getElementAtPosition(
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = getCursorForResizingElement({
transformHandleType: pointerDownState.resize.handleType,
});
</s> add setCursor(
this.canvas,
getCursorForResizingElement({
transformHandleType: pointerDownState.resize.handleType,
}),
); </s> remove // update cursor
// FIXME it is not very nice to have this here
document.documentElement.style.cursor = getCursorForResizingElement({
element,
transformHandleType,
});
</s> add </s> remove document.documentElement.style.cursor = getCursorForResizingElement(
elementWithTransformHandleType,
</s> add setCursor(
this.canvas,
getCursorForResizingElement(elementWithTransformHandleType), </s> remove document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursor(
this.canvas,
isTextElement(hitElement) ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR,
); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
}
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep replace replace replace keep replace keep
|
<mask> );
<mask> if (this.state.elementType === "text") {
<mask> document.documentElement.style.cursor = isTextElement(hitElement)
<mask> ? CURSOR_TYPE.TEXT
<mask> : CURSOR_TYPE.CROSSHAIR;
<mask> } else if (isOverScrollBar) {
<mask> document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
<mask> } else if (
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove resetCursor();
</s> add resetCursor(canvas); </s> remove resetCursor();
</s> add resetCursor(this.canvas);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep replace keep replace keep keep keep keep
|
<mask> ) {
<mask> document.documentElement.style.cursor = CURSOR_TYPE.MOVE;
<mask> } else {
<mask> document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
<mask> }
<mask> };
<mask>
<mask> // set touch moving for mobile context menu
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove resetCursor();
</s> add resetCursor(canvas); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR;
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> let nextPastePrevented = false;
<mask> const isLinux = /Linux/.test(window.navigator.platform);
<mask>
<mask> document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
<mask> let { clientX: lastX, clientY: lastY } = event;
<mask> const onPointerMove = withBatchedUpdates((event: PointerEvent) => {
<mask> const deltaX = lastX - event.clientX;
<mask> const deltaY = lastY - event.clientY;
<mask> lastX = event.clientX;
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove export const resetCursor = () => {
document.documentElement.style.cursor = "";
</s> add export const resetCursor = (canvas: HTMLCanvasElement | null) => {
if (canvas) {
canvas.style.cursor = "";
}
};
export const setCursor = (canvas: HTMLCanvasElement | null, cursor: string) => {
if (canvas) {
canvas.style.cursor = cursor;
} </s> remove document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
</s> add setCursor(this.canvas, CURSOR_TYPE.GRABBING); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> (lastPointerUp = () => {
<mask> lastPointerUp = null;
<mask> isPanning = false;
<mask> if (!isHoldingSpace) {
<mask> setCursorForShape(this.state.elementType);
<mask> }
<mask> this.setState({
<mask> cursorButton: "up",
<mask> });
<mask> this.savePointer(event.clientX, event.clientY, "up");
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove export const resetCursor = () => {
document.documentElement.style.cursor = "";
</s> add export const resetCursor = (canvas: HTMLCanvasElement | null) => {
if (canvas) {
canvas.style.cursor = "";
}
};
export const setCursor = (canvas: HTMLCanvasElement | null, cursor: string) => {
if (canvas) {
canvas.style.cursor = cursor;
} </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> });
<mask>
<mask> const onPointerUp = withBatchedUpdates(() => {
<mask> isDraggingScrollBar = false;
<mask> setCursorForShape(this.state.elementType);
<mask> lastPointerUp = null;
<mask> this.setState({
<mask> cursorButton: "up",
<mask> });
<mask> this.savePointer(event.clientX, event.clientY, "up");
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
</s> add setCursor(this.canvas, CURSOR_TYPE.GRABBING); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove export const resetCursor = () => {
document.documentElement.style.cursor = "";
</s> add export const resetCursor = (canvas: HTMLCanvasElement | null) => {
if (canvas) {
canvas.style.cursor = "";
}
};
export const setCursor = (canvas: HTMLCanvasElement | null, cursor: string) => {
if (canvas) {
canvas.style.cursor = cursor;
} </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR;
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> event.pointerType,
<mask> );
<mask> }
<mask> if (pointerDownState.resize.handleType) {
<mask> document.documentElement.style.cursor = getCursorForResizingElement({
<mask> transformHandleType: pointerDownState.resize.handleType,
<mask> });
<mask> pointerDownState.resize.isResizing = true;
<mask> pointerDownState.resize.offset = tupleToCoors(
<mask> getResizeOffsetXY(
<mask> pointerDownState.resize.handleType,
<mask> selectedElements,
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = getCursorForResizingElement({
transformHandleType,
});
</s> add setCursor(
this.canvas,
getCursorForResizingElement({
transformHandleType,
}),
); </s> remove // update cursor
// FIXME it is not very nice to have this here
document.documentElement.style.cursor = getCursorForResizingElement({
element,
transformHandleType,
});
</s> add </s> remove document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
</s> add setCursor(this.canvas, CURSOR_TYPE.GRABBING); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.MOVE;
</s> add setCursor(this.canvas, CURSOR_TYPE.MOVE); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO); </s> remove document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursor(
this.canvas,
isTextElement(hitElement) ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR,
);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> sceneY: pointerDownState.origin.y,
<mask> insertAtParentCenter: !event.altKey,
<mask> });
<mask>
<mask> resetCursor();
<mask> if (!this.state.elementLocked) {
<mask> this.setState({
<mask> elementType: "selection",
<mask> });
<mask> }
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // point
<mask> mutateElement(multiElement, {
<mask> lastCommittedPoint: multiElement.points[multiElement.points.length - 1],
<mask> });
<mask> document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
<mask> } else {
<mask> const [gridX, gridY] = getGridPoint(
<mask> pointerDownState.origin.x,
<mask> pointerDownState.origin.y,
<mask> elementType === "draw" ? null : this.state.gridSize,
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursor(
this.canvas,
isTextElement(hitElement) ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR,
); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> }
<mask> this.setState({ suggestedBindings: [], startBoundElement: null });
<mask> if (!elementLocked && elementType !== "draw") {
<mask> resetCursor();
<mask> this.setState((prevState) => ({
<mask> draggingElement: null,
<mask> elementType: "selection",
<mask> selectedElementIds: {
<mask> ...prevState.selectedElementIds,
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> }
<mask>
<mask> if (!elementLocked && elementType !== "draw") {
<mask> resetCursor();
<mask> this.setState({
<mask> draggingElement: null,
<mask> suggestedBindings: [],
<mask> elementType: "selection",
<mask> });
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove resetCursor();
</s> add resetCursor(canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/App.tsx
|
keep keep keep add keep keep keep keep keep
|
<mask> <HintViewer appState={appState} elements={elements} />
<mask> {heading}
<mask> <Stack.Row gap={1}>
<mask> <ShapesSwitcher
<mask> elementType={appState.elementType}
<mask> setAppState={setAppState}
<mask> isLibraryOpen={appState.isLibraryOpen}
<mask> />
<mask> </Stack.Row>
</s> fix: cursor being leaked outside of canvas (#3161) </s> add canvas={canvas} </s> remove setCursorForShape(value);
</s> add setCursorForShape(canvas, value); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/LayerUI.tsx
|
keep keep keep add keep keep keep keep keep
|
<mask> <Island padding={1}>
<mask> {heading}
<mask> <Stack.Row gap={1}>
<mask> <ShapesSwitcher
<mask> elementType={appState.elementType}
<mask> setAppState={setAppState}
<mask> isLibraryOpen={appState.isLibraryOpen}
<mask> />
<mask> </Stack.Row>
</s> fix: cursor being leaked outside of canvas (#3161) </s> add canvas={canvas} </s> remove setCursorForShape(value);
</s> add setCursorForShape(canvas, value); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/MobileMenu.tsx
|
keep keep replace keep keep keep keep keep
|
<mask> import React from "react";
<mask> import * as Sentry from "@sentry/browser";
<mask> import { resetCursor } from "../utils";
<mask> import { t } from "../i18n";
<mask>
<mask> interface TopErrorBoundaryState {
<mask> hasError: boolean;
<mask> sentryEventId: string;
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove import { getCursorForResizingElement } from "./resizeTest";
</s> add </s> remove perform: (elements, appState) => {
</s> add perform: (elements, appState, _, { canvas }) => { </s> add setCursor, </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove export const resetCursor = () => {
document.documentElement.style.cursor = "";
</s> add export const resetCursor = (canvas: HTMLCanvasElement | null) => {
if (canvas) {
canvas.style.cursor = "";
}
};
export const setCursor = (canvas: HTMLCanvasElement | null, cursor: string) => {
if (canvas) {
canvas.style.cursor = cursor;
} </s> remove setCursorForShape(elementType);
</s> add setCursorForShape(this.canvas, elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/TopErrorBoundary.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return this.state.hasError ? this.errorSplash() : this.props.children;
<mask> }
<mask>
<mask> componentDidCatch(error: Error, errorInfo: any) {
<mask> resetCursor();
<mask> const _localStorage: any = {};
<mask> for (const [key, value] of Object.entries({ ...localStorage })) {
<mask> try {
<mask> _localStorage[key] = JSON.parse(value);
<mask> } catch (error) {
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursor(
this.canvas,
isTextElement(hitElement) ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR,
); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.AUTO;
</s> add setCursor(this.canvas, CURSOR_TYPE.AUTO); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
}
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/components/TopErrorBoundary.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> } from "./bounds";
<mask> import { isLinearElement, isTextElement } from "./typeChecks";
<mask> import { mutateElement } from "./mutateElement";
<mask> import { getPerfectElementSize } from "./sizeHelpers";
<mask> import { getCursorForResizingElement } from "./resizeTest";
<mask> import { measureText, getFontString } from "../utils";
<mask> import { updateBoundElements } from "./binding";
<mask> import {
<mask> TransformHandleType,
<mask> MaybeTransformHandleType,
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove import { resetCursor } from "../utils";
</s> add </s> remove perform: (elements, appState) => {
</s> add perform: (elements, appState, _, { canvas }) => { </s> add setCursor, </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(elementType);
</s> add setCursorForShape(this.canvas, elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/element/resizeElements.ts
|
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> pointerY,
<mask> );
<mask> }
<mask>
<mask> // update cursor
<mask> // FIXME it is not very nice to have this here
<mask> document.documentElement.style.cursor = getCursorForResizingElement({
<mask> element,
<mask> transformHandleType,
<mask> });
<mask>
<mask> return true;
<mask> } else if (selectedElements.length > 1) {
<mask> if (transformHandleType === "rotation") {
<mask> rotateMultipleElements(
<mask> pointerDownState,
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = getCursorForResizingElement({
transformHandleType,
});
</s> add setCursor(
this.canvas,
getCursorForResizingElement({
transformHandleType,
}),
); </s> remove document.documentElement.style.cursor = getCursorForResizingElement(
elementWithTransformHandleType,
</s> add setCursor(
this.canvas,
getCursorForResizingElement(elementWithTransformHandleType), </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.POINTER;
</s> add setCursor(this.canvas, CURSOR_TYPE.POINTER); </s> remove document.documentElement.style.cursor = getCursorForResizingElement({
transformHandleType: pointerDownState.resize.handleType,
});
</s> add setCursor(
this.canvas,
getCursorForResizingElement({
transformHandleType: pointerDownState.resize.handleType,
}),
); </s> remove document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
</s> add setCursor(this.canvas, CURSOR_TYPE.GRABBING);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/element/resizeElements.ts
|
keep keep replace replace keep keep replace keep keep keep keep
|
<mask> export const distance = (x: number, y: number) => Math.abs(x - y);
<mask>
<mask> export const resetCursor = () => {
<mask> document.documentElement.style.cursor = "";
<mask> };
<mask>
<mask> export const setCursorForShape = (shape: string) => {
<mask> if (shape === "selection") {
<mask> resetCursor();
<mask> } else {
<mask> document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> add canvas.style.cursor = CURSOR_TYPE.CROSSHAIR; </s> remove resetCursor();
</s> add resetCursor(canvas); </s> remove perform: (elements, appState) => {
</s> add perform: (elements, appState, _, { canvas }) => { </s> remove document.documentElement.style.cursor = CURSOR_TYPE.GRABBING;
</s> add setCursor(this.canvas, CURSOR_TYPE.GRABBING); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/utils.ts
|
keep replace keep replace
|
<mask> if (shape === "selection") {
<mask> resetCursor();
<mask> } else {
<mask> document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
</s> fix: cursor being leaked outside of canvas (#3161) </s> remove export const setCursorForShape = (shape: string) => {
</s> add export const setCursorForShape = (
canvas: HTMLCanvasElement | null,
shape: string,
) => {
if (!canvas) {
return;
} </s> remove resetCursor();
</s> add resetCursor(this.canvas); </s> remove setCursorForShape(this.state.elementType);
</s> add setCursorForShape(this.canvas, this.state.elementType); </s> remove export const resetCursor = () => {
document.documentElement.style.cursor = "";
</s> add export const resetCursor = (canvas: HTMLCanvasElement | null) => {
if (canvas) {
canvas.style.cursor = "";
}
};
export const setCursor = (canvas: HTMLCanvasElement | null, cursor: string) => {
if (canvas) {
canvas.style.cursor = cursor;
} </s> remove document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursor(
this.canvas,
isTextElement(hitElement) ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR,
);
|
https://github.com/excalidraw/excalidraw/commit/c77c9ce65ab843e5d01b6637fe19c5d0bea045e4
|
src/utils.ts
|
keep keep add keep keep keep keep keep
|
<mask> private getElementAtPosition(
<mask> x: number,
<mask> y: number,
<mask> ): NonDeleted<ExcalidrawElement> | null {
<mask> const allHitElements = this.getElementsAtPosition(x, y);
<mask> if (allHitElements.length > 1) {
<mask> if (opts?.preferSelected) {
<mask> for (let index = allHitElements.length - 1; index > -1; index--) {
</s> fix: on contextMenu, use selected element regardless of z-index (#3668) </s> add if (opts?.preferSelected) {
for (let index = allHitElements.length - 1; index > -1; index--) {
if (this.state.selectedElementIds[allHitElements[index].id]) {
return allHitElements[index];
}
}
} </s> remove const element = this.getElementAtPosition(x, y);
</s> add const element = this.getElementAtPosition(x, y, { preferSelected: true }); </s> add static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
selectedElementIds: elements.reduce((acc, element) => {
acc[element.id] = true;
return acc;
}, {} as Record<ExcalidrawElement["id"], true>),
});
};
</s> add exports[`contextMenu element shows context menu for element: [end of test] number of elements 2`] = `2`;
</s> add exports[`contextMenu element shows context menu for element: [end of test] number of renders 2`] = `6`;
|
https://github.com/excalidraw/excalidraw/commit/c819b653bff686a53c57b9db9ae603e8c1754ff3
|
src/components/App.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> ): NonDeleted<ExcalidrawElement> | null {
<mask> const allHitElements = this.getElementsAtPosition(x, y);
<mask> if (allHitElements.length > 1) {
<mask> const elementWithHighestZIndex =
<mask> allHitElements[allHitElements.length - 1];
<mask> // If we're hitting element with highest z-index only on its bounding box
<mask> // while also hitting other element figure, the latter should be considered.
<mask> return isHittingElementBoundingBoxWithoutHittingElement(
<mask> elementWithHighestZIndex,
</s> fix: on contextMenu, use selected element regardless of z-index (#3668) </s> add opts?: {
/** if true, returns the first selected element (with highest z-index)
of all hit elements */
preferSelected?: boolean;
}, </s> remove const element = this.getElementAtPosition(x, y);
</s> add const element = this.getElementAtPosition(x, y, { preferSelected: true }); </s> add static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
selectedElementIds: elements.reduce((acc, element) => {
acc[element.id] = true;
return acc;
}, {} as Record<ExcalidrawElement["id"], true>),
});
};
</s> add exports[`contextMenu element shows context menu for element: [end of test] number of elements 2`] = `2`;
</s> add exports[`contextMenu element shows context menu for element: [end of test] number of renders 2`] = `6`;
|
https://github.com/excalidraw/excalidraw/commit/c819b653bff686a53c57b9db9ae603e8c1754ff3
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ) => {
<mask> event.preventDefault();
<mask>
<mask> const { x, y } = viewportCoordsToSceneCoords(event, this.state);
<mask> const element = this.getElementAtPosition(x, y);
<mask>
<mask> const type = element ? "element" : "canvas";
<mask>
<mask> const container = this.excalidrawContainerRef.current!;
<mask> const {
</s> fix: on contextMenu, use selected element regardless of z-index (#3668) </s> add static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
selectedElementIds: elements.reduce((acc, element) => {
acc[element.id] = true;
return acc;
}, {} as Record<ExcalidrawElement["id"], true>),
});
};
</s> add if (opts?.preferSelected) {
for (let index = allHitElements.length - 1; index > -1; index--) {
if (this.state.selectedElementIds[allHitElements[index].id]) {
return allHitElements[index];
}
}
} </s> add opts?: {
/** if true, returns the first selected element (with highest z-index)
of all hit elements */
preferSelected?: boolean;
}, </s> add exports[`contextMenu element shows context menu for element: [end of test] number of elements 2`] = `2`;
</s> add exports[`contextMenu element shows context menu for element: [end of test] number of renders 2`] = `6`;
|
https://github.com/excalidraw/excalidraw/commit/c819b653bff686a53c57b9db9ae603e8c1754ff3
|
src/components/App.tsx
|
keep add keep keep keep
|
<mask> exports[`contextMenu element shows context menu for element: [end of test] number of elements 1`] = `1`;
<mask>
<mask> exports[`contextMenu element shows context menu for element: [end of test] number of renders 1`] = `9`;
<mask>
<mask> exports[`contextMenu element shows context menu for element: [end of test] number of renders 2`] = `6`;
</s> fix: on contextMenu, use selected element regardless of z-index (#3668) </s> add exports[`contextMenu element shows context menu for element: [end of test] number of renders 2`] = `6`; </s> remove const element = this.getElementAtPosition(x, y);
</s> add const element = this.getElementAtPosition(x, y, { preferSelected: true }); </s> add if (opts?.preferSelected) {
for (let index = allHitElements.length - 1; index > -1; index--) {
if (this.state.selectedElementIds[allHitElements[index].id]) {
return allHitElements[index];
}
}
} </s> add opts?: {
/** if true, returns the first selected element (with highest z-index)
of all hit elements */
preferSelected?: boolean;
}, </s> add static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
selectedElementIds: elements.reduce((acc, element) => {
acc[element.id] = true;
return acc;
}, {} as Record<ExcalidrawElement["id"], true>),
});
};
|
https://github.com/excalidraw/excalidraw/commit/c819b653bff686a53c57b9db9ae603e8c1754ff3
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep add
|
<mask>
<mask> exports[`contextMenu element shows context menu for element: [end of test] number of elements 2`] = `2`;
<mask>
<mask> exports[`contextMenu element shows context menu for element: [end of test] number of renders 1`] = `9`;
</s> fix: on contextMenu, use selected element regardless of z-index (#3668) </s> add exports[`contextMenu element shows context menu for element: [end of test] number of elements 2`] = `2`;
</s> remove const element = this.getElementAtPosition(x, y);
</s> add const element = this.getElementAtPosition(x, y, { preferSelected: true }); </s> add if (opts?.preferSelected) {
for (let index = allHitElements.length - 1; index > -1; index--) {
if (this.state.selectedElementIds[allHitElements[index].id]) {
return allHitElements[index];
}
}
} </s> add opts?: {
/** if true, returns the first selected element (with highest z-index)
of all hit elements */
preferSelected?: boolean;
}, </s> add static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
selectedElementIds: elements.reduce((acc, element) => {
acc[element.id] = true;
return acc;
}, {} as Record<ExcalidrawElement["id"], true>),
});
};
|
https://github.com/excalidraw/excalidraw/commit/c819b653bff686a53c57b9db9ae603e8c1754ff3
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep add keep keep keep keep keep keep
|
<mask> const { h } = window;
<mask>
<mask> export class API {
<mask> static getSelectedElements = (): ExcalidrawElement[] => {
<mask> return h.elements.filter(
<mask> (element) => h.state.selectedElementIds[element.id],
<mask> );
<mask> };
<mask>
</s> fix: on contextMenu, use selected element regardless of z-index (#3668) </s> remove const element = this.getElementAtPosition(x, y);
</s> add const element = this.getElementAtPosition(x, y, { preferSelected: true }); </s> add if (opts?.preferSelected) {
for (let index = allHitElements.length - 1; index > -1; index--) {
if (this.state.selectedElementIds[allHitElements[index].id]) {
return allHitElements[index];
}
}
} </s> add opts?: {
/** if true, returns the first selected element (with highest z-index)
of all hit elements */
preferSelected?: boolean;
}, </s> add exports[`contextMenu element shows context menu for element: [end of test] number of elements 2`] = `2`;
</s> add exports[`contextMenu element shows context menu for element: [end of test] number of renders 2`] = `6`;
|
https://github.com/excalidraw/excalidraw/commit/c819b653bff686a53c57b9db9ae603e8c1754ff3
|
src/tests/helpers/api.ts
|
keep keep add keep keep keep keep
|
<mask> _brand: "socketUpdateData";
<mask> };
<mask>
<mask> export const createIV = () => {
<mask> const arr = new Uint8Array(IV_LENGTH_BYTES);
<mask> return window.crypto.getRandomValues(arr);
<mask> };
</s> fix: use random IV for link-sharing encryption (#2829) (#2833)
* fix: use random IV for link-sharing encryption (#2829)
* fix: add backward compatibility for link-sharing encryption (#2829) </s> remove const arr = new Uint8Array(12);
</s> add const arr = new Uint8Array(IV_LENGTH_BYTES); </s> add const decryptImported = async (
iv: ArrayBuffer,
encrypted: ArrayBuffer,
privateKey: string,
): Promise<ArrayBuffer> => {
const key = await getImportedKey(privateKey, "decrypt");
return window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
encrypted,
);
};
</s> remove const key = await getImportedKey(privateKey, "decrypt");
const iv = new Uint8Array(12);
const decrypted = await window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
buffer,
);
</s> add let decrypted: ArrayBuffer;
try {
// Buffer should contain both the IV (fixed length) and encrypted data
const iv = buffer.slice(0, IV_LENGTH_BYTES);
const encrypted = buffer.slice(IV_LENGTH_BYTES, buffer.byteLength);
decrypted = await decryptImported(iv, encrypted, privateKey);
} catch (error) {
// Fixed IV (old format, backward compatibility)
const fixedIv = new Uint8Array(IV_LENGTH_BYTES);
decrypted = await decryptImported(fixedIv, buffer, privateKey);
}
</s> remove body: encrypted,
</s> add body: payload, </s> remove // The iv is set to 0. We are never going to reuse the same key so we don't
// need to have an iv. (I hope that's correct...)
const iv = new Uint8Array(12);
</s> add const iv = createIV(); </s> add // Concatenate IV with encrypted data (IV does not have to be secret).
const payloadBlob = new Blob([iv.buffer, encrypted]);
const payload = await new Response(payloadBlob).arrayBuffer();
|
https://github.com/excalidraw/excalidraw/commit/c8743a8c021007ec9a94b9c63ccb8fd649be1297
|
src/excalidraw-app/data/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> _brand: "socketUpdateData";
<mask> };
<mask>
<mask> export const createIV = () => {
<mask> const arr = new Uint8Array(12);
<mask> return window.crypto.getRandomValues(arr);
<mask> };
<mask>
<mask> export const encryptAESGEM = async (
<mask> data: Uint8Array,
</s> fix: use random IV for link-sharing encryption (#2829) (#2833)
* fix: use random IV for link-sharing encryption (#2829)
* fix: add backward compatibility for link-sharing encryption (#2829) </s> add const IV_LENGTH_BYTES = 12; // 96 bits
</s> add const decryptImported = async (
iv: ArrayBuffer,
encrypted: ArrayBuffer,
privateKey: string,
): Promise<ArrayBuffer> => {
const key = await getImportedKey(privateKey, "decrypt");
return window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
encrypted,
);
};
</s> remove const key = await getImportedKey(privateKey, "decrypt");
const iv = new Uint8Array(12);
const decrypted = await window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
buffer,
);
</s> add let decrypted: ArrayBuffer;
try {
// Buffer should contain both the IV (fixed length) and encrypted data
const iv = buffer.slice(0, IV_LENGTH_BYTES);
const encrypted = buffer.slice(IV_LENGTH_BYTES, buffer.byteLength);
decrypted = await decryptImported(iv, encrypted, privateKey);
} catch (error) {
// Fixed IV (old format, backward compatibility)
const fixedIv = new Uint8Array(IV_LENGTH_BYTES);
decrypted = await decryptImported(fixedIv, buffer, privateKey);
}
</s> remove body: encrypted,
</s> add body: payload, </s> remove // The iv is set to 0. We are never going to reuse the same key so we don't
// need to have an iv. (I hope that's correct...)
const iv = new Uint8Array(12);
</s> add const iv = createIV(); </s> add // Concatenate IV with encrypted data (IV does not have to be secret).
const payloadBlob = new Blob([iv.buffer, encrypted]);
const payload = await new Response(payloadBlob).arrayBuffer();
|
https://github.com/excalidraw/excalidraw/commit/c8743a8c021007ec9a94b9c63ccb8fd649be1297
|
src/excalidraw-app/data/index.ts
|
keep keep add keep keep keep keep
|
<mask> [usage],
<mask> );
<mask>
<mask> const importFromBackend = async (
<mask> id: string | null,
<mask> privateKey?: string | null,
<mask> ): Promise<ImportedDataState> => {
</s> fix: use random IV for link-sharing encryption (#2829) (#2833)
* fix: use random IV for link-sharing encryption (#2829)
* fix: add backward compatibility for link-sharing encryption (#2829) </s> remove const arr = new Uint8Array(12);
</s> add const arr = new Uint8Array(IV_LENGTH_BYTES); </s> remove const key = await getImportedKey(privateKey, "decrypt");
const iv = new Uint8Array(12);
const decrypted = await window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
buffer,
);
</s> add let decrypted: ArrayBuffer;
try {
// Buffer should contain both the IV (fixed length) and encrypted data
const iv = buffer.slice(0, IV_LENGTH_BYTES);
const encrypted = buffer.slice(IV_LENGTH_BYTES, buffer.byteLength);
decrypted = await decryptImported(iv, encrypted, privateKey);
} catch (error) {
// Fixed IV (old format, backward compatibility)
const fixedIv = new Uint8Array(IV_LENGTH_BYTES);
decrypted = await decryptImported(fixedIv, buffer, privateKey);
}
</s> add const IV_LENGTH_BYTES = 12; // 96 bits
</s> remove body: encrypted,
</s> add body: payload, </s> remove // The iv is set to 0. We are never going to reuse the same key so we don't
// need to have an iv. (I hope that's correct...)
const iv = new Uint8Array(12);
</s> add const iv = createIV(); </s> add // Concatenate IV with encrypted data (IV does not have to be secret).
const payloadBlob = new Blob([iv.buffer, encrypted]);
const payload = await new Response(payloadBlob).arrayBuffer();
|
https://github.com/excalidraw/excalidraw/commit/c8743a8c021007ec9a94b9c63ccb8fd649be1297
|
src/excalidraw-app/data/index.ts
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> }
<mask> let data: ImportedDataState;
<mask> if (privateKey) {
<mask> const buffer = await response.arrayBuffer();
<mask> const key = await getImportedKey(privateKey, "decrypt");
<mask> const iv = new Uint8Array(12);
<mask> const decrypted = await window.crypto.subtle.decrypt(
<mask> {
<mask> name: "AES-GCM",
<mask> iv,
<mask> },
<mask> key,
<mask> buffer,
<mask> );
<mask> // We need to convert the decrypted array buffer to a string
<mask> const string = new window.TextDecoder("utf-8").decode(
<mask> new Uint8Array(decrypted) as any,
<mask> );
<mask> data = JSON.parse(string);
</s> fix: use random IV for link-sharing encryption (#2829) (#2833)
* fix: use random IV for link-sharing encryption (#2829)
* fix: add backward compatibility for link-sharing encryption (#2829) </s> add const decryptImported = async (
iv: ArrayBuffer,
encrypted: ArrayBuffer,
privateKey: string,
): Promise<ArrayBuffer> => {
const key = await getImportedKey(privateKey, "decrypt");
return window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
encrypted,
);
};
</s> remove body: encrypted,
</s> add body: payload, </s> remove // The iv is set to 0. We are never going to reuse the same key so we don't
// need to have an iv. (I hope that's correct...)
const iv = new Uint8Array(12);
</s> add const iv = createIV(); </s> add // Concatenate IV with encrypted data (IV does not have to be secret).
const payloadBlob = new Blob([iv.buffer, encrypted]);
const payload = await new Response(payloadBlob).arrayBuffer();
</s> remove const arr = new Uint8Array(12);
</s> add const arr = new Uint8Array(IV_LENGTH_BYTES); </s> add const IV_LENGTH_BYTES = 12; // 96 bits
|
https://github.com/excalidraw/excalidraw/commit/c8743a8c021007ec9a94b9c63ccb8fd649be1297
|
src/excalidraw-app/data/index.ts
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> },
<mask> true, // extractable
<mask> ["encrypt", "decrypt"],
<mask> );
<mask> // The iv is set to 0. We are never going to reuse the same key so we don't
<mask> // need to have an iv. (I hope that's correct...)
<mask> const iv = new Uint8Array(12);
<mask> // We use symmetric encryption. AES-GCM is the recommended algorithm and
<mask> // includes checks that the ciphertext has not been modified by an attacker.
<mask> const encrypted = await window.crypto.subtle.encrypt(
<mask> {
<mask> name: "AES-GCM",
</s> fix: use random IV for link-sharing encryption (#2829) (#2833)
* fix: use random IV for link-sharing encryption (#2829)
* fix: add backward compatibility for link-sharing encryption (#2829) </s> add // Concatenate IV with encrypted data (IV does not have to be secret).
const payloadBlob = new Blob([iv.buffer, encrypted]);
const payload = await new Response(payloadBlob).arrayBuffer();
</s> remove const key = await getImportedKey(privateKey, "decrypt");
const iv = new Uint8Array(12);
const decrypted = await window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
buffer,
);
</s> add let decrypted: ArrayBuffer;
try {
// Buffer should contain both the IV (fixed length) and encrypted data
const iv = buffer.slice(0, IV_LENGTH_BYTES);
const encrypted = buffer.slice(IV_LENGTH_BYTES, buffer.byteLength);
decrypted = await decryptImported(iv, encrypted, privateKey);
} catch (error) {
// Fixed IV (old format, backward compatibility)
const fixedIv = new Uint8Array(IV_LENGTH_BYTES);
decrypted = await decryptImported(fixedIv, buffer, privateKey);
}
</s> remove body: encrypted,
</s> add body: payload, </s> add const IV_LENGTH_BYTES = 12; // 96 bits
</s> add const decryptImported = async (
iv: ArrayBuffer,
encrypted: ArrayBuffer,
privateKey: string,
): Promise<ArrayBuffer> => {
const key = await getImportedKey(privateKey, "decrypt");
return window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
encrypted,
);
};
</s> remove const arr = new Uint8Array(12);
</s> add const arr = new Uint8Array(IV_LENGTH_BYTES);
|
https://github.com/excalidraw/excalidraw/commit/c8743a8c021007ec9a94b9c63ccb8fd649be1297
|
src/excalidraw-app/data/index.ts
|
keep keep keep add keep keep keep keep
|
<mask> },
<mask> key,
<mask> encoded,
<mask> );
<mask> // We use jwk encoding to be able to extract just the base64 encoded key.
<mask> // We will hardcode the rest of the attributes when importing back the key.
<mask> const exportedKey = await window.crypto.subtle.exportKey("jwk", key);
<mask>
</s> fix: use random IV for link-sharing encryption (#2829) (#2833)
* fix: use random IV for link-sharing encryption (#2829)
* fix: add backward compatibility for link-sharing encryption (#2829) </s> remove // The iv is set to 0. We are never going to reuse the same key so we don't
// need to have an iv. (I hope that's correct...)
const iv = new Uint8Array(12);
</s> add const iv = createIV(); </s> remove const key = await getImportedKey(privateKey, "decrypt");
const iv = new Uint8Array(12);
const decrypted = await window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
buffer,
);
</s> add let decrypted: ArrayBuffer;
try {
// Buffer should contain both the IV (fixed length) and encrypted data
const iv = buffer.slice(0, IV_LENGTH_BYTES);
const encrypted = buffer.slice(IV_LENGTH_BYTES, buffer.byteLength);
decrypted = await decryptImported(iv, encrypted, privateKey);
} catch (error) {
// Fixed IV (old format, backward compatibility)
const fixedIv = new Uint8Array(IV_LENGTH_BYTES);
decrypted = await decryptImported(fixedIv, buffer, privateKey);
}
</s> remove body: encrypted,
</s> add body: payload, </s> add const decryptImported = async (
iv: ArrayBuffer,
encrypted: ArrayBuffer,
privateKey: string,
): Promise<ArrayBuffer> => {
const key = await getImportedKey(privateKey, "decrypt");
return window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
encrypted,
);
};
</s> add const IV_LENGTH_BYTES = 12; // 96 bits
</s> remove const arr = new Uint8Array(12);
</s> add const arr = new Uint8Array(IV_LENGTH_BYTES);
|
https://github.com/excalidraw/excalidraw/commit/c8743a8c021007ec9a94b9c63ccb8fd649be1297
|
src/excalidraw-app/data/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> try {
<mask> const response = await fetch(BACKEND_V2_POST, {
<mask> method: "POST",
<mask> body: encrypted,
<mask> });
<mask> const json = await response.json();
<mask> if (json.id) {
<mask> const url = new URL(window.location.href);
<mask> // We need to store the key (and less importantly the id) as hash instead
</s> fix: use random IV for link-sharing encryption (#2829) (#2833)
* fix: use random IV for link-sharing encryption (#2829)
* fix: add backward compatibility for link-sharing encryption (#2829) </s> remove const key = await getImportedKey(privateKey, "decrypt");
const iv = new Uint8Array(12);
const decrypted = await window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
buffer,
);
</s> add let decrypted: ArrayBuffer;
try {
// Buffer should contain both the IV (fixed length) and encrypted data
const iv = buffer.slice(0, IV_LENGTH_BYTES);
const encrypted = buffer.slice(IV_LENGTH_BYTES, buffer.byteLength);
decrypted = await decryptImported(iv, encrypted, privateKey);
} catch (error) {
// Fixed IV (old format, backward compatibility)
const fixedIv = new Uint8Array(IV_LENGTH_BYTES);
decrypted = await decryptImported(fixedIv, buffer, privateKey);
}
</s> remove // The iv is set to 0. We are never going to reuse the same key so we don't
// need to have an iv. (I hope that's correct...)
const iv = new Uint8Array(12);
</s> add const iv = createIV(); </s> add // Concatenate IV with encrypted data (IV does not have to be secret).
const payloadBlob = new Blob([iv.buffer, encrypted]);
const payload = await new Response(payloadBlob).arrayBuffer();
</s> add const decryptImported = async (
iv: ArrayBuffer,
encrypted: ArrayBuffer,
privateKey: string,
): Promise<ArrayBuffer> => {
const key = await getImportedKey(privateKey, "decrypt");
return window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv,
},
key,
encrypted,
);
};
</s> add const IV_LENGTH_BYTES = 12; // 96 bits
</s> remove const arr = new Uint8Array(12);
</s> add const arr = new Uint8Array(IV_LENGTH_BYTES);
|
https://github.com/excalidraw/excalidraw/commit/c8743a8c021007ec9a94b9c63ccb8fd649be1297
|
src/excalidraw-app/data/index.ts
|
keep add keep keep keep keep
|
<mask> name: "deleteSelectedElements",
<mask> perform: (elements, appState) => {
<mask> return {
<mask> elements: nextElements,
<mask> appState: {
<mask> ...nextAppState,
</s> Reset selectedElementIds when deleting selected elements (#875) </s> remove elements: deleteSelectedElements(elements, appState),
appState: { ...appState, elementType: "selection", multiElement: null },
</s> add elements: nextElements,
appState: {
...nextAppState,
elementType: "selection",
multiElement: null,
}, </s> remove return elements.filter(el => !appState.selectedElementIds[el.id]);
</s> add return {
elements: elements.filter(el => !appState.selectedElementIds[el.id]),
appState: {
...appState,
selectedElementIds: {},
},
}; </s> remove elements = deleteSelectedElements(elements, this.state);
</s> add const { elements: nextElements, appState } = deleteSelectedElements(
elements,
this.state,
);
elements = nextElements; </s> remove this.setState({});
</s> add this.setState({ ...appState });
|
https://github.com/excalidraw/excalidraw/commit/c89584832d1aedc8316789c29107dad20b5eb9f1
|
src/actions/actionDeleteSelected.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> export const actionDeleteSelected = register({
<mask> name: "deleteSelectedElements",
<mask> perform: (elements, appState) => {
<mask> return {
<mask> elements: deleteSelectedElements(elements, appState),
<mask> appState: { ...appState, elementType: "selection", multiElement: null },
<mask> };
<mask> },
<mask> contextItemLabel: "labels.delete",
<mask> contextMenuOrder: 3,
<mask> commitToHistory: (appState, elements) =>
</s> Reset selectedElementIds when deleting selected elements (#875) </s> add const {
elements: nextElements,
appState: nextAppState,
} = deleteSelectedElements(elements, appState); </s> remove return elements.filter(el => !appState.selectedElementIds[el.id]);
</s> add return {
elements: elements.filter(el => !appState.selectedElementIds[el.id]),
appState: {
...appState,
selectedElementIds: {},
},
}; </s> remove elements = deleteSelectedElements(elements, this.state);
</s> add const { elements: nextElements, appState } = deleteSelectedElements(
elements,
this.state,
);
elements = nextElements; </s> remove this.setState({});
</s> add this.setState({ ...appState });
|
https://github.com/excalidraw/excalidraw/commit/c89584832d1aedc8316789c29107dad20b5eb9f1
|
src/actions/actionDeleteSelected.tsx
|
keep keep replace keep replace keep keep
|
<mask> }
<mask> copyToAppClipboard(elements, this.state);
<mask> elements = deleteSelectedElements(elements, this.state);
<mask> history.resumeRecording();
<mask> this.setState({});
<mask> event.preventDefault();
<mask> };
</s> Reset selectedElementIds when deleting selected elements (#875) </s> add const {
elements: nextElements,
appState: nextAppState,
} = deleteSelectedElements(elements, appState); </s> remove elements: deleteSelectedElements(elements, appState),
appState: { ...appState, elementType: "selection", multiElement: null },
</s> add elements: nextElements,
appState: {
...nextAppState,
elementType: "selection",
multiElement: null,
}, </s> remove return elements.filter(el => !appState.selectedElementIds[el.id]);
</s> add return {
elements: elements.filter(el => !appState.selectedElementIds[el.id]),
appState: {
...appState,
selectedElementIds: {},
},
};
|
https://github.com/excalidraw/excalidraw/commit/c89584832d1aedc8316789c29107dad20b5eb9f1
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> export function deleteSelectedElements(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
<mask> ) {
<mask> return elements.filter(el => !appState.selectedElementIds[el.id]);
<mask> }
<mask>
<mask> export function getSelectedIndices(
<mask> elements: readonly ExcalidrawElement[],
<mask> appState: AppState,
</s> Reset selectedElementIds when deleting selected elements (#875) </s> remove elements: deleteSelectedElements(elements, appState),
appState: { ...appState, elementType: "selection", multiElement: null },
</s> add elements: nextElements,
appState: {
...nextAppState,
elementType: "selection",
multiElement: null,
}, </s> add const {
elements: nextElements,
appState: nextAppState,
} = deleteSelectedElements(elements, appState); </s> remove elements = deleteSelectedElements(elements, this.state);
</s> add const { elements: nextElements, appState } = deleteSelectedElements(
elements,
this.state,
);
elements = nextElements; </s> remove this.setState({});
</s> add this.setState({ ...appState });
|
https://github.com/excalidraw/excalidraw/commit/c89584832d1aedc8316789c29107dad20b5eb9f1
|
src/scene/selection.ts
|
keep keep keep add keep keep keep keep keep keep
|
<mask> import {
<mask> getNonDeletedElements,
<mask> getNormalizedDimensions,
<mask> isInvisiblySmallElement,
<mask> } from "../element";
<mask> import { isLinearElementType } from "../element/typeChecks";
<mask> import { randomId } from "../random";
<mask> import {
<mask> DEFAULT_FONT_FAMILY,
<mask> DEFAULT_TEXT_ALIGN,
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> add refreshTextDimensions, </s> remove return restoreElementWithProperties(element, {
</s> add element = restoreElementWithProperties(element, { </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> remove const container = getContainerElement(textElement);
if (container) {
text = wrapText(
originalText,
getFontString(textElement),
getMaxContainerWidth(container),
);
}
const dimensions = getAdjustedDimensions(textElement, text);
</s> add </s> remove text,
</s> add </s> remove let migratedElement: ExcalidrawElement | null = restoreElement(element);
</s> add let migratedElement: ExcalidrawElement | null = restoreElement(
element,
refreshDimensions,
);
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/data/restore.ts
|
keep keep keep add keep keep keep keep keep keep
|
<mask> };
<mask>
<mask> const restoreElement = (
<mask> element: Exclude<ExcalidrawElement, ExcalidrawSelectionElement>,
<mask> ): typeof element | null => {
<mask> switch (element.type) {
<mask> case "text":
<mask> let fontSize = element.fontSize;
<mask> let fontFamily = element.fontFamily;
<mask> if ("font" in element) {
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove let migratedElement: ExcalidrawElement | null = restoreElement(element);
</s> add let migratedElement: ExcalidrawElement | null = restoreElement(
element,
refreshDimensions,
); </s> remove return restoreElementWithProperties(element, {
</s> add element = restoreElementWithProperties(element, { </s> add refreshDimensions = true, </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText), </s> remove elements: restoreElements(data?.elements, localElements),
</s> add elements: restoreElements(data?.elements, localElements, true),
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/data/restore.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ).font.split(" ");
<mask> fontSize = parseInt(fontPx, 10);
<mask> fontFamily = getFontFamilyByName(_fontFamily);
<mask> }
<mask> return restoreElementWithProperties(element, {
<mask> fontSize,
<mask> fontFamily,
<mask> text: element.text ?? "",
<mask> baseline: element.baseline,
<mask> textAlign: element.textAlign || DEFAULT_TEXT_ALIGN,
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> add refreshDimensions = true, </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> add refreshTextDimensions, </s> remove const container = getContainerElement(textElement);
if (container) {
text = wrapText(
originalText,
getFontString(textElement),
getMaxContainerWidth(container),
);
}
const dimensions = getAdjustedDimensions(textElement, text);
</s> add </s> remove text,
</s> add </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText),
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/data/restore.ts
|
keep add keep keep keep keep
|
<mask> originalText: element.originalText || element.text,
<mask> });
<mask> case "freedraw": {
<mask> return restoreElementWithProperties(element, {
<mask> points: element.points,
<mask> lastCommittedPoint: null,
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove return restoreElementWithProperties(element, {
</s> add element = restoreElementWithProperties(element, { </s> add refreshDimensions = true, </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText), </s> remove const container = getContainerElement(textElement);
if (container) {
text = wrapText(
originalText,
getFontString(textElement),
getMaxContainerWidth(container),
);
}
const dimensions = getAdjustedDimensions(textElement, text);
</s> add </s> remove text,
</s> add </s> remove elements: restoreElements(data?.elements, localElements),
</s> add elements: restoreElements(data?.elements, localElements, true),
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/data/restore.ts
|
keep add keep keep keep keep keep keep
|
<mask> /** NOTE doesn't serve for reconciliation */
<mask> localElements: readonly ExcalidrawElement[] | null | undefined,
<mask> ): ExcalidrawElement[] => {
<mask> const localElementsMap = localElements ? arrayToMap(localElements) : null;
<mask> return (elements || []).reduce((elements, element) => {
<mask> // filtering out selection, which is legacy, no longer kept in elements,
<mask> // and causing issues if retained
<mask> if (element.type !== "selection" && !isInvisiblySmallElement(element)) {
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove let migratedElement: ExcalidrawElement | null = restoreElement(element);
</s> add let migratedElement: ExcalidrawElement | null = restoreElement(
element,
refreshDimensions,
); </s> remove elements: restoreElements(data?.elements, localElements),
</s> add elements: restoreElements(data?.elements, localElements, true), </s> add refreshDimensions = true, </s> remove remoteElements = restoreElements(remoteElements, null);
</s> add remoteElements = restoreElements(remoteElements, null, false); </s> remove const container = getContainerElement(textElement);
if (container) {
text = wrapText(
originalText,
getFontString(textElement),
getMaxContainerWidth(container),
);
}
const dimensions = getAdjustedDimensions(textElement, text);
</s> add </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element;
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/data/restore.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return (elements || []).reduce((elements, element) => {
<mask> // filtering out selection, which is legacy, no longer kept in elements,
<mask> // and causing issues if retained
<mask> if (element.type !== "selection" && !isInvisiblySmallElement(element)) {
<mask> let migratedElement: ExcalidrawElement | null = restoreElement(element);
<mask> if (migratedElement) {
<mask> const localElement = localElementsMap?.get(element.id);
<mask> if (localElement && localElement.version > migratedElement.version) {
<mask> migratedElement = bumpVersion(migratedElement, localElement.version);
<mask> }
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> add refreshDimensions = true, </s> add refreshDimensions = true, </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> remove const container = getContainerElement(textElement);
if (container) {
text = wrapText(
originalText,
getFontString(textElement),
getMaxContainerWidth(container),
);
}
const dimensions = getAdjustedDimensions(textElement, text);
</s> add </s> remove elements: restoreElements(data?.elements, localElements),
</s> add elements: restoreElements(data?.elements, localElements, true), </s> remove return restoreElementWithProperties(element, {
</s> add element = restoreElementWithProperties(element, {
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/data/restore.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> localAppState: Partial<AppState> | null | undefined,
<mask> localElements: readonly ExcalidrawElement[] | null | undefined,
<mask> ): RestoredDataState => {
<mask> return {
<mask> elements: restoreElements(data?.elements, localElements),
<mask> appState: restoreAppState(data?.appState, localAppState || null),
<mask> files: data?.files || {},
<mask> };
<mask> };
<mask>
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> add refreshDimensions = true, </s> add refreshDimensions = true, </s> remove let migratedElement: ExcalidrawElement | null = restoreElement(element);
</s> add let migratedElement: ExcalidrawElement | null = restoreElement(
element,
refreshDimensions,
); </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText), </s> remove text,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/data/restore.ts
|
keep keep keep add keep keep keep keep keep
|
<mask> export {
<mask> newElement,
<mask> newTextElement,
<mask> updateTextElement,
<mask> newLinearElement,
<mask> newImageElement,
<mask> duplicateElement,
<mask> } from "./newElement";
<mask> export {
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> add refreshTextDimensions, </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText), </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> remove const container = getContainerElement(textElement);
if (container) {
text = wrapText(
originalText,
getFontString(textElement),
getMaxContainerWidth(container),
);
}
const dimensions = getAdjustedDimensions(textElement, text);
</s> add </s> remove return restoreElementWithProperties(element, {
</s> add element = restoreElementWithProperties(element, { </s> remove text,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/element/index.ts
|
keep keep keep keep replace replace replace replace replace replace replace replace replace keep replace keep
|
<mask> isDeleted?: boolean;
<mask> originalText: string;
<mask> },
<mask> ): ExcalidrawTextElement => {
<mask> const container = getContainerElement(textElement);
<mask> if (container) {
<mask> text = wrapText(
<mask> originalText,
<mask> getFontString(textElement),
<mask> getMaxContainerWidth(container),
<mask> );
<mask> }
<mask> const dimensions = getAdjustedDimensions(textElement, text);
<mask> return newElementWith(textElement, {
<mask> text,
<mask> originalText,
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText), </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> add refreshDimensions = true, </s> remove let migratedElement: ExcalidrawElement | null = restoreElement(element);
</s> add let migratedElement: ExcalidrawElement | null = restoreElement(
element,
refreshDimensions,
); </s> remove remoteElements = restoreElements(remoteElements, null);
</s> add remoteElements = restoreElements(remoteElements, null, false);
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/element/newElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return newElementWith(textElement, {
<mask> text,
<mask> originalText,
<mask> isDeleted: isDeleted ?? textElement.isDeleted,
<mask> ...dimensions,
<mask> });
<mask> };
<mask>
<mask> export const newFreeDrawElement = (
<mask> opts: {
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove text,
</s> add </s> remove const container = getContainerElement(textElement);
if (container) {
text = wrapText(
originalText,
getFontString(textElement),
getMaxContainerWidth(container),
);
}
const dimensions = getAdjustedDimensions(textElement, text);
</s> add </s> add refreshDimensions = true, </s> add refreshTextDimensions, </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> remove return restoreElementWithProperties(element, {
</s> add element = restoreElementWithProperties(element, {
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/element/newElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ): ReconciledElements => {
<mask> const localElements = this.getSceneElementsIncludingDeleted();
<mask> const appState = this.excalidrawAPI.getAppState();
<mask>
<mask> remoteElements = restoreElements(remoteElements, null);
<mask>
<mask> const reconciledElements = _reconcileElements(
<mask> localElements,
<mask> remoteElements,
<mask> appState,
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> add refreshDimensions = true, </s> remove const container = getContainerElement(textElement);
if (container) {
text = wrapText(
originalText,
getFontString(textElement),
getMaxContainerWidth(container),
);
}
const dimensions = getAdjustedDimensions(textElement, text);
</s> add </s> add refreshDimensions = true, </s> remove let migratedElement: ExcalidrawElement | null = restoreElement(element);
</s> add let migratedElement: ExcalidrawElement | null = restoreElement(
element,
refreshDimensions,
); </s> remove return restoreElementWithProperties(element, {
</s> add element = restoreElementWithProperties(element, { </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText),
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/excalidraw-app/collab/Collab.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "fillStyle": "hachure",
<mask> "fontFamily": 1,
<mask> "fontSize": 14,
<mask> "groupIds": Array [],
<mask> "height": 100,
<mask> "id": "id-text01",
<mask> "isDeleted": false,
<mask> "link": null,
<mask> "locked": false,
<mask> "opacity": 100,
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove "height": 100,
</s> add "height": 0, </s> remove "width": 100,
</s> add "width": 1, </s> remove "width": 100,
</s> add "width": 1, </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> remove remoteElements = restoreElements(remoteElements, null);
</s> add remoteElements = restoreElements(remoteElements, null, false); </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText),
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/tests/data/__snapshots__/restore.test.ts.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "updated": 1,
<mask> "version": 1,
<mask> "versionNonce": 0,
<mask> "verticalAlign": "middle",
<mask> "width": 100,
<mask> "x": -0.5,
<mask> "y": 0,
<mask> }
<mask> `;
<mask>
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove "width": 100,
</s> add "width": 1, </s> remove "height": 100,
</s> add "height": 0, </s> remove "height": 100,
</s> add "height": 0, </s> add refreshTextDimensions, </s> add refreshTextDimensions, </s> remove text,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/tests/data/__snapshots__/restore.test.ts.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "fillStyle": "hachure",
<mask> "fontFamily": 1,
<mask> "fontSize": 10,
<mask> "groupIds": Array [],
<mask> "height": 100,
<mask> "id": "id-text01",
<mask> "isDeleted": false,
<mask> "link": null,
<mask> "locked": false,
<mask> "opacity": 100,
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove "height": 100,
</s> add "height": 0, </s> remove "width": 100,
</s> add "width": 1, </s> remove "width": 100,
</s> add "width": 1, </s> add if (refreshDimensions) {
element = { ...element, ...refreshTextDimensions(element) };
}
return element; </s> remove remoteElements = restoreElements(remoteElements, null);
</s> add remoteElements = restoreElements(remoteElements, null, false); </s> remove ...dimensions,
</s> add ...refreshTextDimensions(textElement, originalText),
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/tests/data/__snapshots__/restore.test.ts.snap
|
keep keep keep keep replace keep keep keep keep
|
<mask> "updated": 1,
<mask> "version": 1,
<mask> "versionNonce": 0,
<mask> "verticalAlign": "top",
<mask> "width": 100,
<mask> "x": 0,
<mask> "y": 0,
<mask> }
<mask> `;
</s> fix: restore text dimensions (#5432)
* fix: restore text dimensions
* fix tests
* update readme & changelog
* reduce API surface area by always refreshing dimensions for full `restore()` </s> remove "width": 100,
</s> add "width": 1, </s> remove "height": 100,
</s> add "height": 0, </s> remove "height": 100,
</s> add "height": 0, </s> add refreshTextDimensions, </s> add refreshTextDimensions, </s> remove text,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/c8f6e3faa821c5aa25b8c29dc004ede129eb1a6f
|
src/tests/data/__snapshots__/restore.test.ts.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "toggleExportColorScheme": "",
<mask> "share": "",
<mask> "showStroke": "",
<mask> "showBackground": "",
<mask> "toggleTheme": ""
<mask> },
<mask> "buttons": {
<mask> "clearReset": "",
<mask> "exportJSON": "",
<mask> "exportImage": "",
</s> chore: Update translations from Crowdin (#4258) </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": "Veksle tema"
</s> add "toggleTheme": "Veksle tema",
"personalLib": "",
"excalidrawLib": "" </s> remove "clear": ""
</s> add "clear": "",
"remove": "",
"publishLibrary": "",
"submit": "",
"confirm": "" </s> remove "clear": ""
</s> add "clear": "",
"remove": "",
"publishLibrary": "",
"submit": "",
"confirm": ""
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/bn-BD.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "lightMode": "",
<mask> "zenMode": "",
<mask> "exitZenMode": "",
<mask> "cancel": "",
<mask> "clear": ""
<mask> },
<mask> "alerts": {
<mask> "clearReset": "",
<mask> "couldNotCreateShareableLink": "",
<mask> "couldNotCreateShareableLinkTooBig": "",
</s> chore: Update translations from Crowdin (#4258) </s> remove "clear": ""
</s> add "clear": "",
"remove": "",
"publishLibrary": "",
"submit": "",
"confirm": "" </s> remove "clear": ""
</s> add "clear": "",
"remove": "",
"publishLibrary": "",
"submit": "",
"confirm": "" </s> remove "clear": ""
</s> add "clear": "",
"remove": "",
"publishLibrary": "",
"submit": "",
"confirm": "" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": ""
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/bn-BD.json
|
keep add keep keep keep keep keep
|
<mask> "invalidSceneUrl": "",
<mask> "resetLibrary": "",
<mask> "invalidEncryptionKey": ""
<mask> },
<mask> "errors": {
<mask> "unsupportedFileType": "",
<mask> "imageInsertError": "",
</s> chore: Update translations from Crowdin (#4258) </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "addedToLibrary": "",
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/bn-BD.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "rotate": "",
<mask> "lineEditor_info": "",
<mask> "lineEditor_pointSelected": "",
<mask> "lineEditor_nothingSelected": "",
<mask> "placeImage": ""
<mask> },
<mask> "canvasError": {
<mask> "cannotShowPreview": "",
<mask> "canvasTooBig": "",
<mask> "canvasTooBigTip": ""
</s> chore: Update translations from Crowdin (#4258) </s> remove "placeImage": ""
</s> add "placeImage": "",
"publishLibrary": "" </s> remove "placeImage": ""
</s> add "placeImage": "",
"publishLibrary": "" </s> remove "placeImage": ""
</s> add "placeImage": "",
"publishLibrary": "" </s> remove "placeImage": ""
</s> add "placeImage": "",
"publishLibrary": "" </s> add "addedToLibrary": "", </s> add "addedToLibrary": "",
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/bn-BD.json
|
keep keep add keep keep keep keep keep
|
<mask> "width": ""
<mask> },
<mask> "toast": {
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
<mask> "copyToClipboardAsPng": "",
<mask> "fileSaved": "",
<mask> "fileSavedToFilename": "",
</s> chore: Update translations from Crowdin (#4258) </s> add "addedToLibrary": "", </s> add "addedToLibrary": "", </s> add "addedToLibrary": "", </s> add "addedToLibrary": "", </s> add "addedToLibrary": "", </s> remove "copyToClipboardAsPng": "",
</s> add "copyToClipboardAsPng": "Skopiowano {{exportSelection}} do schowka jako PNG\n({{exportColorScheme}})",
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/bn-BD.json
|
keep add keep keep keep keep
|
<mask> },
<mask> "toast": {
<mask> "copyStyles": "S'han copiat els estils.",
<mask> "copyToClipboard": "S'ha copiat al porta-retalls.",
<mask> "copyToClipboardAsPng": "S'ha copiat {{exportSelection}} al porta-retalls en format PNG\n({{exportColorScheme}})",
<mask> "fileSaved": "S'ha desat el fitxer.",
</s> chore: Update translations from Crowdin (#4258) </s> add "addedToLibrary": "", </s> remove "copyToClipboardAsPng": "",
</s> add "copyToClipboardAsPng": "Skopiowano {{exportSelection}} do schowka jako PNG\n({{exportColorScheme}})", </s> add "addedToLibrary": "", </s> add "addedToLibrary": "Tambahkan ke pustaka", </s> add "addedToLibrary": "Tillagd i biblioteket", </s> add "addedToLibrary": "",
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/ca-ES.json
|
keep add keep keep keep keep keep keep
|
<mask> "invalidSceneUrl": "",
<mask> "resetLibrary": "",
<mask> "invalidEncryptionKey": ""
<mask> },
<mask> "errors": {
<mask> "unsupportedFileType": "",
<mask> "imageInsertError": "",
<mask> "fileTooBig": "",
</s> chore: Update translations from Crowdin (#4258) </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "addedToLibrary": "",
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/cs-CZ.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "rotate": "",
<mask> "lineEditor_info": "",
<mask> "lineEditor_pointSelected": "",
<mask> "lineEditor_nothingSelected": "",
<mask> "placeImage": ""
<mask> },
<mask> "canvasError": {
<mask> "cannotShowPreview": "",
<mask> "canvasTooBig": "",
<mask> "canvasTooBigTip": ""
</s> chore: Update translations from Crowdin (#4258)
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/cs-CZ.json
|
keep keep add keep keep keep keep keep
|
<mask> "width": ""
<mask> },
<mask> "toast": {
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
<mask> "copyToClipboardAsPng": "",
<mask> "fileSaved": "",
<mask> "fileSavedToFilename": "",
</s> chore: Update translations from Crowdin (#4258)
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/cs-CZ.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "toggleExportColorScheme": "",
<mask> "share": "Del",
<mask> "showStroke": "",
<mask> "showBackground": "",
<mask> "toggleTheme": ""
<mask> },
<mask> "buttons": {
<mask> "clearReset": "",
<mask> "exportJSON": "",
<mask> "exportImage": "",
</s> chore: Update translations from Crowdin (#4258) </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": "Veksle tema"
</s> add "toggleTheme": "Veksle tema",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": "Thema aan/uit"
</s> add "toggleTheme": "Thema aan/uit",
"personalLib": "Persoonlijke bibliotheek",
"excalidrawLib": "Excalidraw bibliotheek" </s> remove "toggleTheme": "Ubah tema"
</s> add "toggleTheme": "Ubah tema",
"personalLib": "Pustaka Pribadi",
"excalidrawLib": "Pustaka Excalidraw"
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/da-DK.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "lightMode": "Lys baggrund",
<mask> "zenMode": "",
<mask> "exitZenMode": "",
<mask> "cancel": "",
<mask> "clear": ""
<mask> },
<mask> "alerts": {
<mask> "clearReset": "",
<mask> "couldNotCreateShareableLink": "",
<mask> "couldNotCreateShareableLinkTooBig": "",
</s> chore: Update translations from Crowdin (#4258) </s> remove "clear": ""
</s> add "clear": "",
"remove": "",
"publishLibrary": "",
"submit": "",
"confirm": "" </s> remove "clear": ""
</s> add "clear": "",
"remove": "",
"publishLibrary": "",
"submit": "",
"confirm": "" </s> remove "clear": ""
</s> add "clear": "",
"remove": "",
"publishLibrary": "",
"submit": "",
"confirm": "" </s> remove "clear": "Hapus"
</s> add "clear": "Hapus",
"remove": "Hapus",
"publishLibrary": "Terbitkan",
"submit": "Kirimkan",
"confirm": "Konfirmasi" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": "" </s> remove "toggleTheme": ""
</s> add "toggleTheme": "",
"personalLib": "",
"excalidrawLib": ""
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/da-DK.json
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "imageDoesNotContainScene": "",
<mask> "cannotRestoreFromImage": "",
<mask> "invalidSceneUrl": "",
<mask> "resetLibrary": "",
<mask> "invalidEncryptionKey": ""
<mask> },
<mask> "errors": {
<mask> "unsupportedFileType": "",
<mask> "imageInsertError": "",
<mask> "fileTooBig": "",
</s> chore: Update translations from Crowdin (#4258) </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "removeItemsFromsLibrary": "", </s> add "addedToLibrary": "",
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/da-DK.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "rotate": "",
<mask> "lineEditor_info": "",
<mask> "lineEditor_pointSelected": "",
<mask> "lineEditor_nothingSelected": "",
<mask> "placeImage": ""
<mask> },
<mask> "canvasError": {
<mask> "cannotShowPreview": "",
<mask> "canvasTooBig": "",
<mask> "canvasTooBigTip": ""
</s> chore: Update translations from Crowdin (#4258)
|
https://github.com/excalidraw/excalidraw/commit/ca1f3aa09439dbc9e1de6d9bcc08c2b36d83b463
|
src/locales/da-DK.json
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.