smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove closures from mutateElement, get rid of the element spreading (#902)

Browse source
This commit is contained in:
Pete Hunt 2020-03-10 20:11:02 -07:00 • committed by GitHub
parent 13b838117c
commit 83a2f5de28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 218 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/actions/actionFinalize.tsx
View file

@ -19,11 +19,11 @@ export const actionFinalize = register({
if (appState.multiElement) {
// pen and mouse have hover
if (appState.lastPointerDownWith !== "touch") {
mutateElement(appState.multiElement, multiElement => {
multiElement.points = multiElement.points.slice(
mutateElement(appState.multiElement, {
points: appState.multiElement.points.slice(
0,
multiElement.points.length - 1,
);
appState.multiElement.points.length - 1,
),
});
}
if (isInvisiblySmallElement(appState.multiElement)) {

65
src/actions/actionProperties.tsx
View file

@ -11,6 +11,7 @@ import { AppState } from "../../src/types";
import { t } from "../i18n";
import { DEFAULT_FONT } from "../appState";
import { register } from "./register";
import { newElementWith, newTextElementWith } from "../element/mutateElement";
const changeProperty = (
elements: readonly ExcalidrawElement[],
@ -45,10 +46,11 @@ export const actionChangeStrokeColor = register({
name: "changeStrokeColor",
perform: (elements, appState, value) => {
return {
elements: changeProperty(elements, appState, el => ({
...el,
strokeColor: value,
})),
elements: changeProperty(elements, appState, el =>
newElementWith(el, {
strokeColor: value,
}),
),
appState: { ...appState, currentItemStrokeColor: value },
};
},
@ -75,10 +77,11 @@ export const actionChangeBackgroundColor = register({
name: "changeBackgroundColor",
perform: (elements, appState, value) => {
return {
elements: changeProperty(elements, appState, el => ({
...el,
backgroundColor: value,
})),
elements: changeProperty(elements, appState, el =>
newElementWith(el, {
backgroundColor: value,
}),
),
appState: { ...appState, currentItemBackgroundColor: value },
};
},
@ -105,10 +108,11 @@ export const actionChangeFillStyle = register({
name: "changeFillStyle",
perform: (elements, appState, value) => {
return {
elements: changeProperty(elements, appState, el => ({
...el,
fillStyle: value,
})),
elements: changeProperty(elements, appState, el =>
newElementWith(el, {
fillStyle: value,
}),
),
appState: { ...appState, currentItemFillStyle: value },
};
},
@ -141,10 +145,11 @@ export const actionChangeStrokeWidth = register({
name: "changeStrokeWidth",
perform: (elements, appState, value) => {
return {
elements: changeProperty(elements, appState, el => ({
...el,
strokeWidth: value,
})),
elements: changeProperty(elements, appState, el =>
newElementWith(el, {
strokeWidth: value,
}),
),
appState: { ...appState, currentItemStrokeWidth: value },
};
},
@ -175,10 +180,11 @@ export const actionChangeSloppiness = register({
name: "changeSloppiness",
perform: (elements, appState, value) => {
return {
elements: changeProperty(elements, appState, el => ({
...el,
roughness: value,
})),
elements: changeProperty(elements, appState, el =>
newElementWith(el, {
roughness: value,
}),
),
appState: { ...appState, currentItemRoughness: value },
};
},
@ -209,10 +215,11 @@ export const actionChangeOpacity = register({
name: "changeOpacity",
perform: (elements, appState, value) => {
return {
elements: changeProperty(elements, appState, el => ({
...el,
opacity: value,
})),
elements: changeProperty(elements, appState, el =>
newElementWith(el, {
opacity: value,
}),
),
appState: { ...appState, currentItemOpacity: value },
};
},
@ -259,10 +266,9 @@ export const actionChangeFontSize = register({
return {
elements: changeProperty(elements, appState, el => {
if (isTextElement(el)) {
const element: ExcalidrawTextElement = {
...el,
const element: ExcalidrawTextElement = newTextElementWith(el, {
font: `${value}px ${el.font.split("px ")[1]}`,
};
});
redrawTextBoundingBox(element);
return element;
}
@ -307,10 +313,9 @@ export const actionChangeFontFamily = register({
return {
elements: changeProperty(elements, appState, el => {
if (isTextElement(el)) {
const element: ExcalidrawTextElement = {
...el,
const element: ExcalidrawTextElement = newTextElementWith(el, {
font: `${el.font.split("px ")[0]}px ${value}`,
};
});
redrawTextBoundingBox(element);
return element;
}

13
src/actions/actionStyles.ts
View file

@ -6,7 +6,7 @@ import {
import { KEYS } from "../keys";
import { DEFAULT_FONT } from "../appState";
import { register } from "./register";
import { mutateTextElement } from "../element/mutateElement";
import { mutateTextElement, newElementWith } from "../element/mutateElement";
let copiedStyles: string = "{}";
@ -35,20 +35,19 @@ export const actionPasteStyles = register({
return {
elements: elements.map(element => {
if (appState.selectedElementIds[element.id]) {
const newElement = {
...element,
const newElement = newElementWith(element, {
backgroundColor: pastedElement?.backgroundColor,
strokeWidth: pastedElement?.strokeWidth,
strokeColor: pastedElement?.strokeColor,
fillStyle: pastedElement?.fillStyle,
opacity: pastedElement?.opacity,
roughness: pastedElement?.roughness,
};
});
if (isTextElement(newElement)) {
mutateTextElement(newElement, newElement => {
newElement.font = pastedElement?.font || DEFAULT_FONT;
redrawTextBoundingBox(newElement);
mutateTextElement(newElement, {
font: pastedElement?.font || DEFAULT_FONT,
});
redrawTextBoundingBox(newElement);
}
return newElement;
}