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 replace keep keep keep keep keep
|
<mask> "gesturechange",
<mask> this.onGestureChange as any,
<mask> false,
<mask> );
<mask> document.addEventListener("gestureend", this.onGestureEnd as any, false);
<mask> window.addEventListener("beforeunload", this.beforeUnload);
<mask>
<mask> this.initializeScene();
<mask> }
<mask>
<mask> public componentWillUnmount() {
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove "gesturechange",
</s> add EVENT.GESTURE_CHANGE, </s> remove "gesturechange",
</s> add EVENT.GESTURE_CHANGE, </s> remove document.removeEventListener("gestureend", this.onGestureEnd as any, false);
window.removeEventListener("beforeunload", this.beforeUnload);
</s> add document.removeEventListener(
EVENT.GESTURE_END,
this.onGestureEnd as any,
false,
);
window.removeEventListener(EVENT.BEFORE_UNLOAD, this.beforeUnload); </s> remove "gesturestart",
</s> add EVENT.GESTURE_START, </s> remove "gesturestart",
</s> add EVENT.GESTURE_START, </s> remove document.removeEventListener("copy", this.onCopy);
document.removeEventListener("paste", this.pasteFromClipboard);
document.removeEventListener("cut", this.onCut);
</s> add document.removeEventListener(EVENT.COPY, this.onCopy);
document.removeEventListener(EVENT.PASTE, this.pasteFromClipboard);
document.removeEventListener(EVENT.CUT, this.onCut);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep replace replace replace keep replace keep keep keep
|
<mask>
<mask> document.removeEventListener("copy", this.onCopy);
<mask> document.removeEventListener("paste", this.pasteFromClipboard);
<mask> document.removeEventListener("cut", this.onCut);
<mask>
<mask> document.removeEventListener("keydown", this.onKeyDown, false);
<mask> document.removeEventListener(
<mask> "mousemove",
<mask> this.updateCurrentCursorPosition,
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove "mousemove",
</s> add EVENT.MOUSE_MOVE, </s> remove document.addEventListener("copy", this.onCopy);
document.addEventListener("paste", this.pasteFromClipboard);
document.addEventListener("cut", this.onCut);
</s> add document.addEventListener(EVENT.COPY, this.onCopy);
document.addEventListener(EVENT.PASTE, this.pasteFromClipboard);
document.addEventListener(EVENT.CUT, this.onCut); </s> remove document.addEventListener("keydown", this.onKeyDown, false);
document.addEventListener("keyup", this.onKeyUp, { passive: true });
document.addEventListener("mousemove", this.updateCurrentCursorPosition);
window.addEventListener("resize", this.onResize, false);
window.addEventListener("unload", this.onUnload, false);
window.addEventListener("blur", this.onBlur, false);
window.addEventListener("dragover", this.disableEvent, false);
window.addEventListener("drop", this.disableEvent, false);
</s> add document.addEventListener(EVENT.KEYDOWN, this.onKeyDown, false);
document.addEventListener(EVENT.KEYUP, this.onKeyUp, { passive: true });
document.addEventListener(
EVENT.MOUSE_MOVE,
this.updateCurrentCursorPosition,
);
window.addEventListener(EVENT.RESIZE, this.onResize, false);
window.addEventListener(EVENT.UNLOAD, this.onUnload, false);
window.addEventListener(EVENT.BLUR, this.onBlur, false);
window.addEventListener(EVENT.DRAG_OVER, this.disableEvent, false);
window.addEventListener(EVENT.DROP, this.disableEvent, false); </s> remove document.removeEventListener("keyup", this.onKeyUp);
window.removeEventListener("resize", this.onResize, false);
window.removeEventListener("unload", this.onUnload, false);
window.removeEventListener("blur", this.onBlur, false);
window.removeEventListener("dragover", this.disableEvent, false);
window.removeEventListener("drop", this.disableEvent, false);
</s> add document.removeEventListener(EVENT.KEYUP, this.onKeyUp);
window.removeEventListener(EVENT.RESIZE, this.onResize, false);
window.removeEventListener(EVENT.UNLOAD, this.onUnload, false);
window.removeEventListener(EVENT.BLUR, this.onBlur, false);
window.removeEventListener(EVENT.DRAG_OVER, this.disableEvent, false);
window.removeEventListener(EVENT.DROP, this.disableEvent, false); </s> remove "gesturestart",
</s> add EVENT.GESTURE_START,
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep replace replace replace replace replace replace
|
<mask> document.removeEventListener("cut", this.onCut);
<mask>
<mask> document.removeEventListener("keydown", this.onKeyDown, false);
<mask> document.removeEventListener(
<mask> "mousemove",
<mask> this.updateCurrentCursorPosition,
<mask> false,
<mask> );
<mask> document.removeEventListener("keyup", this.onKeyUp);
<mask> window.removeEventListener("resize", this.onResize, false);
<mask> window.removeEventListener("unload", this.onUnload, false);
<mask> window.removeEventListener("blur", this.onBlur, false);
<mask> window.removeEventListener("dragover", this.disableEvent, false);
<mask> window.removeEventListener("drop", this.disableEvent, false);
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove document.addEventListener("keydown", this.onKeyDown, false);
document.addEventListener("keyup", this.onKeyUp, { passive: true });
document.addEventListener("mousemove", this.updateCurrentCursorPosition);
window.addEventListener("resize", this.onResize, false);
window.addEventListener("unload", this.onUnload, false);
window.addEventListener("blur", this.onBlur, false);
window.addEventListener("dragover", this.disableEvent, false);
window.addEventListener("drop", this.disableEvent, false);
</s> add document.addEventListener(EVENT.KEYDOWN, this.onKeyDown, false);
document.addEventListener(EVENT.KEYUP, this.onKeyUp, { passive: true });
document.addEventListener(
EVENT.MOUSE_MOVE,
this.updateCurrentCursorPosition,
);
window.addEventListener(EVENT.RESIZE, this.onResize, false);
window.addEventListener(EVENT.UNLOAD, this.onUnload, false);
window.addEventListener(EVENT.BLUR, this.onBlur, false);
window.addEventListener(EVENT.DRAG_OVER, this.disableEvent, false);
window.addEventListener(EVENT.DROP, this.disableEvent, false); </s> remove document.removeEventListener("keydown", this.onKeyDown, false);
</s> add document.removeEventListener(EVENT.KEYDOWN, this.onKeyDown, false); </s> remove "gesturestart",
</s> add EVENT.GESTURE_START, </s> remove document.removeEventListener("copy", this.onCopy);
document.removeEventListener("paste", this.pasteFromClipboard);
document.removeEventListener("cut", this.onCut);
</s> add document.removeEventListener(EVENT.COPY, this.onCopy);
document.removeEventListener(EVENT.PASTE, this.pasteFromClipboard);
document.removeEventListener(EVENT.CUT, this.onCut); </s> remove document.addEventListener("copy", this.onCopy);
document.addEventListener("paste", this.pasteFromClipboard);
document.addEventListener("cut", this.onCut);
</s> add document.addEventListener(EVENT.COPY, this.onCopy);
document.addEventListener(EVENT.PASTE, this.pasteFromClipboard);
document.addEventListener(EVENT.CUT, this.onCut);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep replace keep keep keep keep replace keep keep
|
<mask>
<mask> document.removeEventListener(
<mask> "gesturestart",
<mask> this.onGestureStart as any,
<mask> false,
<mask> );
<mask> document.removeEventListener(
<mask> "gesturechange",
<mask> this.onGestureChange as any,
<mask> false,
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove "gesturechange",
</s> add EVENT.GESTURE_CHANGE, </s> remove document.removeEventListener("gestureend", this.onGestureEnd as any, false);
window.removeEventListener("beforeunload", this.beforeUnload);
</s> add document.removeEventListener(
EVENT.GESTURE_END,
this.onGestureEnd as any,
false,
);
window.removeEventListener(EVENT.BEFORE_UNLOAD, this.beforeUnload); </s> remove document.addEventListener("gestureend", this.onGestureEnd as any, false);
window.addEventListener("beforeunload", this.beforeUnload);
</s> add document.addEventListener(
EVENT.GESTURE_END,
this.onGestureEnd as any,
false,
);
window.addEventListener(EVENT.BEFORE_UNLOAD, this.beforeUnload); </s> remove "gesturestart",
</s> add EVENT.GESTURE_START, </s> remove document.removeEventListener("keyup", this.onKeyUp);
window.removeEventListener("resize", this.onResize, false);
window.removeEventListener("unload", this.onUnload, false);
window.removeEventListener("blur", this.onBlur, false);
window.removeEventListener("dragover", this.disableEvent, false);
window.removeEventListener("drop", this.disableEvent, false);
</s> add document.removeEventListener(EVENT.KEYUP, this.onKeyUp);
window.removeEventListener(EVENT.RESIZE, this.onResize, false);
window.removeEventListener(EVENT.UNLOAD, this.onUnload, false);
window.removeEventListener(EVENT.BLUR, this.onBlur, false);
window.removeEventListener(EVENT.DRAG_OVER, this.disableEvent, false);
window.removeEventListener(EVENT.DROP, this.disableEvent, false);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "gesturechange",
<mask> this.onGestureChange as any,
<mask> false,
<mask> );
<mask> document.removeEventListener("gestureend", this.onGestureEnd as any, false);
<mask> window.removeEventListener("beforeunload", this.beforeUnload);
<mask> }
<mask> private onResize = withBatchedUpdates(() => {
<mask> globalSceneState
<mask> .getElementsIncludingDeleted()
<mask> .forEach((element) => invalidateShapeForElement(element));
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove "gesturechange",
</s> add EVENT.GESTURE_CHANGE, </s> remove document.addEventListener("gestureend", this.onGestureEnd as any, false);
window.addEventListener("beforeunload", this.beforeUnload);
</s> add document.addEventListener(
EVENT.GESTURE_END,
this.onGestureEnd as any,
false,
);
window.addEventListener(EVENT.BEFORE_UNLOAD, this.beforeUnload); </s> remove "gesturechange",
</s> add EVENT.GESTURE_CHANGE, </s> remove "gesturestart",
</s> add EVENT.GESTURE_START, </s> remove "gesturestart",
</s> add EVENT.GESTURE_START, </s> remove private broadcastScene = (sceneType: "SCENE_INIT" | "SCENE_UPDATE") => {
</s> add private broadcastScene = (sceneType: SCENE.INIT | SCENE.UPDATE) => {
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (
<mask> getDrawingVersion(globalSceneState.getElementsIncludingDeleted()) >
<mask> this.lastBroadcastedOrReceivedSceneVersion
<mask> ) {
<mask> this.broadcastScene("SCENE_UPDATE");
<mask> }
<mask>
<mask> history.record(this.state, globalSceneState.getElementsIncludingDeleted());
<mask> }
<mask>
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
</s> add if (
process.env.NODE_ENV === ENV.TEST ||
process.env.NODE_ENV === ENV.DEVELOPMENT
) { </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", onPointerUp);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> add decryptedData: SocketUpdateDataSource[SCENE.INIT | SCENE.UPDATE], </s> remove const initializationTimer = setTimeout(initialize, 5000);
</s> add const initializationTimer = setTimeout(
initialize,
INITAL_SCENE_UPDATE_TIMEOUT,
); </s> remove window.addEventListener("pointerup", teardown);
</s> add window.addEventListener(EVENT.POINTER_UP, teardown); </s> remove case "SCENE_INIT": {
</s> add case SCENE.INIT: {
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep add keep keep keep keep
|
<mask> };
<mask>
<mask> private onTapStart = (event: TouchEvent) => {
<mask> if (!didTapTwice) {
<mask> didTapTwice = true;
<mask> clearTimeout(tappedTwiceTimer);
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove tappedTwiceTimer = window.setTimeout(() => (didTapTwice = false), 300);
</s> add tappedTwiceTimer = window.setTimeout(
this.resetTapTwice,
TAP_TWICE_TIMEOUT,
); </s> remove this.canvas?.removeEventListener("wheel", this.handleWheel);
this.canvas?.removeEventListener("touchstart", this.onTapStart);
</s> add this.canvas?.removeEventListener(EVENT.WHEEL, this.handleWheel);
this.canvas?.removeEventListener(EVENT.TOUCH_START, this.onTapStart); </s> remove private broadcastScene = (sceneType: "SCENE_INIT" | "SCENE_UPDATE") => {
</s> add private broadcastScene = (sceneType: SCENE.INIT | SCENE.UPDATE) => { </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
</s> add if (
process.env.NODE_ENV === ENV.TEST ||
process.env.NODE_ENV === ENV.DEVELOPMENT
) { </s> remove decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> add decryptedData: SocketUpdateDataSource[SCENE.INIT | SCENE.UPDATE],
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> private onTapStart = (event: TouchEvent) => {
<mask> if (!didTapTwice) {
<mask> didTapTwice = true;
<mask> clearTimeout(tappedTwiceTimer);
<mask> tappedTwiceTimer = window.setTimeout(() => (didTapTwice = false), 300);
<mask> return;
<mask> }
<mask> // insert text only if we tapped twice with a single finger
<mask> // event.touches.length === 1 will also prevent inserting text when user's zooming
<mask> if (didTapTwice && event.touches.length === 1) {
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> add private resetTapTwice() {
didTapTwice = false;
}
</s> remove if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
</s> add if (
process.env.NODE_ENV === ENV.TEST ||
process.env.NODE_ENV === ENV.DEVELOPMENT
) { </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("pointerup", teardown);
</s> add window.addEventListener(EVENT.POINTER_UP, teardown); </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", onPointerUp);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> add decryptedData: SocketUpdateDataSource[SCENE.INIT | SCENE.UPDATE],
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep replace keep keep replace
|
<mask> // fallback in case you're not alone in the room but still don't receive
<mask> // initial SCENE_UPDATE message
<mask> const initializationTimer = setTimeout(initialize, 5000);
<mask>
<mask> const updateScene = (
<mask> decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove new Promise((resolve) => setTimeout(resolve, 1000)),
</s> add new Promise((resolve) => setTimeout(resolve, FONT_LOAD_THRESHOLD)), </s> remove case "SCENE_UPDATE":
</s> add case SCENE.UPDATE: </s> remove private broadcastScene = (sceneType: "SCENE_INIT" | "SCENE_UPDATE") => {
</s> add private broadcastScene = (sceneType: SCENE.INIT | SCENE.UPDATE) => { </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("pointerup", teardown);
</s> add window.addEventListener(EVENT.POINTER_UP, teardown);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (scrollToContent) {
<mask> this.setState({
<mask> ...this.state,
<mask> ...calculateScrollCenter(
<mask> remoteElements.filter((element) => {
<mask> return !element.isDeleted;
<mask> }),
<mask> ),
<mask> });
<mask> }
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> add decryptedData: SocketUpdateDataSource[SCENE.INIT | SCENE.UPDATE], </s> remove new Promise((resolve) => setTimeout(resolve, 1000)),
</s> add new Promise((resolve) => setTimeout(resolve, FONT_LOAD_THRESHOLD)), </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", teardown);
window.removeEventListener("blur", teardown);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, teardown);
window.removeEventListener(EVENT.BLUR, teardown); </s> remove window.addEventListener("blur", teardown);
window.addEventListener("pointermove", onPointerMove, {
</s> add window.addEventListener(EVENT.BLUR, teardown);
window.addEventListener(EVENT.POINTER_MOVE, onPointerMove, { </s> remove this.broadcastScene("SCENE_INIT");
</s> add this.broadcastScene(SCENE.INIT); </s> add private resetTapTwice() {
didTapTwice = false;
}
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> switch (decryptedData.type) {
<mask> case "INVALID_RESPONSE":
<mask> return;
<mask> case "SCENE_INIT": {
<mask> if (!this.portal.socketInitialized) {
<mask> updateScene(decryptedData, { scrollToContent: true });
<mask> }
<mask> break;
<mask> }
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove case "SCENE_UPDATE":
</s> add case SCENE.UPDATE: </s> remove const initializationTimer = setTimeout(initialize, 5000);
</s> add const initializationTimer = setTimeout(
initialize,
INITAL_SCENE_UPDATE_TIMEOUT,
); </s> remove if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
</s> add if (
process.env.NODE_ENV === ENV.TEST ||
process.env.NODE_ENV === ENV.DEVELOPMENT
) { </s> remove window.addEventListener("blur", teardown);
window.addEventListener("pointermove", onPointerMove, {
</s> add window.addEventListener(EVENT.BLUR, teardown);
window.addEventListener(EVENT.POINTER_MOVE, onPointerMove, { </s> remove remoteElements.filter((element) => {
</s> add remoteElements.filter((element: { isDeleted: boolean }) => { </s> add import {
FONT_LOAD_THRESHOLD,
INITAL_SCENE_UPDATE_TIMEOUT,
TAP_TWICE_TIMEOUT,
} from "../time_constants";
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> updateScene(decryptedData, { scrollToContent: true });
<mask> }
<mask> break;
<mask> }
<mask> case "SCENE_UPDATE":
<mask> updateScene(decryptedData);
<mask> break;
<mask> case "MOUSE_LOCATION": {
<mask> const {
<mask> socketID,
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove case "SCENE_INIT": {
</s> add case SCENE.INIT: { </s> remove const initializationTimer = setTimeout(initialize, 5000);
</s> add const initializationTimer = setTimeout(
initialize,
INITAL_SCENE_UPDATE_TIMEOUT,
); </s> remove decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> add decryptedData: SocketUpdateDataSource[SCENE.INIT | SCENE.UPDATE], </s> remove this.canvas?.removeEventListener("wheel", this.handleWheel);
this.canvas?.removeEventListener("touchstart", this.onTapStart);
</s> add this.canvas?.removeEventListener(EVENT.WHEEL, this.handleWheel);
this.canvas?.removeEventListener(EVENT.TOUCH_START, this.onTapStart); </s> add import {
FONT_LOAD_THRESHOLD,
INITAL_SCENE_UPDATE_TIMEOUT,
TAP_TWICE_TIMEOUT,
} from "../time_constants";
</s> remove private broadcastScene = (sceneType: "SCENE_INIT" | "SCENE_UPDATE") => {
</s> add private broadcastScene = (sceneType: SCENE.INIT | SCENE.UPDATE) => {
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask> });
<mask> });
<mask> this.portal.socket!.on("new-user", async (_socketID: string) => {
<mask> this.broadcastScene("SCENE_INIT");
<mask> });
<mask>
<mask> this.setState({
<mask> isCollaborating: true,
<mask> isLoading: opts.showLoadingState ? true : this.state.isLoading,
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove remoteElements.filter((element) => {
</s> add remoteElements.filter((element: { isDeleted: boolean }) => { </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", teardown);
window.removeEventListener("blur", teardown);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, teardown);
window.removeEventListener(EVENT.BLUR, teardown); </s> remove case "SCENE_UPDATE":
</s> add case SCENE.UPDATE: </s> remove case "SCENE_INIT": {
</s> add case SCENE.INIT: { </s> remove window.addEventListener("blur", teardown);
window.addEventListener("pointermove", onPointerMove, {
</s> add window.addEventListener(EVENT.BLUR, teardown);
window.addEventListener(EVENT.POINTER_MOVE, onPointerMove, { </s> remove this.canvas?.removeEventListener("wheel", this.handleWheel);
this.canvas?.removeEventListener("touchstart", this.onTapStart);
</s> add this.canvas?.removeEventListener(EVENT.WHEEL, this.handleWheel);
this.canvas?.removeEventListener(EVENT.TOUCH_START, this.onTapStart);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> }
<mask> };
<mask>
<mask> private broadcastScene = (sceneType: "SCENE_INIT" | "SCENE_UPDATE") => {
<mask> const data: SocketUpdateDataSource[typeof sceneType] = {
<mask> type: sceneType,
<mask> payload: {
<mask> elements: getSyncableElements(
<mask> globalSceneState.getElementsIncludingDeleted(),
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> add decryptedData: SocketUpdateDataSource[SCENE.INIT | SCENE.UPDATE], </s> add private resetTapTwice() {
didTapTwice = false;
}
</s> remove const initializationTimer = setTimeout(initialize, 5000);
</s> add const initializationTimer = setTimeout(
initialize,
INITAL_SCENE_UPDATE_TIMEOUT,
); </s> remove this.canvas?.removeEventListener("wheel", this.handleWheel);
this.canvas?.removeEventListener("touchstart", this.onTapStart);
</s> add this.canvas?.removeEventListener(EVENT.WHEEL, this.handleWheel);
this.canvas?.removeEventListener(EVENT.TOUCH_START, this.onTapStart); </s> remove if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
</s> add if (
process.env.NODE_ENV === ENV.TEST ||
process.env.NODE_ENV === ENV.DEVELOPMENT
) { </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep replace replace replace keep keep replace replace
|
<mask> cursorButton: "up",
<mask> });
<mask> this.savePointer(event.clientX, event.clientY, "up");
<mask> window.removeEventListener("pointermove", onPointerMove);
<mask> window.removeEventListener("pointerup", teardown);
<mask> window.removeEventListener("blur", teardown);
<mask> }),
<mask> );
<mask> window.addEventListener("blur", teardown);
<mask> window.addEventListener("pointermove", onPointerMove, {
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", onPointerUp);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("pointerup", teardown);
</s> add window.addEventListener(EVENT.POINTER_UP, teardown); </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", onPointerUp);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> window.addEventListener("blur", teardown);
<mask> window.addEventListener("pointermove", onPointerMove, {
<mask> passive: true,
<mask> });
<mask> window.addEventListener("pointerup", teardown);
<mask> return;
<mask> }
<mask>
<mask> // only handle left mouse button or touch
<mask> if (
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove window.addEventListener("blur", teardown);
window.addEventListener("pointermove", onPointerMove, {
</s> add window.addEventListener(EVENT.BLUR, teardown);
window.addEventListener(EVENT.POINTER_MOVE, onPointerMove, { </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", teardown);
window.removeEventListener("blur", teardown);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, teardown);
window.removeEventListener(EVENT.BLUR, teardown); </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove tappedTwiceTimer = window.setTimeout(() => (didTapTwice = false), 300);
</s> add tappedTwiceTimer = window.setTimeout(
this.resetTapTwice,
TAP_TWICE_TIMEOUT,
); </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove case "SCENE_INIT": {
</s> add case SCENE.INIT: {
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep replace replace keep keep
|
<mask> this.setState({
<mask> cursorButton: "up",
<mask> });
<mask> this.savePointer(event.clientX, event.clientY, "up");
<mask> window.removeEventListener("pointermove", onPointerMove);
<mask> window.removeEventListener("pointerup", onPointerUp);
<mask> });
<mask>
<mask> lastPointerUp = onPointerUp;
<mask>
<mask> window.addEventListener("pointermove", onPointerMove);
<mask> window.addEventListener("pointerup", onPointerUp);
<mask> return;
<mask> }
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", teardown);
window.removeEventListener("blur", teardown);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, teardown);
window.removeEventListener(EVENT.BLUR, teardown); </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", onPointerUp);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("blur", teardown);
window.addEventListener("pointermove", onPointerMove, {
</s> add window.addEventListener(EVENT.BLUR, teardown);
window.addEventListener(EVENT.POINTER_MOVE, onPointerMove, { </s> remove window.addEventListener("pointerup", teardown);
</s> add window.addEventListener(EVENT.POINTER_UP, teardown);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> resizeArrowFn = null;
<mask> lastPointerUp = null;
<mask>
<mask> window.removeEventListener("pointermove", onPointerMove);
<mask> window.removeEventListener("pointerup", onPointerUp);
<mask>
<mask> if (isLinearElement(draggingElement)) {
<mask> if (draggingElement!.points.length > 1) {
<mask> history.resumeRecording();
<mask> }
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", onPointerUp);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove this.broadcastScene("SCENE_UPDATE");
</s> add this.broadcastScene(SCENE.UPDATE); </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", teardown);
window.removeEventListener("blur", teardown);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, teardown);
window.removeEventListener(EVENT.BLUR, teardown); </s> remove tappedTwiceTimer = window.setTimeout(() => (didTapTwice = false), 300);
</s> add tappedTwiceTimer = window.setTimeout(
this.resetTapTwice,
TAP_TWICE_TIMEOUT,
);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> });
<mask>
<mask> lastPointerUp = onPointerUp;
<mask>
<mask> window.addEventListener("pointermove", onPointerMove);
<mask> window.addEventListener("pointerup", onPointerUp);
<mask> };
<mask>
<mask> private handleCanvasRef = (canvas: HTMLCanvasElement) => {
<mask> // canvas is null when unmounting
<mask> if (canvas !== null) {
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove window.addEventListener("pointermove", onPointerMove);
window.addEventListener("pointerup", onPointerUp);
</s> add window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", onPointerUp);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, onPointerUp); </s> remove this.canvas.addEventListener("wheel", this.handleWheel, {
</s> add this.canvas.addEventListener(EVENT.WHEEL, this.handleWheel, { </s> remove window.removeEventListener("pointermove", onPointerMove);
window.removeEventListener("pointerup", onPointerUp);
</s> add window.removeEventListener(EVENT.POINTER_MOVE, onPointerMove);
window.removeEventListener(EVENT.POINTER_UP, onPointerUp); </s> add private resetTapTwice() {
didTapTwice = false;
}
</s> remove tappedTwiceTimer = window.setTimeout(() => (didTapTwice = false), 300);
</s> add tappedTwiceTimer = window.setTimeout(
this.resetTapTwice,
TAP_TWICE_TIMEOUT,
);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep replace keep keep replace keep keep keep
|
<mask> this.rc = rough.canvas(this.canvas);
<mask>
<mask> this.canvas.addEventListener("wheel", this.handleWheel, {
<mask> passive: false,
<mask> });
<mask> this.canvas.addEventListener("touchstart", this.onTapStart);
<mask> } else {
<mask> this.canvas?.removeEventListener("wheel", this.handleWheel);
<mask> this.canvas?.removeEventListener("touchstart", this.onTapStart);
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove this.canvas?.removeEventListener("wheel", this.handleWheel);
this.canvas?.removeEventListener("touchstart", this.onTapStart);
</s> add this.canvas?.removeEventListener(EVENT.WHEEL, this.handleWheel);
this.canvas?.removeEventListener(EVENT.TOUCH_START, this.onTapStart); </s> remove window.addEventListener("blur", teardown);
window.addEventListener("pointermove", onPointerMove, {
</s> add window.addEventListener(EVENT.BLUR, teardown);
window.addEventListener(EVENT.POINTER_MOVE, onPointerMove, { </s> remove case "SCENE_INIT": {
</s> add case SCENE.INIT: { </s> add import {
FONT_LOAD_THRESHOLD,
INITAL_SCENE_UPDATE_TIMEOUT,
TAP_TWICE_TIMEOUT,
} from "../time_constants";
</s> remove case "SCENE_UPDATE":
</s> add case SCENE.UPDATE:
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> passive: false,
<mask> });
<mask> this.canvas.addEventListener("touchstart", this.onTapStart);
<mask> } else {
<mask> this.canvas?.removeEventListener("wheel", this.handleWheel);
<mask> this.canvas?.removeEventListener("touchstart", this.onTapStart);
<mask> }
<mask> };
<mask>
<mask> private handleCanvasOnDrop = (event: React.DragEvent<HTMLCanvasElement>) => {
<mask> const file = event.dataTransfer?.files[0];
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove this.canvas.addEventListener("touchstart", this.onTapStart);
</s> add this.canvas.addEventListener(EVENT.TOUCH_START, this.onTapStart); </s> remove this.canvas.addEventListener("wheel", this.handleWheel, {
</s> add this.canvas.addEventListener(EVENT.WHEEL, this.handleWheel, { </s> add private resetTapTwice() {
didTapTwice = false;
}
</s> remove private broadcastScene = (sceneType: "SCENE_INIT" | "SCENE_UPDATE") => {
</s> add private broadcastScene = (sceneType: SCENE.INIT | SCENE.UPDATE) => { </s> remove decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> add decryptedData: SocketUpdateDataSource[SCENE.INIT | SCENE.UPDATE], </s> remove const initializationTimer = setTimeout(initialize, 5000);
</s> add const initializationTimer = setTimeout(
initialize,
INITAL_SCENE_UPDATE_TIMEOUT,
);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask> }
<mask> }
<mask>
<mask> if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
<mask> window.h = {} as Window["h"];
<mask>
<mask> Object.defineProperties(window.h, {
<mask> elements: {
<mask> get() {
</s> refactor(app.tsx): use constants instead of hard coded strings for better readablility (#1391)
don't use inline function as it will create a new refrence everytime </s> remove tappedTwiceTimer = window.setTimeout(() => (didTapTwice = false), 300);
</s> add tappedTwiceTimer = window.setTimeout(
this.resetTapTwice,
TAP_TWICE_TIMEOUT,
); </s> remove private broadcastScene = (sceneType: "SCENE_INIT" | "SCENE_UPDATE") => {
</s> add private broadcastScene = (sceneType: SCENE.INIT | SCENE.UPDATE) => { </s> remove decryptedData: SocketUpdateDataSource["SCENE_INIT" | "SCENE_UPDATE"],
</s> add decryptedData: SocketUpdateDataSource[SCENE.INIT | SCENE.UPDATE], </s> add private resetTapTwice() {
didTapTwice = false;
}
</s> remove case "SCENE_INIT": {
</s> add case SCENE.INIT: { </s> remove this.canvas.addEventListener("touchstart", this.onTapStart);
</s> add this.canvas.addEventListener(EVENT.TOUCH_START, this.onTapStart);
|
https://github.com/excalidraw/excalidraw/commit/e98fba38becf36e598e94b8f7863d93f58c80806
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> import { hasBackground, hasStroke, hasText, getTargetElement } from "../scene";
<mask> import { t } from "../i18n";
<mask> import { SHAPES } from "../shapes";
<mask> import { ToolButton } from "./ToolButton";
<mask> import { capitalizeString, getShortcutKey } from "../utils";
<mask> import { CURSOR_TYPE } from "../constants";
<mask> import Stack from "./Stack";
<mask> import useIsMobile from "../is-mobile";
<mask>
<mask> export function SelectedShapeActions({
<mask> appState,
</s> edit text when clicked on with text tool (#1283) </s> add setCursorForShape, </s> add import { CURSOR_TYPE } from "./constants"; </s> remove element: ExcalidrawElement,
</s> add element: ExcalidrawElement | null, </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove document.documentElement.style.cursor =
this.state.elementType === "text"
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(this.state.elementType); </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/Actions.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> elementType: value,
<mask> multiElement: null,
<mask> selectedElementIds: {},
<mask> });
<mask> document.documentElement.style.cursor =
<mask> value === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
<mask> setAppState({});
<mask> }}
<mask> ></ToolButton>
<mask> );
<mask> })}
</s> edit text when clicked on with text tool (#1283) </s> remove document.documentElement.style.cursor =
this.state.elementType === "text"
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(this.state.elementType); </s> remove document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
</s> add if (this.state.elementType === "text") {
document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
} else {
document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
} </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add </s> remove const snappedToCenterPosition = event.altKey
? null
: this.getTextWysiwygSnappedToCenterPosition(
x,
y,
this.state,
this.canvas,
window.devicePixelRatio,
);
</s> add const { x, y } = viewportCoordsToSceneCoords(
event,
this.state,
this.canvas,
window.devicePixelRatio,
); </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove } else {
this.setState({
editingElement: element,
});
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/Actions.tsx
|
keep keep add keep keep keep keep keep
|
<mask> resetCursor,
<mask> viewportCoordsToSceneCoords,
<mask> sceneCoordsToViewportCoords,
<mask> } from "../utils";
<mask> import { KEYS, isArrowKey } from "../keys";
<mask>
<mask> import { findShapeByKey, shapesShortcutKeys } from "../shapes";
<mask> import { createHistory, SceneHistory } from "../history";
</s> edit text when clicked on with text tool (#1283) </s> remove import { capitalizeString, getShortcutKey } from "../utils";
import { CURSOR_TYPE } from "../constants";
</s> add import { capitalizeString, getShortcutKey, setCursorForShape } from "../utils"; </s> add import { CURSOR_TYPE } from "./constants"; </s> remove element: ExcalidrawElement,
</s> add element: ExcalidrawElement | null, </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove document.documentElement.style.cursor =
this.state.elementType === "text"
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(this.state.elementType); </s> remove } else {
this.setState({
editingElement: element,
});
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/App.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> initialDistance: null,
<mask> initialScale: null,
<mask> };
<mask>
<mask> function setCursorForShape(shape: string) {
<mask> if (shape === "selection") {
<mask> resetCursor();
<mask> } else {
<mask> document.documentElement.style.cursor =
<mask> shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
<mask> }
<mask> }
<mask>
<mask> export class App extends React.Component<any, AppState> {
<mask> canvas: HTMLCanvasElement | null = null;
<mask> rc: RoughCanvas | null = null;
<mask> socket: SocketIOClient.Socket | null = null;
<mask> socketInitialized: boolean = false; // we don't want the socket to emit any updates until it is fully initalized
</s> edit text when clicked on with text tool (#1283) </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> add import { CURSOR_TYPE } from "./constants"; </s> remove document.documentElement.style.cursor =
this.state.elementType === "text"
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(this.state.elementType); </s> remove return element.type === "text";
</s> add return element != null && element.type === "text"; </s> remove document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
</s> add if (this.state.elementType === "text") {
document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
} else {
document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
} </s> remove element: ExcalidrawElement,
</s> add element: ExcalidrawElement | null,
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/App.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> if (event.key === KEYS.SPACE) {
<mask> if (this.state.elementType === "selection") {
<mask> resetCursor();
<mask> } else {
<mask> document.documentElement.style.cursor =
<mask> this.state.elementType === "text"
<mask> ? CURSOR_TYPE.TEXT
<mask> : CURSOR_TYPE.CROSSHAIR;
<mask> this.setState({ selectedElementIds: {} });
<mask> }
<mask> isHoldingSpace = false;
<mask> }
<mask> });
</s> edit text when clicked on with text tool (#1283) </s> remove document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
</s> add if (this.state.elementType === "text") {
document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
} else {
document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
} </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove } else {
this.setState({
editingElement: element,
});
</s> add </s> remove document.documentElement.style.cursor =
value === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(value); </s> remove if (hasDeselectedButton || this.state.elementType !== "selection") {
</s> add if (
hasDeselectedButton ||
(this.state.elementType !== "selection" &&
this.state.elementType !== "text")
) {
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return;
<mask> }
<mask>
<mask> const hasDeselectedButton = Boolean(event.buttons);
<mask> if (hasDeselectedButton || this.state.elementType !== "selection") {
<mask> return;
<mask> }
<mask>
<mask> const selectedElements = getSelectedElements(
<mask> globalSceneState.getAllElements(),
</s> edit text when clicked on with text tool (#1283) </s> remove } else {
this.setState({
editingElement: element,
});
</s> add </s> remove const snappedToCenterPosition = event.altKey
? null
: this.getTextWysiwygSnappedToCenterPosition(
x,
y,
this.state,
this.canvas,
window.devicePixelRatio,
);
</s> add const { x, y } = viewportCoordsToSceneCoords(
event,
this.state,
this.canvas,
window.devicePixelRatio,
); </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove document.documentElement.style.cursor =
this.state.elementType === "text"
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(this.state.elementType); </s> add import { CURSOR_TYPE } from "./constants"; </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> x,
<mask> y,
<mask> this.state.zoom,
<mask> );
<mask> document.documentElement.style.cursor =
<mask> hitElement && !isOverScrollBar ? "move" : "";
<mask> };
<mask>
<mask> private handleCanvasPointerDown = (
<mask> event: React.PointerEvent<HTMLCanvasElement>,
<mask> ) => {
</s> edit text when clicked on with text tool (#1283) </s> remove const snappedToCenterPosition = event.altKey
? null
: this.getTextWysiwygSnappedToCenterPosition(
x,
y,
this.state,
this.canvas,
window.devicePixelRatio,
);
</s> add const { x, y } = viewportCoordsToSceneCoords(
event,
this.state,
this.canvas,
window.devicePixelRatio,
); </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove if (hasDeselectedButton || this.state.elementType !== "selection") {
</s> add if (
hasDeselectedButton ||
(this.state.elementType !== "selection" &&
this.state.elementType !== "text")
) { </s> remove const element = newTextElement({
x: snappedToCenterPosition?.elementCenterX ?? x,
y: snappedToCenterPosition?.elementCenterY ?? y,
strokeColor: this.state.currentItemStrokeColor,
backgroundColor: this.state.currentItemBackgroundColor,
fillStyle: this.state.currentItemFillStyle,
strokeWidth: this.state.currentItemStrokeWidth,
roughness: this.state.currentItemRoughness,
opacity: this.state.currentItemOpacity,
text: "",
font: this.state.currentItemFont,
</s> add this.startTextEditing({
x: x,
y: y,
clientX: event.clientX,
clientY: event.clientY,
centerIfPossible: !event.altKey, </s> remove document.documentElement.style.cursor =
value === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(value); </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/App.tsx
|
keep replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep
|
<mask>
<mask> const snappedToCenterPosition = event.altKey
<mask> ? null
<mask> : this.getTextWysiwygSnappedToCenterPosition(
<mask> x,
<mask> y,
<mask> this.state,
<mask> this.canvas,
<mask> window.devicePixelRatio,
<mask> );
<mask>
<mask> const element = newTextElement({
<mask> x: snappedToCenterPosition?.elementCenterX ?? x,
<mask> y: snappedToCenterPosition?.elementCenterY ?? y,
<mask> strokeColor: this.state.currentItemStrokeColor,
<mask> backgroundColor: this.state.currentItemBackgroundColor,
<mask> fillStyle: this.state.currentItemFillStyle,
<mask> strokeWidth: this.state.currentItemStrokeWidth,
<mask> roughness: this.state.currentItemRoughness,
<mask> opacity: this.state.currentItemOpacity,
<mask> text: "",
<mask> font: this.state.currentItemFont,
<mask> });
<mask>
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements(),
</s> edit text when clicked on with text tool (#1283) </s> remove globalSceneState.replaceAllElements([
...globalSceneState.getAllElements(),
element,
]);
this.handleTextWysiwyg(element, {
x: snappedToCenterPosition?.wysiwygX ?? event.clientX,
y: snappedToCenterPosition?.wysiwygY ?? event.clientY,
});
</s> add </s> remove document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
</s> add if (this.state.elementType === "text") {
document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
} else {
document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
} </s> remove document.documentElement.style.cursor =
value === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(value); </s> add import { CURSOR_TYPE } from "./constants"; </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/App.tsx
|
keep replace replace replace replace replace replace replace replace replace keep keep keep replace keep keep keep
|
<mask>
<mask> globalSceneState.replaceAllElements([
<mask> ...globalSceneState.getAllElements(),
<mask> element,
<mask> ]);
<mask>
<mask> this.handleTextWysiwyg(element, {
<mask> x: snappedToCenterPosition?.wysiwygX ?? event.clientX,
<mask> y: snappedToCenterPosition?.wysiwygY ?? event.clientY,
<mask> });
<mask> resetCursor();
<mask> if (!this.state.elementLocked) {
<mask> this.setState({
<mask> editingElement: element,
<mask> elementType: "selection",
<mask> });
<mask> } else {
</s> edit text when clicked on with text tool (#1283) </s> remove const element = newTextElement({
x: snappedToCenterPosition?.elementCenterX ?? x,
y: snappedToCenterPosition?.elementCenterY ?? y,
strokeColor: this.state.currentItemStrokeColor,
backgroundColor: this.state.currentItemBackgroundColor,
fillStyle: this.state.currentItemFillStyle,
strokeWidth: this.state.currentItemStrokeWidth,
roughness: this.state.currentItemRoughness,
opacity: this.state.currentItemOpacity,
text: "",
font: this.state.currentItemFont,
</s> add this.startTextEditing({
x: x,
y: y,
clientX: event.clientX,
clientY: event.clientY,
centerIfPossible: !event.altKey, </s> remove } else {
this.setState({
editingElement: element,
});
</s> add </s> remove const snappedToCenterPosition = event.altKey
? null
: this.getTextWysiwygSnappedToCenterPosition(
x,
y,
this.state,
this.canvas,
window.devicePixelRatio,
);
</s> add const { x, y } = viewportCoordsToSceneCoords(
event,
this.state,
this.canvas,
window.devicePixelRatio,
); </s> remove document.documentElement.style.cursor =
this.state.elementType === "text"
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(this.state.elementType); </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/App.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> this.setState({
<mask> editingElement: element,
<mask> elementType: "selection",
<mask> });
<mask> } else {
<mask> this.setState({
<mask> editingElement: element,
<mask> });
<mask> }
<mask> return;
<mask> } else if (
<mask> this.state.elementType === "arrow" ||
<mask> this.state.elementType === "line"
</s> edit text when clicked on with text tool (#1283) </s> remove editingElement: element,
</s> add </s> remove globalSceneState.replaceAllElements([
...globalSceneState.getAllElements(),
element,
]);
this.handleTextWysiwyg(element, {
x: snappedToCenterPosition?.wysiwygX ?? event.clientX,
y: snappedToCenterPosition?.wysiwygY ?? event.clientY,
});
</s> add </s> remove if (hasDeselectedButton || this.state.elementType !== "selection") {
</s> add if (
hasDeselectedButton ||
(this.state.elementType !== "selection" &&
this.state.elementType !== "text")
) { </s> remove document.documentElement.style.cursor =
this.state.elementType === "text"
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(this.state.elementType); </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
</s> add if (this.state.elementType === "text") {
document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
} else {
document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
}
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ExcalidrawLinearElement,
<mask> } from "./types";
<mask>
<mask> export function isTextElement(
<mask> element: ExcalidrawElement,
<mask> ): element is ExcalidrawTextElement {
<mask> return element.type === "text";
<mask> }
<mask>
<mask> export function isLinearElement(
</s> edit text when clicked on with text tool (#1283) </s> remove return element.type === "text";
</s> add return element != null && element.type === "text"; </s> add import { CURSOR_TYPE } from "./constants"; </s> remove import { capitalizeString, getShortcutKey } from "../utils";
import { CURSOR_TYPE } from "../constants";
</s> add import { capitalizeString, getShortcutKey, setCursorForShape } from "../utils"; </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add </s> add setCursorForShape,
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/element/typeChecks.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> export function isTextElement(
<mask> element: ExcalidrawElement,
<mask> ): element is ExcalidrawTextElement {
<mask> return element.type === "text";
<mask> }
<mask>
<mask> export function isLinearElement(
<mask> element?: ExcalidrawElement | null,
<mask> ): element is ExcalidrawLinearElement {
</s> edit text when clicked on with text tool (#1283) </s> remove element: ExcalidrawElement,
</s> add element: ExcalidrawElement | null, </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> add import { CURSOR_TYPE } from "./constants"; </s> remove import { capitalizeString, getShortcutKey } from "../utils";
import { CURSOR_TYPE } from "../constants";
</s> add import { capitalizeString, getShortcutKey, setCursorForShape } from "../utils"; </s> remove const snappedToCenterPosition = event.altKey
? null
: this.getTextWysiwygSnappedToCenterPosition(
x,
y,
this.state,
this.canvas,
window.devicePixelRatio,
);
</s> add const { x, y } = viewportCoordsToSceneCoords(
event,
this.state,
this.canvas,
window.devicePixelRatio,
);
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/element/typeChecks.ts
|
keep add keep keep keep keep
|
<mask> import { FlooredNumber } from "./types";
<mask> import { getZoomOrigin } from "./scene";
<mask>
<mask> export const SVG_NS = "http://www.w3.org/2000/svg";
<mask>
<mask> let mockDateTime: string | null = null;
</s> edit text when clicked on with text tool (#1283) </s> remove import { capitalizeString, getShortcutKey } from "../utils";
import { CURSOR_TYPE } from "../constants";
</s> add import { capitalizeString, getShortcutKey, setCursorForShape } from "../utils"; </s> add setCursorForShape, </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add </s> remove element: ExcalidrawElement,
</s> add element: ExcalidrawElement | null, </s> add export function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor = CURSOR_TYPE.CROSSHAIR;
}
}
</s> remove const snappedToCenterPosition = event.altKey
? null
: this.getTextWysiwygSnappedToCenterPosition(
x,
y,
this.state,
this.canvas,
window.devicePixelRatio,
);
</s> add const { x, y } = viewportCoordsToSceneCoords(
event,
this.state,
this.canvas,
window.devicePixelRatio,
);
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/utils.ts
|
keep keep add keep keep keep keep
|
<mask> document.documentElement.style.cursor = "";
<mask> }
<mask>
<mask> export const isFullScreen = () =>
<mask> document.fullscreenElement?.nodeName === "HTML";
<mask>
<mask> export const allowFullScreen = () =>
</s> edit text when clicked on with text tool (#1283) </s> remove document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
</s> add if (this.state.elementType === "text") {
document.documentElement.style.cursor = isTextElement(hitElement)
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
} else {
document.documentElement.style.cursor =
hitElement && !isOverScrollBar ? "move" : "";
} </s> add import { CURSOR_TYPE } from "./constants"; </s> remove const snappedToCenterPosition = event.altKey
? null
: this.getTextWysiwygSnappedToCenterPosition(
x,
y,
this.state,
this.canvas,
window.devicePixelRatio,
);
</s> add const { x, y } = viewportCoordsToSceneCoords(
event,
this.state,
this.canvas,
window.devicePixelRatio,
); </s> remove if (hasDeselectedButton || this.state.elementType !== "selection") {
</s> add if (
hasDeselectedButton ||
(this.state.elementType !== "selection" &&
this.state.elementType !== "text")
) { </s> remove function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
} else {
document.documentElement.style.cursor =
shape === "text" ? CURSOR_TYPE.TEXT : CURSOR_TYPE.CROSSHAIR;
}
}
</s> add </s> remove document.documentElement.style.cursor =
this.state.elementType === "text"
? CURSOR_TYPE.TEXT
: CURSOR_TYPE.CROSSHAIR;
</s> add setCursorForShape(this.state.elementType);
|
https://github.com/excalidraw/excalidraw/commit/e9b4700bba04d044adff73d9a7a60ee606d10781
|
src/utils.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "last 1 safari version"
<mask> ]
<mask> },
<mask> "dependencies": {
<mask> "@dwelle/tunnel-rat": "0.1.1",
<mask> "@sentry/browser": "6.2.5",
<mask> "@sentry/integrations": "6.2.5",
<mask> "@testing-library/jest-dom": "5.16.2",
<mask> "@testing-library/react": "12.1.5",
<mask> "@tldraw/vec": "1.7.1",
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add refPrevOpenSidebar.current = appState.openSidebar;
}, [appState.openSidebar, onStateChange, props.name]); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> remove };
const { container } = await render(<CustomExcalidraw />);
</s> add </s> remove {this.props.children}
</LayerUI>
<div className="excalidraw-textEditorContainer" />
<div className="excalidraw-contextMenuContainer" />
{selectedElement.length === 1 &&
!this.state.contextMenu &&
this.state.showHyperlinkPopup && (
<Hyperlink
key={selectedElement[0].id}
element={selectedElement[0]}
</s> add <ExcalidrawActionManagerContext.Provider
value={this.actionManager}
>
<LayerUI
canvas={this.canvas}
appState={this.state}
files={this.files} </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "react-scripts": "5.0.1",
<mask> "roughjs": "4.5.2",
<mask> "sass": "1.51.0",
<mask> "socket.io-client": "2.3.1",
<mask> "tunnel-rat": "0.1.0",
<mask> "workbox-background-sync": "^6.5.4",
<mask> "workbox-broadcast-update": "^6.5.4",
<mask> "workbox-cacheable-response": "^6.5.4",
<mask> "workbox-core": "^6.5.4",
<mask> "workbox-expiration": "^6.5.4",
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove export const isShallowEqual = <T extends Record<string, any>>(
</s> add export const isShallowEqual = <
T extends Record<string, any>,
I extends keyof T,
>( </s> add "defaultSidebarDockedPreference": false, </s> remove "isSidebarDocked": false,
</s> add </s> add "defaultSidebarDockedPreference": false, </s> remove "isSidebarDocked": false,
</s> add </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
package.json
|
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 keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep
|
<mask> this.props.handleKeyboardGlobally ? undefined : this.onKeyDown
<mask> }
<mask> >
<mask> <ExcalidrawContainerContext.Provider
<mask> value={this.excalidrawContainerValue}
<mask> >
<mask> <DeviceContext.Provider value={this.device}>
<mask> <ExcalidrawSetAppStateContext.Provider value={this.setAppState}>
<mask> <ExcalidrawAppStateContext.Provider value={this.state}>
<mask> <ExcalidrawElementsContext.Provider
<mask> value={this.scene.getNonDeletedElements()}
<mask> >
<mask> <ExcalidrawActionManagerContext.Provider
<mask> value={this.actionManager}
<mask> >
<mask> <LayerUI
<mask> canvas={this.canvas}
<mask> appState={this.state}
<mask> files={this.files}
<mask> setAppState={this.setAppState}
<mask> actionManager={this.actionManager}
<mask> elements={this.scene.getNonDeletedElements()}
<mask> onLockToggle={this.toggleLock}
<mask> onPenModeToggle={this.togglePenMode}
<mask> onHandToolToggle={this.onHandToolToggle}
<mask> onInsertElements={(elements) =>
<mask> this.addElementsFromPasteOrLibrary({
<mask> elements,
<mask> position: "center",
<mask> files: null,
<mask> })
<mask> }
<mask> langCode={getLanguage().code}
<mask> renderTopRightUI={renderTopRightUI}
<mask> renderCustomStats={renderCustomStats}
<mask> renderCustomSidebar={this.props.renderSidebar}
<mask> showExitZenModeBtn={
<mask> typeof this.props?.zenModeEnabled === "undefined" &&
<mask> this.state.zenModeEnabled
<mask> }
<mask> libraryReturnUrl={this.props.libraryReturnUrl}
<mask> UIOptions={this.props.UIOptions}
<mask> focusContainer={this.focusContainer}
<mask> library={this.library}
<mask> id={this.id}
<mask> onImageAction={this.onImageAction}
<mask> renderWelcomeScreen={
<mask> !this.state.isLoading &&
<mask> this.state.showWelcomeScreen &&
<mask> this.state.activeTool.type === "selection" &&
<mask> !this.scene.getElementsIncludingDeleted().length
<mask> }
<mask> >
<mask> {this.props.children}
<mask> </LayerUI>
<mask> <div className="excalidraw-textEditorContainer" />
<mask> <div className="excalidraw-contextMenuContainer" />
<mask> {selectedElement.length === 1 &&
<mask> !this.state.contextMenu &&
<mask> this.state.showHyperlinkPopup && (
<mask> <Hyperlink
<mask> key={selectedElement[0].id}
<mask> element={selectedElement[0]}
<mask> setAppState={this.setAppState}
<mask> onLinkOpen={this.props.onLinkOpen}
<mask> />
<mask> )}
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove {renderWelcomeScreen && <tunnels.welcomeScreenCenterTunnel.Out />}
</s> add {renderWelcomeScreen && <tunnels.WelcomeScreenCenterTunnel.Out />} </s> remove <tunnels.welcomeScreenToolbarHintTunnel.Out />
</s> add <tunnels.WelcomeScreenToolbarHintTunnel.Out /> </s> remove if (appState.openSidebar === "library" && !device.canDeviceFitSidebar) {
</s> add if (appState.openSidebar && !device.canDeviceFitSidebar) { </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> add this.setState({ openSidebar: nextName ? { name: nextName, tab } : null });
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/App.tsx
|
keep keep keep add keep keep keep keep
|
<mask> nextName = this.state.openSidebar?.name === name ? null : name;
<mask> } else {
<mask> nextName = force ? name : null;
<mask> }
<mask>
<mask> return !!nextName;
<mask> };
<mask>
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove if (appState.openSidebar === "library" && !device.canDeviceFitSidebar) {
</s> add if (appState.openSidebar && !device.canDeviceFitSidebar) { </s> remove {renderWelcomeScreen && <tunnels.welcomeScreenCenterTunnel.Out />}
</s> add {renderWelcomeScreen && <tunnels.WelcomeScreenCenterTunnel.Out />} </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> add export type SidebarName = string;
export type SidebarTabName = string;
</s> remove export const isShallowEqual = <T extends Record<string, any>>(
</s> add export const isShallowEqual = <
T extends Record<string, any>,
I extends keyof T,
>(
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/App.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> return (
<mask> <button
<mask> onClick={(event) => {
<mask> onSelect();
<mask> rest.onClick?.(event);
<mask> }}
<mask> type={type}
<mask> className={`excalidraw-button ${className}`}
<mask> {...rest}
<mask> >
<mask> {children}
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove });
</s> add </s> remove const { footerCenterTunnel } = useTunnels();
</s> add const { FooterCenterTunnel } = useTunnels(); </s> remove if (appState.openSidebar === "library" && !device.canDeviceFitSidebar) {
</s> add if (appState.openSidebar && !device.canDeviceFitSidebar) { </s> remove {this.props.children}
</LayerUI>
<div className="excalidraw-textEditorContainer" />
<div className="excalidraw-contextMenuContainer" />
{selectedElement.length === 1 &&
!this.state.contextMenu &&
this.state.showHyperlinkPopup && (
<Hyperlink
key={selectedElement[0].id}
element={selectedElement[0]}
</s> add <ExcalidrawActionManagerContext.Provider
value={this.actionManager}
>
<LayerUI
canvas={this.canvas}
appState={this.state}
files={this.files}
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Button.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }: HintViewerProps) => {
<mask> const { activeTool, isResizing, isRotating, lastPointerDownWith } = appState;
<mask> const multiMode = appState.multiElement !== null;
<mask>
<mask> if (appState.openSidebar === "library" && !device.canDeviceFitSidebar) {
<mask> return null;
<mask> }
<mask>
<mask> if (isEraserActive(appState)) {
<mask> return t("hints.eraserRevert");
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove const { footerCenterTunnel } = useTunnels();
</s> add const { FooterCenterTunnel } = useTunnels(); </s> add const { onInsertElements } = useApp(); </s> add this.setState({ openSidebar: nextName ? { name: nextName, tab } : null }); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> add export type SidebarName = string;
export type SidebarTabName = string;
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/HintViewer.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { actionToggleStats } from "../actions/actionToggleStats";
<mask> import Footer from "./footer/Footer";
<mask> import { hostSidebarCountersAtom } from "./Sidebar/Sidebar";
<mask> import { jotaiScope } from "../jotai";
<mask> import { Provider, useAtom } from "jotai";
<mask> import MainMenu from "./main-menu/MainMenu";
<mask> import { ActiveConfirmDialog } from "./ActiveConfirmDialog";
<mask> import { HandButton } from "./HandButton";
<mask> import { isHandToolActive } from "../appState";
<mask> import { TunnelsContext, useInitializeTunnels } from "./context/tunnels";
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { useTunnels } from "./context/tunnels";
</s> add import { useTunnels } from "../context/tunnels"; </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library"; </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick"; </s> add DEFAULT_SIDEBAR, </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <Section heading="shapes" className="shapes-section">
<mask> {(heading: React.ReactNode) => (
<mask> <div style={{ position: "relative" }}>
<mask> {renderWelcomeScreen && (
<mask> <tunnels.welcomeScreenToolbarHintTunnel.Out />
<mask> )}
<mask> <Stack.Col gap={4} align="start">
<mask> <Stack.Row
<mask> gap={1}
<mask> className={clsx("App-toolbar-container", {
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove {this.props.children}
</LayerUI>
<div className="excalidraw-textEditorContainer" />
<div className="excalidraw-contextMenuContainer" />
{selectedElement.length === 1 &&
!this.state.contextMenu &&
this.state.showHyperlinkPopup && (
<Hyperlink
key={selectedElement[0].id}
element={selectedElement[0]}
</s> add <ExcalidrawActionManagerContext.Provider
value={this.actionManager}
>
<LayerUI
canvas={this.canvas}
appState={this.state}
files={this.files} </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> remove {renderWelcomeScreen && <tunnels.welcomeScreenCenterTunnel.Out />}
</s> add {renderWelcomeScreen && <tunnels.WelcomeScreenCenterTunnel.Out />} </s> remove <ExcalidrawContainerContext.Provider
value={this.excalidrawContainerValue}
>
<DeviceContext.Provider value={this.device}>
<ExcalidrawSetAppStateContext.Provider value={this.setAppState}>
<ExcalidrawAppStateContext.Provider value={this.state}>
<ExcalidrawElementsContext.Provider
value={this.scene.getNonDeletedElements()}
>
<ExcalidrawActionManagerContext.Provider
value={this.actionManager}
>
<LayerUI
canvas={this.canvas}
appState={this.state}
files={this.files}
setAppState={this.setAppState}
actionManager={this.actionManager}
elements={this.scene.getNonDeletedElements()}
onLockToggle={this.toggleLock}
onPenModeToggle={this.togglePenMode}
onHandToolToggle={this.onHandToolToggle}
onInsertElements={(elements) =>
this.addElementsFromPasteOrLibrary({
elements,
position: "center",
files: null,
})
}
langCode={getLanguage().code}
renderTopRightUI={renderTopRightUI}
renderCustomStats={renderCustomStats}
renderCustomSidebar={this.props.renderSidebar}
showExitZenModeBtn={
typeof this.props?.zenModeEnabled === "undefined" &&
this.state.zenModeEnabled
}
libraryReturnUrl={this.props.libraryReturnUrl}
UIOptions={this.props.UIOptions}
focusContainer={this.focusContainer}
library={this.library}
id={this.id}
onImageAction={this.onImageAction}
renderWelcomeScreen={
!this.state.isLoading &&
this.state.showWelcomeScreen &&
this.state.activeTool.type === "selection" &&
!this.scene.getElementsIncludingDeleted().length
}
</s> add <AppContext.Provider value={this}>
<AppPropsContext.Provider value={this.props}>
<ExcalidrawContainerContext.Provider
value={this.excalidrawContainerValue}
>
<DeviceContext.Provider value={this.device}>
<ExcalidrawSetAppStateContext.Provider value={this.setAppState}>
<ExcalidrawAppStateContext.Provider value={this.state}>
<ExcalidrawElementsContext.Provider
value={this.scene.getNonDeletedElements()} </s> remove rest.onClick?.(event);
}}
</s> add })} </s> remove const { footerCenterTunnel } = useTunnels();
</s> add const { FooterCenterTunnel } = useTunnels();
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ? { width: `calc(100% - ${LIBRARY_SIDEBAR_WIDTH}px)` }
<mask> : {}
<mask> }
<mask> >
<mask> {renderWelcomeScreen && <tunnels.welcomeScreenCenterTunnel.Out />}
<mask> {renderFixedSideContainer()}
<mask> <Footer
<mask> appState={appState}
<mask> actionManager={actionManager}
<mask> showExitZenModeBtn={showExitZenModeBtn}
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add this.setState({ openSidebar: nextName ? { name: nextName, tab } : null }); </s> remove <ExcalidrawContainerContext.Provider
value={this.excalidrawContainerValue}
>
<DeviceContext.Provider value={this.device}>
<ExcalidrawSetAppStateContext.Provider value={this.setAppState}>
<ExcalidrawAppStateContext.Provider value={this.state}>
<ExcalidrawElementsContext.Provider
value={this.scene.getNonDeletedElements()}
>
<ExcalidrawActionManagerContext.Provider
value={this.actionManager}
>
<LayerUI
canvas={this.canvas}
appState={this.state}
files={this.files}
setAppState={this.setAppState}
actionManager={this.actionManager}
elements={this.scene.getNonDeletedElements()}
onLockToggle={this.toggleLock}
onPenModeToggle={this.togglePenMode}
onHandToolToggle={this.onHandToolToggle}
onInsertElements={(elements) =>
this.addElementsFromPasteOrLibrary({
elements,
position: "center",
files: null,
})
}
langCode={getLanguage().code}
renderTopRightUI={renderTopRightUI}
renderCustomStats={renderCustomStats}
renderCustomSidebar={this.props.renderSidebar}
showExitZenModeBtn={
typeof this.props?.zenModeEnabled === "undefined" &&
this.state.zenModeEnabled
}
libraryReturnUrl={this.props.libraryReturnUrl}
UIOptions={this.props.UIOptions}
focusContainer={this.focusContainer}
library={this.library}
id={this.id}
onImageAction={this.onImageAction}
renderWelcomeScreen={
!this.state.isLoading &&
this.state.showWelcomeScreen &&
this.state.activeTool.type === "selection" &&
!this.scene.getElementsIncludingDeleted().length
}
</s> add <AppContext.Provider value={this}>
<AppPropsContext.Provider value={this.props}>
<ExcalidrawContainerContext.Provider
value={this.excalidrawContainerValue}
>
<DeviceContext.Provider value={this.device}>
<ExcalidrawSetAppStateContext.Provider value={this.setAppState}>
<ExcalidrawAppStateContext.Provider value={this.state}>
<ExcalidrawElementsContext.Provider
value={this.scene.getNonDeletedElements()} </s> remove {this.props.children}
</LayerUI>
<div className="excalidraw-textEditorContainer" />
<div className="excalidraw-contextMenuContainer" />
{selectedElement.length === 1 &&
!this.state.contextMenu &&
this.state.showHyperlinkPopup && (
<Hyperlink
key={selectedElement[0].id}
element={selectedElement[0]}
</s> add <ExcalidrawActionManagerContext.Provider
value={this.actionManager}
>
<LayerUI
canvas={this.canvas}
appState={this.state}
files={this.files} </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove .layer-ui__sidebar__header .dropdown-menu {
&.dropdown-menu--mobile {
top: 100%;
}
.dropdown-menu-container {
--gap: 0;
z-index: 1;
position: absolute;
top: 100%;
left: 0;
:root[dir="rtl"] & {
right: 0;
left: auto;
}
</s> add .layer-ui__library .dropdown-menu {
width: auto;
top: initial;
right: 0;
left: initial;
bottom: 100%;
margin-bottom: 0.625rem; </s> remove if (appState.openSidebar === "library" && !device.canDeviceFitSidebar) {
</s> add if (appState.openSidebar && !device.canDeviceFitSidebar) {
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LayerUI.tsx
|
keep keep keep replace replace replace keep keep keep keep keep
|
<mask> @import "open-color/open-color";
<mask>
<mask> .excalidraw {
<mask> .layer-ui__library-sidebar {
<mask> display: flex;
<mask> flex-direction: column;
<mask> }
<mask>
<mask> .layer-ui__library {
<mask> display: flex;
<mask> flex-direction: column;
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove .layer-ui__sidebar__header__buttons {
</s> add .sidebar-tab-trigger {
--button-width: auto;
--button-bg: transparent;
--button-hover-bg: transparent;
--button-active-bg: var(--color-primary);
--button-hover-color: var(--color-primary);
--button-hover-border: var(--color-primary);
&[data-state="active"] {
--button-bg: var(--color-primary);
--button-hover-bg: var(--color-primary-darker);
--button-hover-color: var(--color-icon-white);
--button-border: var(--color-primary);
color: var(--color-icon-white);
}
}
// ---------------------------- default sidebar ------------------------------
.default-sidebar { </s> remove .layer-ui__sidebar__header .dropdown-menu {
&.dropdown-menu--mobile {
top: 100%;
}
.dropdown-menu-container {
--gap: 0;
z-index: 1;
position: absolute;
top: 100%;
left: 0;
:root[dir="rtl"] & {
right: 0;
left: auto;
}
</s> add .layer-ui__library .dropdown-menu {
width: auto;
top: initial;
right: 0;
left: initial;
bottom: 100%;
margin-bottom: 0.625rem; </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react"; </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LibraryMenu.scss
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> padding-right: 0;
<mask> }
<mask> }
<mask>
<mask> .layer-ui__sidebar__header .dropdown-menu {
<mask> &.dropdown-menu--mobile {
<mask> top: 100%;
<mask> }
<mask> .dropdown-menu-container {
<mask> --gap: 0;
<mask> z-index: 1;
<mask> position: absolute;
<mask> top: 100%;
<mask> left: 0;
<mask>
<mask> :root[dir="rtl"] & {
<mask> right: 0;
<mask> left: auto;
<mask> }
<mask>
<mask> width: 196px;
<mask> box-shadow: var(--library-dropdown-shadow);
<mask> border-radius: var(--border-radius-lg);
<mask> padding: 0.25rem 0.5rem;
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add let counter = 0;
</s> remove .layer-ui__library-sidebar {
display: flex;
flex-direction: column;
</s> add .library-menu-items-container {
height: 100%;
width: 100%; </s> add export type SidebarName = string;
export type SidebarTabName = string;
</s> remove .layer-ui__sidebar__header__buttons {
</s> add .sidebar-tab-trigger {
--button-width: auto;
--button-bg: transparent;
--button-hover-bg: transparent;
--button-active-bg: var(--color-primary);
--button-hover-color: var(--color-primary);
--button-hover-border: var(--color-primary);
&[data-state="active"] {
--button-bg: var(--color-primary);
--button-hover-bg: var(--color-primary-darker);
--button-hover-color: var(--color-icon-white);
--button-border: var(--color-primary);
color: var(--color-icon-white);
}
}
// ---------------------------- default sidebar ------------------------------
.default-sidebar { </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LibraryMenu.scss
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> </LibraryMenuWrapper>
<mask> );
<mask> };
<mask>
<mask> export const LibraryMenu: React.FC<{
<mask> appState: AppState;
<mask> onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
<mask> libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
<mask> focusContainer: () => void;
<mask> library: Library;
<mask> id: string;
<mask> }> = ({
<mask> appState,
<mask> onInsertElements,
<mask> libraryReturnUrl,
<mask> focusContainer,
<mask> library,
<mask> id,
<mask> }) => {
<mask> const setAppState = useExcalidrawSetAppState();
<mask> const elements = useExcalidrawElements();
<mask> const device = useDevice();
<mask>
<mask> const [selectedItems, setSelectedItems] = useState<LibraryItem["id"][]>([]);
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add const { onInsertElements } = useApp(); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> remove const [Context, Component] = withUpstreamOverride(_SidebarHeader);
/** @private */
export const SidebarHeaderComponents = { Context, Component };
</s> add SidebarHeader.displayName = "SidebarHeader"; </s> remove export const isShallowEqual = <T extends Record<string, any>>(
</s> add export const isShallowEqual = <
T extends Record<string, any>,
I extends keyof T,
>( </s> remove const { footerCenterTunnel } = useTunnels();
</s> add const { FooterCenterTunnel } = useTunnels(); </s> remove const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-dock");
expect(closeButton).not.toBe(null);
</s> add const node = container.querySelector("#test-sidebar-content");
expect(node).not.toBe(null);
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LibraryMenu.tsx
|
replace replace replace keep keep keep keep keep
|
<mask> import React, { useCallback, useState } from "react";
<mask> import { saveLibraryAsJSON } from "../data/json";
<mask> import Library, { libraryItemsAtom } from "../data/library";
<mask> import { t } from "../i18n";
<mask> import { AppState, LibraryItem, LibraryItems } from "../types";
<mask> import {
<mask> DotsIcon,
<mask> ExportIcon,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library"; </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels"; </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick"; </s> add DEFAULT_SIDEBAR,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LibraryMenuHeaderContent.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> import { useCallback, useState } from "react";
<mask> import { t } from "../i18n";
<mask> import { jotaiScope } from "../jotai";
<mask> import { AppState, LibraryItem, LibraryItems } from "../types";
<mask> import {
<mask> DotsIcon,
<mask> ExportIcon,
<mask> LoadIcon,
<mask> publishIcon,
<mask> TrashIcon,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react"; </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels"; </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick"; </s> add DEFAULT_SIDEBAR,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LibraryMenuHeaderContent.tsx
|
keep add keep keep keep keep
|
<mask> import Spinner from "./Spinner";
<mask> import { duplicateElements } from "../element/newElement";
<mask>
<mask> const CELLS_PER_ROW = 4;
<mask>
<mask> const LibraryMenuItems = ({
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add import { Button } from "../Button"; </s> remove const { footerCenterTunnel } = useTunnels();
</s> add const { FooterCenterTunnel } = useTunnels(); </s> remove import { useTunnels } from "./context/tunnels";
</s> add import { useTunnels } from "../context/tunnels"; </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/LibraryMenuItems.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
<mask> import { Section } from "./Section";
<mask> import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
<mask> import { LockButton } from "./LockButton";
<mask> import { LibraryButton } from "./LibraryButton";
<mask> import { PenModeButton } from "./PenModeButton";
<mask> import { Stats } from "./Stats";
<mask> import { actionToggleStats } from "../actions";
<mask> import { HandButton } from "./HandButton";
<mask> import { isHandToolActive } from "../appState";
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove import { useTunnels } from "./context/tunnels";
</s> add import { useTunnels } from "../context/tunnels"; </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick"; </s> add DEFAULT_SIDEBAR, </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react"; </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { Stats } from "./Stats";
<mask> import { actionToggleStats } from "../actions";
<mask> import { HandButton } from "./HandButton";
<mask> import { isHandToolActive } from "../appState";
<mask> import { useTunnels } from "./context/tunnels";
<mask>
<mask> type MobileMenuProps = {
<mask> appState: AppState;
<mask> actionManager: ActionManager;
<mask> renderJSONExportDialog: () => React.ReactNode;
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels"; </s> add DEFAULT_SIDEBAR, </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick"; </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/MobileMenu.tsx
|
keep keep keep add keep keep keep keep
|
<mask> appState: AppState;
<mask> onClose: () => void;
<mask> setAppState: React.Component<any, AppState>["setState"];
<mask> }) => {
<mask> const handleClose = React.useCallback(() => {
<mask> if (onClose) {
<mask> onClose();
<mask> }
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove export const LibraryMenu: React.FC<{
appState: AppState;
onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
focusContainer: () => void;
library: Library;
id: string;
}> = ({
appState,
onInsertElements,
libraryReturnUrl,
focusContainer,
library,
id,
}) => {
</s> add /**
* This component is meant to be rendered inside <Sidebar.Tab/> inside our
* <DefaultSidebar/> or host apps Sidebar components.
*/
export const LibraryMenu = () => {
const { library, id, onInsertElements } = useApp();
const appProps = useAppProps();
const appState = useUIAppState(); </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove if (appState.openSidebar === "library" && !device.canDeviceFitSidebar) {
</s> add if (appState.openSidebar && !device.canDeviceFitSidebar) { </s> remove import { useTunnels } from "./context/tunnels";
</s> add import { useTunnels } from "../context/tunnels";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/PasteChartDialog.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> padding: 1rem;
<mask> border-bottom: 1px solid var(--sidebar-border-color);
<mask> }
<mask>
<mask> .layer-ui__sidebar__header__buttons {
<mask> display: flex;
<mask> align-items: center;
<mask> gap: 0.625rem;
<mask> }
<mask> }
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove .layer-ui__library-sidebar {
display: flex;
flex-direction: column;
</s> add .library-menu-items-container {
height: 100%;
width: 100%; </s> remove .layer-ui__sidebar__header .dropdown-menu {
&.dropdown-menu--mobile {
top: 100%;
}
.dropdown-menu-container {
--gap: 0;
z-index: 1;
position: absolute;
top: 100%;
left: 0;
:root[dir="rtl"] & {
right: 0;
left: auto;
}
</s> add .layer-ui__library .dropdown-menu {
width: auto;
top: initial;
right: 0;
left: initial;
bottom: 100%;
margin-bottom: 0.625rem; </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> add DEFAULT_SIDEBAR, </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.scss
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> waitFor,
<mask> withExcalidrawDimensions,
<mask> } from "../../tests/test-utils";
<mask>
<mask> describe("Sidebar", () => {
<mask> it("should render custom sidebar", async () => {
<mask> const { container } = await render(
<mask> <Excalidraw
<mask> initialData={{ appState: { openSidebar: "customSidebar" } }}
<mask> renderSidebar={() => (
<mask> <Sidebar>
<mask> <div id="test-sidebar-content">42</div>
<mask> </Sidebar>
<mask> )}
<mask> />,
<mask> );
<mask>
<mask> const node = container.querySelector("#test-sidebar-content");
<mask> expect(node).not.toBe(null);
<mask> });
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> remove const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-dock");
expect(closeButton).not.toBe(null);
</s> add const node = container.querySelector("#test-sidebar-content");
expect(node).not.toBe(null); </s> remove });
</s> add </s> remove };
const { container } = await render(<CustomExcalidraw />);
</s> add </s> add const { onInsertElements } = useApp(); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState();
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.test.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // make sure only one sidebar is rendered
<mask> const sidebars = container.querySelectorAll(".layer-ui__sidebar");
<mask> expect(sidebars.length).toBe(1);
<mask> });
<mask> });
<mask>
<mask> it("should always render custom sidebar with close button & close on click", async () => {
<mask> const onClose = jest.fn();
<mask> const CustomExcalidraw = () => {
<mask> return (
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-dock");
expect(closeButton).not.toBe(null);
</s> add const node = container.querySelector("#test-sidebar-content");
expect(node).not.toBe(null); </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> remove await waitFor(() => {
const node = container.querySelector("#test-sidebar-content");
expect(node).toBe(null);
</s> add const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
expect(closeButton).not.toBe(null);
fireEvent.click(closeButton);
await waitFor(() => {
expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(
null,
);
expect(onStateChange).toHaveBeenCalledWith(null);
}); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove // force-toggle sidebar off (=> still hidden)
// -------------------------------------------------------------------------
expect(window.h.app.toggleMenu("customSidebar", false)).toBe(false);
</s> add // initial open
expect(onStateChange).toHaveBeenCalledWith({ name: "customSidebar" });
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.test.tsx
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> </Sidebar>
<mask> )}
<mask> />
<mask> );
<mask> };
<mask>
<mask> const { container } = await render(<CustomExcalidraw />);
<mask>
<mask> await withExcalidrawDimensions({ width: 1920, height: 1080 }, async () => {
<mask> // should not show dock button when `dockable` is `false`
<mask> // -------------------------------------------------------------------------
<mask>
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> remove await waitFor(() => {
const node = container.querySelector("#test-sidebar-content");
expect(node).toBe(null);
</s> add const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
expect(closeButton).not.toBe(null);
fireEvent.click(closeButton);
await waitFor(() => {
expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(
null,
);
expect(onStateChange).toHaveBeenCalledWith(null);
}); </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove });
</s> add </s> remove // force-toggle sidebar off (=> still hidden)
// -------------------------------------------------------------------------
expect(window.h.app.toggleMenu("customSidebar", false)).toBe(false);
</s> add // initial open
expect(onStateChange).toHaveBeenCalledWith({ name: "customSidebar" }); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState();
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.test.tsx
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> _setDockable(true);
<mask> });
<mask>
<mask> await waitFor(() => {
<mask> const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
<mask> expect(sidebar).not.toBe(null);
<mask> const closeButton = queryByTestId(sidebar!, "sidebar-dock");
<mask> expect(closeButton).not.toBe(null);
<mask> });
<mask> });
<mask> });
<mask>
<mask> it("should support controlled docking", async () => {
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove await waitFor(() => {
const node = container.querySelector("#test-sidebar-content");
expect(node).toBe(null);
</s> add const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
expect(closeButton).not.toBe(null);
fireEvent.click(closeButton);
await waitFor(() => {
expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(
null,
);
expect(onStateChange).toHaveBeenCalledWith(null);
}); </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> remove });
</s> add </s> remove // force-toggle sidebar off (=> still hidden)
// -------------------------------------------------------------------------
expect(window.h.app.toggleMenu("customSidebar", false)).toBe(false);
</s> add // initial open
expect(onStateChange).toHaveBeenCalledWith({ name: "customSidebar" }); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar",
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.test.tsx
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> });
<mask> });
<mask> });
<mask>
<mask> it("should toggle sidebar using props.toggleMenu()", async () => {
<mask> const { container } = await render(
<mask> <Excalidraw
<mask> renderSidebar={() => (
<mask> <Sidebar>
<mask> <div id="test-sidebar-content">42</div>
<mask> </Sidebar>
<mask> )}
<mask> />,
<mask> );
<mask>
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-dock");
expect(closeButton).not.toBe(null);
</s> add const node = container.querySelector("#test-sidebar-content");
expect(node).not.toBe(null); </s> remove });
</s> add </s> remove };
const { container } = await render(<CustomExcalidraw />);
</s> add </s> remove await waitFor(() => {
const node = container.querySelector("#test-sidebar-content");
expect(node).toBe(null);
</s> add const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
expect(closeButton).not.toBe(null);
fireEvent.click(closeButton);
await waitFor(() => {
expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(
null,
);
expect(onStateChange).toHaveBeenCalledWith(null);
}); </s> remove // force-toggle sidebar off (=> still hidden)
// -------------------------------------------------------------------------
expect(window.h.app.toggleMenu("customSidebar", false)).toBe(false);
</s> add // initial open
expect(onStateChange).toHaveBeenCalledWith({ name: "customSidebar" });
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.test.tsx
|
keep keep keep keep replace replace replace keep replace replace replace keep keep keep
|
<mask> const node = container.querySelector("#test-sidebar-content");
<mask> expect(node).toBe(null);
<mask> });
<mask>
<mask> // force-toggle sidebar off (=> still hidden)
<mask> // -------------------------------------------------------------------------
<mask> expect(window.h.app.toggleMenu("customSidebar", false)).toBe(false);
<mask>
<mask> await waitFor(() => {
<mask> const node = container.querySelector("#test-sidebar-content");
<mask> expect(node).toBe(null);
<mask> });
<mask>
<mask> // force-toggle sidebar on
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-dock");
expect(closeButton).not.toBe(null);
</s> add const node = container.querySelector("#test-sidebar-content");
expect(node).not.toBe(null); </s> remove });
</s> add </s> remove };
const { container } = await render(<CustomExcalidraw />);
</s> add </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.test.tsx
|
replace keep keep keep keep keep
|
<mask> import {
<mask> useEffect,
<mask> useLayoutEffect,
<mask> useRef,
<mask> useState,
<mask> forwardRef,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick"; </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react"; </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library"; </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.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 keep keep keep keep keep
|
<mask> /** using a counter instead of boolean to handle race conditions where
<mask> * the host app may render (mount/unmount) multiple different sidebar */
<mask> export const hostSidebarCountersAtom = atom({ rendered: 0, docked: 0 });
<mask>
<mask> export const Sidebar = Object.assign(
<mask> forwardRef(
<mask> (
<mask> {
<mask> children,
<mask> onClose,
<mask> onDock,
<mask> docked,
<mask> /** Undocumented, may be removed later. Generally should either be
<mask> * `props.docked` or `appState.isSidebarDocked`. Currently serves to
<mask> * prevent unwanted animation of the shadow if initially docked. */
<mask> //
<mask> // NOTE we'll want to remove this after we sort out how to subscribe to
<mask> // individual appState properties
<mask> initialDockedState = docked,
<mask> dockable = true,
<mask> className,
<mask> __isInternal,
<mask> }: SidebarProps<{
<mask> // NOTE sidebars we use internally inside the editor must have this flag set.
<mask> // It indicates that this sidebar should have lower precedence over host
<mask> // sidebars, if both are open.
<mask> /** @private internal */
<mask> __isInternal?: boolean;
<mask> }>,
<mask> ref: React.ForwardedRef<HTMLDivElement>,
<mask> ) => {
<mask> const [hostSidebarCounters, setHostSidebarCounters] = useAtom(
<mask> hostSidebarCountersAtom,
<mask> jotaiScope,
<mask> );
<mask>
<mask> const setAppState = useExcalidrawSetAppState();
<mask>
<mask> const [isDockedFallback, setIsDockedFallback] = useState(
<mask> docked ?? initialDockedState ?? false,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove export const LibraryMenu: React.FC<{
appState: AppState;
onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
focusContainer: () => void;
library: Library;
id: string;
}> = ({
appState,
onInsertElements,
libraryReturnUrl,
focusContainer,
library,
id,
}) => {
</s> add /**
* This component is meant to be rendered inside <Sidebar.Tab/> inside our
* <DefaultSidebar/> or host apps Sidebar components.
*/
export const LibraryMenu = () => {
const { library, id, onInsertElements } = useApp();
const appProps = useAppProps();
const appState = useUIAppState(); </s> remove const [Context, Component] = withUpstreamOverride(_SidebarHeader);
/** @private */
export const SidebarHeaderComponents = { Context, Component };
</s> add SidebarHeader.displayName = "SidebarHeader"; </s> add // FIXME normalize/set defaults in parent component so that the memo resolver
// compares the same values </s> remove await waitFor(() => {
const node = container.querySelector("#test-sidebar-content");
expect(node).toBe(null);
</s> add const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
expect(closeButton).not.toBe(null);
fireEvent.click(closeButton);
await waitFor(() => {
expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(
null,
);
expect(onStateChange).toHaveBeenCalledWith(null);
}); </s> remove // force-toggle sidebar off (=> still hidden)
// -------------------------------------------------------------------------
expect(window.h.app.toggleMenu("customSidebar", false)).toBe(false);
</s> add // initial open
expect(onStateChange).toHaveBeenCalledWith({ name: "customSidebar" }); </s> remove });
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.tsx
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask>
<mask> const onCloseRef = useRef(onClose);
<mask> onCloseRef.current = onClose;
<mask>
<mask> useEffect(() => {
<mask> return () => {
<mask> onCloseRef.current?.();
<mask> };
<mask> }, []);
<mask>
<mask> const headerPropsRef = useRef<SidebarPropsContextValue>({});
<mask> headerPropsRef.current.onClose = () => {
<mask> setAppState({ openSidebar: null });
<mask> };
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-dock");
expect(closeButton).not.toBe(null);
</s> add const node = container.querySelector("#test-sidebar-content");
expect(node).not.toBe(null); </s> remove });
</s> add </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> add const { onInsertElements } = useApp(); </s> remove export const LibraryMenu: React.FC<{
appState: AppState;
onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
focusContainer: () => void;
library: Library;
id: string;
}> = ({
appState,
onInsertElements,
libraryReturnUrl,
focusContainer,
library,
id,
}) => {
</s> add /**
* This component is meant to be rendered inside <Sidebar.Tab/> inside our
* <DefaultSidebar/> or host apps Sidebar components.
*/
export const LibraryMenu = () => {
const { library, id, onInsertElements } = useApp();
const appProps = useAppProps();
const appState = useUIAppState(); </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar",
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.tsx
|
keep add keep keep keep keep
|
<mask> );
<mask> }
<mask>
<mask> const [mounted, setMounted] = useState(false);
<mask> useLayoutEffect(() => {
<mask> setMounted(true);
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add const { onInsertElements } = useApp(); </s> remove describe("Sidebar", () => {
it("should render custom sidebar", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: "customSidebar" } }}
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</Sidebar>
)}
/>,
</s> add export const assertSidebarDockButton = async <T extends boolean>(
hasDockButton: T,
): Promise<
T extends false
? { dockButton: null; sidebar: HTMLElement }
: { dockButton: HTMLElement; sidebar: HTMLElement }
> => {
const sidebar =
GlobalTestState.renderResult.container.querySelector<HTMLElement>(
".sidebar", </s> remove it("should toggle sidebar using props.toggleMenu()", async () => {
const { container } = await render(
<Excalidraw
renderSidebar={() => (
<Sidebar>
<div id="test-sidebar-content">42</div>
</s> add describe("<Sidebar.Header/>", () => {
it("should render custom sidebar header", async () => {
const { container } = await render(
<Excalidraw
initialData={{ appState: { openSidebar: { name: "customSidebar" } } }}
>
<Sidebar name="customSidebar">
<Sidebar.Header>
<div id="test-sidebar-header-content">42</div>
</Sidebar.Header> </s> remove const { footerCenterTunnel } = useTunnels();
</s> add const { FooterCenterTunnel } = useTunnels(); </s> remove export const LibraryMenu: React.FC<{
appState: AppState;
onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
focusContainer: () => void;
library: Library;
id: string;
}> = ({
appState,
onInsertElements,
libraryReturnUrl,
focusContainer,
library,
id,
}) => {
</s> add /**
* This component is meant to be rendered inside <Sidebar.Tab/> inside our
* <DefaultSidebar/> or host apps Sidebar components.
*/
export const LibraryMenu = () => {
const { library, id, onInsertElements } = useApp();
const appProps = useAppProps();
const appState = useUIAppState(); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState();
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/Sidebar.tsx
|
keep keep keep add keep keep keep keep
|
<mask> import { useDevice } from "../App";
<mask> import { SidebarPropsContext } from "./common";
<mask> import { CloseIcon, PinIcon } from "../icons";
<mask> import { Tooltip } from "../Tooltip";
<mask>
<mask> export const SidebarHeader = ({
<mask> children,
<mask> className,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick"; </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels"; </s> add import { LibraryMenuControlButtons } from "./LibraryMenuControlButtons"; </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/SidebarHeader.tsx
|
keep keep keep keep replace replace replace replace
|
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> const [Context, Component] = withUpstreamOverride(_SidebarHeader);
<mask>
<mask> /** @private */
<mask> export const SidebarHeaderComponents = { Context, Component };
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove export const LibraryMenu: React.FC<{
appState: AppState;
onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
focusContainer: () => void;
library: Library;
id: string;
}> = ({
appState,
onInsertElements,
libraryReturnUrl,
focusContainer,
library,
id,
}) => {
</s> add /**
* This component is meant to be rendered inside <Sidebar.Tab/> inside our
* <DefaultSidebar/> or host apps Sidebar components.
*/
export const LibraryMenu = () => {
const { library, id, onInsertElements } = useApp();
const appProps = useAppProps();
const appState = useUIAppState(); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> remove export const isShallowEqual = <T extends Record<string, any>>(
</s> add export const isShallowEqual = <
T extends Record<string, any>,
I extends keyof T,
>( </s> remove export const Sidebar = Object.assign(
forwardRef(
(
{
children,
onClose,
onDock,
docked,
/** Undocumented, may be removed later. Generally should either be
* `props.docked` or `appState.isSidebarDocked`. Currently serves to
* prevent unwanted animation of the shadow if initially docked. */
//
// NOTE we'll want to remove this after we sort out how to subscribe to
// individual appState properties
initialDockedState = docked,
dockable = true,
className,
__isInternal,
}: SidebarProps<{
// NOTE sidebars we use internally inside the editor must have this flag set.
// It indicates that this sidebar should have lower precedence over host
// sidebars, if both are open.
/** @private internal */
__isInternal?: boolean;
}>,
ref: React.ForwardedRef<HTMLDivElement>,
) => {
const [hostSidebarCounters, setHostSidebarCounters] = useAtom(
hostSidebarCountersAtom,
jotaiScope,
);
</s> add // FIXME replace this with the implem from ColorPicker once it's merged
const useOnClickOutside = (
ref: RefObject<HTMLElement>,
cb: (event: MouseEvent) => void,
) => {
useEffect(() => {
const listener = (event: MouseEvent) => {
if (!ref.current) {
return;
} </s> remove };
const { container } = await render(<CustomExcalidraw />);
</s> add </s> add refPrevOpenSidebar.current = appState.openSidebar;
}, [appState.openSidebar, onStateChange, props.name]);
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/SidebarHeader.tsx
|
keep keep keep keep replace
|
<mask> "onClose" | "onDock" | "docked" | "dockable"
<mask> >;
<mask>
<mask> export const SidebarPropsContext =
<mask> React.createContext<SidebarPropsContextValue>({});
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add export type SidebarName = string;
export type SidebarTabName = string;
</s> remove export const isShallowEqual = <T extends Record<string, any>>(
</s> add export const isShallowEqual = <
T extends Record<string, any>,
I extends keyof T,
>( </s> remove const [Context, Component] = withUpstreamOverride(_SidebarHeader);
/** @private */
export const SidebarHeaderComponents = { Context, Component };
</s> add SidebarHeader.displayName = "SidebarHeader"; </s> add import { Button } from "../Button"; </s> remove export const LibraryMenu: React.FC<{
appState: AppState;
onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
focusContainer: () => void;
library: Library;
id: string;
}> = ({
appState,
onInsertElements,
libraryReturnUrl,
focusContainer,
library,
id,
}) => {
</s> add /**
* This component is meant to be rendered inside <Sidebar.Tab/> inside our
* <DefaultSidebar/> or host apps Sidebar components.
*/
export const LibraryMenu = () => {
const { library, id, onInsertElements } = useApp();
const appProps = useAppProps();
const appState = useUIAppState(); </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState();
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/Sidebar/common.ts
|
replace keep keep keep keep keep
|
<mask> import { useOutsideClickHook } from "../../hooks/useOutsideClick";
<mask> import { Island } from "../Island";
<mask>
<mask> import { useDevice } from "../App";
<mask> import clsx from "clsx";
<mask> import Stack from "../Stack";
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add import { Button } from "../Button"; </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react"; </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library"; </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/dropdownMenu/DropdownMenuContent.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { useTunnels } from "../context/tunnels";
<mask> import "./FooterCenter.scss";
<mask>
<mask> const FooterCenter = ({ children }: { children?: React.ReactNode }) => {
<mask> const { footerCenterTunnel } = useTunnels();
<mask> const appState = useExcalidrawAppState();
<mask> return (
<mask> <footerCenterTunnel.In>
<mask> <div
<mask> className={clsx("footer-center zen-mode-transition", {
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add import { LibraryMenuControlButtons } from "./LibraryMenuControlButtons"; </s> remove import { useTunnels } from "./context/tunnels";
</s> add import { useTunnels } from "../context/tunnels"; </s> add import { Button } from "../Button"; </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels"; </s> remove if (appState.openSidebar === "library" && !device.canDeviceFitSidebar) {
</s> add if (appState.openSidebar && !device.canDeviceFitSidebar) { </s> add const { onInsertElements } = useApp();
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/footer/FooterCenter.tsx
|
keep keep add keep keep keep keep
|
<mask> // components at the same time until counter is initialized.
<mask> let preferHost = false;
<mask>
<mask> const WrapperComponent: React.FC<
<mask> P & {
<mask> __fallback?: boolean;
<mask> }
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add // FIXME normalize/set defaults in parent component so that the memo resolver
// compares the same values </s> remove });
</s> add </s> remove export const Sidebar = Object.assign(
forwardRef(
(
{
children,
onClose,
onDock,
docked,
/** Undocumented, may be removed later. Generally should either be
* `props.docked` or `appState.isSidebarDocked`. Currently serves to
* prevent unwanted animation of the shadow if initially docked. */
//
// NOTE we'll want to remove this after we sort out how to subscribe to
// individual appState properties
initialDockedState = docked,
dockable = true,
className,
__isInternal,
}: SidebarProps<{
// NOTE sidebars we use internally inside the editor must have this flag set.
// It indicates that this sidebar should have lower precedence over host
// sidebars, if both are open.
/** @private internal */
__isInternal?: boolean;
}>,
ref: React.ForwardedRef<HTMLDivElement>,
) => {
const [hostSidebarCounters, setHostSidebarCounters] = useAtom(
hostSidebarCountersAtom,
jotaiScope,
);
</s> add // FIXME replace this with the implem from ColorPicker once it's merged
const useOnClickOutside = (
ref: RefObject<HTMLElement>,
cb: (event: MouseEvent) => void,
) => {
useEffect(() => {
const listener = (event: MouseEvent) => {
if (!ref.current) {
return;
} </s> remove };
const { container } = await render(<CustomExcalidraw />);
</s> add </s> remove await waitFor(() => {
const node = container.querySelector("#test-sidebar-content");
expect(node).toBe(null);
</s> add const sidebar = container.querySelector<HTMLElement>(".test-sidebar");
expect(sidebar).not.toBe(null);
const closeButton = queryByTestId(sidebar!, "sidebar-close")!;
expect(closeButton).not.toBe(null);
fireEvent.click(closeButton);
await waitFor(() => {
expect(container.querySelector<HTMLElement>(".test-sidebar")).toBe(
null,
);
expect(onStateChange).toHaveBeenCalledWith(null);
}); </s> remove // force-toggle sidebar off (=> still hidden)
// -------------------------------------------------------------------------
expect(window.h.app.toggleMenu("customSidebar", false)).toBe(false);
</s> add // initial open
expect(onStateChange).toHaveBeenCalledWith({ name: "customSidebar" });
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/hoc/withInternalFallback.tsx
|
keep replace keep keep keep keep keep
|
<mask> import { t } from "../../i18n";
<mask> import { useTunnels } from "../context/tunnels";
<mask> import {
<mask> WelcomeScreenHelpArrow,
<mask> WelcomeScreenMenuArrow,
<mask> WelcomeScreenTopToolbarArrow,
<mask> } from "../icons";
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove import { useTunnels } from "./context/tunnels";
</s> add import { useTunnels } from "../context/tunnels"; </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react"; </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library"; </s> add import { Button } from "../Button"; </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/components/welcome-screen/WelcomeScreen.Hints.tsx
|
keep keep keep add keep keep keep keep
|
<mask> --text-primary-color: var(--color-gray-80);
<mask>
<mask> --color-selection: #6965db;
<mask>
<mask> --color-primary: #6965db;
<mask> --color-primary-darker: #5b57d1;
<mask> --color-primary-darkest: #4a47b1;
<mask> --color-primary-light: #e3e2fe;
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove "isSidebarDocked": false,
</s> add </s> add "defaultSidebarDockedPreference": false, </s> remove "isSidebarDocked": false,
</s> add </s> add "defaultSidebarDockedPreference": false, </s> remove "isSidebarDocked": false,
</s> add </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/css/theme.scss
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> background-color: var(--color-primary-light);
<mask> border-color: var(--color-primary-light);
<mask>
<mask> &:hover {
<mask> background-color: var(--color-primary-light);
<mask> }
<mask>
<mask> svg {
<mask> color: var(--button-color, var(--color-primary-darker));
<mask> }
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove .layer-ui__sidebar__header__buttons {
</s> add .sidebar-tab-trigger {
--button-width: auto;
--button-bg: transparent;
--button-hover-bg: transparent;
--button-active-bg: var(--color-primary);
--button-hover-color: var(--color-primary);
--button-hover-border: var(--color-primary);
&[data-state="active"] {
--button-bg: var(--color-primary);
--button-hover-bg: var(--color-primary-darker);
--button-hover-color: var(--color-icon-white);
--button-border: var(--color-primary);
color: var(--color-icon-white);
}
}
// ---------------------------- default sidebar ------------------------------
.default-sidebar { </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react"; </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library"; </s> remove import { useTunnels } from "../context/tunnels";
</s> add import { useTunnels } from "../../context/tunnels";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/css/variables.module.scss
|
keep keep keep add keep keep keep keep keep keep
|
<mask> DEFAULT_VERTICAL_ALIGN,
<mask> PRECEDING_ELEMENT_KEY,
<mask> FONT_FAMILY,
<mask> ROUNDNESS,
<mask> } from "../constants";
<mask> import { getDefaultAppState } from "../appState";
<mask> import { LinearElementEditor } from "../element/linearElementEditor";
<mask> import { bumpVersion } from "../element/mutateElement";
<mask> import { getFontString, getUpdatedTimestamp, updateActiveTool } from "../utils";
<mask> import { arrayToMap } from "../utils";
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove import { LibraryButton } from "./LibraryButton";
</s> add </s> remove import { Provider, useAtom } from "jotai";
</s> add import { Provider, useAtomValue } from "jotai"; </s> remove import { useOutsideClickHook } from "../../hooks/useOutsideClick";
</s> add import { useOutsideClick } from "../../hooks/useOutsideClick"; </s> remove import { useTunnels } from "./context/tunnels";
</s> add import { useTunnels } from "../context/tunnels"; </s> remove import React, { useCallback, useState } from "react";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
</s> add import { useCallback, useState } from "react"; </s> add import { useApp, useExcalidrawAppState, useExcalidrawSetAppState } from "./App";
import { saveLibraryAsJSON } from "../data/json";
import Library, { libraryItemsAtom } from "../data/library";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/data/restore.ts
|
keep keep keep add keep keep keep keep keep
|
<mask> } = props;
<mask>
<mask> const canvasActions = props.UIOptions?.canvasActions;
<mask>
<mask> const UIOptions: AppProps["UIOptions"] = {
<mask> ...props.UIOptions,
<mask> canvasActions: {
<mask> ...DEFAULT_UI_OPTIONS.canvasActions,
<mask> ...canvasActions,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove const { footerCenterTunnel } = useTunnels();
</s> add const { FooterCenterTunnel } = useTunnels(); </s> add import { LibraryMenuControlButtons } from "./LibraryMenuControlButtons"; </s> remove useEffect(() => {
return () => {
onCloseRef.current?.();
};
}, []);
</s> add const setAppState = useExcalidrawSetAppState(); </s> add const { onInsertElements } = useApp(); </s> remove export const LibraryMenu: React.FC<{
appState: AppState;
onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
focusContainer: () => void;
library: Library;
id: string;
}> = ({
appState,
onInsertElements,
libraryReturnUrl,
focusContainer,
library,
id,
}) => {
</s> add /**
* This component is meant to be rendered inside <Sidebar.Tab/> inside our
* <DefaultSidebar/> or host apps Sidebar components.
*/
export const LibraryMenu = () => {
const { library, id, onInsertElements } = useApp();
const appProps = useAppProps();
const appState = useUIAppState(); </s> remove const [Context, Component] = withUpstreamOverride(_SidebarHeader);
/** @private */
export const SidebarHeaderComponents = { Context, Component };
</s> add SidebarHeader.displayName = "SidebarHeader";
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/packages/excalidraw/index.tsx
|
keep keep add keep keep keep keep
|
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep add keep keep keep keep keep
|
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep add keep keep keep keep
|
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep add keep keep keep keep keep
|
<mask> "currentItemStrokeStyle": "solid",
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 20,
<mask> "offsetTop": 10,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep add keep keep keep keep keep
|
<mask> "currentItemStrokeStyle": "solid",
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 20,
<mask> "offsetTop": 10,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "currentItemStrokeStyle": "solid",
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
<mask> "exportBackground": true,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 20,
<mask> "offsetTop": 10,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep add keep keep keep keep keep
|
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 20,
<mask> "offsetTop": 10,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep add keep keep keep keep keep keep
|
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
<mask> "exportBackground": true,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 20,
<mask> "offsetTop": 10,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "currentItemStrokeStyle": "solid",
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
<mask> "exportBackground": true,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 20,
<mask> "offsetTop": 10,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/contextmenu.test.tsx.snap
|
keep add keep keep keep keep keep keep
|
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
<mask> "exportBackground": true,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 0,
<mask> "offsetTop": 0,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep add keep keep keep keep
|
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 0,
<mask> "offsetTop": 0,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep add keep keep keep keep
|
<mask> "currentItemStrokeStyle": "solid",
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": "id10",
<mask> "editingLinearElement": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": false,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 0,
<mask> "offsetTop": 0,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add </s> remove "isSidebarDocked": false,
</s> add
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep add keep keep keep keep keep
|
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
<mask> "errorMessage": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "isBindingEnabled": true,
<mask> "isLoading": false,
<mask> "isResizing": false,
<mask> "isRotating": false,
<mask> "isSidebarDocked": false,
<mask> "lastPointerDownWith": "mouse",
<mask> "multiElement": null,
<mask> "name": "Untitled-201933152653",
<mask> "offsetLeft": 0,
<mask> "offsetTop": 0,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
keep keep keep add keep keep keep keep
|
<mask> "currentItemStrokeStyle": "solid",
<mask> "currentItemStrokeWidth": 1,
<mask> "currentItemTextAlign": "left",
<mask> "cursorButton": "up",
<mask> "draggingElement": null,
<mask> "editingElement": null,
<mask> "editingGroupId": null,
<mask> "editingLinearElement": null,
</s> feat: sidebar tabs support (#6213)
* feat: Sidebar tabs support [wip]
* tab trigger styling tweaks
* add `:hover` & `:active` states
* replace `@dwelle/tunnel-rat` with `tunnel-rat`
* make stuff more explicit
- remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place)
- make `docked` state explicit
- stop tunneling `Sidebar.TabTriggers` (render in place)
* redesign sidebar / library as per latest spec
* support no label on `Sidebar.Trigger`
* add Sidebar `props.onStateChange`
* style fixes
* make `appState.isSidebarDocked` into a soft user preference
* px -> rem & refactor
* remove `props.renderSidebar`
* update tests
* remove
* refactor
* rename constants
* tab triggers styling fixes
* factor out library-related logic from generic sidebar trigger
* change `props.onClose` to `onToggle`
* rename `props.value` -> `props.tab`
* add displayNames
* allow HTMLAttributes on applicable compos
* fix example App
* more styling tweaks and fixes
* fix not setting `dockable`
* more style fixes
* fix and align sidebar header button styling
* make DefaultSidebar dockable on if host apps supplies `onDock`
* stop `Sidebar.Trigger` hiding label on mobile
this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS
* fix `dockable` prop of defaultSidebar
* remove extra `typescript` dep
* remove `defaultTab` prop
in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution).
* remove `onToggle` in favor of `onStateChange`
reducing API surface area
* fix restore
* comment no longer applies
* reuse `Button` component in sidebar buttons
* fix tests
* split Sidebar sub-components into files
* remove `props.dockable` in favor of `props.onDock` only
* split tests
* fix sidebar showing dock button if no `props.docked` supplied & add more tests
* reorder and group sidebar tests
* clarify
* rename classes & dedupe css
* refactor tests
* update changelog
* update changelog
---------
Co-authored-by: barnabasmolnar <[email protected]> </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false, </s> add "defaultSidebarDockedPreference": false,
|
https://github.com/excalidraw/excalidraw/commit/e9cae918a7c83c577afb5f6385f6aba9d3544670
|
src/tests/__snapshots__/regressionTests.test.tsx.snap
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.