ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 01:25:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sql/base/browser/ui/dropdownList/dropdownList.ts
View File

@@ -15,6 +15,7 @@ import { EventType as GestureEventType } from 'vs/base/browser/touch';
import { List } from 'vs/base/browser/ui/list/listWidget';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { Builder } from 'vs/base/browser/builder';
import { Button } from 'sql/base/browser/ui/button/button';
import { attachButtonStyler } from 'sql/common/theme/styler';
@@ -58,9 +59,9 @@ export class DropdownList extends Dropdown {
attachButtonStyler(button, this._themeService);
}
DOM.append(this.element.getHTMLElement(), DOM.$('div.dropdown-icon'));
DOM.append(this.element, DOM.$('div.dropdown-icon'));
this.toDispose.push(this.element.on([DOM.EventType.CLICK, DOM.EventType.MOUSE_DOWN, GestureEventType.Tap], (e: Event) => {
this.toDispose.push(new Builder(this.element).on([DOM.EventType.CLICK, DOM.EventType.MOUSE_DOWN, GestureEventType.Tap], (e: Event) => {
DOM.EventHelper.stop(e, true); // prevent default click behaviour to trigger
}).on([DOM.EventType.MOUSE_DOWN, GestureEventType.Tap], (e: Event) => {
// We want to show the context menu on dropdown so that as a user you can press and hold the
@@ -82,11 +83,11 @@ export class DropdownList extends Dropdown {
this.toDispose.push(this._list.onSelectionChange(() => {
// focus on the dropdown label then hide the dropdown list
this.element.getHTMLElement().focus();
this.element.focus();
this.hide();
}));
this.element.getHTMLElement().setAttribute('tabindex', '0');
this.element.setAttribute('tabindex', '0');
}
/**
@@ -94,7 +95,7 @@ export class DropdownList extends Dropdown {
*/
protected renderContents(container: HTMLElement): IDisposable {
let div = DOM.append(container, this._contentContainer);
div.style.width = DOM.getTotalWidth(this.element.getHTMLElement()) + 'px';
div.style.width = DOM.getTotalWidth(this.element) + 'px';
return null;
}
@@ -103,22 +104,22 @@ export class DropdownList extends Dropdown {
*/
public renderLabel(): void {
if (this._options.labelRenderer) {
this._options.labelRenderer(this.label.getHTMLElement());
this._options.labelRenderer(this.label);
}
}
protected onEvent(e: Event, activeElement: HTMLElement): void {
// If there is an event outside dropdown label and dropdown list, hide the dropdown list
if (!DOM.isAncestor(<HTMLElement>e.target, this.element.getHTMLElement()) && !DOM.isAncestor(<HTMLElement>e.target, this._contentContainer)) {
if (!DOM.isAncestor(<HTMLElement>e.target, this.element) && !DOM.isAncestor(<HTMLElement>e.target, this._contentContainer)) {
// focus on the dropdown label then hide the dropdown list
this.element.getHTMLElement().focus();
this.element.focus();
this.hide();
// If there is an keyboard event inside the list and key code is escape, hide the dropdown list
} else if (DOM.isAncestor(<HTMLElement>e.target, this._list.getHTMLElement()) && e instanceof KeyboardEvent) {
let event = new StandardKeyboardEvent(e);
if (event.equals(KeyCode.Escape)) {
// focus on the dropdown label then hide the dropdown list
this.element.getHTMLElement().focus();
this.element.focus();
this.hide();
e.stopPropagation();
}
@@ -138,7 +139,7 @@ export class DropdownList extends Dropdown {
const border = this.borderColor ? this.borderColor.toString() : null;
this.applyStylesOnElement(this._contentContainer, background, foreground, border);
if (this.label) {
this.applyStylesOnElement(this.element.getHTMLElement(), background, foreground, border);
this.applyStylesOnElement(this.element, background, foreground, border);
}
}

12
src/sql/base/browser/ui/dropdownList/media/dropdownList.css
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
.dropdown {
.monaco-dropdown {
width: 100%;
/* TODO: Determine a more permanent fix; vs/dropdown is overwriting this selector in packaged builds */
display: flex !important;
@@ -11,15 +11,15 @@
cursor: pointer;
}
.dropdown > .dropdown-label {
.monaco-dropdown > .dropdown-label {
width: 100%;
}
.dropdown > .dropdown-label:not(:empty) {
.monaco-dropdown > .dropdown-label:not(:empty) {
padding: 0px;
}
.dropdown > .dropdown-icon {
.monaco-dropdown > .dropdown-icon {
flex: 0 0 15px;
height: 10px;
width: 10px;
@@ -28,7 +28,7 @@
padding-right: 10px;
}
.vs-dark .dropdown > .dropdown-icon,
.hc-black .dropdown > .dropdown-icon {
.vs-dark .monaco-dropdown > .dropdown-icon,
.hc-black .monaco-dropdown > .dropdown-icon {
content: url("dropdownarrow_inverse.svg");
}