Migrate to app-drawer-layout (#929)

This commit is contained in:
Paulus Schoutsen 2018-02-27 17:38:19 -08:00 committed by GitHub
parent ebc21aaa40
commit 3430996700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 13 deletions

View File

@ -20,6 +20,7 @@
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
}; };
height: 100%;
display: block; display: block;
overflow: auto; overflow: auto;
-ms-user-select: none; -ms-user-select: none;

View File

@ -1,5 +1,6 @@
<link rel='import' href='../../bower_components/polymer/polymer-element.html'> <link rel='import' href='../../bower_components/polymer/polymer-element.html'>
<link rel='import' href='../../bower_components/paper-drawer-panel/paper-drawer-panel.html'> <link rel='import' href='../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html'>
<link rel='import' href='../../bower_components/app-layout/app-drawer/app-drawer.html'>
<link rel='import' href='../../bower_components/iron-media-query/iron-media-query.html'> <link rel='import' href='../../bower_components/iron-media-query/iron-media-query.html'>
<link rel='import' href='../../bower_components/iron-pages/iron-pages.html'> <link rel='import' href='../../bower_components/iron-pages/iron-pages.html'>
<link rel='import' href='../../bower_components/app-route/app-route.html'> <link rel='import' href='../../bower_components/app-route/app-route.html'>
@ -20,6 +21,9 @@
:host { :host {
color: var(--primary-text-color); color: var(--primary-text-color);
} }
iron-pages {
height: 100%;
}
</style> </style>
<more-info-dialog hass='[[hass]]'></more-info-dialog> <more-info-dialog hass='[[hass]]'></more-info-dialog>
<ha-url-sync hass='[[hass]]'></ha-url-sync> <ha-url-sync hass='[[hass]]'></ha-url-sync>
@ -35,18 +39,25 @@
<iron-media-query query="(max-width: 870px)" query-matches="{{narrow}}"> <iron-media-query query="(max-width: 870px)" query-matches="{{narrow}}">
</iron-media-query> </iron-media-query>
<paper-drawer-panel id='drawer' <app-drawer-layout
fullbleed
force-narrow='[[computeForceNarrow(narrow, dockedSidebar)]]' force-narrow='[[computeForceNarrow(narrow, dockedSidebar)]]'
responsive-width='0' disable-swipe='[[_computeDisableSwipe(hass)]]' responsive-width='0'
disable-edge-swipe='[[_computeDisableSwipe(hass)]]'> >
<ha-sidebar <app-drawer
id='drawer'
slot="drawer" slot="drawer"
narrow='[[narrow]]' disable-swipe='[[_computeDisableSwipe(hass)]]'
hass='[[hass]]' swipe-open='[[!_computeDisableSwipe(hass)]]'
></ha-sidebar> persistent='[[dockedSidebar]]'
>
<ha-sidebar
narrow='[[narrow]]'
hass='[[hass]]'
></ha-sidebar>
</app-drawer>
<iron-pages <iron-pages
slot="main"
attr-for-selected='id' attr-for-selected='id'
fallback-selection='panel-resolver' fallback-selection='panel-resolver'
selected='[[hass.panelUrl]]' selected='[[hass.panelUrl]]'
@ -70,7 +81,7 @@
></partial-panel-resolver> ></partial-panel-resolver>
</iron-pages> </iron-pages>
</paper-drawer-panel> </app-drawer-layout>
</template> </template>
</dom-module> </dom-module>
@ -107,7 +118,7 @@
_routeChanged() { _routeChanged() {
if (this.narrow) { if (this.narrow) {
this.$.drawer.closeDrawer(); this.$.drawer.close();
} }
} }
@ -118,14 +129,14 @@
handleOpenMenu() { handleOpenMenu() {
if (this.narrow) { if (this.narrow) {
this.$.drawer.openDrawer(); this.$.drawer.open();
} else { } else {
this.fire('hass-dock-sidebar', { dock: true }); this.fire('hass-dock-sidebar', { dock: true });
} }
} }
handleCloseMenu() { handleCloseMenu() {
this.$.drawer.closeDrawer(); this.$.drawer.close();
if (this.dockedSidebar) { if (this.dockedSidebar) {
this.fire('hass-dock-sidebar', { dock: false }); this.fire('hass-dock-sidebar', { dock: false });
} }