Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into radio-form-support
Browse files Browse the repository at this point in the history
  • Loading branch information
vladitasev committed Apr 23, 2019
2 parents 86598b9 + d8bf3ea commit 3243e35
Show file tree
Hide file tree
Showing 47 changed files with 138 additions and 21 deletions.
3 changes: 3 additions & 0 deletions packages/main/src/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import Icon from "./Icon.js";
// Styles
import buttonCss from "./themes/Button.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ import "@ui5/webcomponents-core/dist/sap/ui/core/date/Gregorian.js";
// Styles
import calendarCSS from "./themes/Calendar.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/CalendarHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import CalendarHeaderRenderer from "./build/compiled/CalendarHeaderRenderer.lit.
// Styles
import styles from "./themes/CalendarHeader.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

const metadata = {
tag: "ui5-calendar-header",
properties: {
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Card.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import Icon from "./Icon.js";
// Styles
import cardCss from "./themes/Card.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/CheckBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import Label from "./Label.js";
// Styles
import checkboxCss from "./themes/CheckBox.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/CustomListItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import CustomListItemRenderer from "./build/compiled/CustomListItemRenderer.lit.
// Styles
import columnListItemCss from "./themes/CustomListItem.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/DatePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ import "@ui5/webcomponents-core/dist/sap/ui/core/date/Gregorian.js";
// Styles
import datePickerCss from "./themes/DatePicker.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/DayPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import DayPickerRenderer from "./build/compiled/DayPickerRenderer.lit.js";
// Styles
import dayPickerCSS from "./themes/DayPicker.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import DialogRenderer from "./build/compiled/DialogRenderer.lit.js";
// Styles
import dialogCss from "./themes/Dialog.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
2 changes: 2 additions & 0 deletions packages/main/src/GroupHeaderListItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import GroupHeaderListItemTemplateContext from "./GroupHeaderListItemTemplateCon
// Styles
import groupheaderListItemCss from "./themes/GroupHeaderListItem.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import IconRenderer from "./build/compiled/IconRenderer.lit.js";
// Styles
import iconCss from "./themes/Icon.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import InputTemplateContext from "./InputTemplateContext.js";
import styles from "./themes/Input.css.js";
import shellbarInput from "./themes/ShellBarInput.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Label.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import LabelTemplateContext from "./LabelTemplateContext.js";
// Styles
import labelCss from "./themes/Label.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Link.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import LinkTemplateContext from "./LinkTemplateContext.js";
// Styles
import linkCss from "./themes/Link.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/List.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import ListTemplateContext from "./ListTemplateContext.js";
// Styles
import listCss from "./themes/List.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/MessageStrip.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import Icon from "./Icon.js";
// Styles
import messageStripCss from "./themes/MessageStrip.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/MessageStripTemplateContext.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class MessageStripTemplateContext {
"ui5-messagestrip-close-icon": true,
},
main: {
"ui5-messagestrip": true,
"ui5-messagestrip-root": true,
"ui5-messagestrip-icon--hidden": state.hideIcon,
"ui5-messagestrip-close-icon--hidden": state.hideCloseButton,
[MessageStripTemplateContext.getTypeClasses(state)]: true,
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/MonthPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import MonthPickerRenderer from "./build/compiled/MonthPickerRenderer.lit.js";
// Styles
import styles from "./themes/MonthPicker.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import { fetchResourceBundle, getResourceBundle } from "./ResourceBundleProvider
// Styles
import panelCss from "./themes/Panel.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import PopoverRenderer from "./build/compiled/PopoverRenderer.lit.js";
// Styles
import popoverCss from "./themes/Popover.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import { isEscape } from "@ui5/webcomponents-base/src/events/PseudoEvents.js";
// Styles
import styles from "./themes/Popup.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/RadioButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import RadioButtonTemplateContext from "./RadioButtonTemplateContext.js";
// Styles
import radioButtonCss from "./themes/RadioButton.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
8 changes: 3 additions & 5 deletions packages/main/src/RadioButtonGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,10 @@ class RadioButtonGroup {
static enforceSingleSelection(radioBtn, groupName) {
const selectedRadio = this.getSelectedRadioFromGroup(groupName);

if (!selectedRadio) {
return;
}

if (radioBtn.selected) {
if (radioBtn !== selectedRadio) {
if (!selectedRadio) {
this.selectedRadios.set(groupName, radioBtn);
} else if (radioBtn !== selectedRadio) {
this._deselectRadio(selectedRadio);
this.selectedRadios.set(groupName, radioBtn);
}
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import SelectTemplateContext from "./SelectTemplateContext.js";
// Styles
import selectCss from "./themes/Select.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/ShellBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import ShellBarTemplateContext from "./ShellBarTemplateContext.js";
// Styles
import styles from "./themes/ShellBar.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/ShellBarItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import URI from "@ui5/webcomponents-base/src/types/URI.js";
// Template
import ShellBarItemRenderer from "./build/compiled/ShellBarItemRenderer.lit.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/StandardListItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import StandardListItemRenderer from "./build/compiled/StandardListItemRenderer.

// Styles

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Switch.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import SwitchType from "./types/SwitchType.js";
// Styles
import switchCss from "./themes/Switch.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import IconColor from "./types/IconColor.js";
import Icon from "./Icon.js";
import TabRenderer from "./build/compiled/TabRenderer.lit.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
7 changes: 5 additions & 2 deletions packages/main/src/TabContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import Popover from "./Popover.js";
import TabBase from "./TabBase.js";

// Styles
import buttonCss from "./themes/TabContainer.css.js";
import tabContainerCss from "./themes/TabContainer.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

const SCROLL_STEP = 128;

Expand Down Expand Up @@ -162,7 +165,7 @@ class TabContainer extends UI5Element {
}

static get styles() {
return buttonCss;
return tabContainerCss;
}

static get renderer() {
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/TabSeparator.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import TabSeparatorTemplateContext from "./TabSeparatorTemplateContext.js";
import TabBase from "./TabBase.js";
import TabSeparatorRenderer from "./build/compiled/TabSeparatorRenderer.lit.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Table.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import TableRenderer from "./build/compiled/TableRenderer.lit.js";
// Styles
import styles from "./themes/Table.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/TableCell.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import TableCellRenderer from "./build/compiled/TableCellRenderer.lit.js";
// Styles
import styles from "./themes/TableCell.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/TableColumn.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import TableColumnRenderer from "./build/compiled/TableColumnRenderer.lit.js";
// Styles
import styles from "./themes/TableColumn.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

const metadata = {
tag: "ui5-table-column",
slots: /** @lends sap.ui.webcomponents.main.TableColumn.prototype */ {
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/TableRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import TableRowRenderer from "./build/compiled/TableRowRenderer.lit.js";
// Styles
import styles from "./themes/TableRow.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/TextArea.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import { fetchResourceBundle, getResourceBundle } from "./ResourceBundleProvider
// Styles
import styles from "./themes/TextArea.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/Timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import TimelineRenderer from "./build/compiled/TimelineRenderer.lit.js";
// Styles
import styles from "./themes/Timeline.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/TimelineItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import TimelineItemRenderer from "./build/compiled/TimelineItemRenderer.lit.js";
// Styles
import styles from "./themes/TimelineItem.css.js";

// all themes should work via the convenience import (inlined now, switch to json when elements can be imported individyally)
import "./ThemePropertiesProvider.js";

/**
* @public
*/
Expand Down
Loading

0 comments on commit 3243e35

Please sign in to comment.