Restore launch screen migration line breaks

* Add search functionality to media browser

* prettier

* add debounced search, clear properly

* abort in flight search, remove dead code

* prettier

* filter

* prettier

* Hide media type filter on root media sources page

* Only show media type filter for searchable sources

* Apply media type filter only to backend search, not local browse

* Move media type filter inside the search bar

* Add client-side filters for media browser results

* Center search spinner in media browser

* Revert "Add client-side filters for media browser results"

This reverts commit 3e1fc71fbd.

* Revert "Move media type filter inside the search bar"

This reverts commit 19dcb92ad1.

* Revert "Apply media type filter only to backend search, not local browse"

This reverts commit 9b4f86878d.

* Revert "Only show media type filter for searchable sources"

This reverts commit 6dca0ce24e.

* Revert "Hide media type filter on root media sources page"

This reverts commit 62bbe34b71.

* Revert "prettier"

This reverts commit d64f90865c.

* Revert "filter"

This reverts commit 56dc5450b2.

* Reapply "filter"

This reverts commit a18edb79e4.

* Reapply "prettier"

This reverts commit 224b8823ea.

* Reapply "Hide media type filter on root media sources page"

This reverts commit 9e447e2d68.

* Reapply "Only show media type filter for searchable sources"

This reverts commit f29bd8e434.

* Reapply "Apply media type filter only to backend search, not local browse"

This reverts commit e5c021a814.

* Reapply "Move media type filter inside the search bar"

This reverts commit c83d7b77a6.

* Reapply "Add client-side filters for media browser results"

This reverts commit 436e32eeea.

* Remove local filters panel from media browser

Removes the 'Filters' collapsible panel that included:
- Local text search filter
- Local media class filter chips
- Keeps media type dropdown filter in search bar

* Fix eslint: use const instead of let for notShown variable

* Fix prettier formatting

* remove debounced search

* remove char limit

* Search button, localize

---------

Co-authored-by: Petar Petrov <MindFreeze@users.noreply.github.com>

demo/src/html/index.html.template

@@ -34,8 +34,16 @@
       content="width=device-width, initial-scale=1, shrink-to-fit=no"
     />
     <meta name="theme-color" content="#03a9f4" />
+    <link rel="preload" href="/static/fonts/roboto/Roboto-Regular.woff2" as="font" type="font/woff2" crossorigin>
     <%= renderTemplate("_social_meta.html.template") %>
     <style>
+      @font-face {
+        font-family: "Roboto Launch Screen";
+        font-display: block;
+        src: url("/static/fonts/roboto/Roboto-Regular.woff2") format("woff2");
+        font-weight: 400;
+        font-style: normal;
+      }
       html {
         background-color: var(--primary-background-color, #fafafa);
         color: var(--primary-text-color, #212121);
@@ -56,15 +64,38 @@
         padding: 0;
       }
       #ha-launch-screen {
+        font-family: "Roboto Launch Screen", sans-serif;
         height: 100%;
         display: flex;
         flex-direction: column;
         justify-content: center;
         align-items: center;
+        transition: opacity var(--ha-animation-duration-normal, 250ms) ease-out;
       }
-      #ha-launch-screen svg {
-        width: 112px;
+      #ha-launch-screen.removing {
+        opacity: 0;
+      }
+      @keyframes launch-lockup-in {
+        from {
+          opacity: 0;
+        }
+        to {
+          opacity: 1;
+        }
+      }
+      #ha-launch-screen .ha-lockup {
+        display: flex;
+        align-items: center;
         flex-shrink: 0;
+        animation: launch-lockup-in var(--ha-animation-duration-normal, 250ms) ease-out both;
+      }
+      #ha-launch-screen-info-box > *,
+      #ha-launch-screen .ohf-logo {
+        animation: launch-lockup-in var(--ha-animation-duration-normal, 250ms) ease-out both;
+      }
+      #ha-launch-screen .ha-logo {
+        width: 96px;
+        height: 96px;
       }
       #ha-launch-screen .ha-launch-screen-spacer-top {
         flex: 1;
@@ -80,11 +111,32 @@
         display: flex;
         flex-direction: column;
         align-items: center;
+        gap: 4px;
         opacity: .66;
       }
-      @media (prefers-color-scheme: dark) {
+      .ohf-logo span {
+        font-size: 12px;
+        line-height: 12px;
+        text-transform: uppercase;
+      }
+      .ohf-logo picture {
+        display: flex;
+      }
+      .ohf-logo img {
+        width: 237px;
+        aspect-ratio: 237 / 24;
+        height: auto;
+      }
+      @media (max-height: 560px) {
+        #ha-launch-screen .ha-launch-screen-spacer-top {
+          margin-top: 24px;
+          padding-top: 24px;
+        }
+        #ha-launch-screen .ha-launch-screen-spacer-bottom {
+          padding-top: 16px;
+        }
         .ohf-logo {
-          filter: invert(1);
+          margin-block: 24px;
         }
       }
     </style>
@@ -92,13 +144,16 @@
   <body>
     <div id="ha-launch-screen">
       <div class="ha-launch-screen-spacer-top"></div>
-      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 240">
-        <path fill="#18BCF2" d="M240 224.762a15 15 0 0 1-15 15H15a15 15 0 0 1-15-15v-90c0-8.25 4.77-19.769 10.61-25.609l98.78-98.7805c5.83-5.83 15.38-5.83 21.21 0l98.79 98.7895c5.83 5.83 10.61 17.36 10.61 25.61v90-.01Z"/>
-        <path fill="#F2F4F9" d="m107.27 239.762-40.63-40.63c-2.09.72-4.32 1.13-6.64 1.13-11.3 0-20.5-9.2-20.5-20.5s9.2-20.5 20.5-20.5 20.5 9.2 20.5 20.5c0 2.33-.41 4.56-1.13 6.65l31.63 31.63v-115.88c-6.8-3.3395-11.5-10.3195-11.5-18.3895 0-11.3 9.2-20.5 20.5-20.5s20.5 9.2 20.5 20.5c0 8.07-4.7 15.05-11.5 18.3895v81.27l31.46-31.46c-.62-1.96-.96-4.04-.96-6.2 0-11.3 9.2-20.5 20.5-20.5s20.5 9.2 20.5 20.5-9.2 20.5-20.5 20.5c-2.5 0-4.88-.47-7.09-1.29L129 208.892v30.88z"/>
-      </svg>
+      <div class="ha-lockup">
+        <img class="ha-logo" src="/static/images/home-assistant-logo-loading.svg" alt="Home Assistant">
+      </div>
       <div id="ha-launch-screen-info-box" class="ha-launch-screen-spacer-bottom"></div>
       <div class="ohf-logo">
-        <img src="/static/images/ohf-badge.svg" alt="Home Assistant is a project by the Open Home Foundation" height="46">
+        <span id="ha-launch-screen-attribution">A project from the</span>
+        <picture>
+          <source media="(prefers-color-scheme: dark)" srcset="/static/images/open-home-foundation-on-dark.svg">
+          <img src="/static/images/open-home-foundation-on-light.svg" alt="Open Home Foundation" width="237" height="24">
+        </picture>
       </div>
     </div>
     <ha-demo></ha-demo>

public/static/images/home-assistant-logo-loading.svg

@@ -0,0 +1,36 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" role="presentation">
+  <style>
+    .dot-left { animation: pulse-left 1300ms 350ms linear infinite; }
+    .dot-right { animation: pulse-right 1300ms 350ms linear infinite; }
+    .dot-top { animation: pulse-top 1300ms 350ms linear infinite; }
+    @keyframes pulse-left {
+      0% { transform: translate(50px, 69.634804px) scale(1); animation-timing-function: cubic-bezier(.39, .575, .565, 1); }
+      15.384615% { transform: translate(50px, 69.634804px) scale(1.2); animation-timing-function: cubic-bezier(.39, .575, .565, 1); }
+      38.461538%, 100% { transform: translate(50px, 69.634804px) scale(1); }
+    }
+    @keyframes pulse-right {
+      0%, 15.384615% { transform: translate(90px, 58.634798px) scale(1); }
+      15.384615% { animation-timing-function: cubic-bezier(.39, .575, .565, 1); }
+      30.769231% { transform: translate(90px, 58.634798px) scale(1.2); animation-timing-function: cubic-bezier(.39, .575, .565, 1); }
+      53.846154%, 100% { transform: translate(90px, 58.634798px) scale(1); }
+    }
+    @keyframes pulse-top {
+      0%, 30.769231% { transform: translate(70px, 37.6348px) scale(1); }
+      30.769231% { animation-timing-function: cubic-bezier(.39, .575, .565, 1); }
+      46.153846% { transform: translate(70px, 37.6348px) scale(1.2); animation-timing-function: cubic-bezier(.39, .575, .565, 1); }
+      69.230769%, 100% { transform: translate(70px, 37.6348px) scale(1); }
+    }
+  </style>
+  <g transform="matrix(.938408 0 0 .93841 -5.688557 -13.572944)">
+    <path fill="#18bcf2" d="M73.5367 13.0937 106.463 46.0524v.0033C108.41 48.0043 110 51.848 110 54.6007v30.0292c0 2.7527-2.25 5.0049-5 5.0049l-70-.0034c-2.75 0-5-2.2522-5-5.0048V54.5974c0-2.7527 1.5933-6.5998 3.5367-8.545l32.93-32.9587c1.9433-1.9452 5.1266-1.9452 7.07 0Z" transform="matrix(1.598452 0 0 1.598452 -41.89164 -.937304)"/>
+    <g mask="url(#logo-mask)" transform="matrix(1.598452 0 0 1.598452 -41.89164 -.937311)">
+      <path d="m70 89.6348-20-20M70 89.6348v-52M90 58.1348l-20 20" fill="none" stroke="#f2f4f9" stroke-linecap="round" stroke-width="6"/>
+      <circle class="dot-left" r="7" fill="#f2f4f9" transform="translate(50 69.634804)"/>
+      <circle class="dot-right" r="7" fill="#f2f4f9" transform="translate(90 58.634798)"/>
+      <circle class="dot-top" r="7" fill="#f2f4f9" transform="translate(70 37.6348)"/>
+    </g>
+    <mask id="logo-mask" x="-150%" y="-150%" width="400%" height="400%" mask-type="luminance">
+      <path fill="#f2f4f9" d="M73.5367 13.0937 106.463 46.0524v.0033C108.41 48.0043 110 51.848 110 54.6007v30.0292c0 2.7527-2.25 5.0049-5 5.0049l-70-.0034c-2.75 0-5-2.2522-5-5.0048V54.5974c0-2.7527 1.5933-6.5998 3.5367-8.545l32.93-32.9587c1.9433-1.9452 5.1266-1.9452 7.07 0Z"/>
+    </mask>
+  </g>
+</svg>

public/static/images/open-home-foundation-on-dark.svg

@@ -0,0 +1,22 @@
+<svg width="237" height="24" viewBox="0 0 237 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.54181 0.297615C8.14709 -0.0992051 7.5012 -0.0992051 7.1082 0.297615L0.717655 6.72232C0.322945 7.11914 0 7.90248 0 8.46249V14.2894C0 14.8494 0.456224 15.3098 1.01497 15.3098H14.635C15.1921 15.3098 15.65 14.8511 15.65 14.2894V8.46249C15.65 7.90248 15.3271 7.11914 14.9324 6.72232L8.54181 0.297615Z" fill="#F7F6F2"/>
+<path d="M14.8672 17.918C15.2993 17.918 15.6502 18.2682 15.6504 18.7002V22.417C15.6504 22.8492 15.2994 23.2002 14.8672 23.2002H13.8896C13.4575 23.2002 13.1064 22.8492 13.1064 22.417V20.4609H2.54297V22.417C2.54297 22.8491 2.19285 23.2001 1.76074 23.2002H0.782227C0.350189 23.2 0 22.8491 0 22.417V18.7002C0.000147852 18.2682 0.350281 17.9181 0.782227 17.918H14.8672Z" fill="#F7F6F2"/>
+<path d="M28.0439 5.24023C28.9236 5.24023 29.7386 5.39857 30.4891 5.71734C31.2396 6.03402 31.8754 6.47362 32.3965 7.03406C32.9177 7.5945 33.3242 8.26536 33.616 9.05081C33.9058 9.83625 34.0517 10.6842 34.0517 11.5967C34.0621 12.4989 33.9204 13.3447 33.6285 14.1385C33.3346 14.9323 32.9239 15.6094 32.3965 16.1719C31.8691 16.7344 31.227 17.1761 30.4724 17.4949C29.7178 17.8157 28.9027 17.9699 28.0272 17.9595C26.8702 17.9762 25.83 17.7095 24.9086 17.1616C23.9872 16.6136 23.2764 15.8532 22.7761 14.8802C22.2757 13.9073 22.0339 12.8176 22.0506 11.6134C22.0402 10.7113 22.1819 9.86542 22.4738 9.07164C22.7677 8.27786 23.1763 7.60075 23.7016 7.03406C24.2269 6.46945 24.8648 6.02568 25.6174 5.70692C26.3699 5.38816 27.1787 5.2319 28.0439 5.24232V5.24023ZM28.0584 15.524C29.0966 15.524 29.9179 15.1719 30.5245 14.4698C31.1312 13.7656 31.4334 12.8093 31.4334 11.5967C31.4334 10.3842 31.1312 9.41332 30.5287 8.71121C29.9262 8.01118 29.1028 7.66117 28.0584 7.66117C27.0141 7.66117 26.1906 8.01118 25.5882 8.71121C24.9857 9.41124 24.6835 10.3738 24.6835 11.5967C24.6835 12.8197 24.9857 13.7802 25.5882 14.4781C26.1906 15.1761 27.0141 15.5261 28.0584 15.5261V15.524Z" fill="#F7F6F2"/>
+<path d="M44.9854 9.52582C44.9854 10.7592 44.6123 11.7509 43.8681 12.503C43.1239 13.2551 42.1108 13.6322 40.8267 13.6322H38.3898V17.7553H35.9028V5.45899H40.86C42.1483 5.45899 43.1572 5.82151 43.8889 6.54654C44.6206 7.27157 44.9854 8.26536 44.9854 9.52374V9.52582ZM42.3588 9.47791C42.3588 8.95705 42.19 8.52578 41.8502 8.18619C41.5104 7.84659 41.0205 7.67783 40.3785 7.67783H38.3898V11.4676H40.3785C41.0247 11.4676 41.5167 11.2842 41.8544 10.9175C42.1921 10.5509 42.3588 10.0717 42.3588 9.47999V9.47791Z" fill="#F7F6F2"/>
+<path d="M54.4829 17.7553H46.7386V5.45899H54.4829V7.82159H49.2234V10.4446H53.895V12.6447H49.2234V15.4156H54.4829V17.7553Z" fill="#F7F6F2"/>
+<path d="M67.397 5.46108V17.7574H64.9268L59.5381 9.42999V17.7574H57.0678V5.46108H59.5381L64.9268 13.8052V5.46108H67.397Z" fill="#F7F6F2"/>
+<path d="M74.4409 5.46108H76.9279V10.4321L81.8037 10.4488V5.46108H84.3074V17.7574H81.8037V12.6655L76.9279 12.6322V17.7574H74.4409V5.46108Z" fill="#F7F6F2"/>
+<path d="M92.133 5.24023C93.0127 5.24023 93.8278 5.39857 94.5782 5.71734C95.3287 6.03402 95.9645 6.47362 96.4856 7.03406C97.0068 7.5945 97.4133 8.26536 97.7051 9.05081C97.9949 9.83625 98.1408 10.6842 98.1408 11.5967C98.1512 12.4989 98.0095 13.3447 97.7176 14.1385C97.4237 14.9323 97.013 15.6094 96.4856 16.1719C95.9582 16.7344 95.3162 17.1761 94.5615 17.4949C93.8069 17.8157 92.9918 17.9699 92.1163 17.9595C90.9593 17.9762 89.9191 17.7095 88.9977 17.1616C88.0763 16.6136 87.3655 15.8532 86.8652 14.8802C86.3649 13.9073 86.1231 12.8176 86.1397 11.6134C86.1293 10.7113 86.2711 9.86542 86.5629 9.07164C86.8568 8.27786 87.2654 7.60075 87.7907 7.03406C88.3161 6.46945 88.954 6.02568 89.7065 5.70692C90.459 5.38816 91.2679 5.2319 92.133 5.24232V5.24023ZM92.1476 15.524C93.1857 15.524 94.007 15.1719 94.6137 14.4698C95.2203 13.7656 95.5225 12.8093 95.5225 11.5967C95.5225 10.3842 95.2203 9.41332 94.6178 8.71121C94.0154 8.01118 93.192 7.66117 92.1476 7.66117C91.1032 7.66117 90.2798 8.01118 89.6773 8.71121C89.0749 9.41124 88.7726 10.3738 88.7726 11.5967C88.7726 12.8197 89.0749 13.7802 89.6773 14.4781C90.2798 15.1761 91.1032 15.5261 92.1476 15.5261V15.524Z" fill="#F7F6F2"/>
+<path d="M112.408 5.46108V17.7574H109.954V11.0342L107.321 17.7574H104.966L102.364 11.0842V17.7574H99.9919V5.46108H102.364L106.148 14.8552L109.954 5.46108H112.408Z" fill="#F7F6F2"/>
+<path d="M122.762 17.7553H115.018V5.45899H122.762V7.82159H117.503V10.4446H122.174V12.6447H117.503V15.4156H122.762V17.7553Z" fill="#F7F6F2"/>
+<path d="M131.526 7.21579V10.9075H136.254V12.5936H131.526V17.7408H129.65V5.44079H137.146V7.21579H131.526Z" fill="#F7F6F2"/>
+<path d="M144.303 5.24079C145.156 5.22968 145.956 5.38523 146.699 5.70468C147.441 6.02412 148.074 6.46579 148.597 7.02968C149.117 7.59357 149.525 8.27135 149.82 9.05746C150.114 9.84635 150.256 10.688 150.245 11.5852C150.256 12.488 150.114 13.338 149.82 14.1297C149.525 14.9241 149.117 15.5991 148.597 16.163C148.077 16.7241 147.443 17.1658 146.699 17.4852C145.954 17.8047 145.156 17.9602 144.303 17.9491C143.449 17.9602 142.652 17.8047 141.91 17.4852C141.168 17.1658 140.537 16.7241 140.017 16.1602C139.497 15.5963 139.089 14.9186 138.797 14.1325C138.505 13.3463 138.363 12.5019 138.374 11.6047C138.363 10.7075 138.505 9.86301 138.797 9.07412C139.089 8.28523 139.494 7.60746 140.017 7.04079C140.537 6.4769 141.168 6.03246 141.91 5.71023C142.652 5.38801 143.449 5.23246 144.303 5.24357V5.24079ZM141.44 14.8602C142.165 15.6825 143.124 16.0963 144.319 16.0963C145.515 16.0963 146.473 15.6852 147.196 14.8602C147.919 14.038 148.28 12.9463 148.28 11.5852C148.28 10.2241 147.919 9.12412 147.196 8.3019C146.473 7.47968 145.515 7.06579 144.319 7.06579C143.124 7.06579 142.163 7.47968 141.44 8.30468C140.715 9.12968 140.353 10.2241 140.353 11.5852C140.353 12.9463 140.715 14.038 141.44 14.8602Z" fill="#F7F6F2"/>
+<path d="M154.097 5.43801V13.3019C154.103 14.238 154.378 14.9463 154.923 15.4241C155.467 15.9047 156.184 16.1436 157.071 16.1436C157.958 16.1436 158.636 15.8908 159.203 15.388C159.77 14.8852 160.053 14.188 160.053 13.3019V5.43801H161.929V13.3769C161.929 14.0991 161.799 14.7519 161.54 15.338C161.282 15.9241 160.929 16.4075 160.487 16.7825C160.042 17.1602 159.531 17.4491 158.944 17.6547C158.358 17.8602 157.735 17.9602 157.068 17.9602C156.401 17.9602 155.804 17.8602 155.226 17.663C154.647 17.4658 154.131 17.1797 153.68 16.8075C153.227 16.4352 152.871 15.9547 152.61 15.363C152.349 14.7713 152.218 14.1075 152.218 13.3769V5.43801H154.097Z" fill="#F7F6F2"/>
+<path d="M174.473 5.43801V17.738H172.597L166.529 8.46857V17.738H164.653V5.43801H166.529L172.597 14.7241V5.43801H174.473Z" fill="#F7F6F2"/>
+<path d="M187.583 11.6019C187.588 12.4825 187.436 13.3102 187.124 14.0797C186.813 14.8519 186.382 15.5075 185.835 16.0463C185.287 16.5852 184.628 17.0075 183.859 17.3102C183.089 17.613 182.269 17.7575 181.391 17.7408H177.291V5.44079H181.391C182.547 5.42412 183.603 5.67968 184.553 6.21023C185.504 6.73801 186.249 7.4769 186.788 8.42412C187.327 9.37135 187.591 10.4325 187.583 11.6047V11.6019ZM185.59 11.6019C185.59 10.3019 185.204 9.24635 184.428 8.43523C183.653 7.62412 182.636 7.21579 181.374 7.21579H179.184V15.9963H181.374C182.647 15.9963 183.667 15.5936 184.437 14.7852C185.207 13.9797 185.59 12.9158 185.59 11.6019Z" fill="#F7F6F2"/>
+<path d="M195.821 14.7825H190.91L189.843 17.7408H187.916L192.363 5.44079H194.381L198.853 17.7408H196.869L195.818 14.7825H195.821ZM195.276 13.188L193.383 7.8269L191.474 13.188H195.276Z" fill="#F7F6F2"/>
+<path d="M207.278 7.21579H203.706V17.7408H201.813V7.21579H198.242V5.44079H207.275V7.21579H207.278Z" fill="#F7F6F2"/>
+<path d="M208.973 17.738V5.43801H210.866V17.738H208.973Z" fill="#F7F6F2"/>
+<path d="M218.873 5.24079C219.726 5.22968 220.527 5.38523 221.269 5.70468C222.014 6.02412 222.645 6.46579 223.167 7.02968C223.687 7.59357 224.095 8.27135 224.39 9.05746C224.685 9.84635 224.826 10.688 224.815 11.5852C224.826 12.488 224.685 13.338 224.39 14.1297C224.095 14.9241 223.687 15.5991 223.167 16.163C222.647 16.7241 222.014 17.1658 221.269 17.4852C220.524 17.8047 219.726 17.9602 218.873 17.9491C218.02 17.9602 217.222 17.8047 216.48 17.4852C215.738 17.1658 215.107 16.7241 214.587 16.1602C214.067 15.5963 213.659 14.9186 213.367 14.1325C213.075 13.3463 212.933 12.5019 212.945 11.6047C212.933 10.7075 213.075 9.86301 213.367 9.07412C213.659 8.28523 214.065 7.60746 214.587 7.04079C215.107 6.4769 215.738 6.03246 216.48 5.71023C217.222 5.38801 218.02 5.23246 218.873 5.24357V5.24079ZM216.01 14.8602C216.736 15.6825 217.695 16.0963 218.89 16.0963C220.085 16.0963 221.044 15.6852 221.766 14.8602C222.489 14.038 222.85 12.9463 222.85 11.5852C222.85 10.2241 222.489 9.12412 221.766 8.3019C221.044 7.47968 220.085 7.06579 218.89 7.06579C217.695 7.06579 216.733 7.47968 216.01 8.30468C215.285 9.12968 214.924 10.2241 214.924 11.5852C214.924 12.9463 215.285 14.038 216.01 14.8602Z" fill="#F7F6F2"/>
+<path d="M236.728 5.43801V17.738H234.852L228.784 8.46857V17.738H226.908V5.43801H228.784L234.852 14.7241V5.43801H236.728Z" fill="#F7F6F2"/>
+</svg>

public/static/images/open-home-foundation-on-light.svg

@@ -0,0 +1,22 @@
+<svg width="237" height="24" viewBox="0 0 237 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.54181 0.297615C8.14709 -0.0992051 7.5012 -0.0992051 7.1082 0.297615L0.717655 6.72232C0.322945 7.11914 0 7.90248 0 8.46249V14.2894C0 14.8494 0.456224 15.3098 1.01497 15.3098H14.635C15.1921 15.3098 15.65 14.8511 15.65 14.2894V8.46249C15.65 7.90248 15.3271 7.11914 14.9324 6.72232L8.54181 0.297615Z" fill="#09202E"/>
+<path d="M14.8672 17.9182C15.2993 17.9182 15.6502 18.2684 15.6504 18.7004V22.4172C15.6504 22.8494 15.2994 23.2004 14.8672 23.2004H13.8896C13.4575 23.2004 13.1064 22.8494 13.1064 22.4172V20.4612H2.54297V22.4172C2.54297 22.8494 2.19285 23.2004 1.76074 23.2004H0.782227C0.350189 23.2003 0 22.8493 0 22.4172V18.7004C0.000147852 18.2685 0.350281 17.9184 0.782227 17.9182H14.8672Z" fill="#09202E"/>
+<path d="M28.0439 5.23999C28.9236 5.23999 29.7386 5.39833 30.4891 5.71709C31.2396 6.03377 31.8754 6.47337 32.3965 7.03381C32.9177 7.59425 33.3242 8.26511 33.616 9.05056C33.9058 9.83601 34.0517 10.684 34.0517 11.5965C34.0621 12.4986 33.9204 13.3445 33.6285 14.1383C33.3346 14.932 32.9239 15.6092 32.3965 16.1717C31.8691 16.7342 31.227 17.1759 30.4724 17.4947C29.7178 17.8155 28.9027 17.9697 28.0272 17.9593C26.8702 17.9759 25.83 17.7092 24.9086 17.1613C23.9872 16.6134 23.2764 15.8529 22.7761 14.88C22.2757 13.907 22.0339 12.8174 22.0506 11.6132C22.0402 10.711 22.1819 9.86518 22.4738 9.0714C22.7677 8.27761 23.1763 7.6005 23.7016 7.03381C24.2269 6.46921 24.8648 6.02544 25.6174 5.70668C26.3699 5.38791 27.1787 5.23166 28.0439 5.24207V5.23999ZM28.0584 15.5237C29.0966 15.5237 29.9179 15.1716 30.5245 14.4695C31.1312 13.7653 31.4334 12.809 31.4334 11.5965C31.4334 10.3839 31.1312 9.41308 30.5287 8.71096C29.9263 8.01094 29.1028 7.66092 28.0584 7.66092C27.0141 7.66092 26.1906 8.01094 25.5882 8.71096C24.9857 9.41099 24.6835 10.3735 24.6835 11.5965C24.6835 12.8195 24.9857 13.7799 25.5882 14.4779C26.1906 15.1758 27.0141 15.5258 28.0584 15.5258V15.5237Z" fill="#09202E"/>
+<path d="M44.9854 9.52558C44.9854 10.759 44.6123 11.7507 43.8681 12.5028C43.1239 13.2549 42.1108 13.632 40.8267 13.632H38.3898V17.7551H35.9028V5.45875H40.86C42.1483 5.45875 43.1572 5.82126 43.8889 6.54629C44.6206 7.27132 44.9854 8.26511 44.9854 9.5235V9.52558ZM42.3588 9.47766C42.3588 8.95681 42.19 8.52554 41.8502 8.18594C41.5104 7.84635 41.0205 7.67759 40.3785 7.67759H38.3898V11.4673H40.3785C41.0247 11.4673 41.5167 11.284 41.8544 10.9173C42.1921 10.5506 42.3588 10.0714 42.3588 9.47975V9.47766Z" fill="#09202E"/>
+<path d="M54.4829 17.7551H46.7386V5.45875H54.4829V7.82134H49.2234V10.4444H53.895V12.6445H49.2234V15.4154H54.4829V17.7551Z" fill="#09202E"/>
+<path d="M67.397 5.46083V17.7572H64.9268L59.5381 9.42974V17.7572H57.0678V5.46083H59.5381L64.9268 13.8049V5.46083H67.397Z" fill="#09202E"/>
+<path d="M74.4409 5.46083H76.9279V10.4319L81.8037 10.4485V5.46083H84.3074V17.7572H81.8037V12.6653L76.9279 12.632V17.7572H74.4409V5.46083Z" fill="#09202E"/>
+<path d="M92.133 5.23999C93.0127 5.23999 93.8278 5.39833 94.5782 5.71709C95.3287 6.03377 95.9645 6.47337 96.4856 7.03381C97.0068 7.59425 97.4133 8.26511 97.7051 9.05056C97.9949 9.83601 98.1408 10.684 98.1408 11.5965C98.1512 12.4986 98.0095 13.3445 97.7176 14.1383C97.4237 14.932 97.013 15.6092 96.4856 16.1717C95.9582 16.7342 95.3162 17.1759 94.5615 17.4947C93.8069 17.8155 92.9918 17.9697 92.1163 17.9593C90.9593 17.9759 89.9191 17.7092 88.9977 17.1613C88.0763 16.6134 87.3655 15.8529 86.8652 14.88C86.3649 13.907 86.1231 12.8174 86.1397 11.6132C86.1293 10.711 86.2711 9.86518 86.5629 9.0714C86.8568 8.27761 87.2654 7.6005 87.7907 7.03381C88.3161 6.46921 88.954 6.02544 89.7065 5.70668C90.459 5.38791 91.2679 5.23166 92.133 5.24207V5.23999ZM92.1476 15.5237C93.1857 15.5237 94.007 15.1716 94.6137 14.4695C95.2203 13.7653 95.5225 12.809 95.5225 11.5965C95.5225 10.3839 95.2203 9.41308 94.6178 8.71096C94.0154 8.01094 93.192 7.66092 92.1476 7.66092C91.1032 7.66092 90.2798 8.01094 89.6773 8.71096C89.0749 9.41099 88.7726 10.3735 88.7726 11.5965C88.7726 12.8195 89.0749 13.7799 89.6773 14.4779C90.2798 15.1758 91.1032 15.5258 92.1476 15.5258V15.5237Z" fill="#09202E"/>
+<path d="M112.408 5.46083V17.7572H109.954V11.034L107.321 17.7572H104.966L102.364 11.084V17.7572H99.9919V5.46083H102.364L106.148 14.855L109.954 5.46083H112.408Z" fill="#09202E"/>
+<path d="M122.762 17.7551H115.018V5.45875H122.762V7.82134H117.503V10.4444H122.174V12.6445H117.503V15.4154H122.762V17.7551Z" fill="#09202E"/>
+<path d="M131.526 7.21555V10.9072H136.254V12.5933H131.526V17.7405H129.65V5.44054H137.146V7.21555H131.526Z" fill="#09202E"/>
+<path d="M144.303 5.24055C145.156 5.22943 145.956 5.38499 146.699 5.70443C147.441 6.02388 148.074 6.46555 148.597 7.02943C149.117 7.59332 149.525 8.2711 149.82 9.05721C150.114 9.8461 150.256 10.6878 150.245 11.585C150.256 12.4878 150.114 13.3378 149.82 14.1294C149.525 14.9239 149.117 15.5989 148.597 16.1628C148.077 16.7239 147.443 17.1655 146.699 17.485C145.954 17.8044 145.156 17.96 144.303 17.9489C143.449 17.96 142.652 17.8044 141.91 17.485C141.168 17.1655 140.537 16.7239 140.017 16.16C139.497 15.5961 139.089 14.9183 138.797 14.1322C138.505 13.3461 138.363 12.5017 138.374 11.6044C138.363 10.7072 138.505 9.86277 138.797 9.07388C139.089 8.28499 139.494 7.60721 140.017 7.04055C140.537 6.47666 141.168 6.03221 141.91 5.70999C142.652 5.38777 143.449 5.23221 144.303 5.24332V5.24055ZM141.44 14.86C142.165 15.6822 143.124 16.0961 144.319 16.0961C145.515 16.0961 146.473 15.685 147.196 14.86C147.919 14.0378 148.28 12.9461 148.28 11.585C148.28 10.2239 147.919 9.12388 147.196 8.30166C146.473 7.47943 145.515 7.06555 144.319 7.06555C143.124 7.06555 142.163 7.47943 141.44 8.30443C140.715 9.12943 140.353 10.2239 140.353 11.585C140.353 12.9461 140.715 14.0378 141.44 14.86Z" fill="#09202E"/>
+<path d="M154.097 5.43777V13.3017C154.103 14.2378 154.378 14.9461 154.923 15.4239C155.467 15.9044 156.184 16.1433 157.071 16.1433C157.958 16.1433 158.636 15.8905 159.203 15.3878C159.77 14.885 160.053 14.1878 160.053 13.3017V5.43777H161.929V13.3767C161.929 14.0989 161.799 14.7517 161.54 15.3378C161.282 15.9239 160.929 16.4072 160.487 16.7822C160.042 17.16 159.531 17.4489 158.944 17.6544C158.358 17.86 157.735 17.96 157.068 17.96C156.401 17.96 155.804 17.86 155.226 17.6628C154.647 17.4655 154.131 17.1794 153.68 16.8072C153.227 16.435 152.871 15.9544 152.61 15.3628C152.349 14.7711 152.218 14.1072 152.218 13.3767V5.43777H154.097Z" fill="#09202E"/>
+<path d="M174.473 5.43777V17.7378H172.597L166.529 8.46832V17.7378H164.653V5.43777H166.529L172.597 14.7239V5.43777H174.473Z" fill="#09202E"/>
+<path d="M187.583 11.6017C187.588 12.4822 187.436 13.31 187.124 14.0794C186.813 14.8517 186.382 15.5072 185.835 16.0461C185.287 16.585 184.628 17.0072 183.859 17.31C183.089 17.6128 182.269 17.7572 181.391 17.7405H177.291V5.44054H181.391C182.547 5.42388 183.603 5.67943 184.553 6.20999C185.504 6.73777 186.249 7.47666 186.788 8.42388C187.327 9.3711 187.591 10.4322 187.583 11.6044V11.6017ZM185.59 11.6017C185.59 10.3017 185.204 9.2461 184.428 8.43499C183.653 7.62388 182.636 7.21555 181.374 7.21555H179.184V15.9961H181.374C182.647 15.9961 183.667 15.5933 184.437 14.785C185.207 13.9794 185.59 12.9155 185.59 11.6017Z" fill="#09202E"/>
+<path d="M195.821 14.7822H190.91L189.843 17.7405H187.916L192.363 5.44054H194.381L198.853 17.7405H196.869L195.818 14.7822H195.821ZM195.276 13.1878L193.383 7.82666L191.474 13.1878H195.276Z" fill="#09202E"/>
+<path d="M207.278 7.21555H203.706V17.7405H201.813V7.21555H198.242V5.44054H207.275V7.21555H207.278Z" fill="#09202E"/>
+<path d="M208.973 17.7378V5.43777H210.866V17.7378H208.973Z" fill="#09202E"/>
+<path d="M218.873 5.24055C219.726 5.22943 220.527 5.38499 221.269 5.70443C222.014 6.02388 222.645 6.46555 223.167 7.02943C223.687 7.59332 224.095 8.2711 224.39 9.05721C224.685 9.8461 224.826 10.6878 224.815 11.585C224.826 12.4878 224.685 13.3378 224.39 14.1294C224.095 14.9239 223.687 15.5989 223.167 16.1628C222.647 16.7239 222.014 17.1655 221.269 17.485C220.524 17.8044 219.726 17.96 218.873 17.9489C218.02 17.96 217.222 17.8044 216.48 17.485C215.738 17.1655 215.107 16.7239 214.587 16.16C214.067 15.5961 213.659 14.9183 213.367 14.1322C213.075 13.3461 212.933 12.5017 212.945 11.6044C212.933 10.7072 213.075 9.86277 213.367 9.07388C213.659 8.28499 214.065 7.60721 214.587 7.04055C215.107 6.47666 215.738 6.03221 216.48 5.70999C217.222 5.38777 218.02 5.23221 218.873 5.24332V5.24055ZM216.01 14.86C216.736 15.6822 217.695 16.0961 218.89 16.0961C220.085 16.0961 221.044 15.685 221.766 14.86C222.489 14.0378 222.85 12.9461 222.85 11.585C222.85 10.2239 222.489 9.12388 221.766 8.30166C221.044 7.47943 220.085 7.06555 218.89 7.06555C217.695 7.06555 216.733 7.47943 216.01 8.30443C215.285 9.12943 214.924 10.2239 214.924 11.585C214.924 12.9461 215.285 14.0378 216.01 14.86Z" fill="#09202E"/>
+<path d="M236.728 5.43777V17.7378H234.852L228.784 8.46832V17.7378H226.908V5.43777H228.784L234.852 14.7239V5.43777H236.728Z" fill="#09202E"/>
+</svg>

src/components/ha-code-editor.ts

@@ -57,10 +57,7 @@ import "./ha-code-editor-completion-items";
 import type { CompletionItem } from "./ha-code-editor-completion-items";
 import "./ha-icon";
 import "./ha-icon-button-toolbar";
-import type {
-  HaIconButtonToolbar,
-  HaIconButtonToolbarItem,
-} from "./ha-icon-button-toolbar";
+import type { HaIconButtonToolbar } from "./ha-icon-button-toolbar";
 
 declare global {
   interface HASSDomEvents {
@@ -118,9 +115,6 @@ export class HaCodeEditor extends ReactiveElement {
   @property({ type: Boolean, attribute: "has-test" })
   public hasTest = false;
 
-  @property({ attribute: false })
-  public toolbarItems?: (HaIconButtonToolbarItem | string)[];
-
   @property({ attribute: false }) public testing = false;
 
   @property({ type: String }) public placeholder?: string;
@@ -357,8 +351,7 @@ export class HaCodeEditor extends ReactiveElement {
       changedProps.has("_canCopy") ||
       changedProps.has("_canUndo") ||
       changedProps.has("_canRedo") ||
-      changedProps.has("testing") ||
-      changedProps.has("toolbarItems")
+      changedProps.has("testing")
     ) {
       this._updateToolbarButtons();
     }
@@ -536,7 +529,6 @@ export class HaCodeEditor extends ReactiveElement {
     }
 
     this._editorToolbar.items = [
-      ...(this.toolbarItems ?? []),
       ...(this.hasTest && !this._isFullscreen
         ? [
             {

src/components/ha-split-panel.ts

@@ -1,68 +0,0 @@
-import SplitPanel from "@home-assistant/webawesome/dist/components/split-panel/split-panel";
-import type { CSSResultGroup } from "lit";
-import { css } from "lit";
-import { customElement } from "lit/decorators";
-
-@customElement("ha-split-panel")
-export class HaSplitPanel extends SplitPanel {
-  static get styles(): CSSResultGroup {
-    return [
-      SplitPanel.styles,
-      css`
-        :host {
-          --divider-width: var(--ha-split-panel-divider-width, 2px);
-          --divider-hit-area: var(--ha-split-panel-divider-hit-area, 12px);
-          --min: var(--ha-split-panel-min, 0);
-          --max: var(--ha-split-panel-max, 100%);
-        }
-
-        .divider {
-          background-color: var(--divider-color);
-          transition: background-color var(--ha-animation-duration-fast)
-            ease-out;
-        }
-
-        /* Grip affordance so the divider reads as draggable. The divider
-           already centers its children via flexbox, so keep this in flow.
-           Consumers slotting their own divider handle can hide it with
-           --ha-split-panel-grip-display: none. */
-        .divider::before {
-          content: "";
-          width: 2px;
-          height: var(--ha-space-8);
-          display: var(--ha-split-panel-grip-display, block);
-          border-radius: var(--ha-border-radius-pill, 9999px);
-          background-color: var(--secondary-text-color);
-          opacity: 0.5;
-          transition: opacity var(--ha-animation-duration-fast) ease-out;
-        }
-
-        /* In vertical orientation the divider is horizontal, so the grip pill
-           lies flat instead of standing upright. */
-        :host([orientation="vertical"]) .divider::before {
-          width: var(--ha-space-8);
-          height: 2px;
-        }
-
-        @media (hover: hover) {
-          :host(:not([disabled])) .divider:hover {
-            background-color: var(--primary-color);
-          }
-          :host(:not([disabled])) .divider:hover::before {
-            opacity: 1;
-          }
-        }
-
-        :host(:not([disabled])) .divider:focus-visible {
-          background-color: var(--primary-color);
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-split-panel": HaSplitPanel;
-  }
-}

src/components/media-player/ha-media-player-browse.ts

@@ -1,7 +1,13 @@
 import type { LitVirtualizer } from "@lit-labs/virtualizer";
 import { grid } from "@lit-labs/virtualizer/layouts/grid";
 
-import { mdiArrowUpRight, mdiKeyboard, mdiPlay, mdiPlus } from "@mdi/js";
+import {
+  mdiArrowUpRight,
+  mdiFilterVariant,
+  mdiKeyboard,
+  mdiPlay,
+  mdiPlus,
+} from "@mdi/js";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import {
@@ -14,6 +20,7 @@ import {
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { fireEvent } from "../../common/dom/fire_event";
+import { caseInsensitiveStringCompare } from "../../common/string/compare";
 import { slugify } from "../../common/string/slugify";
 import { debounce } from "../../common/util/debounce";
 import { UNAVAILABLE } from "../../data/entity/entity";
@@ -32,6 +39,7 @@ import {
   browseLocalMediaPlayer,
   isManualMediaSourceContentId,
   MANUAL_MEDIA_SOURCE_PREFIX,
+  searchMedia,
 } from "../../data/media_source";
 import { isTTSMediaSource } from "../../data/tts";
 import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
@@ -43,9 +51,14 @@ import "../entity/ha-entity-picker";
 import "../ha-alert";
 import "../ha-button";
 import "../ha-card";
+import "../ha-dropdown";
+import type { HaDropdownSelectEvent } from "../ha-dropdown";
+import "../ha-dropdown-item";
 import "../ha-icon-button";
 import "../ha-list";
 import "../ha-list-item";
+import "../input/ha-input-search";
+import type { HaInputSearch } from "../input/ha-input-search";
 import "./ha-media-browser-thumbnail";
 import "../ha-spinner";
 import "../ha-svg-icon";
@@ -74,6 +87,8 @@ export interface MediaPlayerItemId {
   media_content_type?: string | undefined;
 }
 
+type MediaClass = MediaPlayerItem["media_class"];
+
 const MANUAL_ITEM_BASE: Omit<MediaPlayerItem, "title"> = {
   can_expand: true,
   can_play: false,
@@ -122,6 +137,16 @@ export class HaMediaPlayerBrowse extends LitElement {
 
   @state() private _currentItem?: MediaPlayerItem;
 
+  @state() private _searchQuery = "";
+
+  @state() private _searchResults?: MediaPlayerItem[];
+
+  @state() private _searching = false;
+
+  @state() private _mediaClassFilter: MediaClass[] = [];
+
+  private _searchRequestId = 0;
+
   @query(".header") private _header?: HTMLDivElement;
 
   @query(".content") private _content?: HTMLDivElement;
@@ -197,6 +222,10 @@ export class HaMediaPlayerBrowse extends LitElement {
     const oldParentItem = this._parentItem;
     this._currentItem = undefined;
     this._parentItem = undefined;
+    this._abortSearch();
+    this._searchQuery = "";
+    this._searchResults = undefined;
+    this._mediaClassFilter = [];
     const currentId = navigateIds[navigateIds.length - 1];
     const parentId =
       navigateIds.length > 1 ? navigateIds[navigateIds.length - 2] : undefined;
@@ -328,11 +357,14 @@ export class HaMediaPlayerBrowse extends LitElement {
   protected updated(changedProps: PropertyValues): void {
     super.updated(changedProps);
 
-    if (changedProps.has("_scrolled")) {
+    if (changedProps.has("_scrolled") || changedProps.has("_currentItem")) {
+      // Re-measure across frames rather than once: the search input sizes
+      // asynchronously, so a single measurement can be too small and the
+      // content would clip under the header.
       this._animateHeaderHeight();
-    } else if (changedProps.has("_currentItem")) {
-      this._setHeaderHeight();
+    }
 
+    if (changedProps.has("_currentItem")) {
       // This fixes a race condition for resizing of the cards using the grid layout
       if (this._observed) {
         return;
@@ -365,10 +397,15 @@ export class HaMediaPlayerBrowse extends LitElement {
 
     const currentItem = this._currentItem;
 
+    const isSearching = this._searchResults !== undefined;
+
     const subtitle = this.hass.localize(
       `ui.components.media-browser.class.${currentItem.media_class}`
     );
-    let children = currentItem.children || [];
+    let children = isSearching
+      ? this._searchResults!
+      : currentItem.children || [];
+    const notShown = isSearching ? 0 : currentItem.not_shown || 0;
     const canPlayChildren = new Set<string>();
 
     // Filter children based on accept property if provided
@@ -399,6 +436,26 @@ export class HaMediaPlayerBrowse extends LitElement {
       });
     }
 
+    // Search is available on non-root pages that opt in via can_search, aside
+    // from the manual-entry and TTS pseudo-sources.
+    const showSearch =
+      this.navigateIds.length > 1 &&
+      !isManualMediaSourceContentId(currentItem.media_content_id) &&
+      !isTTSMediaSource(currentItem.media_content_id) &&
+      currentItem.can_search;
+    // The backend reports which media classes are worth filtering by for this
+    // item; without them we still allow searching, just without the filter.
+    const mediaClassFilterOptions =
+      showSearch && currentItem.search_media_classes
+        ? [...currentItem.search_media_classes].sort((a, b) =>
+            caseInsensitiveStringCompare(
+              this._localizeMediaClass(a),
+              this._localizeMediaClass(b),
+              this.hass.locale.language
+            )
+          )
+        : [];
+
     const mediaClass = MediaClassBrowserSettings[currentItem.media_class];
     const childrenMediaClass = currentItem.children_media_class
       ? MediaClassBrowserSettings[currentItem.children_media_class]
@@ -406,94 +463,109 @@ export class HaMediaPlayerBrowse extends LitElement {
 
     return html`
               ${
-                currentItem.can_play
+                currentItem.can_play || showSearch
                   ? html`
                       <div
                         class="header ${classMap({
                           "no-img": !currentItem.thumbnail,
                           "no-dialog": !this.dialog,
+                          "search-only": !currentItem.can_play,
                         })}"
                         @transitionend=${this._setHeaderHeight}
                       >
-                        <div class="header-content">
-                          ${
-                            currentItem.thumbnail
-                              ? html`
-                                  <div class="img">
-                                    <ha-media-browser-thumbnail
-                                      .hass=${this.hass}
-                                      .url=${currentItem.thumbnail}
-                                    ></ha-media-browser-thumbnail>
+                        ${
+                          showSearch
+                            ? this._renderSearchRow(
+                                currentItem,
+                                mediaClassFilterOptions
+                              )
+                            : nothing
+                        }
+                        ${
+                          currentItem.can_play
+                            ? html`<div class="header-content">
+                                ${
+                                  currentItem.thumbnail
+                                    ? html`
+                                        <div class="img">
+                                          <ha-media-browser-thumbnail
+                                            .hass=${this.hass}
+                                            .url=${currentItem.thumbnail}
+                                          ></ha-media-browser-thumbnail>
+                                          ${
+                                            this.narrow &&
+                                            currentItem?.can_play &&
+                                            (!this.accept ||
+                                              canPlayChildren.has(
+                                                currentItem.media_content_id
+                                              ))
+                                              ? html`
+                                                  <ha-button
+                                                    class="fab"
+                                                    .item=${currentItem}
+                                                    @click=${this._actionClicked}
+                                                    .title=${this.hass.localize(
+                                                      `ui.components.media-browser.${this.action}`
+                                                    )}
+                                                  >
+                                                    <ha-svg-icon
+                                                      .path=${
+                                                        this.action === "play"
+                                                          ? mdiPlay
+                                                          : mdiPlus
+                                                      }
+                                                    ></ha-svg-icon>
+                                                  </ha-button>
+                                                `
+                                              : ""
+                                          }
+                                        </div>
+                                      `
+                                    : nothing
+                                }
+                                <div class="header-info">
+                                  <div class="breadcrumb">
+                                    <h1 class="title">${currentItem.title}</h1>
                                     ${
-                                      this.narrow &&
-                                      currentItem?.can_play &&
-                                      (!this.accept ||
-                                        canPlayChildren.has(
-                                          currentItem.media_content_id
-                                        ))
+                                      subtitle
                                         ? html`
-                                            <ha-button
-                                              class="fab"
-                                              .item=${currentItem}
-                                              @click=${this._actionClicked}
-                                              .title=${this.hass.localize(
-                                                `ui.components.media-browser.${this.action}`
-                                              )}
-                                            >
-                                              <ha-svg-icon
-                                                .path=${
-                                                  this.action === "play"
-                                                    ? mdiPlay
-                                                    : mdiPlus
-                                                }
-                                              ></ha-svg-icon>
-                                            </ha-button>
+                                            <h2 class="subtitle">
+                                              ${subtitle}
+                                            </h2>
                                           `
                                         : ""
                                     }
                                   </div>
-                                `
-                              : nothing
-                          }
-                          <div class="header-info">
-                            <div class="breadcrumb">
-                              <h1 class="title">${currentItem.title}</h1>
-                              ${
-                                subtitle
-                                  ? html`
-                                      <h2 class="subtitle">${subtitle}</h2>
-                                    `
-                                  : ""
-                              }
-                            </div>
-                            ${
-                              currentItem.can_play &&
-                              (!currentItem.thumbnail || !this.narrow)
-                                ? html`
-                                    <ha-button
-                                      .item=${currentItem}
-                                      @click=${this._actionClicked}
-                                    >
-                                      <ha-svg-icon
-                                        .label=${this.hass.localize(
-                                          `ui.components.media-browser.${this.action}-media`
-                                        )}
-                                        .path=${
-                                          this.action === "play"
-                                            ? mdiPlay
-                                            : mdiPlus
-                                        }
-                                        slot="start"
-                                      ></ha-svg-icon>
-                                      ${this.hass.localize(
-                                        `ui.components.media-browser.${this.action}`
-                                      )}
-                                    </ha-button>
-                                  `
-                                : ""
-                            }
-                          </div>
-                        </div>
+                                  ${
+                                    currentItem.can_play &&
+                                    (!currentItem.thumbnail || !this.narrow)
+                                      ? html`
+                                          <ha-button
+                                            .item=${currentItem}
+                                            @click=${this._actionClicked}
+                                          >
+                                            <ha-svg-icon
+                                              .label=${this.hass.localize(
+                                                `ui.components.media-browser.${this.action}-media`
+                                              )}
+                                              .path=${
+                                                this.action === "play"
+                                                  ? mdiPlay
+                                                  : mdiPlus
+                                              }
+                                              slot="start"
+                                            ></ha-svg-icon>
+                                            ${this.hass.localize(
+                                              `ui.components.media-browser.${this.action}`
+                                            )}
+                                          </ha-button>
+                                        `
+                                      : ""
+                                  }
+                                </div>
+                              </div>`
+                            : nothing
+                        }
                       </div>
                     `
                   : ""
@@ -504,12 +576,10 @@ export class HaMediaPlayerBrowse extends LitElement {
             @touchmove=${this._scroll}
           >
             ${
-              this._error
+              this._searching
                 ? html`
                     <div class="container">
-                      <ha-alert alert-type="error">
-                        ${this._renderError(this._error)}
-                      </ha-alert>
+                      <ha-spinner></ha-spinner>
                     </div>
                   `
                 : isManualMediaSourceContentId(currentItem.media_content_id)
@@ -532,29 +602,33 @@ export class HaMediaPlayerBrowse extends LitElement {
                           @tts-picked=${this._ttsPicked}
                         ></ha-browse-media-tts>
                       `
-                    : !children.length && !currentItem.not_shown
+                    : !children.length && !notShown
                       ? html`
                           <div class="container no-items">
                             ${
-                              currentItem.media_content_id ===
-                              "media-source://media_source/local/."
-                                ? html`
-                                    <div class="highlight-add-button">
-                                      <span>
-                                        <ha-svg-icon
-                                          .path=${mdiArrowUpRight}
-                                        ></ha-svg-icon>
-                                      </span>
-                                      <span>
-                                        ${this.hass.localize(
-                                          "ui.components.media-browser.file_management.highlight_button"
-                                        )}
-                                      </span>
-                                    </div>
-                                  `
-                                : this.hass.localize(
-                                    "ui.components.media-browser.no_items"
+                              isSearching
+                                ? this.hass.localize(
+                                    "ui.components.media-browser.search.no_results"
                                   )
+                                : currentItem.media_content_id ===
+                                    "media-source://media_source/local/."
+                                  ? html`
+                                      <div class="highlight-add-button">
+                                        <span>
+                                          <ha-svg-icon
+                                            .path=${mdiArrowUpRight}
+                                          ></ha-svg-icon>
+                                        </span>
+                                        <span>
+                                          ${this.hass.localize(
+                                            "ui.components.media-browser.file_management.highlight_button"
+                                          )}
+                                        </span>
+                                      </div>
+                                    `
+                                  : this.hass.localize(
+                                      "ui.components.media-browser.no_items"
+                                    )
                             }
                           </div>
                         `
@@ -584,17 +658,17 @@ export class HaMediaPlayerBrowse extends LitElement {
                                 portrait:
                                   childrenMediaClass.thumbnail_ratio ===
                                   "portrait",
-                                not_shown: !!currentItem.not_shown,
+                                not_shown: !!notShown,
                               })}"
                             ></lit-virtualizer>
                             ${
-                              currentItem.not_shown
+                              notShown
                                 ? html`
                                     <div class="grid not-shown">
                                       <div class="title">
                                         ${this.hass.localize(
                                           "ui.components.media-browser.not_shown",
-                                          { count: currentItem.not_shown }
+                                          { count: notShown }
                                         )}
                                       </div>
                                     </div>
@@ -614,7 +688,7 @@ export class HaMediaPlayerBrowse extends LitElement {
                                 .renderItem=${this._renderListItem}
                               ></lit-virtualizer>
                               ${
-                                currentItem.not_shown
+                                notShown
                                   ? html`
                                       <ha-list-item
                                         noninteractive
@@ -628,7 +702,7 @@ export class HaMediaPlayerBrowse extends LitElement {
                                         <span class="title">
                                           ${this.hass.localize(
                                             "ui.components.media-browser.not_shown",
-                                            { count: currentItem.not_shown }
+                                            { count: notShown }
                                           )}
                                         </span>
                                       </ha-list-item>
@@ -644,6 +718,188 @@ export class HaMediaPlayerBrowse extends LitElement {
     `;
   }
 
+  private _renderSearchRow(
+    currentItem: MediaPlayerItem,
+    mediaClassFilterOptions: MediaClass[]
+  ): TemplateResult {
+    return html`
+      <div class="search-row">
+        ${
+          currentItem.can_search
+            ? html`
+                <ha-input-search
+                  class="search-input"
+                  appearance="outlined"
+                  .value=${this._searchQuery}
+                  .placeholder=${this.hass.localize(
+                    "ui.components.media-browser.search.search_placeholder",
+                    { name: currentItem.title }
+                  )}
+                  @input=${this._handleSearchInput}
+                  @keydown=${this._handleSearchKeydown}
+                ></ha-input-search>
+                ${
+                  mediaClassFilterOptions.length
+                    ? this._renderMediaClassFilter(mediaClassFilterOptions)
+                    : nothing
+                }
+                <ha-button
+                  class="search-button"
+                  appearance="filled"
+                  .disabled=${!this._searchQuery.trim()}
+                  @click=${this._search}
+                >
+                  ${this.hass.localize("ui.common.search")}
+                </ha-button>
+              `
+            : nothing
+        }
+      </div>
+    `;
+  }
+
+  private _renderMediaClassFilter(
+    mediaClassFilterOptions: MediaClass[]
+  ): TemplateResult {
+    const selectedCount = this._mediaClassFilter.length;
+    return html`
+      <div class="media-class-filter">
+        <ha-dropdown
+          placement="bottom-end"
+          @wa-select=${this._toggleMediaClassFilter}
+        >
+          <ha-icon-button
+            slot="trigger"
+            class="filter-button ${classMap({ active: selectedCount > 0 })}"
+            .path=${mdiFilterVariant}
+            .label=${this.hass.localize(
+              "ui.components.media-browser.filter_media_type"
+            )}
+          ></ha-icon-button>
+          ${mediaClassFilterOptions.map((mediaClass) => {
+            const selected = this._mediaClassFilter.includes(mediaClass);
+            return html`
+              <ha-dropdown-item
+                .value=${mediaClass}
+                .action=${selected ? "remove" : "add"}
+                type="checkbox"
+                .checked=${selected}
+              >
+                ${this._localizeMediaClass(mediaClass)}
+              </ha-dropdown-item>
+            `;
+          })}
+        </ha-dropdown>
+        ${
+          selectedCount
+            ? html`<div class="filter-badge">${selectedCount}</div>`
+            : nothing
+        }
+      </div>
+    `;
+  }
+
+  private _localizeMediaClass(mediaClass: MediaClass): string {
+    return (
+      this.hass.localize(`ui.components.media-browser.class.${mediaClass}`) ||
+      mediaClass
+    );
+  }
+
+  private _toggleMediaClassFilter(ev: HaDropdownSelectEvent<MediaClass>): void {
+    ev.preventDefault(); // keep the dropdown open for multi-select
+    const value = ev.detail.item.value;
+    const action = (ev.detail.item as { action?: "add" | "remove" }).action;
+    this._mediaClassFilter =
+      action === "add"
+        ? [...this._mediaClassFilter, value]
+        : this._mediaClassFilter.filter((mediaClass) => mediaClass !== value);
+    // Only refine results already on screen; before a search has run, the
+    // filter is just staged for the next Enter/search-button submission.
+    if (this._searchResults !== undefined) {
+      this._search();
+    }
+  }
+
+  private _handleSearchInput(ev: InputEvent): void {
+    const value = (ev.target as HaInputSearch).value ?? "";
+    this._searchQuery = value;
+    // Searching is explicit (Enter or the search button). Emptying the field —
+    // e.g. via the clear button — returns to the browse view.
+    if (!value) {
+      this._clearSearch();
+    }
+  }
+
+  private _handleSearchKeydown(ev: KeyboardEvent): void {
+    if (ev.key === "Enter") {
+      ev.preventDefault();
+      this._search();
+    }
+  }
+
+  private _abortSearch(): void {
+    // Invalidate any in-flight search so a late response is ignored, and clear
+    // the loading state.
+    this._searchRequestId++;
+    this._searching = false;
+  }
+
+  private _clearSearch(): void {
+    this._abortSearch();
+    this._searchQuery = "";
+    this._searchResults = undefined;
+  }
+
+  private async _search(): Promise<void> {
+    const searchQuery = this._searchQuery.trim();
+    if (!searchQuery) {
+      // Nothing to search; drop any stale results but keep the input.
+      this._abortSearch();
+      this._searchResults = undefined;
+      return;
+    }
+
+    const navigateId = this.navigateIds[this.navigateIds.length - 1];
+    const requestId = ++this._searchRequestId;
+
+    this._searching = true;
+    // Clear previous results so stale data isn't shown while searching or on error
+    this._searchResults = undefined;
+    const mediaFilterClasses = this._mediaClassFilter.length
+      ? this._mediaClassFilter
+      : undefined;
+    try {
+      const { result } = await searchMedia(
+        this.hass,
+        navigateId.media_content_id,
+        searchQuery,
+        mediaFilterClasses
+      );
+      // Ignore the response if a newer search started or we navigated away
+      if (requestId !== this._searchRequestId) {
+        return;
+      }
+      this._searchResults = result;
+    } catch (err) {
+      // Ignore errors from superseded searches
+      if (requestId !== this._searchRequestId) {
+        return;
+      }
+      showAlertDialog(this, {
+        title: this.hass.localize(
+          "ui.components.media-browser.media_browsing_error"
+        ),
+        text: err instanceof Error ? err.message : String(err),
+      });
+    } finally {
+      // Only the most recent search controls the loading state
+      if (requestId === this._searchRequestId) {
+        this._searching = false;
+      }
+    }
+  }
+
   private _renderGridItem = (child: MediaPlayerItem): TemplateResult => {
     return html`
       <div class="child" .item=${child} @click=${this._childClicked}>
@@ -1009,7 +1265,8 @@ export class HaMediaPlayerBrowse extends LitElement {
 
         .header {
           display: flex;
-          justify-content: space-between;
+          flex-direction: column;
+          gap: var(--ha-space-2);
           border-bottom: 1px solid var(--divider-color);
           background-color: var(--card-background-color);
           position: absolute;
@@ -1019,6 +1276,56 @@ export class HaMediaPlayerBrowse extends LitElement {
           z-index: 3;
           padding: 16px;
         }
+        .header.search-only {
+          padding: 8px 16px;
+        }
+        .search-row {
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          gap: var(--ha-space-2);
+        }
+        .search-input {
+          flex: 1;
+          --ha-input-padding-top: 0;
+          --ha-input-padding-bottom: 0;
+        }
+        .search-button {
+          flex: none;
+        }
+        :host([narrow]) .search-row {
+          box-sizing: border-box;
+          padding: 8px 16px;
+        }
+        .media-class-filter {
+          position: relative;
+          flex: none;
+        }
+        .filter-button {
+          --ha-icon-button-size: 40px;
+          color: var(--secondary-text-color);
+        }
+        .filter-button.active {
+          color: var(--primary-color);
+        }
+        .filter-badge {
+          position: absolute;
+          top: -4px;
+          right: -4px;
+          inset-inline-end: -4px;
+          inset-inline-start: initial;
+          min-width: 16px;
+          box-sizing: border-box;
+          border-radius: var(--ha-border-radius-circle);
+          font-size: var(--ha-font-size-xs);
+          font-weight: var(--ha-font-weight-normal);
+          background-color: var(--primary-color);
+          line-height: var(--ha-line-height-normal);
+          text-align: center;
+          padding: 0px 2px;
+          color: var(--text-primary-color);
+          pointer-events: none;
+        }
         .header_button {
           position: relative;
           right: -8px;

src/data/media-player.ts

@@ -186,6 +186,9 @@ export interface MediaPlayerItem {
   can_play: boolean;
   can_expand: boolean;
   can_search: boolean;
+  search_media_classes?:
+    | (keyof TranslationDict["ui"]["components"]["media-browser"]["class"])[]
+    | null;
   thumbnail?: string;
   iconPath?: string;
   children?: MediaPlayerItem[];

src/data/media_source.ts

@@ -24,6 +24,23 @@ export const browseLocalMediaPlayer = (
     media_content_id: mediaContentId,
   });
 
+export interface SearchMediaResult {
+  result: MediaPlayerItem[];
+}
+
+export const searchMedia = (
+  hass: HomeAssistant,
+  mediaContentId: string | undefined,
+  searchQuery: string,
+  mediaFilterClasses?: string[]
+): Promise<SearchMediaResult> =>
+  hass.callWS<SearchMediaResult>({
+    type: "media_source/search_media",
+    media_content_id: mediaContentId,
+    search_query: searchQuery,
+    media_filter_classes: mediaFilterClasses,
+  });
+
 export const MANUAL_MEDIA_SOURCE_PREFIX = "__MANUAL_ENTRY__";
 
 export const isManualMediaSourceContentId = (mediaContentId: string) =>

src/html/index.html.template

@@ -18,8 +18,16 @@
     <meta name="referrer" content="same-origin" />
     <meta name="theme-color" content="{{ theme_color }}" />
     <meta name="color-scheme" content="dark light" />
+    <link rel="preload" href="/static/fonts/roboto/Roboto-Regular.woff2" as="font" type="font/woff2" crossorigin>
     <%= renderTemplate("_style_base.html.template") %>
     <style>
+      @font-face {
+        font-family: "Roboto Launch Screen";
+        font-display: block;
+        src: url("/static/fonts/roboto/Roboto-Regular.woff2") format("woff2");
+        font-weight: 400;
+        font-style: normal;
+      }
       @keyframes fade-out {
         from {
           opacity: 1;
@@ -29,11 +37,11 @@
         }
       }
       ::view-transition-group(launch-screen) {
-        animation-duration: var(--ha-animation-duration-slow, 350ms);
+        animation-duration: var(--ha-animation-duration-normal, 250ms);
         animation-timing-function: ease-out;
       }
       ::view-transition-old(launch-screen) {
-        animation: fade-out var(--ha-animation-duration-slow, 350ms) ease-out;
+        animation: fade-out var(--ha-animation-duration-normal, 250ms) ease-out;
       }
       html {
         background-color: var(--primary-background-color, #fafafa);
@@ -41,6 +49,7 @@
         height: 100vh;
       }
       #ha-launch-screen {
+        font-family: "Roboto Launch Screen", sans-serif;
         position: fixed;
         top: 0;
         left: 0;
@@ -55,13 +64,32 @@
         view-transition-name: launch-screen;
         background-color: var(--primary-background-color, #fafafa);
         z-index: 100;
+        transition: opacity var(--ha-animation-duration-normal, 250ms) ease-out;
       }
       #ha-launch-screen.removing {
         opacity: 0;
       }
-      #ha-launch-screen svg {
-        width: 112px;
+      @keyframes launch-lockup-in {
+        from {
+          opacity: 0;
+        }
+        to {
+          opacity: 1;
+        }
+      }
+      #ha-launch-screen .ha-lockup {
+        display: flex;
+        align-items: center;
         flex-shrink: 0;
+        animation: launch-lockup-in var(--ha-animation-duration-normal, 250ms) ease-out both;
+      }
+      #ha-launch-screen-info-box > *,
+      #ha-launch-screen .ohf-logo {
+        animation: launch-lockup-in var(--ha-animation-duration-normal, 250ms) ease-out both;
+      }
+      #ha-launch-screen .ha-logo {
+        width: 96px;
+        height: 96px;
       }
       #ha-launch-screen .ha-launch-screen-spacer-top {
         flex: 1;
@@ -77,8 +105,22 @@
         display: flex;
         flex-direction: column;
         align-items: center;
+        gap: 4px;
         opacity: .66;
       }
+      .ohf-logo span {
+        font-size: 12px;
+        line-height: 12px;
+        text-transform: uppercase;
+      }
+      .ohf-logo picture {
+        display: flex;
+      }
+      .ohf-logo img {
+        width: 237px;
+        aspect-ratio: 237 / 24;
+        height: auto;
+      }
       @media (prefers-color-scheme: dark) {
         html {
           background-color: var(--primary-background-color, #111111);
@@ -88,8 +130,17 @@
         body #ha-launch-screen {
           background-color: var(--primary-background-color, #111111);
         }
+      }
+      @media (max-height: 560px) {
+        #ha-launch-screen .ha-launch-screen-spacer-top {
+          margin-top: 24px;
+          padding-top: 24px;
+        }
+        #ha-launch-screen .ha-launch-screen-spacer-bottom {
+          padding-top: 16px;
+        }
         .ohf-logo {
-          filter: invert(1);
+          margin-block: 24px;
         }
       }
     </style>
@@ -97,13 +148,16 @@
   <body>
     <div id="ha-launch-screen">
       <div class="ha-launch-screen-spacer-top"></div>
-      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 240">
-        <path fill="#18BCF2" d="M240 224.762a15 15 0 0 1-15 15H15a15 15 0 0 1-15-15v-90c0-8.25 4.77-19.769 10.61-25.609l98.78-98.7805c5.83-5.83 15.38-5.83 21.21 0l98.79 98.7895c5.83 5.83 10.61 17.36 10.61 25.61v90-.01Z"/>
-        <path fill="#F2F4F9" d="m107.27 239.762-40.63-40.63c-2.09.72-4.32 1.13-6.64 1.13-11.3 0-20.5-9.2-20.5-20.5s9.2-20.5 20.5-20.5 20.5 9.2 20.5 20.5c0 2.33-.41 4.56-1.13 6.65l31.63 31.63v-115.88c-6.8-3.3395-11.5-10.3195-11.5-18.3895 0-11.3 9.2-20.5 20.5-20.5s20.5 9.2 20.5 20.5c0 8.07-4.7 15.05-11.5 18.3895v81.27l31.46-31.46c-.62-1.96-.96-4.04-.96-6.2 0-11.3 9.2-20.5 20.5-20.5s20.5 9.2 20.5 20.5-9.2 20.5-20.5 20.5c-2.5 0-4.88-.47-7.09-1.29L129 208.892v30.88z"/>
-      </svg>
+      <div class="ha-lockup">
+        <img class="ha-logo" src="/static/images/home-assistant-logo-loading.svg" alt="Home Assistant">
+      </div>
       <div id="ha-launch-screen-info-box" class="ha-launch-screen-spacer-bottom"></div>
       <div class="ohf-logo">
-        <img src="/static/images/ohf-badge.svg" alt="Home Assistant is a project by the Open Home Foundation" height="46">
+        <span id="ha-launch-screen-attribution">A project from the</span>
+        <picture>
+          <source media="(prefers-color-scheme: dark)" srcset="/static/images/open-home-foundation-on-dark.svg">
+          <img src="/static/images/open-home-foundation-on-light.svg" alt="Open Home Foundation" width="237" height="24">
+        </picture>
       </div>
     </div>
     <home-assistant></home-assistant>

src/layouts/ha-init-page.ts

@@ -1,91 +1,91 @@
-import type { PropertyValues } from "lit";
-import { css, html, LitElement } from "lit";
+import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import "../components/ha-spinner";
+import type { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-button";
 
 @customElement("ha-init-page")
-class HaInitPage extends LitElement {
+export class HaInitPage extends LitElement {
   @property({ type: Boolean }) public error = false;
 
   @property({ type: Boolean }) public migration = false;
 
-  @state() private _retryInSeconds = 60;
+  @property({ attribute: false }) public localize?: LocalizeFunc;
 
-  private _showProgressIndicatorTimeout?: number;
+  @state() private _retryInSeconds = 60;
 
   private _retryInterval?: number;
 
   protected render() {
     return this.error
       ? html`
-          <p>Unable to connect to Home Assistant.</p>
+          <p>
+            ${
+              this.localize?.("ui.init.error.title") ||
+              "Unable to connect to Home Assistant."
+            }
+          </p>
           <p class="retry-text">
-            Retrying in ${this._retryInSeconds} seconds...
+            ${
+              this.localize?.("ui.init.error.retrying", {
+                seconds: this._retryInSeconds,
+              }) || `Retrying in ${this._retryInSeconds} seconds...`
+            }
           </p>
           <ha-button size="s" appearance="plain" @click=${this._retry}
-            >Retry now</ha-button
+            >${
+              this.localize?.("ui.init.error.retry_now") || "Retry now"
+            }</ha-button
           >
           ${
             location.host.includes("ui.nabu.casa")
-              ? html`
-                  <p>
-                    It is possible that you are seeing this screen because your
-                    Home Assistant is not currently connected. You can ask it to
-                    come online from your
-                    <a href="https://account.nabucasa.com/"
-                      >Nabu Casa account page</a
-                    >.
-                  </p>
-                `
-              : ""
+              ? html`<p>
+                  ${
+                    this.localize?.("ui.init.error.nabu_casa", {
+                      account_link: html`<a href="https://account.nabucasa.com/"
+                        >${
+                          this.localize?.("ui.init.error.nabu_casa_account") ||
+                          "Nabu Casa account page"
+                        }</a
+                      >`,
+                    }) ||
+                    html`It is possible that you are seeing this screen because
+                      your Home Assistant is not currently connected. You can
+                      ask it to come online from your
+                      <a href="https://account.nabucasa.com/"
+                        >Nabu Casa account page</a
+                      >.`
+                  }
+                </p>`
+              : nothing
           }
         `
-      : html`
-          <div id="progress-indicator-wrapper">
-            <ha-spinner></ha-spinner>
-          </div>
-          <div id="loading-text">
-            ${
-              this.migration
-                ? html`
-                    Database upgrade is in progress, Home Assistant will not
-                    start until the upgrade is completed.
-                    <br /><br />
-                    The upgrade may need a long time to complete, please be
-                    patient.
-                  `
-                : "Loading data"
-            }
-          </div>
-        `;
+      : html`<p>
+          ${
+            this.migration
+              ? html`<span class="migration-text"
+                  >${
+                    this.localize?.("ui.init.migration") ||
+                    "Database upgrade is in progress, Home Assistant will not start until the upgrade is completed.\n\nThe upgrade may need a long time to complete, please be patient."
+                  }</span
+                >`
+              : this.localize?.("ui.init.loading") || "Loading data"
+          }
+        </p>`;
   }
 
   disconnectedCallback() {
     super.disconnectedCallback();
-    if (this._showProgressIndicatorTimeout) {
-      clearTimeout(this._showProgressIndicatorTimeout);
-    }
     if (this._retryInterval) {
       clearInterval(this._retryInterval);
     }
   }
 
-  protected willUpdate(changedProperties: PropertyValues<this>) {
-    if (changedProperties.has("error") && this.error) {
-      import("../components/ha-button");
-    }
-  }
-
   protected firstUpdated() {
-    this._showProgressIndicatorTimeout = window.setTimeout(() => {
-      import("../components/ha-spinner");
-    }, 5000);
-
     this._retryInterval = window.setInterval(() => {
-      const remainingSeconds = this._retryInSeconds--;
-      if (remainingSeconds <= 0) {
+      if (this._retryInSeconds <= 1) {
         this._retry();
+      } else {
+        this._retryInSeconds -= 1;
       }
     }, 1000);
   }
@@ -104,24 +104,22 @@ class HaInitPage extends LitElement {
       flex-direction: column;
       align-items: center;
     }
-    #progress-indicator-wrapper {
-      display: flex;
-      align-items: center;
-      margin: 25px 0;
-      height: 50px;
-    }
     a {
       color: var(--primary-color);
     }
     .retry-text {
       margin-top: 0;
     }
-    p,
-    #loading-text {
+    p {
       max-width: 350px;
+      margin: var(--ha-space-3, 12px) var(--ha-space-4, 16px);
       color: var(--primary-text-color);
+      font-size: var(--ha-font-size-m, 14px);
       text-align: center;
     }
+    .migration-text {
+      white-space: pre-line;
+    }
   `;
 }
 

src/layouts/home-assistant.ts

@@ -5,6 +5,7 @@ import { customElement, state } from "lit/decorators";
 import { storage } from "../common/decorators/storage";
 import { isNavigationClick } from "../common/dom/is-navigation-click";
 import { navigate } from "../common/navigate";
+import type { LocalizeFunc } from "../common/translations/localize";
 import { fetchHttpConfig } from "../data/http";
 import type { HttpConfigState } from "../data/http";
 import type { WindowWithPreloads } from "../data/preloads";
@@ -18,7 +19,7 @@ import type { HomeAssistant, Route } from "../types";
 import { storeState } from "../util/ha-pref-storage";
 import {
   removeLaunchScreen,
-  renderLaunchScreenInfoBox,
+  renderLaunchScreenContent,
 } from "../util/launch-screen";
 import { checkOnboardingSurveyToast } from "../util/onboarding-survey";
 import {
@@ -60,6 +61,8 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
 
   private _httpPendingDialogOpen = false;
 
+  private _initError = false;
+
   private _onboardingSurveyChecked = false;
 
   private _panelUrl: string;
@@ -188,6 +191,11 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
     if (this.render !== this.renderHass) {
       this._renderInitInfo(false);
     }
+    this.addEventListener("translations-updated", () => {
+      if (this.render !== this.renderHass) {
+        this._renderInitInfo(this._initError);
+      }
+    });
   }
 
   protected updated(changedProps: PropertyValues): void {
@@ -315,7 +323,7 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
 
   protected async _initializeHass() {
     try {
-      let result;
+      let result: Awaited<Window["hassConnection"]>;
 
       if (window.hassConnection) {
         result = await window.hassConnection;
@@ -388,11 +396,25 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
   }
 
   private _renderInitInfo(error: boolean) {
-    renderLaunchScreenInfoBox(
+    this._initError = error;
+    renderLaunchScreenContent(
       html`<ha-init-page
         .error=${error}
         .migration=${this._databaseMigration}
-      ></ha-init-page>`
+        .localize=${this._launchScreenLocalize}
+      ></ha-init-page>`,
+      this._launchScreenAttribution
+    );
+  }
+
+  private get _launchScreenLocalize(): LocalizeFunc | undefined {
+    return (this.hass ?? this._pendingHass).localize;
+  }
+
+  private get _launchScreenAttribution() {
+    return (
+      this._launchScreenLocalize?.("ui.init.project_from") ||
+      "A project from the"
     );
   }
 }

src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts

@@ -249,9 +249,9 @@ export class DialogEnergyBatterySettings
         ></ha-statistic-picker>
 
         <ha-input
-          .value=${this._source.capacity != null
-            ? String(this._source.capacity)
-            : ""}
+          .value=${
+            this._source.capacity != null ? String(this._source.capacity) : ""
+          }
           .label=${this.hass.localize(
             "ui.panel.config.energy.battery.dialog.capacity"
           )}

src/panels/config/tools/template/tools-template.ts

@@ -1,26 +1,17 @@
-import {
-  mdiRestore,
-  mdiTrashCanOutline,
-  mdiViewSplitHorizontal,
-  mdiViewSplitVertical,
-} from "@mdi/js";
-import memoizeOne from "memoize-one";
 import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
+import type { HASSDomEvent } from "../../../../common/dom/fire_event";
 import type { LocalizeKeys } from "../../../../common/translations/localize";
 import { debounce } from "../../../../common/util/debounce";
 import "../../../../components/ha-alert";
+import "../../../../components/ha-button";
 import "../../../../components/ha-card";
 import "../../../../components/ha-code-editor";
 import "../../../../components/ha-expansion-panel";
-import type { HaIconButtonToolbarItem } from "../../../../components/ha-icon-button-toolbar";
-import "../../../../components/ha-label";
 import "../../../../components/ha-spinner";
-import "../../../../components/ha-split-panel";
-import type { HaSplitPanel } from "../../../../components/ha-split-panel";
-import "../../../../components/ha-svg-icon";
 import "../../../../components/ha-tip";
 import type { RenderTemplateResult } from "../../../../data/ws-templates";
 import { subscribeRenderTemplate } from "../../../../data/ws-templates";
@@ -59,18 +50,11 @@ const TEMPLATE_DOCS_LINKS: { key: string; path: string }[] = [
   { key: "docs_functions", path: "/template-functions/" },
 ];
 
-const STORAGE_KEY_TEMPLATE = "panel-dev-template-template";
-const STORAGE_KEY_SPLIT_POSITION = "panel-dev-template-split-position";
-const STORAGE_KEY_SPLIT_ORIENTATION = "panel-dev-template-split-orientation";
-const DEFAULT_SPLIT_POSITION = 50;
-
-type SplitOrientation = "horizontal" | "vertical";
-
 @customElement("tools-template")
 class HaPanelDevTemplate extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ type: Boolean, reflect: true }) public narrow = false;
+  @property({ type: Boolean }) public narrow = false;
 
   @state() private _error?: string;
 
@@ -82,9 +66,9 @@ class HaPanelDevTemplate extends LitElement {
 
   @state() private _unsubRenderTemplate?: Promise<UnsubscribeFunc>;
 
-  @state() private _splitPosition = DEFAULT_SPLIT_POSITION;
+  @state() private _descriptionExpanded = false;
 
-  @state() private _splitOrientation: SplitOrientation = "horizontal";
+  @query("ha-tip") private _editorTip?: HTMLElement;
 
   private _template = "";
 
@@ -94,6 +78,8 @@ class HaPanelDevTemplate extends LitElement {
   // its late-arriving results discarded.
   private _subscribeRequestId = 0;
 
+  private _tipResizeObserver?: ResizeObserver;
+
   public connectedCallback() {
     super.connectedCallback();
     if (this._template && !this._unsubRenderTemplate) {
@@ -104,25 +90,18 @@ class HaPanelDevTemplate extends LitElement {
   public disconnectedCallback() {
     super.disconnectedCallback();
     this._unsubscribeTemplate();
+    this._tipResizeObserver?.disconnect();
+    this._tipResizeObserver = undefined;
   }
 
   protected firstUpdated() {
-    if (localStorage && localStorage[STORAGE_KEY_TEMPLATE]) {
-      this._template = localStorage[STORAGE_KEY_TEMPLATE];
+    if (localStorage && localStorage["panel-dev-template-template"]) {
+      this._template = localStorage["panel-dev-template-template"];
     } else {
       this._template = DEMO_TEMPLATE;
     }
-    const storedPosition = localStorage?.[STORAGE_KEY_SPLIT_POSITION];
-    if (storedPosition) {
-      const parsed = parseFloat(storedPosition);
-      if (!isNaN(parsed) && parsed >= 0 && parsed <= 100) {
-        this._splitPosition = parsed;
-      }
-    }
-    if (localStorage?.[STORAGE_KEY_SPLIT_ORIENTATION] === "vertical") {
-      this._splitOrientation = "vertical";
-    }
     this._subscribeTemplate();
+    this._observeTipHeight();
     this._inited = true;
   }
 
@@ -135,20 +114,15 @@ class HaPanelDevTemplate extends LitElement {
           : "dict"
         : type;
 
-    const editorCard = this._renderEditorCard();
-    const resultCard = this._renderResultCard(type, resultType);
-
-    // On narrow viewports side-by-side is too cramped, so force the (still
-    // resizable) stacked layout and hide the orientation toggle.
-    const orientation = this.narrow ? "vertical" : this._splitOrientation;
-
     return html`
-      <div class="about">
+      <div class="content">
         <ha-expansion-panel
           .header=${this.hass.localize(
             "ui.panel.config.tools.tabs.templates.about"
           )}
           outlined
+          .expanded=${this._descriptionExpanded}
+          @expanded-changed=${this._expandedChanged}
         >
           <div class="description">
             <p>
@@ -190,159 +164,92 @@ class HaPanelDevTemplate extends LitElement {
           </div>
         </ha-expansion-panel>
       </div>
-
-      <ha-split-panel
-        class="panes ${orientation === "vertical" ? "vertical" : ""}"
-        .position=${this._splitPosition}
-        .orientation=${orientation}
-        snap="50%"
-        @wa-reposition=${this._splitRepositioned}
+      <div
+        class="content ${classMap({
+          layout: !this.narrow,
+          horizontal: !this.narrow,
+        })}"
+        style="--description-expanded: ${this._descriptionExpanded ? 1 : 0}"
       >
-        <div slot="start" class="pane">${editorCard}</div>
-        <div slot="end" class="pane">${resultCard}</div>
-        ${this.narrow ? nothing : this._renderOrientationToggle()}
-      </ha-split-panel>
-    `;
-  }
+        <ha-card
+          class="edit-pane"
+          header=${this.hass.localize(
+            "ui.panel.config.tools.tabs.templates.editor"
+          )}
+        >
+          <div class="card-content">
+            <ha-code-editor
+              mode="jinja2"
+              .value=${this._template}
+              .error=${this._error}
+              autofocus
+              autocomplete-entities
+              autocomplete-icons
+              @value-changed=${this._templateChanged}
+              dir="ltr"
+            ></ha-code-editor>
+          </div>
+          <div class="card-actions">
+            <ha-button appearance="plain" @click=${this._restoreDemo}>
+              ${this.hass.localize(
+                "ui.panel.config.tools.tabs.templates.reset"
+              )}
+            </ha-button>
+            <ha-button appearance="plain" @click=${this._clear}>
+              ${this.hass.localize("ui.common.clear")}
+            </ha-button>
+          </div>
+          <ha-tip>
+            ${this.hass.localize(
+              "ui.panel.config.tools.tabs.templates.keyboard_tip",
+              {
+                autocomplete: html`<kbd>Ctrl</kbd>+<kbd>Space</kbd>`,
+              }
+            )}
+          </ha-tip>
+        </ha-card>
 
-  private _renderOrientationToggle() {
-    const label = this.hass.localize(
-      this._splitOrientation === "vertical"
-        ? "ui.panel.config.tools.tabs.templates.layout_side_by_side"
-        : "ui.panel.config.tools.tabs.templates.layout_stacked"
-    );
-    return html`
-      <button
-        type="button"
-        slot="divider"
-        class="divider-toggle"
-        .title=${label}
-        aria-label=${label}
-        @pointerdown=${this._dividerPointerDown}
-        @pointerup=${this._dividerPointerUp}
-        @click=${this._dividerClick}
-      >
-        <ha-svg-icon
-          .path=${
-            this._splitOrientation === "vertical"
-              ? mdiViewSplitVertical
-              : mdiViewSplitHorizontal
-          }
-        ></ha-svg-icon>
-      </button>
-    `;
-  }
-
-  // Reset/clear live in the editor toolbar next to the built-in undo/redo,
-  // copy, search and fullscreen buttons; the trailing divider separates them.
-  private _editorToolbarItems = memoizeOne(
-    (
-      localize: HomeAssistant["localize"]
-    ): (HaIconButtonToolbarItem | string)[] => [
-      {
-        id: "restore-demo",
-        label: localize("ui.panel.config.tools.tabs.templates.reset"),
-        path: mdiRestore,
-        action: () => this._restoreDemo(),
-      },
-      {
-        id: "clear",
-        label: localize("ui.common.clear"),
-        path: mdiTrashCanOutline,
-        action: () => this._clear(),
-      },
-      "divider",
-    ]
-  );
-
-  private _renderEditorCard() {
-    return html`
-      <ha-card
-        class="edit-pane"
-        header=${this.hass.localize(
-          "ui.panel.config.tools.tabs.templates.editor"
-        )}
-      >
-        <div class="card-content">
-          <ha-code-editor
-            mode="jinja2"
-            .value=${this._template}
-            .error=${this._error}
-            .toolbarItems=${this._editorToolbarItems(this.hass.localize)}
-            autofocus
-            autocomplete-entities
-            autocomplete-icons
-            @value-changed=${this._templateChanged}
-            dir="ltr"
-          ></ha-code-editor>
-        </div>
-        ${
-          this.narrow
-            ? nothing
-            : html`
-                <ha-tip>
-                  ${this.hass.localize(
-                    "ui.panel.config.tools.tabs.templates.keyboard_tip",
-                    {
-                      autocomplete: html`<kbd>Ctrl</kbd>+<kbd>Space</kbd>`,
-                    }
-                  )}
-                </ha-tip>
-              `
-        }
-      </ha-card>
-    `;
-  }
-
-  private _renderResultCard(type: string, resultType: string) {
-    const showEmptyState =
-      !this._error && !this._rendering && !this._template?.trim();
-
-    return html`
-      <ha-card
-        class="render-pane"
-        header=${this.hass.localize(
-          "ui.panel.config.tools.tabs.templates.result"
-        )}
-      >
-        <div class="card-content ha-scrollbar">
-          ${
-            this._rendering
-              ? html`<ha-spinner
-                  class="render-spinner"
-                  size="small"
-                ></ha-spinner>`
-              : ""
-          }
-          ${
-            this._error
-              ? html`<ha-alert
-                  alert-type=${this._errorLevel?.toLowerCase() || "error"}
-                  >${this._error}</ha-alert
-                >`
-              : nothing
-          }
-          ${
-            showEmptyState
-              ? html`<div class="empty">
-                  ${this.hass.localize(
-                    "ui.panel.config.tools.tabs.templates.result_placeholder"
-                  )}
-                </div>`
-              : this._templateResult
-                ? html`
-                    <ha-label dense>
-                      ${this.hass.localize(
-                        "ui.panel.config.tools.tabs.templates.result_type"
-                      )}:
-                      ${resultType}
-                    </ha-label>
-                    <pre class="rendered">
+        <ha-card
+          class="render-pane"
+          header=${this.hass.localize(
+            "ui.panel.config.tools.tabs.templates.result"
+          )}
+        >
+          <div class="card-content ha-scrollbar">
+            ${
+              this._rendering
+                ? html`<ha-spinner
+                    class="render-spinner"
+                    size="small"
+                  ></ha-spinner>`
+                : ""
+            }
+            ${
+              this._error
+                ? html`<ha-alert
+                    alert-type=${this._errorLevel?.toLowerCase() || "error"}
+                    >${this._error}</ha-alert
+                  >`
+                : nothing
+            }
+            ${
+              this._templateResult
+                ? html`<pre
+                      class="rendered ${classMap({
+                        [resultType]: resultType,
+                      })}"
+                    >
 ${
   type === "object"
     ? JSON.stringify(this._templateResult.result, null, 2)
     : this._templateResult.result
 }</pre>
+                    <p>
+                      ${this.hass.localize(
+                        "ui.panel.config.tools.tabs.templates.result_type"
+                      )}:
+                      ${resultType}
+                    </p>
                     ${
                       this._templateResult.listeners.time
                         ? html`
@@ -409,62 +316,35 @@ ${
                                   )}
                                 </span>`
                               : nothing
-                    }
-                  `
+                    }`
                 : nothing
-          }
-        </div>
-      </ha-card>
+            }
+          </div>
+        </ha-card>
+      </div>
     `;
   }
 
-  private _splitRepositioned(ev: Event) {
-    this._splitPosition = (ev.target as HaSplitPanel).position;
-    this._storeSplitPosition();
-  }
-
-  private _toggleOrientation() {
-    this._splitOrientation =
-      this._splitOrientation === "vertical" ? "horizontal" : "vertical";
-    if (this._inited) {
-      localStorage[STORAGE_KEY_SPLIT_ORIENTATION] = this._splitOrientation;
-    }
-  }
-
-  private _dividerPointerStart?: { x: number; y: number };
-
-  private _dividerPointerDown = (ev: PointerEvent) => {
-    this._dividerPointerStart = { x: ev.clientX, y: ev.clientY };
-  };
-
-  private _dividerPointerUp = (ev: PointerEvent) => {
-    const start = this._dividerPointerStart;
-    this._dividerPointerStart = undefined;
-    // Ignore the pointerup that ends a drag-resize; only a genuine (still)
-    // tap or click toggles the orientation.
-    if (!start || Math.hypot(ev.clientX - start.x, ev.clientY - start.y) > 5) {
+  private _observeTipHeight() {
+    if (!this._editorTip || this._tipResizeObserver) {
       return;
     }
-    this._toggleOrientation();
-  };
-
-  private _dividerClick = (ev: MouseEvent) => {
-    // Allow Enter/Space to toggle orientation when the divider is focused.
-    if (ev.detail === 0) {
-      this._toggleOrientation();
-    }
-  };
-
-  private _storeSplitPosition = debounce(
-    () => {
-      if (!this._inited) {
-        return;
+    this._tipResizeObserver = new ResizeObserver((entries) => {
+      const height =
+        entries[0]?.borderBoxSize?.[0]?.blockSize ??
+        entries[0]?.contentRect.height;
+      if (height) {
+        this.style.setProperty("--tip-height", `${height}px`);
       }
-      localStorage[STORAGE_KEY_SPLIT_POSITION] = String(this._splitPosition);
-    },
-    500,
-    false
-  );
+    });
+    this._tipResizeObserver.observe(this._editorTip);
+  }
+
+  private _expandedChanged(
+    ev: HASSDomEvent<HASSDomEvents["expanded-changed"]>
+  ) {
+    this._descriptionExpanded = ev.detail.expanded;
+  }
 
   static get styles(): CSSResultGroup {
     return [
@@ -472,140 +352,73 @@ ${
       haStyleScrollbar,
       css`
         :host {
-          display: flex;
-          flex-direction: column;
-          height: 100%;
+          user-select: none;
         }
 
-        .about {
-          flex: none;
+        .content {
+          gap: var(--ha-space-4);
           padding: var(--ha-space-4);
+        }
+
+        .content:has(ha-expansion-panel) {
           padding-bottom: 0;
         }
 
-        .about a {
-          color: var(--primary-color);
-        }
-
-        .panes {
-          flex: 1;
-          min-height: 0;
-          box-sizing: border-box;
-          padding: var(--ha-space-4);
-          --ha-split-panel-min: 20%;
-          --ha-split-panel-max: 80%;
-          --ha-split-panel-divider-hit-area: var(--ha-space-4);
-        }
-
-        /* On wide viewports we slot our own handle (the orientation toggle)
-           into the divider, so hide the default grip. On narrow there is no
-           toggle, so keep the default grip as the resize affordance. */
-        :host(:not([narrow])) .panes {
-          --ha-split-panel-grip-display: none;
-        }
-
-        /* Orientation toggle that lives on the divider and doubles as a grip.
-           Clicks toggle orientation; dragging the divider elsewhere resizes. */
-        .divider-toggle {
-          position: relative;
-          z-index: 1;
-          flex: none;
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-          box-sizing: border-box;
-          width: 24px;
-          height: 24px;
-          margin: 0;
-          padding: 0;
-          border: 1px solid var(--divider-color);
-          border-radius: 50%;
-          background-color: var(--card-background-color);
-          color: var(--secondary-text-color);
-          cursor: pointer;
-          --mdc-icon-size: 16px;
-          transition:
-            color var(--ha-animation-duration-fast) ease-out,
-            border-color var(--ha-animation-duration-fast) ease-out;
-        }
-
-        @media (hover: hover) {
-          .divider-toggle:hover {
-            color: var(--primary-color);
-            border-color: var(--primary-color);
-          }
-        }
-
-        .divider-toggle:focus-visible {
-          outline: none;
-          color: var(--primary-color);
-          border-color: var(--primary-color);
-        }
-
-        .pane {
-          display: flex;
-          min-width: 0;
-          height: 100%;
-          box-sizing: border-box;
-          contain: size;
-        }
-
-        .pane[slot="start"] {
-          padding-inline-end: var(--ha-space-4);
-        }
-
-        .pane[slot="end"] {
-          padding-inline-start: var(--ha-space-4);
-        }
-
-        .panes.vertical .pane[slot="start"] {
-          padding-inline-end: 0;
-          padding-block-end: var(--ha-space-4);
-        }
-
-        .panes.vertical .pane[slot="end"] {
-          padding-inline-start: 0;
-          padding-block-start: var(--ha-space-4);
-        }
-
-        .pane ha-card {
-          flex: 1;
-          min-width: 0;
+        .content.horizontal {
+          --panel-header-height: calc(
+            var(--header-height) + 1em * 2 + var(--ha-line-height-normal) *
+              var(--ha-font-size-m) + 1px + 2px
+          );
+          --description-pane-height: calc(
+            var(--ha-space-4) + 48px +
+              (
+                var(--ha-line-height-normal) * var(--ha-font-size-m) * 3 +
+                  var(--ha-space-1) * 2
+              ) *
+              var(--description-expanded) + var(--ha-card-border-width, 1px) * 2
+          );
+          --card-header-height: calc(
+            var(--ha-space-3) + var(--ha-space-4) +
+              var(--ha-line-height-expanded) *
+              var(--ha-card-header-font-size, var(--ha-font-size-2xl))
+          );
+          --card-actions-height: calc(1px + var(--ha-space-2) * 2 + 40px);
+          --tip-height-minimal: calc(
+            var(--mdc-icon-size, 24px) + var(--ha-space-4)
+          );
+          --edit-pane-height: calc(
+            100vh - var(--panel-header-height) - var(
+                --description-pane-height
+              ) - var(--ha-space-4) *
+              2
+          );
+          --code-mirror-max-height: calc(
+            var(--edit-pane-height) - var(--card-header-height) +
+              var(--ha-space-2) - var(--card-actions-height) - var(
+                --tip-height,
+                var(--tip-height-minimal)
+              ) - var(--ha-space-4) - var(--ha-card-border-width, 1px) *
+              2
+          );
         }
 
         ha-card {
-          display: flex;
-          flex-direction: column;
-          height: 100%;
-          margin: 0;
-        }
-
-        .edit-pane .card-content {
-          flex: 1;
-          min-height: 0;
-          display: flex;
-        }
-
-        .edit-pane ha-code-editor {
-          flex: 1;
-          min-height: 0;
-          width: 100%;
-          --code-mirror-height: 100%;
-        }
-
-        .render-pane .card-content {
-          flex: 1;
-          min-height: 0;
-          overflow: auto;
-          display: flex;
-          flex-direction: column;
-          gap: var(--ha-space-2);
+          margin-bottom: var(--ha-space-4);
         }
 
         .edit-pane {
           direction: var(--direction);
         }
 
+        .edit-pane a {
+          color: var(--primary-color);
+        }
+
+        .content.horizontal > * {
+          width: 50%;
+          margin-bottom: 0px;
+        }
+
         .render-spinner {
           position: absolute;
           top: var(--ha-space-2);
@@ -615,24 +428,10 @@ ${
         }
 
         ha-alert {
+          margin-bottom: var(--ha-space-2);
           display: block;
         }
 
-        .render-pane ha-label {
-          align-self: flex-start;
-        }
-
-        .empty {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          height: 100%;
-          min-height: 120px;
-          padding: var(--ha-space-4);
-          text-align: center;
-          color: var(--secondary-text-color);
-        }
-
         .rendered {
           font-family: var(--ha-font-family-code);
           -webkit-font-smoothing: var(--ha-font-smoothing);
@@ -640,7 +439,6 @@ ${
           clear: both;
           white-space: pre-wrap;
           background-color: var(--secondary-background-color);
-          border-radius: var(--ha-border-radius-md);
           padding: var(--ha-space-2);
           margin-top: 0;
           margin-bottom: 0;
@@ -649,7 +447,7 @@ ${
 
         p,
         ul {
-          margin-block: 0;
+          margin-block-end: 0;
         }
         .description > p {
           margin-block-start: 0;
@@ -670,6 +468,26 @@ ${
           color: var(--secondary-text-color);
         }
 
+        .render-pane .card-content {
+          user-select: text;
+        }
+
+        .content.horizontal .render-pane .card-content {
+          overflow: auto;
+          max-height: calc(
+            var(--code-mirror-max-height) +
+              47px - var(--ha-card-border-radius, var(--ha-border-radius-lg))
+          );
+        }
+
+        .content.horizontal .render-pane {
+          overflow: hidden;
+          padding-bottom: var(
+            --ha-card-border-radius,
+            var(--ha-border-radius-lg)
+          );
+        }
+
         .all_listeners {
           color: var(--warning-color);
         }
@@ -689,6 +507,19 @@ ${
           background-color: var(--secondary-background-color);
           white-space: nowrap;
         }
+
+        @media all and (max-width: 870px) {
+          .content ha-card {
+            max-width: 100%;
+          }
+        }
+
+        .card-actions {
+          display: flex;
+        }
+        .card-actions > ha-button:last-child {
+          margin-inline-start: auto;
+        }
       `,
     ];
   }
@@ -784,7 +615,7 @@ ${
     if (!this._inited) {
       return;
     }
-    localStorage[STORAGE_KEY_TEMPLATE] = this._template;
+    localStorage["panel-dev-template-template"] = this._template;
   }
 
   private async _restoreDemo() {
@@ -800,7 +631,7 @@ ${
     }
     this._template = DEMO_TEMPLATE;
     this._subscribeTemplate();
-    delete localStorage[STORAGE_KEY_TEMPLATE];
+    delete localStorage["panel-dev-template-template"];
   }
 
   private async _clear() {
@@ -816,8 +647,12 @@ ${
     }
     this._unsubscribeTemplate();
     this._template = "";
-    // An empty template shows the placeholder empty state.
-    this._templateResult = undefined;
+    // Reset to empty result. Setting to 'undefined' results in a different visual
+    // behaviour compared to manually emptying the template input box.
+    this._templateResult = {
+      result: "",
+      listeners: { all: false, entities: [], domains: [], time: false },
+    };
   }
 }
 

src/panels/lovelace/cards/energy/common/sankey.ts

@@ -17,6 +17,7 @@ export type SankeyDeviceNode = Node & { parent?: string };
 
 interface SmallConsumer {
   id: string;
+  includedInStat: string | undefined;
   name: string | undefined;
   value: number;
   effectiveParent: string | undefined;
@@ -96,8 +97,15 @@ export const buildSankeyDeviceNodes = (
   const deviceNodes: SankeyDeviceNode[] = [];
   const parentLinks: Record<string, string> = {};
   const smallConsumersByParent = new Map<string, SmallConsumer[]>();
+  const smallConsumerStats = new Set<string>();
   let untrackedConsumption = initialUntracked;
 
+  // Parent chain in stat_consumption space, used to detect nested small consumers
+  const deviceParents = new Map<string, string | undefined>();
+  devices.forEach((device) => {
+    deviceParents.set(device.stat_consumption, device.included_in_stat);
+  });
+
   devices.forEach((device, idx) => {
     const id = getId(device);
     // Falsy check (not `=== undefined`) mirrors the cards' original `!stat_rate` guard.
@@ -115,11 +123,13 @@ export const buildSankeyDeviceNodes = (
       }
       smallConsumersByParent.get(parentKey)!.push({
         id,
+        includedInStat: device.included_in_stat,
         name: device.name,
         value,
         effectiveParent,
         idx,
       });
+      smallConsumerStats.add(device.stat_consumption);
       return;
     }
 
@@ -142,7 +152,21 @@ export const buildSankeyDeviceNodes = (
   });
 
   // Process small consumers - show a lone one directly, group clusters as "Other"
-  smallConsumersByParent.forEach((consumers, parentKey) => {
+  smallConsumersByParent.forEach((allConsumers, parentKey) => {
+    // A small consumer whose included_in_stat chain reaches another small
+    // consumer is already counted inside that ancestor's value - drop it so
+    // totals don't double-count nested devices.
+    const consumers = allConsumers.filter((consumer) => {
+      let ancestor = consumer.includedInStat;
+      for (let hops = 0; ancestor && hops < devices.length; hops++) {
+        if (smallConsumerStats.has(ancestor)) {
+          return false;
+        }
+        ancestor = deviceParents.get(ancestor);
+      }
+      return true;
+    });
+
     const totalValue = consumers.reduce((sum, c) => sum + c.value, 0);
     if (totalValue <= 0) {
       return;

src/panels/lovelace/strategies/home/home-overview-view-strategy.ts

@@ -2,6 +2,7 @@ import { ReactiveElement } from "lit";
 import { customElement } from "lit/decorators";
 import { getAreasFloorHierarchy } from "../../../../common/areas/areas-floor-hierarchy";
 import { isComponentLoaded } from "../../../../common/config/is_component_loaded";
+import { getEntityContext } from "../../../../common/entity/context/get_entity_context";
 import {
   findEntities,
   generateEntityFilter,
@@ -107,7 +108,24 @@ export class HomeOverviewViewStrategy extends ReactiveElement {
       generateEntityFilter(hass, filter)
     );
 
-    const entitiesWithoutAreas = findEntities(allEntities, otherDevicesFilters);
+    const primaryFilter = generateEntityFilter(hass, {
+      entity_category: "none",
+    });
+
+    // Only show the devices tile if the other devices view has content: it
+    // only renders area-less primary entities that belong to a device.
+    const hasOtherDevices = allEntities.some(
+      (entityId) =>
+        otherDevicesFilters.some((filter) => filter(entityId)) &&
+        primaryFilter(entityId) &&
+        !!getEntityContext(
+          hass.states[entityId],
+          hass.entities,
+          hass.devices,
+          hass.areas,
+          hass.floors
+        ).device
+    );
 
     const floorsSections: LovelaceSectionConfig[] = [];
     for (const floorStructure of home.floors) {
@@ -140,13 +158,13 @@ export class HomeOverviewViewStrategy extends ReactiveElement {
       }
     }
 
-    if (home.areas.length > 0 || entitiesWithoutAreas.length > 0) {
+    if (home.areas.length > 0 || hasOtherDevices) {
       const cards: LovelaceCardConfig[] = [];
       for (const areaId of home.areas) {
         cards.push(computeAreaCard(areaId, hass));
       }
 
-      if (entitiesWithoutAreas.length > 0) {
+      if (hasOtherDevices) {
         cards.push({
           type: "tile",
           entity: "zone.home", // zone entity to represent unassigned area as it always exists

src/translations/en.json

@@ -74,6 +74,18 @@
     }
   },
   "ui": {
+    "init": {
+      "loading": "Loading data",
+      "migration": "Database upgrade is in progress, Home Assistant will not start until the upgrade is completed.\n\nThe upgrade may need a long time to complete, please be patient.",
+      "project_from": "A project from the",
+      "error": {
+        "title": "Unable to connect to Home Assistant.",
+        "retrying": "Retrying in {seconds, plural, one {# second} other {# seconds}}...",
+        "retry_now": "Retry now",
+        "nabu_casa": "It is possible that you are seeing this screen because your Home Assistant is not currently connected. You can ask it to come online from your {account_link}.",
+        "nabu_casa_account": "Nabu Casa account page"
+      }
+    },
     "backup": {
       "upload_backup": "Upload backup"
     },
@@ -1193,6 +1205,11 @@
         "play": "Play",
         "play-media": "Play media",
         "pick-media": "Pick media",
+        "search": {
+          "search_placeholder": "Search {name}",
+          "no_results": "No results found"
+        },
+        "filter_media_type": "Filter by media type",
         "no_items": "No items",
         "not_shown": "{count} {count, plural,\n  one {item}\n  other {items}\n} incompatible with the currently selected player {count, plural,\n  one {is}\n  other {are}\n} hidden",
         "choose_player": "Choose player",
@@ -3933,9 +3950,6 @@
               "about": "About templates",
               "editor": "Template editor",
               "result": "Result",
-              "result_placeholder": "Your template result will appear here.",
-              "layout_stacked": "Drag to resize, click for stacked view",
-              "layout_side_by_side": "Drag to resize, click for side-by-side view",
               "reset": "Reset to demo template",
               "confirm_reset": "Do you want to reset your current template back to the demo template?",
               "confirm_clear": "Do you want to clear your current template?",

src/util/launch-screen.ts

@@ -26,28 +26,42 @@ export const removeLaunchScreen = (instant = false): boolean => {
     return true;
   }
 
-  withViewTransition((viewTransitionAvailable: boolean) => {
-    if (!viewTransitionAvailable) {
+  withViewTransition((viewTransitionAvailable) => {
+    if (viewTransitionAvailable) {
       launchScreenElement.parentElement?.removeChild(launchScreenElement);
       return;
     }
 
     launchScreenElement.classList.add("removing");
-
     const durationFromCss = getComputedStyle(document.documentElement)
-      .getPropertyValue("--ha-animation-duration-slow")
+      .getPropertyValue("--ha-animation-duration-normal")
       .trim();
-
-    setTimeout(() => {
-      launchScreenElement.parentElement?.removeChild(launchScreenElement);
-    }, parseAnimationDuration(durationFromCss));
+    setTimeout(
+      () => {
+        launchScreenElement.parentElement?.removeChild(launchScreenElement);
+      },
+      parseAnimationDuration(durationFromCss || "250ms")
+    );
   });
   return true;
 };
 
-export const renderLaunchScreenInfoBox = (content: TemplateResult) => {
+export const renderLaunchScreenContent = (
+  content: TemplateResult,
+  attribution: string
+) => {
   const infoBoxElement = document.getElementById("ha-launch-screen-info-box");
   if (infoBoxElement) {
     render(content, infoBoxElement);
   }
+  updateLaunchScreenAttribution(attribution);
+};
+
+export const updateLaunchScreenAttribution = (attribution: string) => {
+  const attributionElement = document.getElementById(
+    "ha-launch-screen-attribution"
+  );
+  if (attributionElement) {
+    attributionElement.textContent = attribution;
+  }
 };

test/layouts/ha-init-page.test.ts

@@ -0,0 +1,90 @@
+import { LitElement } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { LocalizeFunc } from "../../src/common/translations/localize";
+import type { HaInitPage } from "../../src/layouts/ha-init-page";
+
+vi.mock("../../src/components/ha-button", () => ({}));
+customElements.define("ha-button", class extends LitElement {});
+await import("../../src/layouts/ha-init-page");
+
+const translations: Record<string, string> = {
+  "ui.init.loading": "Loading translated data",
+  "ui.init.migration": "Database migration translated\n\nPlease wait",
+  "ui.init.error.title": "Connection error translated",
+  "ui.init.error.retry_now": "Retry translated",
+};
+
+const localize: LocalizeFunc = (key, values) => {
+  if (key === "ui.init.error.retrying") {
+    return `Retry translated ${values?.seconds}`;
+  }
+  return translations[key] ?? "";
+};
+
+let host: HTMLDivElement | undefined;
+let element: HaInitPage | undefined;
+
+const mount = async (properties: Partial<HaInitPage> = {}) => {
+  host = document.createElement("div");
+  document.body.append(host);
+  element = document.createElement("ha-init-page");
+  Object.assign(element, { localize, ...properties });
+  host.append(element);
+  await element.updateComplete;
+  return element;
+};
+
+afterEach(() => {
+  host?.remove();
+  host = undefined;
+  element = undefined;
+  vi.useRealTimers();
+});
+
+describe("ha-init-page", () => {
+  it("renders localized loading and migration states", async () => {
+    const initPage = await mount();
+    expect(initPage.shadowRoot!.textContent).toContain(
+      "Loading translated data"
+    );
+
+    initPage.migration = true;
+    await initPage.updateComplete;
+    expect(
+      initPage.shadowRoot!.querySelector(".migration-text")!.textContent
+    ).toBe("Database migration translated\n\nPlease wait");
+  });
+
+  it("preserves migration paragraph breaks without localization", async () => {
+    const initPage = await mount({ localize: undefined, migration: true });
+
+    expect(
+      initPage.shadowRoot!.querySelector(".migration-text")!.textContent
+    ).toContain("completed.\n\nThe upgrade");
+  });
+
+  it("renders the localized connection error and countdown", async () => {
+    const initPage = await mount({ error: true });
+
+    expect(initPage.shadowRoot!.textContent).toContain(
+      "Connection error translated"
+    );
+    expect(initPage.shadowRoot!.textContent).toContain("Retry translated 60");
+    expect(
+      initPage.shadowRoot!.querySelector("ha-button")!.textContent
+    ).toContain("Retry translated");
+  });
+
+  it("counts down once per second and stops after disconnecting", async () => {
+    vi.useFakeTimers();
+    const initPage = await mount({ error: true });
+
+    await vi.advanceTimersByTimeAsync(1000);
+    await initPage.updateComplete;
+    expect(initPage.shadowRoot!.textContent).toContain("Retry translated 59");
+
+    initPage.remove();
+    await vi.advanceTimersByTimeAsync(1000);
+    expect(initPage.shadowRoot!.textContent).toContain("Retry translated 59");
+  });
+});

test/panels/lovelace/cards/energy/common/sankey.test.ts

@@ -231,6 +231,96 @@ describe("buildSankeyDeviceNodes", () => {
     // the top-level parent (10), never the cluster total.
     expect(result.untrackedConsumption).toBe(0);
   });
+
+  it("counts a nested small device only once (via its small ancestor)", () => {
+    // child's consumption is already included in parent's statistic
+    const result = buildSankeyDeviceNodes(
+      cumulativeOpts({
+        devices: devices(
+          { stat_consumption: "parent" },
+          { stat_consumption: "child", included_in_stat: "parent" }
+        ),
+        values: { parent: 0.008, child: 0.006 },
+        initialUntracked: 10,
+      })
+    );
+    // Only the parent remains, so it is shown directly instead of "Other"
+    expect(result.deviceNodes.map((n) => n.id)).toEqual(["parent"]);
+    expect(result.deviceNodes[0].value).toBeCloseTo(0.008, 10);
+    expect(result.untrackedConsumption).toBeCloseTo(10 - 0.008, 10);
+  });
+
+  it("excludes nested small devices from the Other total", () => {
+    const result = buildSankeyDeviceNodes(
+      cumulativeOpts({
+        devices: devices(
+          { stat_consumption: "parent" },
+          { stat_consumption: "child", included_in_stat: "parent" },
+          { stat_consumption: "unrelated" }
+        ),
+        values: { parent: 0.004, child: 0.003, unrelated: 0.002 },
+        initialUntracked: 10,
+      })
+    );
+    const other = result.deviceNodes.find((n) => n.id === "other_home");
+    // parent + unrelated only; child is inside parent's value
+    expect(other?.value).toBeCloseTo(0.006, 10);
+    expect(result.untrackedConsumption).toBeCloseTo(10 - 0.006, 10);
+  });
+
+  it("keeps only the top ancestor of a nested small-device chain", () => {
+    const result = buildSankeyDeviceNodes(
+      cumulativeOpts({
+        devices: devices(
+          { stat_consumption: "grandparent" },
+          { stat_consumption: "parent", included_in_stat: "grandparent" },
+          { stat_consumption: "child", included_in_stat: "parent" }
+        ),
+        values: { grandparent: 0.005, parent: 0.004, child: 0.003 },
+        initialUntracked: 10,
+      })
+    );
+    expect(result.deviceNodes.map((n) => n.id)).toEqual(["grandparent"]);
+    expect(result.untrackedConsumption).toBeCloseTo(10 - 0.005, 10);
+  });
+
+  it("detects a small ancestor across a device the card skips entirely", () => {
+    // Power-card scenario: "outlet" has no stat_rate so it is never rendered
+    // or collected, but the plug's consumption still flows through it into
+    // the heater group. Requires walking the chain, not a direct-parent check.
+    const result = buildSankeyDeviceNodes(
+      cumulativeOpts({
+        devices: devices(
+          { stat_consumption: "heater_group" },
+          { stat_consumption: "outlet", included_in_stat: "heater_group" },
+          { stat_consumption: "plug", included_in_stat: "outlet" }
+        ),
+        values: { heater_group: 0.008, plug: 0.005 },
+        initialUntracked: 10,
+        getId: (device) =>
+          device.stat_consumption === "outlet"
+            ? undefined
+            : device.stat_consumption,
+      })
+    );
+    expect(result.deviceNodes.map((n) => n.id)).toEqual(["heater_group"]);
+    expect(result.untrackedConsumption).toBeCloseTo(10 - 0.008, 10);
+  });
+
+  it("leaves a cyclic small-device cluster in untracked instead of looping", () => {
+    const result = buildSankeyDeviceNodes(
+      cumulativeOpts({
+        devices: devices(
+          { stat_consumption: "a", included_in_stat: "b" },
+          { stat_consumption: "b", included_in_stat: "a" }
+        ),
+        values: { a: 0.003, b: 0.004 },
+        initialUntracked: 10,
+      })
+    );
+    expect(result.deviceNodes).toEqual([]);
+    expect(result.untrackedConsumption).toBe(10);
+  });
 });
 
 describe("groupSankeyDevicesByFloorAndArea", () => {