This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit b841a7a9d21f70607a763d58cc951d9b237d3d58 Author: Zoran Regvart <[email protected]> AuthorDate: Fri Feb 25 16:52:09 2022 +0100 fix: search all components in component search The `display: none` would remain for non-expanded groups of components. So when filtering they would not be shown even if matched. This changes the approach of toggling `display` via JavaScript to toggling it via CSS. This way we don't need to keep state of non-expanded and then expanded for the search to show them items. But rather the state pivots around any text put in the `input` element used for the search. This makes state handling much simpler and lets the cascading property of CSS do all the work. Fixes #789 --- antora-ui-camel/public/_/css/site-669e4fdea0.css | 2 ++ antora-ui-camel/public/_/css/site-91cabd5e14.css | 2 -- antora-ui-camel/public/_/data/rev-manifest.json | 4 ++-- antora-ui-camel/public/_/helpers/asset.js | 4 ++-- .../public/_/img/asf-estd-1999-logo-bb89c741ef.svg | 1 + .../js/{site-0d18f68ee9.js => site-ca1c0b0367.js} | 2 +- .../public/_/partials/footer-scripts.hbs | 2 +- antora-ui-camel/public/_/partials/head-styles.hbs | 2 +- antora-ui-camel/public/_/rev-manifest | 4 ++-- antora-ui-camel/src/css/nav.css | 24 ++++++++++++++++++++++ antora-ui-camel/src/js/99-nav-search.js | 8 ++------ 11 files changed, 38 insertions(+), 17 deletions(-) diff --git a/antora-ui-camel/public/_/css/site-669e4fdea0.css b/antora-ui-camel/public/_/css/site-669e4fdea0.css new file mode 100644 index 0000000..1839ae4 --- /dev/null +++ b/antora-ui-camel/public/_/css/site-669e4fdea0.css @@ -0,0 +1,2 @@ +@font-face{font-family:Open Sans;font-style:normal;font-display:swap;font-weight:300;src:local("Open Sans Light"),local("OpenSans-Light"),url(../font/open-sans-latin-ext-300.woff2) format("woff2"),url(../font/open-sans-latin-ext-300.woff) format("woff")}@font-face{font-family:Open Sans;font-style:italic;font-display:swap;font-weight:300;src:local("Open Sans Light Italic"),local("OpenSans-LightItalic"),url(../font/open-sans-latin-ext-300-italic.woff2) format("woff2"),url(../font/open-sans [...] +/*! Adapted from the GitHub style by Vasily Polovnyov <[email protected]> */.hljs-comment,.hljs-quote{color:#998;font-style:italic}.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#333;font-weight:500}.hljs-literal,.hljs-number,.hljs-tag .hljs-attr,.hljs-template-variable,.hljs-variable{color:teal}.hljs-doctag,.hljs-string{color:#d14}.hljs-section,.hljs-selector-id,.hljs-title{color:#900;font-weight:500}.hljs-subst{font-weight:400}.hljs-class .hljs-title,.hljs-type{color:#458;font-wei [...] \ No newline at end of file diff --git a/antora-ui-camel/public/_/css/site-91cabd5e14.css b/antora-ui-camel/public/_/css/site-91cabd5e14.css deleted file mode 100644 index d0f15cf..0000000 --- a/antora-ui-camel/public/_/css/site-91cabd5e14.css +++ /dev/null @@ -1,2 +0,0 @@ -@font-face{font-family:Open Sans;font-style:normal;font-display:swap;font-weight:300;src:local("Open Sans Light"),local("OpenSans-Light"),url(../font/open-sans-latin-ext-300.woff2) format("woff2"),url(../font/open-sans-latin-ext-300.woff) format("woff")}@font-face{font-family:Open Sans;font-style:italic;font-display:swap;font-weight:300;src:local("Open Sans Light Italic"),local("OpenSans-LightItalic"),url(../font/open-sans-latin-ext-300-italic.woff2) format("woff2"),url(../font/open-sans [...] -/*! Adapted from the GitHub style by Vasily Polovnyov <[email protected]> */.hljs-comment,.hljs-quote{color:#998;font-style:italic}.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#333;font-weight:500}.hljs-literal,.hljs-number,.hljs-tag .hljs-attr,.hljs-template-variable,.hljs-variable{color:teal}.hljs-doctag,.hljs-string{color:#d14}.hljs-section,.hljs-selector-id,.hljs-title{color:#900;font-weight:500}.hljs-subst{font-weight:400}.hljs-class .hljs-title,.hljs-type{color:#458;font-wei [...] \ No newline at end of file diff --git a/antora-ui-camel/public/_/data/rev-manifest.json b/antora-ui-camel/public/_/data/rev-manifest.json index e5a7248..fef7136 100644 --- a/antora-ui-camel/public/_/data/rev-manifest.json +++ b/antora-ui-camel/public/_/data/rev-manifest.json @@ -1,5 +1,5 @@ { - "css/site.css": "css/site-91cabd5e14.css", + "css/site.css": "css/site-669e4fdea0.css", "img/algolia.svg": "img/algolia-05f7506b2a.svg", "img/apache-kafka.svg": "img/apache-kafka-712a1f3ba0.svg", "img/apache-karaf.svg": "img/apache-karaf-e55039ae99.svg", @@ -34,7 +34,7 @@ "img/support.svg": "img/support-d38244a6cc.svg", "img/team.svg": "img/team-eef83d1804.svg", "img/user-stories.svg": "img/user-stories-89e2dbda2c.svg", - "js/site.js": "js/site-0d18f68ee9.js", + "js/site.js": "js/site-ca1c0b0367.js", "js/vendor/algoliasearch.js": "js/vendor/algoliasearch-8fe81df376.js", "js/vendor/highlight.js": "js/vendor/highlight-0a351063af.js", "js/vendor/svg4everybody.js": "js/vendor/svg4everybody-195d47ce7d.js" diff --git a/antora-ui-camel/public/_/helpers/asset.js b/antora-ui-camel/public/_/helpers/asset.js index 4e2291a..dab2933 100644 --- a/antora-ui-camel/public/_/helpers/asset.js +++ b/antora-ui-camel/public/_/helpers/asset.js @@ -1,7 +1,7 @@ 'use strict' const manifest = { - "css/site.css": "css/site-91cabd5e14.css", + "css/site.css": "css/site-669e4fdea0.css", "img/algolia.svg": "img/algolia-05f7506b2a.svg", "img/apache-kafka.svg": "img/apache-kafka-712a1f3ba0.svg", "img/apache-karaf.svg": "img/apache-karaf-e55039ae99.svg", @@ -36,7 +36,7 @@ const manifest = { "img/support.svg": "img/support-d38244a6cc.svg", "img/team.svg": "img/team-eef83d1804.svg", "img/user-stories.svg": "img/user-stories-89e2dbda2c.svg", - "js/site.js": "js/site-0d18f68ee9.js", + "js/site.js": "js/site-ca1c0b0367.js", "js/vendor/algoliasearch.js": "js/vendor/algoliasearch-8fe81df376.js", "js/vendor/highlight.js": "js/vendor/highlight-0a351063af.js", "js/vendor/svg4everybody.js": "js/vendor/svg4everybody-195d47ce7d.js" diff --git a/antora-ui-camel/public/_/img/asf-estd-1999-logo-bb89c741ef.svg b/antora-ui-camel/public/_/img/asf-estd-1999-logo-bb89c741ef.svg new file mode 100644 index 0000000..49b7ccc --- /dev/null +++ b/antora-ui-camel/public/_/img/asf-estd-1999-logo-bb89c741ef.svg @@ -0,0 +1 @@ +<svg width="439" height="179" fill="none" xmlns="http://www.w3.org/2000/svg";><path fill="#fff" d="M0 0h439v179H0z"/><g clip-path="url(#a)"><path d="M436.572 53.038c.938.938 1.404 2.066 1.404 3.384s-.466 2.446-1.404 3.397c-.938.944-2.072 1.416-3.409 1.416-1.336 0-2.464-.466-3.396-1.404-.926-.938-1.392-2.066-1.392-3.384s.466-2.447 1.404-3.397c.938-.944 2.066-1.416 3.396-1.416 1.325 0 2.459.466 3.397 1.404zm-.405 6.382c.816-.834 1.226-1.827 1.226-2.986 0-1.158-.404-2.145-1.214-2.973-.809-.8 [...] \ No newline at end of file diff --git a/antora-ui-camel/public/_/js/site-0d18f68ee9.js b/antora-ui-camel/public/_/js/site-ca1c0b0367.js similarity index 92% rename from antora-ui-camel/public/_/js/site-0d18f68ee9.js rename to antora-ui-camel/public/_/js/site-ca1c0b0367.js index 0ac5949..63719b5 100644 --- a/antora-ui-camel/public/_/js/site-0d18f68ee9.js +++ b/antora-ui-camel/public/_/js/site-ca1c0b0367.js @@ -3,4 +3,4 @@ !function(){"use strict";var e=document.querySelector("article.doc"),t=document.querySelector(".toolbar");function n(e){return e&&(~e.indexOf("%")?decodeURIComponent(e):e).slice(1)}function o(n){n&&(window.location.hash="#"+this.id,n.preventDefault()),window.scrollTo(0,function t(n,o){return e.contains(n)?t(n.offsetParent,n.offsetTop+o):o}(this,0)-t.getBoundingClientRect().bottom)}window.addEventListener("load",function e(t){var i,c;(i=n(window.location.hash))&&(c=document.getElementById [...] !function(){"use strict";var e=document.querySelector(".page-versions .version-menu-toggle");if(e){var t=document.querySelector(".page-versions");e.addEventListener("click",function(e){t.classList.toggle("is-active"),e.stopPropagation()}),document.documentElement.addEventListener("click",function(){t.classList.remove("is-active")})}}(); document.addEventListener("DOMContentLoaded",function(){var t=Array.prototype.slice.call(document.querySelectorAll(".navbar-burger"),0);0!==t.length&&(t.forEach(function(t){t.addEventListener("click",function(e){e.stopPropagation(),t.classList.toggle("is-active"),document.getElementById(t.dataset.target).classList.toggle("is-active"),document.documentElement.classList.toggle("is-clipped--navbar")})}),document.documentElement.dataset.scroll=0,document.addEventListener("scroll",()=>{docume [...] -document.addEventListener("DOMContentLoaded",function(){var e=function(e){return".*"+e+".*"},n=document.querySelector(".nav-panel-menu input.search");if(n){var t=document.querySelectorAll(".nav-item-toggle"),l=document.querySelectorAll(".nav-link");n.addEventListener("keyup",function(){t.forEach(function(e){e.style.display=""===n.value?"block":"none"});for(var o=n.value.split(""),r=new RegExp(o.map(e).join(""),"i"),a=0;a<l.length;a++){var i=l[a].textContent,s="";if(r.test(i))if(l[a].styl [...] \ No newline at end of file +document.addEventListener("DOMContentLoaded",function(){var e=function(e){return".*"+e+".*"},n=document.querySelector(".nav-panel-menu input.search");if(n){var t=document.querySelectorAll(".nav-link");n.addEventListener("keyup",function(){for(var r=n.value.split(""),i=new RegExp(r.map(e).join(""),"i"),a=0;a<t.length;a++){var o=t[a].textContent,s="";if(i.test(o))if(t[a].classList.remove("filtered"),0===r.length)s=o;else{for(var l=0,u=0,d=0;d<r.length;d++)u=o.toLowerCase().indexOf(r[d].toL [...] \ No newline at end of file diff --git a/antora-ui-camel/public/_/partials/footer-scripts.hbs b/antora-ui-camel/public/_/partials/footer-scripts.hbs index 9bdfcd6..4c550ab 100644 --- a/antora-ui-camel/public/_/partials/footer-scripts.hbs +++ b/antora-ui-camel/public/_/partials/footer-scripts.hbs @@ -1,5 +1,5 @@ <script src="{{uiRootPath}}/js/vendor/algoliasearch-8fe81df376.js"></script> -<script src="{{uiRootPath}}/js/site-0d18f68ee9.js"></script> +<script src="{{uiRootPath}}/js/site-ca1c0b0367.js"></script> <script async src="{{uiRootPath}}/js/vendor/highlight-0a351063af.js"></script> <script async src="{{uiRootPath}}/js/vendor/svg4everybody-195d47ce7d.js"></script> {{> seo-main}} diff --git a/antora-ui-camel/public/_/partials/head-styles.hbs b/antora-ui-camel/public/_/partials/head-styles.hbs index f1542ff..ea53100 100644 --- a/antora-ui-camel/public/_/partials/head-styles.hbs +++ b/antora-ui-camel/public/_/partials/head-styles.hbs @@ -1 +1 @@ - <link rel="stylesheet" href="{{uiRootPath}}/css/site-91cabd5e14.css"> + <link rel="stylesheet" href="{{uiRootPath}}/css/site-669e4fdea0.css"> diff --git a/antora-ui-camel/public/_/rev-manifest b/antora-ui-camel/public/_/rev-manifest index e5a7248..fef7136 100644 --- a/antora-ui-camel/public/_/rev-manifest +++ b/antora-ui-camel/public/_/rev-manifest @@ -1,5 +1,5 @@ { - "css/site.css": "css/site-91cabd5e14.css", + "css/site.css": "css/site-669e4fdea0.css", "img/algolia.svg": "img/algolia-05f7506b2a.svg", "img/apache-kafka.svg": "img/apache-kafka-712a1f3ba0.svg", "img/apache-karaf.svg": "img/apache-karaf-e55039ae99.svg", @@ -34,7 +34,7 @@ "img/support.svg": "img/support-d38244a6cc.svg", "img/team.svg": "img/team-eef83d1804.svg", "img/user-stories.svg": "img/user-stories-89e2dbda2c.svg", - "js/site.js": "js/site-0d18f68ee9.js", + "js/site.js": "js/site-ca1c0b0367.js", "js/vendor/algoliasearch.js": "js/vendor/algoliasearch-8fe81df376.js", "js/vendor/highlight.js": "js/vendor/highlight-0a351063af.js", "js/vendor/svg4everybody.js": "js/vendor/svg4everybody-195d47ce7d.js" diff --git a/antora-ui-camel/src/css/nav.css b/antora-ui-camel/src/css/nav.css index e3e93c4..71c32ce 100644 --- a/antora-ui-camel/src/css/nav.css +++ b/antora-ui-camel/src/css/nav.css @@ -119,6 +119,30 @@ html.is-clipped--nav { border-bottom-color: var(--nav-panel-divider-color); } +.nav-panel-menu input.search:valid ~ .nav-menu ul { + display: block; + margin: 0; + padding: 0; +} + +.nav-panel-menu input.search:valid ~ .nav-menu li { + display: block; + margin: 0; + padding: 0; +} + +.nav-panel-menu input.search:valid ~ .nav-menu .filtered { + display: none; +} + +.nav-panel-menu input.search:valid ~ .nav-menu button { + display: none; +} + +.nav-panel-menu input.search:valid ~ .nav-menu a.nav-link:not(.filtered) { + line-height: 1.5rem; +} + .nav-menu { top: 2.5rem; min-height: 0; diff --git a/antora-ui-camel/src/js/99-nav-search.js b/antora-ui-camel/src/js/99-nav-search.js index 1c39ce0..0cc0a32 100644 --- a/antora-ui-camel/src/js/99-nav-search.js +++ b/antora-ui-camel/src/js/99-nav-search.js @@ -6,12 +6,8 @@ document.addEventListener('DOMContentLoaded', function () { if (!navSearch) { return } - var navToggle = document.querySelectorAll('.nav-item-toggle') var navLinks = document.querySelectorAll('.nav-link') navSearch.addEventListener('keyup', function () { - navToggle.forEach(function (navToggle) { - navToggle.style.display = navSearch.value === '' ? 'block' : 'none' - }) var tokens = navSearch.value.split('') var term = new RegExp(tokens.map(tokenize).join(''), 'i') for (var i = 0; i < navLinks.length; i++) { @@ -19,7 +15,7 @@ document.addEventListener('DOMContentLoaded', function () { var matches = term.test(text) var replacement = '' if (matches) { - navLinks[i].style.display = '' + navLinks[i].classList.remove('filtered') if (tokens.length === 0) { replacement = text } else { @@ -36,7 +32,7 @@ document.addEventListener('DOMContentLoaded', function () { } } } else { - navLinks[i].style.display = 'none' + navLinks[i].classList.add('filtered') replacement = text } navLinks[i].innerHTML = replacement
