Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
add92a5
Fix quickbar overlaying, fix click handling (#11900)
bramkragten Mar 2, 2022
24829bd
Supervisor mobile click accessibility (#11915)
steverep Mar 3, 2022
797c871
Convert objects to string in config flow error (#11908)
bramkragten Mar 3, 2022
8c445f6
Fix datepicker triangle (#11920)
robinwittebol Mar 3, 2022
604b796
Always show tab labels (#11919)
robinwittebol Mar 3, 2022
8f8017e
Remove zwave and ozw panels (#11911)
bramkragten Mar 4, 2022
adefc7a
Convert lovelace config dialogs to ha-form (#11910)
bramkragten Mar 4, 2022
0936fd9
Guard setting up config flow for an unsupported domain (#11937)
balloob Mar 4, 2022
bd20c15
Show triggered vars on click (#11924)
balloob Mar 5, 2022
ccb91e0
Allow marking YAML editor as read only (#11960)
balloob Mar 7, 2022
3873203
Convert inputs (#11907)
bramkragten Mar 7, 2022
b4b52d3
Remove some additional old zwave code (#11941)
raman325 Mar 7, 2022
2e10eb0
Correct media upload error + add file name (#11949)
spacegaier Mar 7, 2022
dfcb0f6
Fix humidifier more info mode dropdown (#11964)
bramkragten Mar 7, 2022
8258641
Make min width of select configurable (#11965)
bramkragten Mar 7, 2022
9d28df3
Fix for Statistics Editor (#11942)
zsarnett Mar 7, 2022
4b8b14a
A11y expansion panel (#11967)
bramkragten Mar 7, 2022
0dac10a
Convert file upload to mdc (#11906)
bramkragten Mar 7, 2022
4cdff3f
Add location selector, convert zone editor (#11902)
bramkragten Mar 7, 2022
68e7ce1
Add systemd_resolved unsupported reason (#11971)
ludeeus Mar 7, 2022
fc6b594
Allow selecting multiple entities (#11986)
balloob Mar 8, 2022
db830e9
Fix theme setting (#11977)
bramkragten Mar 8, 2022
d968fe4
Update Style of Design Page (#11982)
zsarnett Mar 8, 2022
9f1e9b4
Use entities-picker in entity selector (#11990)
balloob Mar 9, 2022
246e426
#11971 Change order of alarm panel buttons (#11998)
bratanon Mar 10, 2022
99fd3a1
Fix zwave_js 'add/remove device' disabled bug (#12000)
raman325 Mar 10, 2022
f89b8cf
Fix zwave_js set config dropdown default value (#11974)
cgarwood Mar 10, 2022
294a69d
Fix changing cost number in energy settings (#12009)
zsarnett Mar 11, 2022
f4e28da
Fix Dashboard Editing (#12011)
zsarnett Mar 11, 2022
9b6c935
Fix For Selecting Device Class (#12010)
zsarnett Mar 11, 2022
5dfe17a
Fix: Allow for deleting Input_select options (#12007)
zsarnett Mar 12, 2022
a993d3a
Script ID update with Alias (#12008)
zsarnett Mar 12, 2022
fad8a27
HAWS 6.1 (#12016)
balloob Mar 12, 2022
4916527
Bumped version to 20220301.1
balloob Mar 12, 2022
4fbcc30
Merge remote-tracking branch 'origin/master' into dev
balloob Mar 12, 2022
c4dc6bf
Bumped version to 20220301.2
balloob Mar 12, 2022
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
1 change: 0 additions & 1 deletion cast/src/receiver/second-load.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import "web-animations-js/web-animations-next-lite.min";
import "../../../src/resources/ha-style";
import "../../../src/resources/roboto";
import "./layout/hc-lovelace";
3 changes: 3 additions & 0 deletions gallery/src/components/demo-cards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ class DemoCards extends LitElement {
ha-formfield {
margin-right: 16px;
}
#container {
background-color: var(--primary-background-color);
}
`;
}

Expand Down
22 changes: 21 additions & 1 deletion gallery/src/components/page-description.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ class PageDescription extends HaMarkdown {
if (!PAGES[this.page].description) {
return html``;
}

return html`
<div class="heading">
<div class="title">
${PAGES[this.page].metadata.title || this.page.split("/")[1]}
</div>
<div class="subtitle">${PAGES[this.page].metadata.subtitle}</div>
</div>
${until(
PAGES[this.page]
.description()
Expand All @@ -25,9 +32,22 @@ class PageDescription extends HaMarkdown {
static styles = [
HaMarkdown.styles,
css`
.heading {
padding: 16px;
border-bottom: 1px solid var(--secondary-background-color);
}
.title {
font-size: 42px;
line-height: 56px;
padding-bottom: 8px;
}
.subtitle {
font-size: 18px;
line-height: 24px;
}
.root {
max-width: 800px;
margin: 0 auto;
margin: 16px auto;
}
.root > *:first-child {
margin-top: 0;
Expand Down
94 changes: 54 additions & 40 deletions gallery/src/ha-gallery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { html, css, LitElement, PropertyValues } from "lit";
import { customElement, property, query } from "lit/decorators";
import "../../src/components/ha-icon-button";
import "../../src/managers/notification-manager";
import "../../src/components/ha-expansion-panel";
import { haStyle } from "../../src/resources/styles";
import { PAGES, SIDEBAR } from "../build/import-pages";
import { dynamicElement } from "../../src/common/dom/dynamic-element-directive";
Expand Down Expand Up @@ -53,10 +54,9 @@ class HaGallery extends LitElement {
sidebar.push(
group.header
? html`
<details>
<summary class="section">${group.header}</summary>
<ha-expansion-panel .header=${group.header}>
${links}
</details>
</ha-expansion-panel>
`
: links
);
Expand Down Expand Up @@ -92,27 +92,34 @@ class HaGallery extends LitElement {
${dynamicElement(`demo-${this._page.replace("/", "-")}`)}
</div>
<div class="page-footer">
${PAGES[this._page].description ||
Object.keys(PAGES[this._page].metadata).length > 0
? html`
<a
href=${`${GITHUB_DEMO_URL}${this._page}.markdown`}
target="_blank"
>
Edit text
</a>
`
: ""}
${PAGES[this._page].demo
? html`
<a
href=${`${GITHUB_DEMO_URL}${this._page}.ts`}
target="_blank"
>
Edit demo
</a>
`
: ""}
<div class="header">Help us to improve our documentation</div>
<div class="secondary">
Suggest an edit to this page, or provide/view feedback for this
page.
</div>
<div>
${PAGES[this._page].description ||
Object.keys(PAGES[this._page].metadata).length > 0
? html`
<a
href=${`${GITHUB_DEMO_URL}${this._page}.markdown`}
target="_blank"
>
Edit text
</a>
`
: ""}
${PAGES[this._page].demo
? html`
<a
href=${`${GITHUB_DEMO_URL}${this._page}.ts`}
target="_blank"
>
Edit demo
</a>
`
: ""}
</div>
</div>
</div>
</mwc-drawer>
Expand Down Expand Up @@ -186,27 +193,16 @@ class HaGallery extends LitElement {
padding: 4px;
}

.sidebar details {
margin-top: 1em;
margin-left: 1em;
}

.sidebar summary {
cursor: pointer;
font-weight: bold;
margin-bottom: 8px;
}

.sidebar a {
color: var(--primary-text-color);
display: block;
padding: 4px 12px;
padding: 12px;
text-decoration: none;
position: relative;
}

.sidebar a[active]::before {
border-radius: 4px;
border-radius: 12px;
position: absolute;
top: 0;
right: 2px;
Expand Down Expand Up @@ -237,14 +233,32 @@ class HaGallery extends LitElement {

.page-footer {
text-align: center;
margin: 16px 0;
padding-top: 16px;
border-top: 1px solid rgba(0, 0, 0, 0.12);
margin: 16px;
padding: 16px;
border-radius: 12px;
background-color: var(--primary-background-color);
}

.page-footer div {
margin-top: 4px;
}

.page-footer .header {
font-size: 16px;
font-weight: 500;
line-height: 28px;
text-align: center;
}

.page-footer .secondary {
line-height: 23px;
text-align: center;
}

.page-footer a {
display: inline-block;
margin: 0 8px;
text-decoration: none;
}
`,
];
Expand Down
1 change: 1 addition & 0 deletions gallery/src/pages/components/ha-alert.markdown
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Alerts
subtitle: An alert displays a short, important message in a way that attracts the user's attention without interrupting the user's task.
---

# Alert `<ha-alert>`
Expand Down
102 changes: 100 additions & 2 deletions gallery/src/pages/components/ha-form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,98 @@ import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
import { provideHass } from "../../../../src/fake_data/provide_hass";
import { HomeAssistant } from "../../../../src/types";
import { getEntity } from "../../../../src/fake_data/entity";

const ENTITIES = [
getEntity("alarm_control_panel", "alarm", "disarmed", {
friendly_name: "Alarm",
}),
getEntity("media_player", "livingroom", "playing", {
friendly_name: "Livingroom",
}),
getEntity("media_player", "lounge", "idle", {
friendly_name: "Lounge",
supported_features: 444983,
}),
getEntity("light", "bedroom", "on", {
friendly_name: "Bedroom",
}),
getEntity("switch", "coffee", "off", {
friendly_name: "Coffee",
}),
];

const DEVICES = [
{
area_id: "bedroom",
configuration_url: null,
config_entries: ["config_entry_1"],
connections: [],
disabled_by: null,
entry_type: null,
id: "device_1",
identifiers: [["demo", "volume1"] as [string, string]],
manufacturer: null,
model: null,
name_by_user: null,
name: "Dishwasher",
sw_version: null,
hw_version: null,
via_device_id: null,
},
{
area_id: "backyard",
configuration_url: null,
config_entries: ["config_entry_2"],
connections: [],
disabled_by: null,
entry_type: null,
id: "device_2",
identifiers: [["demo", "pwm1"] as [string, string]],
manufacturer: null,
model: null,
name_by_user: null,
name: "Lamp",
sw_version: null,
hw_version: null,
via_device_id: null,
},
{
area_id: null,
configuration_url: null,
config_entries: ["config_entry_3"],
connections: [],
disabled_by: null,
entry_type: null,
id: "device_3",
identifiers: [["demo", "pwm1"] as [string, string]],
manufacturer: null,
model: null,
name_by_user: "User name",
name: "Technical name",
sw_version: null,
hw_version: null,
via_device_id: null,
},
];

const AREAS = [
{
area_id: "backyard",
name: "Backyard",
picture: null,
},
{
area_id: "bedroom",
name: "Bedroom",
picture: null,
},
{
area_id: "livingroom",
name: "Livingroom",
picture: null,
},
];

const SCHEMAS: {
title: string;
Expand Down Expand Up @@ -39,6 +131,7 @@ const SCHEMAS: {
icon: "Icon",
media: "Media",
location: "Location",
entities: "Entities",
},
schema: [
{ name: "addon", selector: { addon: {} } },
Expand Down Expand Up @@ -80,6 +173,10 @@ const SCHEMAS: {
name: "location",
selector: { location: { radius: true, icon: "mdi:home" } },
},
{
name: "entities",
selector: { entity: { multiple: true } },
},
],
},
{
Expand Down Expand Up @@ -320,9 +417,10 @@ class DemoHaForm extends LitElement {
const hass = provideHass(this);
hass.updateTranslations(null, "en");
hass.updateTranslations("config", "en");
hass.addEntities(ENTITIES);
mockEntityRegistry(hass);
mockDeviceRegistry(hass);
mockAreaRegistry(hass);
mockDeviceRegistry(hass, DEVICES);
mockAreaRegistry(hass, AREAS);
mockHassioSupervisor(hass);
}

Expand Down
6 changes: 6 additions & 0 deletions gallery/src/pages/components/ha-selector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,12 @@ const SCHEMAS: {
},
},
},
{
name: "Multiples",
input: {
entity: { name: "Entity", selector: { entity: { multiple: true } } },
},
},
];

@customElement("demo-components-ha-selector")
Expand Down
3 changes: 3 additions & 0 deletions hassio/src/entrypoint.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
// Compat needs to be first import
import "../../src/resources/compatibility";
import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
import "../../src/resources/roboto";
import "../../src/resources/safari-14-attachshadow-patch";
import "./hassio-main";

setCancelSyntheticClickEvents(false);

const styleEl = document.createElement("style");
styleEl.innerHTML = `
body {
Expand Down
3 changes: 2 additions & 1 deletion hassio/src/hassio-main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ export class HassioMain extends SupervisorBaseElement {
this.parentElement,
this.hass.themes,
themeName,
themeSettings
themeSettings,
true
);
}
}
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"@polymer/iron-icon": "^3.0.1",
"@polymer/iron-input": "^3.0.1",
"@polymer/iron-resizable-behavior": "^3.0.1",
"@polymer/paper-dropdown-menu": "^3.2.0",
"@polymer/paper-input": "^3.2.1",
"@polymer/paper-item": "^3.0.1",
"@polymer/paper-listbox": "^3.0.1",
Expand Down Expand Up @@ -109,7 +108,7 @@
"fuse.js": "^6.0.0",
"google-timezones-json": "^1.0.2",
"hls.js": "^1.1.5",
"home-assistant-js-websocket": "^6.0.1",
"home-assistant-js-websocket": "^6.1.1",
"idb-keyval": "^5.1.3",
"intl-messageformat": "^9.9.1",
"js-yaml": "^4.1.0",
Expand All @@ -136,7 +135,6 @@
"vis-network": "^8.5.4",
"vue": "^2.6.12",
"vue2-daterange-picker": "^0.5.1",
"web-animations-js": "^2.3.2",
"workbox-cacheable-response": "^6.4.2",
"workbox-core": "^6.4.2",
"workbox-expiration": "^6.4.2",
Expand Down
Loading