From c7c2a139b887a4e942cf124af4a26b14fe190a4e Mon Sep 17 00:00:00 2001 From: Alex TYRODE Date: Sun, 27 Apr 2025 19:01:22 +0000 Subject: [PATCH 1/9] fix: remove deleted elements from default canvas --- src/backend/default_canvas.json | 48 +++++++-------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/src/backend/default_canvas.json b/src/backend/default_canvas.json index 8abf154..3148d6c 100644 --- a/src/backend/default_canvas.json +++ b/src/backend/default_canvas.json @@ -2146,21 +2146,21 @@ "lastCommittedPoint": null }, { - "x": 0, - "y": 0, + "x": 20, + "y": -20, "id": "1igpgsvrsh3", "link": "!dashboard", "seed": 76441, "type": "embeddable", "angle": 0, "index": "b0q", - "width": 340, - "height": 280, + "width": 420, + "height": 320, "locked": false, "frameId": null, "opacity": 100, - "updated": 1744437345493, - "version": 1890, + "updated": 1745779075413, + "version": 2052, "groupIds": [], "fillStyle": "solid", "isDeleted": false, @@ -2172,40 +2172,10 @@ "strokeColor": "#ced4da", "strokeStyle": "solid", "strokeWidth": 2, - "versionNonce": 1530984984, + "versionNonce": 692312488, "boundElements": [], "backgroundColor": "#e9ecef" - }, - { - "x": 755.6666259765625, - "y": 137.1666259765625, - "id": "g8btk6ouog", - "link": "https://coder.pad.ws/@romaincourtoismails/ubuntu.main/terminal", - "seed": 2344, - "type": "embeddable", - "angle": 0, - "index": "b0r", - "width": 600, - "height": 400, - "locked": false, - "frameId": null, - "opacity": 100, - "updated": 1744437380078, - "version": 3, - "groupIds": [], - "fillStyle": "solid", - "isDeleted": true, - "roughness": 1, - "roundness": { - "type": 3 - }, - "isSelected": true, - "strokeColor": "#1e1e1e", - "strokeStyle": "solid", - "strokeWidth": 2, - "versionNonce": 748163688, - "boundElements": null, - "backgroundColor": "#ffffff" } ] -} \ No newline at end of file +} + From f06a11d98534350629b85ffd16b0057945a97738 Mon Sep 17 00:00:00 2001 From: Alex TYRODE Date: Sun, 27 Apr 2025 19:01:38 +0000 Subject: [PATCH 2/9] chore: update @atyrode/excalidraw dependency to version 0.18.0-3 --- src/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/package.json b/src/frontend/package.json index 48e8371..d68c2be 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@atyrode/excalidraw": "^0.18.0-2", + "@atyrode/excalidraw": "^0.18.0-3", "@monaco-editor/react": "^4.7.0", "@tanstack/react-query": "^5.74.3", "@tanstack/react-query-devtools": "^5.74.3", From eae6f37513fb0d32080efef2ce35c6dcedddab69 Mon Sep 17 00:00:00 2001 From: Alex TYRODE Date: Sun, 27 Apr 2025 19:03:57 +0000 Subject: [PATCH 3/9] feat: add borders to pad.ws elements to enhance ergonomy --- src/frontend/index.scss | 23 ++++++--- .../src/CustomEmbeddableRenderer.scss | 5 +- src/frontend/src/CustomEmbeddableRenderer.tsx | 21 +++++--- src/frontend/src/utils/canvasUtils.ts | 9 ++++ src/frontend/yarn.lock | 48 +++++++++---------- 5 files changed, 67 insertions(+), 39 deletions(-) diff --git a/src/frontend/index.scss b/src/frontend/index.scss index c302f5a..9e5560c 100644 --- a/src/frontend/index.scss +++ b/src/frontend/index.scss @@ -39,11 +39,6 @@ body { display: none !important; } -.excalidraw__embeddable__outer { - padding: 0px !important; - pointer-events: all !important; -} - .excalidraw .layer-ui__wrapper__top-right { gap: 0rem; } @@ -67,4 +62,20 @@ body { .excalidraw .Modal__content { animation: Modal__content_fade-in 0.3s ease-out forwards !important; -} \ No newline at end of file +} + +/* Embeddables */ + +.excalidraw__embeddable-container { /* 1st layer */ + display: block; +} + +.excalidraw__embeddable-container__inner { /* 2nd layer */ + border-color: #525252 !important; +} + +.excalidraw__embeddable__outer { /* 3rd layer */ + padding: 0px !important; + pointer-events: all !important; + display: flex; +} diff --git a/src/frontend/src/CustomEmbeddableRenderer.scss b/src/frontend/src/CustomEmbeddableRenderer.scss index a5d9bc2..52e265b 100644 --- a/src/frontend/src/CustomEmbeddableRenderer.scss +++ b/src/frontend/src/CustomEmbeddableRenderer.scss @@ -1,6 +1,7 @@ .custom-rendered-embeddable { height: 100%; width: 100%; - position: absolute; - z-index: 1; + display: flex; + border-radius: 0px !important; + border: 0px !important; } diff --git a/src/frontend/src/CustomEmbeddableRenderer.tsx b/src/frontend/src/CustomEmbeddableRenderer.tsx index 4e6f7a8..4fa4aba 100644 --- a/src/frontend/src/CustomEmbeddableRenderer.tsx +++ b/src/frontend/src/CustomEmbeddableRenderer.tsx @@ -19,28 +19,37 @@ export const renderCustomEmbeddable = ( if (element.link && element.link.startsWith('!')) { let path = element.link.split('!')[1]; + let content; switch (path) { case 'html': - return ; + content = ; + break; case 'editor': - return ; + content = ; + break; case 'state': - return ; + content = ; + break; case 'control': - return ; + content = ; + break; case 'button': - return ; + break; case 'dashboard': - return ; + content = ; + break; default: return null; } + + return
{content}
; } else { return