8000 [ATL-1599] [ATL-1416] Upgrade Theia to 1.18.0 by fstasi · Pull Request #489 · arduino/arduino-ide · GitHub
[go: up one dir, main page]
Skip to content

[ATL-1599] [ATL-1416] Upgrade Theia to 1.18.0 #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Oct 6, 2021
Merged

[ATL-1599] [ATL-1416] Upgrade Theia to 1.18.0 #489

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4ec0013
theia 1.13.0
fstasi Aug 26, 2021
89bef7b
theia 1.14.0
fstasi Aug 27, 2021
45df461
theia 1.15.0
fstasi Aug 27, 2021
c772d25
theia 1.16.0
fstasi Aug 27, 2021
547ceea
theia 1.17.0
fstasi Aug 30, 2021
69023b8
ATL-1416: new windows to not overlap
fstasi Aug 30, 2021
b21d0a4
force top panel to be visible
fstasi Aug 30, 2021
9906b38
cleanup script
fstasi Aug 31, 2021
f09d05b
fix context menus
fstasi Aug 31, 2021
0458f5f
Update arduino-ide-extension/src/browser/widgets/sketchbook/sketchboo…
fstasi Aug 31, 2021
4d024aa
theia 1.17.1
fstasi Sep 1, 2021
f075fcc
fixed app build
fstasi Sep 2, 2021
03acb58
updated node-gyp
fstasi Sep 2, 2021
fe9ffe1
updated launch.json configuration
fstasi Sep 14, 2021
34dfa1b
attempt to fix node-gyp issues
fstasi Sep 15, 2021
34c08fc
use theia editor preview
fstasi Sep 15, 2021
5990b71
theia 1.17.2
fstasi Sep 22, 2021
bf00e6b
theia 1.18.0 & icons
fstasi Oct 4, 2021
261e0eb
Merge remote-tracking branch 'origin/main' into theia-upgrade
fstasi Oct 4, 2021
cf5e22d
use custom close icon in dialogs
fstasi Oct 5, 2021
eaa2653
show sketchbook commands on hover
fstasi Oct 5, 2021
916bb4b
Merge branch 'main' into theia-upgrade
fstasi Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
show sketchbook commands on hover
  • Loading branch information
@fstasi
fstasi authored and Alberto Iannaccone committed Oct 5, 2021
commit eaa2653763a71f7eb2cffe3527301220ad3f8d68
9 changes: 9 additions & 0 deletions arduino-ide-extension/src/browser/style/sketchbook.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,12 @@
#arduino-sketchbook-tree-widget .theia-TreeNodeSegmentGrow {
flex: 1;
}

.theia-TreeNode .sketchbook-commands-icons {
display: none;
}

.theia-TreeNode:hover .sketchbook-commands-icons,
.theia-TreeNode.theia-mod-selected .sketchbook-commands-icons {
display: block;
}
9 changes: 2 additions & 7 deletions arduino-ide-extension/src/browser/widgets/cloud-sketchbook/cloud-sketchbook-tree-widget.tsx
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,8 @@ export class CloudSketchbookTreeWidget extends SketchbookTreeWidget {
return classNames;
}

protected renderInlineCommands(node: any, props: NodeProps): React.ReactNode {
if (
CloudSketchbookTree.CloudSketchDirNode.is(node) &&
node.commands &&
(node.id === this.hoveredNodeId ||
this.currentSketchUri === node.uri.toString())
) {
protected renderInlineCommands(node: any): React.ReactNode {
if (CloudSketchbookTree.CloudSketchDirNode.is(node) && node.commands) {
return Array.from(new Set(node.commands)).map((command) =>
this.renderInlineCommand(command.id, node, {
username: this.authenticationService.session?.account?.label,
Expand Down
14 changes: 4 additions & 10 deletions arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-tree-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class SketchbookTreeWidget extends FileTreeWidget {
return (
<React.Fragment>
{super.renderTailDecorations(node, props)}
{this.renderInlineCommands(node, props)}
{this.renderInlineCommands(node)}
</React.Fragment>
);
}
Expand All @@ -107,15 +107,8 @@ export class SketchbookTreeWidget extends FileTreeWidget {
};
}

protected renderInlineCommands(
node: TreeNode,
props: NodeProps
): React.ReactNode {
if (
SketchbookTree.SketchDirNode.is(node) &&
((node.commands && node.id === this.hoveredNodeId) ||
this.currentSketchUri === node?.uri.toString())
) {
protected renderInlineCommands(node: TreeNode): React.ReactNode {
if (SketchbookTree.SketchDirNode.is(node) && node.commands) {
return Array.from(new Set(node.commands)).map((command) =>
this.renderInlineCommand(command.id, node)
);
Expand All @@ -142,6 +135,7 @@ export class SketchbookTreeWidget extends FileTreeWidget {
TREE_NODE_TAIL_CLASS,
icon,
'theia-tree-view-inline-action',
'sketchbook-commands-icons',
].join(' ');
return (
<div
Expand Down
0