From 13720b52a37cd6df410ed2375a6697d9b9fb2f83 Mon Sep 17 00:00:00 2001 From: aexol Date: Wed, 7 Feb 2024 11:51:22 +0100 Subject: [PATCH] nody sie nie nakladaja juz na siebie, padding w relationfields uwzgledniony --- package-lock.json | 14 +++++++------- packages/editor-worker/package.json | 2 +- packages/editor/package.json | 4 ++-- .../Relation/PanZoom/LinesDiagram/Node/index.tsx | 16 +++++++++------- packages/editor/src/editor/menu/Menu.tsx | 11 +++++------ packages/sandbox/package.json | 4 ++-- packages/socket-live-test/package.json | 2 +- packages/svg-ts-sync/package.json | 2 +- 8 files changed, 28 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97c5e78c..62678ebc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15731,7 +15731,7 @@ }, "packages/editor": { "name": "graphql-editor", - "version": "7.2.0", + "version": "7.2.1", "license": "MIT", "dependencies": { "@aexol-studio/hooks": "^0.2.8", @@ -15744,7 +15744,7 @@ "file-saver": "^2.0.5", "framer-motion": "^10.12.16", "fuzzyjs": "^5.0.1", - "graphql-editor-worker": "^7.2.0", + "graphql-editor-worker": "^7.2.1", "graphql-js-tree": "^1.0.9", "graphql-language-service": "3.1.4", "html-to-image": "^1.10.8", @@ -15772,7 +15772,7 @@ }, "packages/editor-worker": { "name": "graphql-editor-worker", - "version": "7.2.0", + "version": "7.2.1", "license": "MIT", "dependencies": { "@qix/elkjs-patched": "^0.8.0-patch3", @@ -15854,13 +15854,13 @@ } }, "packages/sandbox": { - "version": "7.2.0", + "version": "7.2.1", "license": "MIT", "dependencies": { "@aexol-studio/styling-system": "^0.0.8", "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", - "graphql-editor": "^7.2.0", + "graphql-editor": "^7.2.1", "graphql-js-tree": "^0.1.6", "socket.io-client": "^4.7.2", "y-monaco": "^0.1.5", @@ -16127,14 +16127,14 @@ "license": "ISC" }, "packages/socket-live-test": { - "version": "2.2.0", + "version": "2.2.1", "license": "ISC", "dependencies": { "socket.io": "^4.7.2" } }, "packages/svg-ts-sync": { - "version": "1.2.0", + "version": "1.2.1", "license": "MIT", "dependencies": { "@svgr/core": "^6.5.1" diff --git a/packages/editor-worker/package.json b/packages/editor-worker/package.json index 9de38bff..4f4a683c 100644 --- a/packages/editor-worker/package.json +++ b/packages/editor-worker/package.json @@ -1,6 +1,6 @@ { "name": "graphql-editor-worker", - "version": "7.2.0", + "version": "7.2.1", "private": false, "license": "MIT", "description": "Visual node editor for GraphQL", diff --git a/packages/editor/package.json b/packages/editor/package.json index 147d0f7e..352f23ec 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "graphql-editor", - "version": "7.2.0", + "version": "7.2.1", "private": false, "license": "MIT", "description": "Visual node editor for GraphQL", @@ -45,7 +45,7 @@ "file-saver": "^2.0.5", "framer-motion": "^10.12.16", "fuzzyjs": "^5.0.1", - "graphql-editor-worker": "^7.2.0", + "graphql-editor-worker": "^7.2.1", "graphql-js-tree": "^1.0.9", "graphql-language-service": "3.1.4", "html-to-image": "^1.10.8", diff --git a/packages/editor/src/Relation/PanZoom/LinesDiagram/Node/index.tsx b/packages/editor/src/Relation/PanZoom/LinesDiagram/Node/index.tsx index a5dbf1bc..6ab624a8 100644 --- a/packages/editor/src/Relation/PanZoom/LinesDiagram/Node/index.tsx +++ b/packages/editor/src/Relation/PanZoom/LinesDiagram/Node/index.tsx @@ -122,13 +122,15 @@ const Content = styled.div` const NodeRelationFields = styled.div< Pick >` - width: ${(p) => - Math.min( - p.width, - p.printPreviewActive - ? PRINT_PREVIEW_RELATION_NODE_MAX_WIDTH - : RELATION_NODE_MAX_WIDTH - )}px; + width: calc( + ${(p) => + Math.min( + p.width, + p.printPreviewActive + ? PRINT_PREVIEW_RELATION_NODE_MAX_WIDTH + : RELATION_NODE_MAX_WIDTH + )}px - 24px + ); transition: ${transition}; position: relative; margin-top: 24px; diff --git a/packages/editor/src/editor/menu/Menu.tsx b/packages/editor/src/editor/menu/Menu.tsx index 733e3f76..9038eee7 100644 --- a/packages/editor/src/editor/menu/Menu.tsx +++ b/packages/editor/src/editor/menu/Menu.tsx @@ -9,7 +9,7 @@ import { ArrowNarrowUpMove, ArrowNarrowBottomAlignment, DropdownMenu, - MenuItem, + MenuItem as MI, Tooltip, } from "@aexol-studio/styling-system"; import { PassedSchema } from "@/Models"; @@ -21,12 +21,11 @@ const Sidebar = styled.div` background: ${({ theme }) => theme.neutrals.L6}; color: ${({ theme }) => theme.text.disabled}; z-index: 4; - border: 0 solid ${({ theme }) => theme.neutrals.L8}; + border: 0 solid ${({ theme }) => theme.neutrals.L7}; border-right-width: 1px; border-left-width: 1px; position: relative; transition: width 0.5s ease-in-out; - width: 2rem; display: flex; flex-direction: column; gap: 1px; @@ -55,7 +54,7 @@ const MenuItem = styled.div<{ overflow: visible; user-select: none; background-color: ${({ theme }) => theme.neutrals.L5}; - border-bottom: ${(p) => p.theme.neutrals.L8} 1px solid; + border-bottom: ${(p) => p.theme.neutrals.L7} 1px solid; &:hover { background-color: ${({ theme, isDisabled }) => @@ -66,7 +65,7 @@ const MenuItem = styled.div<{ svg { flex-shrink: 0; - height: 20px; + height: 1.25rem; transition: ${transition}; } @@ -119,7 +118,7 @@ export const Menu = ({ }: MenuProps) => { const [importOpen, setImportOpen] = useState(false); const { saveToFile } = useFileOperations(); - const exportActions: MenuItem[] = [ + const exportActions: MI[] = [ { name: "Export schema", onClick: () => { diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json index 8ac9d45f..e6a97b36 100644 --- a/packages/sandbox/package.json +++ b/packages/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "sandbox", - "version": "7.2.0", + "version": "7.2.1", "private": false, "license": "MIT", "description": "Visual node editor for GraphQL", @@ -49,7 +49,7 @@ "@aexol-studio/styling-system": "^0.0.8", "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", - "graphql-editor": "^7.2.0", + "graphql-editor": "^7.2.1", "graphql-js-tree": "^0.1.6", "socket.io-client": "^4.7.2", "y-monaco": "^0.1.5", diff --git a/packages/socket-live-test/package.json b/packages/socket-live-test/package.json index c4231e80..840ab11a 100644 --- a/packages/socket-live-test/package.json +++ b/packages/socket-live-test/package.json @@ -1,6 +1,6 @@ { "name": "socket-live-test", - "version": "2.2.0", + "version": "2.2.1", "description": "testing editor live", "main": "index.js", "type": "module", diff --git a/packages/svg-ts-sync/package.json b/packages/svg-ts-sync/package.json index 53e0cbdb..066d7c9a 100644 --- a/packages/svg-ts-sync/package.json +++ b/packages/svg-ts-sync/package.json @@ -1,6 +1,6 @@ { "name": "svg-ts-sync", - "version": "1.2.0", + "version": "1.2.1", "private": false, "license": "MIT", "description": "Sync folders with svg's to react typescript components",