Enhanced animations API.
This commit is contained in:
@@ -121,6 +121,16 @@ export default function ExampleApp({
|
|||||||
const [hideAllForFadeDemo, setHideAllForFadeDemo] = useState(false);
|
const [hideAllForFadeDemo, setHideAllForFadeDemo] = useState(false);
|
||||||
const [fadeDemoNextIndex, setFadeDemoNextIndex] = useState(0);
|
const [fadeDemoNextIndex, setFadeDemoNextIndex] = useState(0);
|
||||||
const [fadeDemoElementIds, setFadeDemoElementIds] = useState<string[]>([]);
|
const [fadeDemoElementIds, setFadeDemoElementIds] = useState<string[]>([]);
|
||||||
|
const [demoAnimationType, setDemoAnimationType] = useState<"fade" | "fly">(
|
||||||
|
"fade",
|
||||||
|
);
|
||||||
|
const [demoAnimationDuration, setDemoAnimationDuration] = useState(500);
|
||||||
|
const [demoFlyFrom, setDemoFlyFrom] = useState<
|
||||||
|
"left" | "right" | "top" | "bottom"
|
||||||
|
>("left");
|
||||||
|
const [demoAnimationEasing, setDemoAnimationEasing] = useState<
|
||||||
|
"linear" | "easeOut" | "easeInOut"
|
||||||
|
>("easeOut");
|
||||||
|
|
||||||
const initialStatePromiseRef = useRef<{
|
const initialStatePromiseRef = useRef<{
|
||||||
promise: ResolvablePromise<ExcalidrawInitialDataState | null>;
|
promise: ResolvablePromise<ExcalidrawInitialDataState | null>;
|
||||||
@@ -676,6 +686,67 @@ export default function ExampleApp({
|
|||||||
</button>
|
</button>
|
||||||
{showFadeDemo && (
|
{showFadeDemo && (
|
||||||
<>
|
<>
|
||||||
|
<label>
|
||||||
|
Animation type
|
||||||
|
<select
|
||||||
|
value={demoAnimationType}
|
||||||
|
onChange={(event) =>
|
||||||
|
setDemoAnimationType(
|
||||||
|
event.target.value as "fade" | "fly",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<option value="fade">fade</option>
|
||||||
|
<option value="fly">fly</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Duration
|
||||||
|
<input
|
||||||
|
type="number"
|
||||||
|
value={demoAnimationDuration}
|
||||||
|
onChange={(event) =>
|
||||||
|
setDemoAnimationDuration(Number(event.target.value) || 0)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Easing
|
||||||
|
<select
|
||||||
|
value={demoAnimationEasing}
|
||||||
|
onChange={(event) =>
|
||||||
|
setDemoAnimationEasing(
|
||||||
|
event.target.value as "linear" | "easeOut" | "easeInOut",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<option value="linear">linear</option>
|
||||||
|
<option value="easeOut">easeOut</option>
|
||||||
|
<option value="easeInOut">easeInOut</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
{demoAnimationType === "fly" && (
|
||||||
|
<label>
|
||||||
|
Fly from
|
||||||
|
<select
|
||||||
|
value={demoFlyFrom}
|
||||||
|
onChange={(event) =>
|
||||||
|
setDemoFlyFrom(
|
||||||
|
event.target.value as
|
||||||
|
| "left"
|
||||||
|
| "right"
|
||||||
|
| "top"
|
||||||
|
| "bottom",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<option value="left">left</option>
|
||||||
|
<option value="right">right</option>
|
||||||
|
<option value="top">top</option>
|
||||||
|
<option value="bottom">bottom</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
<button
|
<button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (!excalidrawAPI) {
|
if (!excalidrawAPI) {
|
||||||
@@ -687,7 +758,7 @@ export default function ExampleApp({
|
|||||||
.getSceneElements()
|
.getSceneElements()
|
||||||
.map((element) => element.id),
|
.map((element) => element.id),
|
||||||
);
|
);
|
||||||
excalidrawAPI.clearElementOpacityOverrides();
|
excalidrawAPI.clearElementAnimationOverrides();
|
||||||
setHideAllForFadeDemo(true);
|
setHideAllForFadeDemo(true);
|
||||||
setFadeDemoNextIndex(0);
|
setFadeDemoNextIndex(0);
|
||||||
}}
|
}}
|
||||||
@@ -716,20 +787,32 @@ export default function ExampleApp({
|
|||||||
: fadeDemoNextIndex;
|
: fadeDemoNextIndex;
|
||||||
|
|
||||||
if (nextIndex === 0) {
|
if (nextIndex === 0) {
|
||||||
excalidrawAPI.clearElementOpacityOverrides();
|
excalidrawAPI.clearElementAnimationOverrides();
|
||||||
}
|
}
|
||||||
|
|
||||||
excalidrawAPI.fadeElements({
|
if (demoAnimationType === "fly") {
|
||||||
elements: [elements[nextIndex].id],
|
excalidrawAPI.animateElements({
|
||||||
from: 0,
|
elements: [elements[nextIndex].id],
|
||||||
to: 100,
|
type: "fly",
|
||||||
duration: 500,
|
from: demoFlyFrom,
|
||||||
});
|
duration: demoAnimationDuration,
|
||||||
|
phase: "in",
|
||||||
|
easing: demoAnimationEasing,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
excalidrawAPI.animateElements({
|
||||||
|
elements: [elements[nextIndex].id],
|
||||||
|
type: "fade",
|
||||||
|
duration: demoAnimationDuration,
|
||||||
|
phase: "in",
|
||||||
|
easing: demoAnimationEasing,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
setFadeDemoNextIndex(nextIndex + 1);
|
setFadeDemoNextIndex(nextIndex + 1);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Fade in next element
|
Animate in next element
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
@@ -747,18 +830,31 @@ export default function ExampleApp({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
excalidrawAPI.fadeElements({
|
if (demoAnimationType === "fly") {
|
||||||
elements,
|
excalidrawAPI.animateElements({
|
||||||
from: 0,
|
elements,
|
||||||
to: 100,
|
type: "fly",
|
||||||
duration: 500,
|
from: demoFlyFrom,
|
||||||
stagger: 1000,
|
duration: demoAnimationDuration,
|
||||||
});
|
stagger: 120,
|
||||||
|
phase: "in",
|
||||||
|
easing: demoAnimationEasing,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
excalidrawAPI.animateElements({
|
||||||
|
elements,
|
||||||
|
type: "fade",
|
||||||
|
duration: demoAnimationDuration,
|
||||||
|
stagger: 120,
|
||||||
|
phase: "in",
|
||||||
|
easing: demoAnimationEasing,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
setFadeDemoNextIndex(elements.length);
|
setFadeDemoNextIndex(elements.length);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Fade in all
|
Animate in all
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
@@ -785,17 +881,29 @@ export default function ExampleApp({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
excalidrawAPI.fadeElements({
|
if (demoAnimationType === "fly") {
|
||||||
elements: [elements[prevIndex].id],
|
excalidrawAPI.animateElements({
|
||||||
from: 100,
|
elements: [elements[prevIndex].id],
|
||||||
to: 0,
|
type: "fly",
|
||||||
duration: 500,
|
from: demoFlyFrom,
|
||||||
});
|
duration: demoAnimationDuration,
|
||||||
|
phase: "out",
|
||||||
|
easing: demoAnimationEasing,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
excalidrawAPI.animateElements({
|
||||||
|
elements: [elements[prevIndex].id],
|
||||||
|
type: "fade",
|
||||||
|
duration: demoAnimationDuration,
|
||||||
|
phase: "out",
|
||||||
|
easing: demoAnimationEasing,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
setFadeDemoNextIndex(prevIndex);
|
setFadeDemoNextIndex(prevIndex);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Fade out prev element
|
Animate out prev element
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -130,6 +130,32 @@ export const resolveRenderOpacity = (
|
|||||||
return element.opacity;
|
return element.opacity;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const resolveRenderPositionOffset = (
|
||||||
|
element: ExcalidrawElement,
|
||||||
|
renderConfig: Pick<StaticCanvasRenderConfig, "elementPositionOverrides">,
|
||||||
|
) => {
|
||||||
|
return renderConfig.elementPositionOverrides?.get(element.id) ?? { x: 0, y: 0 };
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getRenderElementWithPositionOverride = <
|
||||||
|
TElement extends NonDeletedExcalidrawElement,
|
||||||
|
>(
|
||||||
|
element: TElement,
|
||||||
|
renderConfig: Pick<StaticCanvasRenderConfig, "elementPositionOverrides">,
|
||||||
|
): TElement => {
|
||||||
|
const positionOffset = resolveRenderPositionOffset(element, renderConfig);
|
||||||
|
|
||||||
|
if (positionOffset.x === 0 && positionOffset.y === 0) {
|
||||||
|
return element;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
...element,
|
||||||
|
x: element.x + positionOffset.x,
|
||||||
|
y: element.y + positionOffset.y,
|
||||||
|
} as TElement;
|
||||||
|
};
|
||||||
|
|
||||||
export const getRenderOpacity = (
|
export const getRenderOpacity = (
|
||||||
element: ExcalidrawElement,
|
element: ExcalidrawElement,
|
||||||
renderConfig: Pick<
|
renderConfig: Pick<
|
||||||
@@ -821,6 +847,8 @@ export const renderElement = (
|
|||||||
!appState.selectedElementIds[element.id] &&
|
!appState.selectedElementIds[element.id] &&
|
||||||
!appState.hoveredElementIds[element.id];
|
!appState.hoveredElementIds[element.id];
|
||||||
|
|
||||||
|
element = getRenderElementWithPositionOverride(element, renderConfig);
|
||||||
|
|
||||||
context.globalAlpha = getRenderOpacity(
|
context.globalAlpha = getRenderOpacity(
|
||||||
element,
|
element,
|
||||||
renderConfig,
|
renderConfig,
|
||||||
|
|||||||
@@ -210,6 +210,7 @@ import {
|
|||||||
getMinTextElementWidth,
|
getMinTextElementWidth,
|
||||||
ShapeCache,
|
ShapeCache,
|
||||||
getRenderOpacity,
|
getRenderOpacity,
|
||||||
|
resolveRenderPositionOffset,
|
||||||
resolveRenderOpacity,
|
resolveRenderOpacity,
|
||||||
editGroupForSelectedElement,
|
editGroupForSelectedElement,
|
||||||
getElementsInGroup,
|
getElementsInGroup,
|
||||||
@@ -742,28 +743,33 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
onRemoveEventListenersEmitter = new Emitter<[]>();
|
onRemoveEventListenersEmitter = new Emitter<[]>();
|
||||||
|
|
||||||
api: ExcalidrawImperativeAPI;
|
api: ExcalidrawImperativeAPI;
|
||||||
private renderOpacityVersion = 0;
|
private renderAnimationVersion = 0;
|
||||||
private elementOpacityOverrides = new Map<string, number>();
|
private elementOpacityOverrides = new Map<string, number>();
|
||||||
private elementFadeStates = new Map<
|
private elementPositionOverrides = new Map<string, { x: number; y: number }>();
|
||||||
|
private elementAnimationStates = new Map<
|
||||||
string,
|
string,
|
||||||
{
|
{
|
||||||
from: number;
|
opacityFrom: number;
|
||||||
to: number;
|
opacityTo: number;
|
||||||
|
positionFrom: { x: number; y: number };
|
||||||
|
positionTo: { x: number; y: number };
|
||||||
|
easing: "linear" | "easeOut" | "easeInOut";
|
||||||
duration: number;
|
duration: number;
|
||||||
delay: number;
|
delay: number;
|
||||||
elapsed: number;
|
elapsed: number;
|
||||||
}
|
}
|
||||||
>();
|
>();
|
||||||
|
|
||||||
private getElementFadeAnimationKey = () => `${this.id}:fade-element`;
|
private getElementAnimationKey = () => `${this.id}:animate-element`;
|
||||||
|
|
||||||
private bumpRenderOpacityVersion = () => {
|
private bumpRenderAnimationVersion = () => {
|
||||||
this.renderOpacityVersion++;
|
this.renderAnimationVersion++;
|
||||||
this.setState({});
|
this.setState({});
|
||||||
};
|
};
|
||||||
|
|
||||||
private getRenderOpacityConfig = () => ({
|
private getRenderOpacityConfig = () => ({
|
||||||
elementOpacityOverrides: this.elementOpacityOverrides,
|
elementOpacityOverrides: this.elementOpacityOverrides,
|
||||||
|
elementPositionOverrides: this.elementPositionOverrides,
|
||||||
resolveRenderOpacity: this.props.resolveRenderOpacity,
|
resolveRenderOpacity: this.props.resolveRenderOpacity,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -771,10 +777,116 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
return resolveRenderOpacity(element, this.getRenderOpacityConfig());
|
return resolveRenderOpacity(element, this.getRenderOpacityConfig());
|
||||||
};
|
};
|
||||||
|
|
||||||
private syncFadeElementAnimations = () => {
|
private getElementVisibleOpacity = (element: NonDeletedExcalidrawElement) => {
|
||||||
const animationKey = this.getElementFadeAnimationKey();
|
return clamp(element.opacity, 0, 100);
|
||||||
|
};
|
||||||
|
|
||||||
if (this.elementFadeStates.size === 0) {
|
private applyAnimationEasing = (
|
||||||
|
progress: number,
|
||||||
|
easing: "linear" | "easeOut" | "easeInOut",
|
||||||
|
) => {
|
||||||
|
switch (easing) {
|
||||||
|
case "linear":
|
||||||
|
return progress;
|
||||||
|
case "easeOut":
|
||||||
|
return easeOut(progress);
|
||||||
|
case "easeInOut":
|
||||||
|
return progress < 0.5
|
||||||
|
? 4 * progress * progress * progress
|
||||||
|
: 1 - Math.pow(-2 * progress + 2, 3) / 2;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private getFlyPositionOffset = (
|
||||||
|
element: NonDeletedExcalidrawElement,
|
||||||
|
from: "left" | "right" | "top" | "bottom",
|
||||||
|
) => {
|
||||||
|
const [x1, y1, x2, y2] = getElementAbsoluteCoords(
|
||||||
|
element,
|
||||||
|
this.scene.getNonDeletedElementsMap(),
|
||||||
|
);
|
||||||
|
const viewportWidth = this.state.width / this.state.zoom.value;
|
||||||
|
const viewportHeight = this.state.height / this.state.zoom.value;
|
||||||
|
const elementWidth = x2 - x1;
|
||||||
|
const elementHeight = y2 - y1;
|
||||||
|
|
||||||
|
switch (from) {
|
||||||
|
case "left":
|
||||||
|
return { x: -(Math.max(viewportWidth, elementWidth) + 64), y: 0 };
|
||||||
|
case "right":
|
||||||
|
return { x: Math.max(viewportWidth, elementWidth) + 64, y: 0 };
|
||||||
|
case "top":
|
||||||
|
return { x: 0, y: -(Math.max(viewportHeight, elementHeight) + 64) };
|
||||||
|
case "bottom":
|
||||||
|
return { x: 0, y: Math.max(viewportHeight, elementHeight) + 64 };
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private animateElement = ({
|
||||||
|
id,
|
||||||
|
opacityFrom,
|
||||||
|
opacityTo,
|
||||||
|
positionFrom = { x: 0, y: 0 },
|
||||||
|
positionTo = { x: 0, y: 0 },
|
||||||
|
easing,
|
||||||
|
duration,
|
||||||
|
delay,
|
||||||
|
}: {
|
||||||
|
id: string;
|
||||||
|
opacityFrom: number;
|
||||||
|
opacityTo: number;
|
||||||
|
positionFrom?: { x: number; y: number };
|
||||||
|
positionTo?: { x: number; y: number };
|
||||||
|
easing: "linear" | "easeOut" | "easeInOut";
|
||||||
|
duration: number;
|
||||||
|
delay: number;
|
||||||
|
}) => {
|
||||||
|
const normalizedOpacityFrom = clamp(opacityFrom, 0, 100);
|
||||||
|
const normalizedOpacityTo = clamp(opacityTo, 0, 100);
|
||||||
|
const normalizedDuration = Math.max(duration, 0);
|
||||||
|
const normalizedDelay = Math.max(delay, 0);
|
||||||
|
|
||||||
|
this.elementOpacityOverrides.set(id, normalizedOpacityFrom);
|
||||||
|
|
||||||
|
if (positionFrom.x !== 0 || positionFrom.y !== 0) {
|
||||||
|
this.elementPositionOverrides.set(id, positionFrom);
|
||||||
|
} else {
|
||||||
|
this.elementPositionOverrides.delete(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (normalizedDuration === 0 && normalizedDelay === 0) {
|
||||||
|
this.elementAnimationStates.delete(id);
|
||||||
|
this.elementOpacityOverrides.set(id, normalizedOpacityTo);
|
||||||
|
|
||||||
|
if (positionTo.x !== 0 || positionTo.y !== 0) {
|
||||||
|
this.elementPositionOverrides.set(id, positionTo);
|
||||||
|
} else {
|
||||||
|
this.elementPositionOverrides.delete(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.bumpRenderAnimationVersion();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.elementAnimationStates.set(id, {
|
||||||
|
opacityFrom: normalizedOpacityFrom,
|
||||||
|
opacityTo: normalizedOpacityTo,
|
||||||
|
positionFrom,
|
||||||
|
positionTo,
|
||||||
|
easing,
|
||||||
|
duration: normalizedDuration,
|
||||||
|
delay: normalizedDelay,
|
||||||
|
elapsed: 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
this.bumpRenderAnimationVersion();
|
||||||
|
this.syncElementAnimations();
|
||||||
|
};
|
||||||
|
|
||||||
|
private syncElementAnimations = () => {
|
||||||
|
const animationKey = this.getElementAnimationKey();
|
||||||
|
|
||||||
|
if (this.elementAnimationStates.size === 0) {
|
||||||
AnimationController.cancel(animationKey);
|
AnimationController.cancel(animationKey);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -786,26 +898,45 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
AnimationController.start(animationKey, ({ deltaTime }) => {
|
AnimationController.start(animationKey, ({ deltaTime }) => {
|
||||||
let shouldRerender = false;
|
let shouldRerender = false;
|
||||||
|
|
||||||
for (const [id, fade] of this.elementFadeStates) {
|
for (const [id, animation] of this.elementAnimationStates) {
|
||||||
const element = this.scene.getNonDeletedElement(id);
|
const element = this.scene.getNonDeletedElement(id);
|
||||||
|
|
||||||
if (!element) {
|
if (!element) {
|
||||||
this.elementFadeStates.delete(id);
|
this.elementAnimationStates.delete(id);
|
||||||
shouldRerender =
|
shouldRerender =
|
||||||
this.elementOpacityOverrides.delete(id) || shouldRerender;
|
this.elementOpacityOverrides.delete(id) || shouldRerender;
|
||||||
|
shouldRerender =
|
||||||
|
this.elementPositionOverrides.delete(id) || shouldRerender;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
fade.elapsed += deltaTime;
|
animation.elapsed += deltaTime;
|
||||||
|
|
||||||
|
const progress =
|
||||||
|
animation.elapsed <= animation.delay
|
||||||
|
? 0
|
||||||
|
: animation.duration === 0
|
||||||
|
? 1
|
||||||
|
: Math.min(
|
||||||
|
(animation.elapsed - animation.delay) / animation.duration,
|
||||||
|
1,
|
||||||
|
);
|
||||||
|
const easedProgress = this.applyAnimationEasing(
|
||||||
|
progress,
|
||||||
|
animation.easing,
|
||||||
|
);
|
||||||
|
|
||||||
const nextOpacity =
|
const nextOpacity =
|
||||||
fade.elapsed <= fade.delay
|
animation.opacityFrom +
|
||||||
? fade.from
|
(animation.opacityTo - animation.opacityFrom) * easedProgress;
|
||||||
: fade.duration === 0
|
const nextPosition = {
|
||||||
? fade.to
|
x:
|
||||||
: fade.from +
|
animation.positionFrom.x +
|
||||||
(fade.to - fade.from) *
|
(animation.positionTo.x - animation.positionFrom.x) * easedProgress,
|
||||||
Math.min((fade.elapsed - fade.delay) / fade.duration, 1);
|
y:
|
||||||
|
animation.positionFrom.y +
|
||||||
|
(animation.positionTo.y - animation.positionFrom.y) * easedProgress,
|
||||||
|
};
|
||||||
|
|
||||||
const clampedOpacity = clamp(nextOpacity, 0, 100);
|
const clampedOpacity = clamp(nextOpacity, 0, 100);
|
||||||
|
|
||||||
@@ -814,16 +945,31 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
shouldRerender = true;
|
shouldRerender = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fade.elapsed >= fade.delay + fade.duration) {
|
const currentPositionOverride =
|
||||||
this.elementFadeStates.delete(id);
|
this.elementPositionOverrides.get(id) ?? ({ x: 0, y: 0 } as const);
|
||||||
|
|
||||||
|
if (
|
||||||
|
currentPositionOverride.x !== nextPosition.x ||
|
||||||
|
currentPositionOverride.y !== nextPosition.y
|
||||||
|
) {
|
||||||
|
if (nextPosition.x === 0 && nextPosition.y === 0) {
|
||||||
|
this.elementPositionOverrides.delete(id);
|
||||||
|
} else {
|
||||||
|
this.elementPositionOverrides.set(id, nextPosition);
|
||||||
|
}
|
||||||
|
shouldRerender = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (animation.elapsed >= animation.delay + animation.duration) {
|
||||||
|
this.elementAnimationStates.delete(id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shouldRerender) {
|
if (shouldRerender) {
|
||||||
this.bumpRenderOpacityVersion();
|
this.bumpRenderAnimationVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.elementFadeStates.size > 0 ? {} : undefined;
|
return this.elementAnimationStates.size > 0 ? {} : undefined;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -843,9 +989,9 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
clear: this.resetHistory,
|
clear: this.resetHistory,
|
||||||
},
|
},
|
||||||
scrollToContent: this.scrollToContent,
|
scrollToContent: this.scrollToContent,
|
||||||
fadeElements: this.fadeElements,
|
animateElements: this.animateElements,
|
||||||
cancelFadeElement: this.cancelFadeElement,
|
cancelElementAnimation: this.cancelElementAnimation,
|
||||||
clearElementOpacityOverrides: this.clearElementOpacityOverrides,
|
clearElementAnimationOverrides: this.clearElementAnimationOverrides,
|
||||||
getSceneElements: this.getSceneElements,
|
getSceneElements: this.getSceneElements,
|
||||||
getAppState: () => this.state,
|
getAppState: () => this.state,
|
||||||
getFiles: () => this.files,
|
getFiles: () => this.files,
|
||||||
@@ -1823,6 +1969,10 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
const isHovered =
|
const isHovered =
|
||||||
this.state.activeEmbeddable?.element === el &&
|
this.state.activeEmbeddable?.element === el &&
|
||||||
this.state.activeEmbeddable?.state === "hover";
|
this.state.activeEmbeddable?.state === "hover";
|
||||||
|
const renderPositionOffset = resolveRenderPositionOffset(
|
||||||
|
el,
|
||||||
|
this.getRenderOpacityConfig(),
|
||||||
|
);
|
||||||
|
|
||||||
// scale video embeds based on zoom (capped) so that smaller embeds
|
// scale video embeds based on zoom (capped) so that smaller embeds
|
||||||
// on canvas when zoomed are still of legible quality
|
// on canvas when zoomed are still of legible quality
|
||||||
@@ -1844,8 +1994,8 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
})}
|
})}
|
||||||
style={{
|
style={{
|
||||||
transform: isVisible
|
transform: isVisible
|
||||||
? `translate(${x - this.state.offsetLeft}px, ${
|
? `translate(${x + renderPositionOffset.x * this.state.zoom.value - this.state.offsetLeft}px, ${
|
||||||
y - this.state.offsetTop
|
y + renderPositionOffset.y * this.state.zoom.value - this.state.offsetTop
|
||||||
}px) scale(${scale})`
|
}px) scale(${scale})`
|
||||||
: "none",
|
: "none",
|
||||||
display: isVisible ? "block" : "none",
|
display: isVisible ? "block" : "none",
|
||||||
@@ -2442,7 +2592,8 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.flowChartCreator.pendingNodes,
|
this.flowChartCreator.pendingNodes,
|
||||||
theme: this.state.theme,
|
theme: this.state.theme,
|
||||||
...this.getRenderOpacityConfig(),
|
...this.getRenderOpacityConfig(),
|
||||||
renderOpacityVersion: this.renderOpacityVersion,
|
renderAnimationVersion:
|
||||||
|
this.renderAnimationVersion,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{newElementCanvasElement && (
|
{newElementCanvasElement && (
|
||||||
@@ -2466,8 +2617,8 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
pendingFlowchartNodes: null,
|
pendingFlowchartNodes: null,
|
||||||
theme: this.state.theme,
|
theme: this.state.theme,
|
||||||
...this.getRenderOpacityConfig(),
|
...this.getRenderOpacityConfig(),
|
||||||
renderOpacityVersion:
|
renderAnimationVersion:
|
||||||
this.renderOpacityVersion,
|
this.renderAnimationVersion,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -3301,7 +3452,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.editorLifecycleEvents.emit("editor:unmount");
|
this.editorLifecycleEvents.emit("editor:unmount");
|
||||||
this.props.onUnmount?.();
|
this.props.onUnmount?.();
|
||||||
this.props.onExcalidrawAPI?.(null);
|
this.props.onExcalidrawAPI?.(null);
|
||||||
AnimationController.cancel(this.getElementFadeAnimationKey());
|
AnimationController.cancel(this.getElementAnimationKey());
|
||||||
|
|
||||||
(window as any).launchQueue?.setConsumer(() => {});
|
(window as any).launchQueue?.setConsumer(() => {});
|
||||||
|
|
||||||
@@ -4714,104 +4865,96 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
private fadeElement = ({
|
public animateElements = ({
|
||||||
id,
|
|
||||||
from,
|
|
||||||
to = 100,
|
|
||||||
duration = 250,
|
|
||||||
delay = 0,
|
|
||||||
}: {
|
|
||||||
id: string;
|
|
||||||
from?: number;
|
|
||||||
to?: number;
|
|
||||||
duration?: number;
|
|
||||||
delay?: number;
|
|
||||||
}) => {
|
|
||||||
const element = this.scene.getNonDeletedElement(id);
|
|
||||||
|
|
||||||
if (!element) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const startOpacity = clamp(
|
|
||||||
from ?? this.getResolvedElementOpacity(element),
|
|
||||||
0,
|
|
||||||
100,
|
|
||||||
);
|
|
||||||
const targetOpacity = clamp(to, 0, 100);
|
|
||||||
const normalizedDuration = Math.max(duration, 0);
|
|
||||||
const normalizedDelay = Math.max(delay, 0);
|
|
||||||
|
|
||||||
this.elementOpacityOverrides.set(id, startOpacity);
|
|
||||||
|
|
||||||
if (normalizedDuration === 0 && normalizedDelay === 0) {
|
|
||||||
this.elementFadeStates.delete(id);
|
|
||||||
this.elementOpacityOverrides.set(id, targetOpacity);
|
|
||||||
this.bumpRenderOpacityVersion();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.elementFadeStates.set(id, {
|
|
||||||
from: startOpacity,
|
|
||||||
to: targetOpacity,
|
|
||||||
duration: normalizedDuration,
|
|
||||||
delay: normalizedDelay,
|
|
||||||
elapsed: 0,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.bumpRenderOpacityVersion();
|
|
||||||
this.syncFadeElementAnimations();
|
|
||||||
};
|
|
||||||
|
|
||||||
public fadeElements = ({
|
|
||||||
elements,
|
elements,
|
||||||
from,
|
|
||||||
to = 100,
|
|
||||||
duration = 250,
|
duration = 250,
|
||||||
delay = 0,
|
delay = 0,
|
||||||
stagger = 0,
|
stagger = 0,
|
||||||
}: {
|
phase = "in",
|
||||||
elements: readonly (ExcalidrawElement | ExcalidrawElement["id"])[];
|
easing,
|
||||||
from?: number;
|
...animation
|
||||||
to?: number;
|
}:
|
||||||
duration?: number;
|
| {
|
||||||
delay?: number;
|
elements: readonly (ExcalidrawElement | ExcalidrawElement["id"])[];
|
||||||
stagger?: number;
|
type: "fade";
|
||||||
}) => {
|
duration?: number;
|
||||||
|
delay?: number;
|
||||||
|
stagger?: number;
|
||||||
|
phase?: "in" | "out";
|
||||||
|
easing?: "linear" | "easeOut" | "easeInOut";
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
elements: readonly (ExcalidrawElement | ExcalidrawElement["id"])[];
|
||||||
|
type: "fly";
|
||||||
|
from: "left" | "right" | "top" | "bottom";
|
||||||
|
duration?: number;
|
||||||
|
delay?: number;
|
||||||
|
stagger?: number;
|
||||||
|
phase?: "in" | "out";
|
||||||
|
easing?: "linear" | "easeOut" | "easeInOut";
|
||||||
|
}) => {
|
||||||
const normalizedDelay = Math.max(delay, 0);
|
const normalizedDelay = Math.max(delay, 0);
|
||||||
const normalizedStagger = Math.max(stagger, 0);
|
const normalizedStagger = Math.max(stagger, 0);
|
||||||
|
|
||||||
elements.forEach((element, index) => {
|
elements.forEach((elementOrId, index) => {
|
||||||
this.fadeElement({
|
const id = typeof elementOrId === "string" ? elementOrId : elementOrId.id;
|
||||||
id: typeof element === "string" ? element : element.id,
|
const element = this.scene.getNonDeletedElement(id);
|
||||||
from,
|
|
||||||
to,
|
if (!element) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (animation.type === "fade") {
|
||||||
|
this.animateElement({
|
||||||
|
id,
|
||||||
|
opacityFrom:
|
||||||
|
phase === "in" ? 0 : this.getElementVisibleOpacity(element),
|
||||||
|
opacityTo:
|
||||||
|
phase === "in" ? this.getElementVisibleOpacity(element) : 0,
|
||||||
|
easing: easing ?? "easeInOut",
|
||||||
|
duration,
|
||||||
|
delay: normalizedDelay + index * normalizedStagger,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const flyOffset = this.getFlyPositionOffset(element, animation.from);
|
||||||
|
|
||||||
|
this.animateElement({
|
||||||
|
id,
|
||||||
|
opacityFrom: phase === "in" ? 0 : this.getElementVisibleOpacity(element),
|
||||||
|
opacityTo: phase === "in" ? this.getElementVisibleOpacity(element) : 0,
|
||||||
|
positionFrom: phase === "in" ? flyOffset : { x: 0, y: 0 },
|
||||||
|
positionTo: phase === "in" ? { x: 0, y: 0 } : flyOffset,
|
||||||
|
easing: easing ?? "easeOut",
|
||||||
duration,
|
duration,
|
||||||
delay: normalizedDelay + index * normalizedStagger,
|
delay: normalizedDelay + index * normalizedStagger,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
public cancelFadeElement = (id: string) => {
|
public cancelElementAnimation = (id: string) => {
|
||||||
if (!this.elementFadeStates.delete(id)) {
|
if (!this.elementAnimationStates.delete(id)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.syncFadeElementAnimations();
|
this.syncElementAnimations();
|
||||||
};
|
};
|
||||||
|
|
||||||
public clearElementOpacityOverrides = () => {
|
public clearElementAnimationOverrides = () => {
|
||||||
if (
|
if (
|
||||||
this.elementOpacityOverrides.size === 0 &&
|
this.elementOpacityOverrides.size === 0 &&
|
||||||
this.elementFadeStates.size === 0
|
this.elementPositionOverrides.size === 0 &&
|
||||||
|
this.elementAnimationStates.size === 0
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.elementFadeStates.clear();
|
this.elementAnimationStates.clear();
|
||||||
this.elementOpacityOverrides.clear();
|
this.elementOpacityOverrides.clear();
|
||||||
this.syncFadeElementAnimations();
|
this.elementPositionOverrides.clear();
|
||||||
this.bumpRenderOpacityVersion();
|
this.syncElementAnimations();
|
||||||
|
this.bumpRenderAnimationVersion();
|
||||||
};
|
};
|
||||||
|
|
||||||
public applyDeltas = (
|
public applyDeltas = (
|
||||||
|
|||||||
@@ -19,7 +19,11 @@ import {
|
|||||||
shouldApplyFrameClip,
|
shouldApplyFrameClip,
|
||||||
} from "@excalidraw/element";
|
} from "@excalidraw/element";
|
||||||
|
|
||||||
import { getRenderOpacity, renderElement } from "@excalidraw/element";
|
import {
|
||||||
|
getRenderElementWithPositionOverride,
|
||||||
|
getRenderOpacity,
|
||||||
|
renderElement,
|
||||||
|
} from "@excalidraw/element";
|
||||||
|
|
||||||
import { getElementAbsoluteCoords } from "@excalidraw/element";
|
import { getElementAbsoluteCoords } from "@excalidraw/element";
|
||||||
|
|
||||||
@@ -173,6 +177,8 @@ const renderLinkIcon = (
|
|||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
renderConfig: StaticCanvasRenderConfig,
|
renderConfig: StaticCanvasRenderConfig,
|
||||||
) => {
|
) => {
|
||||||
|
element = getRenderElementWithPositionOverride(element, renderConfig);
|
||||||
|
|
||||||
if (element.link && !appState.selectedElementIds[element.id]) {
|
if (element.link && !appState.selectedElementIds[element.id]) {
|
||||||
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
|
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
|
||||||
const [x, y, width, height] = getLinkHandleFromCoords(
|
const [x, y, width, height] = getLinkHandleFromCoords(
|
||||||
|
|||||||
@@ -40,7 +40,11 @@ export type StaticCanvasRenderConfig = {
|
|||||||
theme: AppState["theme"];
|
theme: AppState["theme"];
|
||||||
resolveRenderOpacity?: RenderOpacityResolver;
|
resolveRenderOpacity?: RenderOpacityResolver;
|
||||||
elementOpacityOverrides?: ReadonlyMap<ExcalidrawElement["id"], number>;
|
elementOpacityOverrides?: ReadonlyMap<ExcalidrawElement["id"], number>;
|
||||||
renderOpacityVersion?: number;
|
elementPositionOverrides?: ReadonlyMap<
|
||||||
|
ExcalidrawElement["id"],
|
||||||
|
{ x: number; y: number }
|
||||||
|
>;
|
||||||
|
renderAnimationVersion?: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type SVGRenderConfig = {
|
export type SVGRenderConfig = {
|
||||||
|
|||||||
@@ -967,11 +967,11 @@ export interface ExcalidrawImperativeAPI {
|
|||||||
getFiles: () => InstanceType<typeof App>["files"];
|
getFiles: () => InstanceType<typeof App>["files"];
|
||||||
getName: InstanceType<typeof App>["getName"];
|
getName: InstanceType<typeof App>["getName"];
|
||||||
scrollToContent: InstanceType<typeof App>["scrollToContent"];
|
scrollToContent: InstanceType<typeof App>["scrollToContent"];
|
||||||
fadeElements: InstanceType<typeof App>["fadeElements"];
|
animateElements: InstanceType<typeof App>["animateElements"];
|
||||||
cancelFadeElement: InstanceType<typeof App>["cancelFadeElement"];
|
cancelElementAnimation: InstanceType<typeof App>["cancelElementAnimation"];
|
||||||
clearElementOpacityOverrides: InstanceType<
|
clearElementAnimationOverrides: InstanceType<
|
||||||
typeof App
|
typeof App
|
||||||
>["clearElementOpacityOverrides"];
|
>["clearElementAnimationOverrides"];
|
||||||
registerAction: (action: Action) => void;
|
registerAction: (action: Action) => void;
|
||||||
refresh: InstanceType<typeof App>["refresh"];
|
refresh: InstanceType<typeof App>["refresh"];
|
||||||
setToast: InstanceType<typeof App>["setToast"];
|
setToast: InstanceType<typeof App>["setToast"];
|
||||||
|
|||||||
Reference in New Issue
Block a user