Updated to next (26c3273a) Theia.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2019-06-24 13:09:18 +02:00 committed by jbicker
parent 6195da3858
commit b7e17b5828
3 changed files with 1618 additions and 416 deletions

View File

@ -2,8 +2,6 @@ import { FrontendApplicationContribution, FrontendApplication } from "@theia/cor
import { injectable, inject } from "inversify"; import { injectable, inject } from "inversify";
import { ArduinoToolbar } from "./arduino-toolbar"; import { ArduinoToolbar } from "./arduino-toolbar";
import { TabBarToolbarRegistry } from "@theia/core/lib/browser/shell/tab-bar-toolbar"; import { TabBarToolbarRegistry } from "@theia/core/lib/browser/shell/tab-bar-toolbar";
import { CommandRegistry } from "@theia/core/lib/common/command";
import { LabelParser } from "@theia/core/lib/browser/label-parser";
@injectable() @injectable()
export class ArduinoToolbarContribution implements FrontendApplicationContribution { export class ArduinoToolbarContribution implements FrontendApplicationContribution {
@ -11,10 +9,8 @@ export class ArduinoToolbarContribution implements FrontendApplicationContributi
protected toolbarWidget: ArduinoToolbar; protected toolbarWidget: ArduinoToolbar;
constructor( constructor(
@inject(TabBarToolbarRegistry) protected tabBarToolBarRegistry: TabBarToolbarRegistry, @inject(TabBarToolbarRegistry) protected tabBarToolBarRegistry: TabBarToolbarRegistry) {
@inject(CommandRegistry) protected commandRegistry: CommandRegistry, this.toolbarWidget = new ArduinoToolbar(tabBarToolBarRegistry);
@inject(LabelParser) protected labelParser: LabelParser) {
this.toolbarWidget = new ArduinoToolbar(tabBarToolBarRegistry, commandRegistry, labelParser);
} }
onStart(app: FrontendApplication) { onStart(app: FrontendApplication) {

View File

@ -14,14 +14,14 @@ export namespace ArduinoToolbarComponent {
executeCommand: (e: React.MouseEvent<HTMLElement>) => void executeCommand: (e: React.MouseEvent<HTMLElement>) => void
} }
export interface State { export interface State {
tootip: string tooltip: string
} }
} }
export class ArduinoToolbarComponent extends React.Component<ArduinoToolbarComponent.Props, ArduinoToolbarComponent.State> { export class ArduinoToolbarComponent extends React.Component<ArduinoToolbarComponent.Props, ArduinoToolbarComponent.State> {
constructor(props: ArduinoToolbarComponent.Props) { constructor(props: ArduinoToolbarComponent.Props) {
super(props); super(props);
this.state = { tootip: '' }; this.state = {tooltip: ''};
} }
protected renderItem(item: TabBarToolbarItem): React.ReactNode { protected renderItem(item: TabBarToolbarItem): React.ReactNode {
@ -35,8 +35,8 @@ export class ArduinoToolbarComponent extends React.Component<ArduinoToolbarCompo
id={item.id} id={item.id}
className={`${item.id} arduino-tool-icon`} className={`${item.id} arduino-tool-icon`}
onClick={this.props.executeCommand} onClick={this.props.executeCommand}
onMouseOver={() => this.setState({ tootip: item.tooltip || '' })} onMouseOver={() => this.setState({ tooltip: item.tooltip || '' })}
onMouseOut={() => this.setState({ tootip: '' })} onMouseOut={() => this.setState({ tooltip: '' })}
title={item.tooltip}> title={item.tooltip}>
{innerText} {innerText}
</div> </div>
@ -46,7 +46,7 @@ export class ArduinoToolbarComponent extends React.Component<ArduinoToolbarCompo
render(): React.ReactNode { render(): React.ReactNode {
return <React.Fragment> return <React.Fragment>
<div className={'arduino-toolbar-tooltip'}>{this.state.tootip}</div> <div className={'arduino-toolbar-tooltip'}>{this.state.tooltip}</div>
{[...this.props.items].map(item => TabBarToolbarItem.is(item) ? this.renderItem(item) : item.render())} {[...this.props.items].map(item => TabBarToolbarItem.is(item) ? this.renderItem(item) : item.render())}
</React.Fragment>; </React.Fragment>;
} }

2016
yarn.lock

File diff suppressed because it is too large Load Diff