Skip to content

Commit 362bbac

Browse files
authored
Merge pull request #3685 from ilandikov/fix-copy-button-position
fix: copy button position
2 parents fa11bf7 + 48a37c7 commit 362bbac

File tree

19 files changed

+35
-28
lines changed

19 files changed

+35
-28
lines changed

src/Renderer/HtmlQueryResultsRenderer.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type App, type Component, Notice, type TFile } from 'obsidian';
1+
import { type App, type Component, Notice, type TFile, setIcon, setTooltip } from 'obsidian';
22
import { postponeButtonTitle, shouldShowPostponeButton } from '../DateTime/Postponer';
33
import { QueryLayout } from '../Layout/QueryLayout';
44
import { TaskLayout } from '../Layout/TaskLayout';
@@ -103,9 +103,11 @@ export class HtmlQueryResultsRenderer extends QueryResultsRendererBase {
103103
}
104104

105105
private addCopyButton(_queryResult: QueryResult) {
106-
const copyButton = createAndAppendElement('button', this.content);
107-
copyButton.textContent = 'Copy results';
108-
copyButton.classList.add('plugin-tasks-copy-button');
106+
const toolbar = createAndAppendElement('div', this.content);
107+
toolbar.classList.add('plugin-tasks-toolbar');
108+
const copyButton = createAndAppendElement('button', toolbar);
109+
setIcon(copyButton, 'lucide-copy');
110+
setTooltip(copyButton, 'Copy results');
109111
copyButton.addEventListener('click', async () => {
110112
// TODO reimplement this using QueryResult.asMarkdown() when it supports trees and list items.
111113
await this.markdownRenderer.renderQuery(State.Warm, this.queryRendererParameters.allTasks());

src/Renderer/Renderer.scss

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@
1313
--code-white-space: pre;
1414
}
1515

16-
.plugin-tasks-copy-button {
17-
position: absolute;
18-
right: 0;
19-
transform: translate(-50%, -50%);
20-
z-index: 1;
21-
22-
margin-top: 16px;
16+
.plugin-tasks-toolbar {
17+
display: flex;
18+
flex-direction: row;
19+
justify-content: flex-end;
20+
gap: var(--size-4-1);
2321
}
2422

2523
.tasks-count {

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_tests_explain.approved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
scheduled date is on 1970-01-01 (Thursday 1st January 1970)
1111
</pre
1212
>
13-
<button class="plugin-tasks-copy-button">Copy results</button>
13+
<div class="plugin-tasks-toolbar"><button test-icon="lucide-copy" test-tooltip="Copy results"></button></div>
1414
<ul class="contains-task-list plugin-tasks-query-result tasks-layout-hide-urgency"></ul>
1515
<div class="task-count">0 tasks</div>
1616
</div>

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_tests_fully_populated_task.approved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-->
44

55
<div>
6-
<button class="plugin-tasks-copy-button">Copy results</button>
6+
<div class="plugin-tasks-toolbar"><button test-icon="lucide-copy" test-tooltip="Copy results"></button></div>
77
<ul class="contains-task-list plugin-tasks-query-result">
88
<li
99
class="task-list-item plugin-tasks-list-item"

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_tests_fully_populated_task_-_hidden_fields.approved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-->
44

55
<div>
6-
<button class="plugin-tasks-copy-button">Copy results</button>
6+
<div class="plugin-tasks-toolbar"><button test-icon="lucide-copy" test-tooltip="Copy results"></button></div>
77
<ul
88
class="contains-task-list plugin-tasks-query-result tasks-layout-hide-priority tasks-layout-hide-scheduledDate tasks-layout-hide-urgency">
99
<li

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_tests_fully_populated_task_-_short_mode.approved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-->
44

55
<div>
6-
<button class="plugin-tasks-copy-button">Copy results</button>
6+
<div class="plugin-tasks-toolbar"><button test-icon="lucide-copy" test-tooltip="Copy results"></button></div>
77
<ul class="contains-task-list plugin-tasks-query-result tasks-layout-short-mode">
88
<li
99
class="task-list-item plugin-tasks-list-item"

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_tests_parent-child_items.approved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
-->
99

1010
<div>
11-
<button class="plugin-tasks-copy-button">Copy results</button>
11+
<div class="plugin-tasks-toolbar"><button test-icon="lucide-copy" test-tooltip="Copy results"></button></div>
1212
<ul class="contains-task-list plugin-tasks-query-result tasks-layout-hide-urgency">
1313
<li
1414
class="task-list-item plugin-tasks-list-item"

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_tests_parent-child_items_hidden.approved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
-->
99

1010
<div>
11-
<button class="plugin-tasks-copy-button">Copy results</button>
11+
<div class="plugin-tasks-toolbar"><button test-icon="lucide-copy" test-tooltip="Copy results"></button></div>
1212
<ul class="contains-task-list plugin-tasks-query-result tasks-layout-hide-urgency">
1313
<li
1414
class="task-list-item plugin-tasks-list-item"

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_tests_parent-child_items_reverse_sorted.approved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
-->
99

1010
<div>
11-
<button class="plugin-tasks-copy-button">Copy results</button>
11+
<div class="plugin-tasks-toolbar"><button test-icon="lucide-copy" test-tooltip="Copy results"></button></div>
1212
<ul class="contains-task-list plugin-tasks-query-result tasks-layout-hide-urgency">
1313
<li
1414
class="task-list-item plugin-tasks-list-item"

tests/Renderer/QueryResultsRenderer.test.QueryResultsRenderer_tests_should_allow_a_task_to_be_in_multiple_groups.approved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-->
44

55
<div>
6-
<button class="plugin-tasks-copy-button">Copy results</button>
6+
<div class="plugin-tasks-toolbar"><button test-icon="lucide-copy" test-tooltip="Copy results"></button></div>
77
<h4 class="tasks-group-heading">For test purposes: heading a</h4>
88
<ul class="contains-task-list plugin-tasks-query-result tasks-layout-hide-urgency" data-task-group-by="function">
99
<li

0 commit comments

Comments
 (0)