From f1b60b8b400e17d7a42cc735bcb43aec26327e41 Mon Sep 17 00:00:00 2001 From: Misode Date: Fri, 4 Oct 2024 17:40:02 +0200 Subject: [PATCH] Add paste button on mobile + update copy icon (#610) --- src/app/components/Octicon.tsx | 3 ++- src/app/components/generator/SchemaGenerator.tsx | 4 ++-- src/app/components/generator/SourcePanel.tsx | 10 ++++++++++ src/app/pages/Transformation.tsx | 6 +++--- src/app/schema/renderHtml.tsx | 2 +- src/styles/global.css | 1 + 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/app/components/Octicon.tsx b/src/app/components/Octicon.tsx index fc7916df..c2754857 100644 --- a/src/app/components/Octicon.tsx +++ b/src/app/components/Octicon.tsx @@ -10,9 +10,9 @@ export const Octicon = { chevron_right: , chevron_up: , circle_slash: , - clippy: , code: , codescan_checkmark: , + copy: , diff_added: , diff_modified: , diff_removed: , @@ -44,6 +44,7 @@ export const Octicon = { moon: , mortar_board: , package: , + paste: , pencil: , play: , plus: , diff --git a/src/app/components/generator/SchemaGenerator.tsx b/src/app/components/generator/SchemaGenerator.tsx index 656e50a7..540af753 100644 --- a/src/app/components/generator/SchemaGenerator.tsx +++ b/src/app/components/generator/SchemaGenerator.tsx @@ -349,7 +349,7 @@ export function SchemaGenerator({ gen, allowedVersions }: Props) { {Octicon.download}
- {copyActive ? Octicon.check : Octicon.clippy} + {copyActive ? Octicon.check : Octicon.copy}
{sourceShown ? Octicon.chevron_right : Octicon.code} @@ -363,7 +363,7 @@ export function SchemaGenerator({ gen, allowedVersions }: Props) {
- +
diff --git a/src/app/components/generator/SourcePanel.tsx b/src/app/components/generator/SourcePanel.tsx index 221e25b8..093c9ace 100644 --- a/src/app/components/generator/SourcePanel.tsx +++ b/src/app/components/generator/SourcePanel.tsx @@ -202,8 +202,18 @@ export function SourcePanel({ name, model, blockStates, doCopy, doDownload, doIm setHighlighting(value) } + const importFromClipboard = useCallback(async () => { + if (editor.current) { + const text = await navigator.clipboard.readText() + editor.current.setValue(text) + } + }, []) + return <>
+ {window.matchMedia('(pointer: coarse)').matches && <> + + } {getSourceIndents().map(key => {locale('transformation.translation')} - +
{XYZ.map((c) => changeTranslation(c, v)} /> @@ -228,7 +228,7 @@ export function Transformation({}: Props) {
{locale('transformation.matrix')} - +
{Array(16).fill(0).map((_, i) => changeMatrix(i, v)} disabled={i % 4 === 3} /> diff --git a/src/app/schema/renderHtml.tsx b/src/app/schema/renderHtml.tsx index b4cbe6d7..67b068c1 100644 --- a/src/app/schema/renderHtml.tsx +++ b/src/app/schema/renderHtml.tsx @@ -545,7 +545,7 @@ function TreeNode({ label, schema, path, value, lang, version, states, ctx, acti {a.description ?? localize(lang, a.label)}
)}
- navigator.clipboard.writeText(context)} /> + navigator.clipboard.writeText(context)} /> {context}
} diff --git a/src/styles/global.css b/src/styles/global.css index 3de5a5c5..b6c9778c 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -306,6 +306,7 @@ main > .controls { .sounds-controls > *:not(:last-child), .preview-controls > *:not(:last-child), .generator-controls > *:not(:last-child), +.source-controls > *:not(:last-child), .project-controls > *:not(:last-child) { margin-right: 8px; }