{
+ let router = Next.Router.useRouter()
+
+
{
+ // items->Belt.Array.map(item => {
+ // let new_url = Util.Url.make(item.url)
+ // {...item, url: `${new_url.pathname}${new_url.hash}`}
+ // })
+ // }}
+ // hitComponent={({hit, children}) => {
+ // children
+ // }}
+ navigator={{
+ navigate: {
+ ({itemUrl}) => {
+ router->Next.Router.push(itemUrl)
+ }
+ },
+ }}
+ />
+}
\ No newline at end of file
diff --git a/styles/_docsearch.css b/styles/_docsearch.css
index bcb0f9c46..52e4702d6 100644
--- a/styles/_docsearch.css
+++ b/styles/_docsearch.css
@@ -1,55 +1,323 @@
/* purgecss start ignore */
+.DocSearch-Button {
+ @apply flex justify-center select-none cursor-pointer p-2 px-3;
+}
+
+.DocSearch-Button:hover .DocSearch-Search-Icon {
+ @apply text-fire-30;
+}
+
+.DocSearch-Search-Icon {
+ stroke-width: 2;
+}
+
+.DocSearch-Button .DocSearch-Search-Icon {
+ @apply text-gray-60;
+}
+
+.DocSearch-Button-Placeholder {
+ display: none !important;
+}
+
+.DocSearch-Button-Keys {
+ display: none !important;
+}
+
+/* Modal */
+/* Body modifier */
+
+.DocSearch--active {
+ /*
+ * We need to mark it as important because some websites override the
+ * `style` attribute (e.g. Docusaurus).
+ */
+ overflow: hidden !important;
+}
+
+/* Container & Modal */
+
+.DocSearch-Container {
+ height: 100vh;
+ width: 100vw;
+ z-index: 200;
+ padding: 10vh;
+ cursor: auto !important;
+ @apply fixed top-0 left-0 bg-white-40-tr flex flex-col backdrop-blur-sm;
+}
+
+.DocSearch-Container a {
+ text-decoration: none;
+}
+
+.DocSearch-Link {
+ font: inherit;
+ @apply appearance-none bg-none border-none cursor-pointer m-0 p-0 text-red-500;
+}
+
+.DocSearch-Modal {
+ border-radius: 4px;
+ @apply relative min-h-0 mx-auto bg-white w-full flex flex-col shadow-lg max-w-740;
+}
+
+/* Modal Searchbox */
+
+.DocSearch-SearchBar {
+ border-bottom: 1px solid;
+ @apply flex items-center pl-4 pr-4 border-gray-20;
+}
+
+.DocSearch-Form {
+ @apply relative w-full m-0 flex items-center h-14;
+}
+
+.DocSearch-Input {
+ @apply appearance-none outline-none bg-transparent border-none flex-1 text-14 pl-2;
+}
+
+.DocSearch-Input::placeholder {
+ @apply opacity-100 text-gray-40;
+}
+
+.DocSearch-Input::-webkit-search-cancel-button,
+.DocSearch-Input::-webkit-search-decoration,
+.DocSearch-Input::-webkit-search-results-button,
+.DocSearch-Input::-webkit-search-results-decoration {
+ display: none;
+}
+
+.DocSearch-LoadingIndicator,
+.DocSearch-MagnifierLabel,
+.DocSearch-Reset {
+ @apply m-0 p-0;
+}
+
+.DocSearch-MagnifierLabel,
+.DocSearch-Reset {
+ @apply flex items-center justify-between text-red-500;
+}
+
+.DocSearch-Container--Stalled .DocSearch-MagnifierLabel {
+ @apply hidden;
+}
+
+.DocSearch-LoadingIndicator {
+ @apply hidden;
+}
+
+.DocSearch-Container--Stalled .DocSearch-LoadingIndicator {
+ @apply flex items-center justify-between text-red-500;
+}
+
+.DocSearch-Reset {
+ @apply hidden;
+}
+
+.DocSearch-LoadingIndicator svg,
+.DocSearch-MagnifierLabel svg {
+ @apply w-4 h-4;
+}
+
+.DocSearch-Cancel {
+ font-size: 0;
+ background-image: url("data:image/svg+xml,%3Csvg width='16' height='7' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M.506 6h3.931V4.986H1.736v-1.39h2.488V2.583H1.736V1.196h2.69V.182H.506V6ZM8.56 1.855h1.18C9.721.818 8.87.102 7.574.102c-1.276 0-2.21.705-2.205 1.762-.003.858.602 1.35 1.585 1.585l.634.159c.633.153.986.335.988.727-.002.426-.406.716-1.03.716-.64 0-1.1-.295-1.14-.878h-1.19c.03 1.259.931 1.91 2.343 1.91 1.42 0 2.256-.68 2.259-1.745-.003-.969-.733-1.483-1.744-1.71l-.523-.125c-.506-.117-.93-.304-.92-.722 0-.375.332-.65.934-.65.588 0 .949.267.994.724ZM15.78 2.219C15.618.875 14.6.102 13.254.102c-1.537 0-2.71 1.086-2.71 2.989 0 1.898 1.153 2.989 2.71 2.989 1.492 0 2.392-.992 2.526-2.063l-1.244-.006c-.117.623-.606.98-1.262.98-.883 0-1.483-.656-1.483-1.9 0-1.21.591-1.9 1.492-1.9.673 0 1.159.389 1.253 1.028h1.244Z' fill='%23334155'/%3E%3C/svg%3E");
+ background-size: 67.142857% auto;
+ @apply w-8 h-7 bg-no-repeat bg-center;
+}
+
+/* Modal Dropdown */
+
+.DocSearch-Dropdown {
+ @apply pl-4 pr-4 overflow-y-auto;
+}
+
+.DocSearch-Dropdown ul {
+ @apply list-none m-0 p-0;
+}
+
+.DocSearch-Title {
+ @apply text-gray-40 text-18 pb-2 self-center;
+}
+
+.DocSearch-Logo a {
+ @apply flex items-center;
+}
+.DocSearch-Logo .DocSearch-Label {
+ @apply text-gray-40 text-11;
+}
-/* Main dropdown wrapper */
-.algolia-autocomplete .ds-dropdown-menu {
- width: 500px;
+.DocSearch-Logo svg {
+ color: #5468ff;
+ @apply ml-1;
}
-/* Main category (eg. Getting Started) */
-.algolia-autocomplete .algolia-docsearch-suggestion--category-header {
- /*color: darkgray;*/
- /*border: 1px solid gray;*/
+/* Hit */
+
+.DocSearch-Hits:last-of-type {
+ @apply mb-2;
+}
+
+.DocSearch-Hits mark {
+ @apply text-red-500 bg-transparent;
+}
+
+.DocSearch-HitsFooter {
+ @apply hidden;
+}
+
+.DocSearch-Hit {
+ border-radius: 4px;
+ @apply relative flex;
+}
+
+.DocSearch-Hit a {
+ border-radius: 4px;
+ @apply block w-full;
+}
+
+.DocSearch-Hit-source {
+ @apply sticky top-0 z-100 pt-3 pb-3 text-16 font-semibold bg-white text-gray-80;
+}
+
+.DocSearch-Hit--deleting {
+ opacity: 0;
+ transition: all 250ms linear;
+}
+
+.DocSearch-Hit--favoriting {
+ @apply scale-0 origin-center;
+}
+
+.DocSearch-Hit-Tree {
+ @apply text-gray-40 opacity-50 stroke-2 w-5 h-7;
+}
+
+.DocSearch-Hit[aria-selected='true'] a {
+ @apply bg-gray-20;
+}
+
+.DocSearch-Hit[aria-selected='true'] mark {
+ text-decoration: none;
+}
+
+.DocSearch-Hit-Container {
+ @apply flex items-center flex-row p-4 text-gray-40;
+}
+
+.DocSearch-Hit-icon {
+ @apply w-5 h-5 stroke-1 text-gray-40;
+}
+
+.DocSearch-Hit-action {
+ @apply flex items-center stroke-1;
+}
+
+.DocSearch-Hit-action svg {
+ @apply block w-5 h-5;
+}
+
+.DocSearch-Hit-action + .DocSearch-Hit-action {
+ margin-left: 6px;
+}
+
+.DocSearch-Hit-action-button {
+ @apply appearance-none bg-transparent border-none cursor-pointer;
+}
+
+svg.DocSearch-Hit-Select-Icon {
+ display: none;
+}
+
+.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-Select-Icon {
+ display: block;
+}
+
+.DocSearch-Hit-action-button:hover path,
+.DocSearch-Hit-action-button:focus path {
+ fill: #fff;
+}
+
+.DocSearch-Hit-content-wrapper {
+ @apply flex flex-auto flex-col justify-center whitespace-nowrap overflow-ellipsis relative font-medium pl-4 pr-4 overflow-hidden;
+}
+
+.DocSearch-Hit-title {
+ @apply text-14;
+}
+
+.DocSearch-Hit-path {
+ @apply text-12;
}
-/* Category (eg. Downloads) */
-.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column {
- color: gray;
+.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-title,
+.DocSearch-Hit[aria-selected='true'] mark,
+.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-text,
+.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-path,
+.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-icon,
+.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-action,
+.DocSearch-Hit[aria-selected='true'] .DocSearch-Hit-Tree {
+ color: none;
}
-/* Title (eg. Bootstrap CDN) */
-.algolia-autocomplete .algolia-docsearch-suggestion--title {
- font-weight: bold;
- color: black;
+/* No Results - Start Screen - Error Screen */
+
+.DocSearch-NoResults,
+.DocSearch-StartScreen,
+.DocSearch-ErrorScreen {
+ @apply flex flex-col pt-5;
+}
+
+.DocSearch-Screen-Icon {
+ @apply pb-3 text-gray-40 self-center;
+}
+
+.DocSearch-Help {
+ @apply text-gray-40 pb-2 text-center;
+}
+
+.DocSearch-Prefill {
+ border-radius: 4px;
+ @apply appearance-none bg-transparent border-none cursor-pointer p-4 text-gray-40 text-14 font-medium w-full text-left;
}
-/* Description description (eg. Bootstrap currently works...) */
-.algolia-autocomplete .algolia-docsearch-suggestion--text {
- font-size: 0.8rem;
- color: gray;
+.DocSearch-Prefill:hover,
+.DocSearch-Prefill:focus {
+ outline: none;
+ text-decoration: none;
+ @apply bg-gray-20;
}
-/* Highlighted text */
-.algolia-autocomplete .algolia-docsearch-suggestion--highlight {
- @apply text-fire bg-fire-5 shadow-none !important;
+/* Modal Footer */
+
+.DocSearch-Footer {
+ @apply flex flex-row-reverse flex-shrink-0 justify-between relative select-none w-full z-100 p-4;
}
-@media (max-width: 576px) {
- .algolia-autocomplete .ds-dropdown-menu {
- max-width: calc(100vw - 32px) !important;
- min-width: calc(100vw - 32px) !important;
- width: 100%;
- @apply -ml-10 !important;
+.DocSearch-Commands {
+ display: none !important;
+}
+
+/* Responsive */
+@media (max-width: 750px) {
+ .DocSearch-Dropdown {
+ height: 100%;
}
- .algolia-autocomplete .algolia-docsearch-suggestion--content {
- width: 100% !important;
- padding-left: 0 !important;
+
+ .DocSearch-Container {
+ padding: 2vh;
}
- .algolia-autocomplete .algolia-docsearch-suggestion--content:before {
- display: none !important;
+
+ /* .DocSearch-Hit-content-wrapper { */
+ /* display: flex; */
+ /* position: relative; */
+ /* width: 80%; */
+ /* } */
+
+ .DocSearch-Modal {
+ max-width: 95%;
}
- .algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column {
- display: none !important;
+
+ .DocSearch-Hit-Tree {
+ display: none;
}
}
-
/* purgecss end ignore */
From 996c903931ba6a4af9b3a90f721993a9e7b2b582 Mon Sep 17 00:00:00 2001
From: Pedro Castro
Date: Sat, 16 Jul 2022 01:47:25 -0300
Subject: [PATCH 02/22] update docsearc
---
package-lock.json | 100 ++++++++++++++++++-------------------
package.json | 2 +-
src/bindings/DocSearch.res | 14 ++++--
src/common/Util.mjs | 13 ++---
src/common/Util.res | 15 ------
src/common/Util.resi | 13 -----
src/components/Search.mjs | 11 +---
src/components/Search.res | 18 -------
8 files changed, 67 insertions(+), 119 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 88bf365fd..7a8ca73a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MIT",
"dependencies": {
- "@docsearch/react": "3.0.0",
+ "@docsearch/react": "^3.1.1",
"@headlessui/react": "^1.2.0",
"@mdx-js/loader": "^1.5.5",
"@next/mdx": "^8.1.0",
@@ -50,19 +50,19 @@
}
},
"node_modules/@algolia/autocomplete-core": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz",
- "integrity": "sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A==",
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.1.tgz",
+ "integrity": "sha512-eiZw+fxMzNQn01S8dA/hcCpoWCOCwcIIEUtHHdzN5TGB3IpzLbuhqFeTfh2OUhhgkE8Uo17+wH+QJ/wYyQmmzg==",
"dependencies": {
- "@algolia/autocomplete-shared": "1.5.2"
+ "@algolia/autocomplete-shared": "1.7.1"
}
},
"node_modules/@algolia/autocomplete-preset-algolia": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz",
- "integrity": "sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw==",
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.1.tgz",
+ "integrity": "sha512-pJwmIxeJCymU1M6cGujnaIYcY3QPOVYZOXhFkWVM7IxKzy272BwCvMFMyc5NpG/QmiObBxjo7myd060OeTNJXg==",
"dependencies": {
- "@algolia/autocomplete-shared": "1.5.2"
+ "@algolia/autocomplete-shared": "1.7.1"
},
"peerDependencies": {
"@algolia/client-search": "^4.9.1",
@@ -70,9 +70,9 @@
}
},
"node_modules/@algolia/autocomplete-shared": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz",
- "integrity": "sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug=="
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.1.tgz",
+ "integrity": "sha512-eTmGVqY3GeyBTT8IWiB2K5EuURAqhnumfktAEoHxfDY2o7vg2rSnO16ZtIG0fMgt3py28Vwgq42/bVEuaQV7pg=="
},
"node_modules/@algolia/cache-browser-local-storage": {
"version": "4.13.1",
@@ -481,24 +481,24 @@
}
},
"node_modules/@docsearch/css": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.0.0.tgz",
- "integrity": "sha512-1kkV7tkAsiuEd0shunYRByKJe3xQDG2q7wYg24SOw1nV9/2lwEd4WrUYRJC/ukGTl2/kHeFxsaUvtiOy0y6fFA=="
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.1.1.tgz",
+ "integrity": "sha512-utLgg7E1agqQeqCJn05DWC7XXMk4tMUUnL7MZupcknRu2OzGN13qwey2qA/0NAKkVBGugiWtON0+rlU0QIPojg=="
},
"node_modules/@docsearch/react": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.0.0.tgz",
- "integrity": "sha512-yhMacqS6TVQYoBh/o603zszIb5Bl8MIXuOc6Vy617I74pirisDzzcNh0NEaYQt50fVVR3khUbeEhUEWEWipESg==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.1.1.tgz",
+ "integrity": "sha512-cfoql4qvtsVRqBMYxhlGNpvyy/KlCoPqjIsJSZYqYf9AplZncKjLBTcwBu6RXFMVCe30cIFljniI4OjqAU67pQ==",
"dependencies": {
- "@algolia/autocomplete-core": "1.5.2",
- "@algolia/autocomplete-preset-algolia": "1.5.2",
- "@docsearch/css": "3.0.0",
+ "@algolia/autocomplete-core": "1.7.1",
+ "@algolia/autocomplete-preset-algolia": "1.7.1",
+ "@docsearch/css": "3.1.1",
"algoliasearch": "^4.0.0"
},
"peerDependencies": {
- "@types/react": ">= 16.8.0 < 18.0.0",
- "react": ">= 16.8.0 < 18.0.0",
- "react-dom": ">= 16.8.0 < 18.0.0"
+ "@types/react": ">= 16.8.0 < 19.0.0",
+ "react": ">= 16.8.0 < 19.0.0",
+ "react-dom": ">= 16.8.0 < 19.0.0"
}
},
"node_modules/@hapi/accept": {
@@ -1013,9 +1013,9 @@
"dev": true
},
"node_modules/@types/react": {
- "version": "17.0.47",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.47.tgz",
- "integrity": "sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA==",
+ "version": "18.0.15",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
+ "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
"peer": true,
"dependencies": {
"@types/prop-types": "*",
@@ -10737,25 +10737,25 @@
},
"dependencies": {
"@algolia/autocomplete-core": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz",
- "integrity": "sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A==",
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.1.tgz",
+ "integrity": "sha512-eiZw+fxMzNQn01S8dA/hcCpoWCOCwcIIEUtHHdzN5TGB3IpzLbuhqFeTfh2OUhhgkE8Uo17+wH+QJ/wYyQmmzg==",
"requires": {
- "@algolia/autocomplete-shared": "1.5.2"
+ "@algolia/autocomplete-shared": "1.7.1"
}
},
"@algolia/autocomplete-preset-algolia": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz",
- "integrity": "sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw==",
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.1.tgz",
+ "integrity": "sha512-pJwmIxeJCymU1M6cGujnaIYcY3QPOVYZOXhFkWVM7IxKzy272BwCvMFMyc5NpG/QmiObBxjo7myd060OeTNJXg==",
"requires": {
- "@algolia/autocomplete-shared": "1.5.2"
+ "@algolia/autocomplete-shared": "1.7.1"
}
},
"@algolia/autocomplete-shared": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz",
- "integrity": "sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug=="
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.1.tgz",
+ "integrity": "sha512-eTmGVqY3GeyBTT8IWiB2K5EuURAqhnumfktAEoHxfDY2o7vg2rSnO16ZtIG0fMgt3py28Vwgq42/bVEuaQV7pg=="
},
"@algolia/cache-browser-local-storage": {
"version": "4.13.1",
@@ -11088,18 +11088,18 @@
}
},
"@docsearch/css": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.0.0.tgz",
- "integrity": "sha512-1kkV7tkAsiuEd0shunYRByKJe3xQDG2q7wYg24SOw1nV9/2lwEd4WrUYRJC/ukGTl2/kHeFxsaUvtiOy0y6fFA=="
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.1.1.tgz",
+ "integrity": "sha512-utLgg7E1agqQeqCJn05DWC7XXMk4tMUUnL7MZupcknRu2OzGN13qwey2qA/0NAKkVBGugiWtON0+rlU0QIPojg=="
},
"@docsearch/react": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.0.0.tgz",
- "integrity": "sha512-yhMacqS6TVQYoBh/o603zszIb5Bl8MIXuOc6Vy617I74pirisDzzcNh0NEaYQt50fVVR3khUbeEhUEWEWipESg==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.1.1.tgz",
+ "integrity": "sha512-cfoql4qvtsVRqBMYxhlGNpvyy/KlCoPqjIsJSZYqYf9AplZncKjLBTcwBu6RXFMVCe30cIFljniI4OjqAU67pQ==",
"requires": {
- "@algolia/autocomplete-core": "1.5.2",
- "@algolia/autocomplete-preset-algolia": "1.5.2",
- "@docsearch/css": "3.0.0",
+ "@algolia/autocomplete-core": "1.7.1",
+ "@algolia/autocomplete-preset-algolia": "1.7.1",
+ "@docsearch/css": "3.1.1",
"algoliasearch": "^4.0.0"
}
},
@@ -11514,9 +11514,9 @@
"dev": true
},
"@types/react": {
- "version": "17.0.47",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.47.tgz",
- "integrity": "sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA==",
+ "version": "18.0.15",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
+ "integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
"peer": true,
"requires": {
"@types/prop-types": "*",
diff --git a/package.json b/package.json
index 4a9647807..4cde9ff0b 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"node": ">=12.x"
},
"dependencies": {
- "@docsearch/react": "3.0.0",
+ "@docsearch/react": "^3.1.1",
"@headlessui/react": "^1.2.0",
"@mdx-js/loader": "^1.5.5",
"@next/mdx": "^8.1.0",
diff --git a/src/bindings/DocSearch.res b/src/bindings/DocSearch.res
index 72426f251..ad20cc50f 100644
--- a/src/bindings/DocSearch.res
+++ b/src/bindings/DocSearch.res
@@ -1,3 +1,4 @@
+// https://docsearch.algolia.com/docs/api
type contentType =
| Content
| Lvl0
@@ -39,7 +40,11 @@ type item = {
}
type navigator = {
- navigate: @uncurry (item => unit)
+ navigate: item => unit
+}
+
+type searchParameters = {
+ facetFilters: array
}
@module("@docsearch/react") @react.component
@@ -47,7 +52,8 @@ external make: (
~appId: string,
~indexName: string,
~apiKey: string,
- ~transformItems: @uncurry transformItems => transformItems=?,
- ~hitComponent: @uncurry hitComponent => React.element=?,
- ~navigator: navigator=?
+ ~transformItems: transformItems => transformItems=?,
+ ~hitComponent: hitComponent => React.element=?,
+ ~navigator: navigator=?,
+ ~searchParameters: searchParameters=?
) => React.element = "DocSearch"
diff --git a/src/common/Util.mjs b/src/common/Util.mjs
index 874667188..8bec3df26 100644
--- a/src/common/Util.mjs
+++ b/src/common/Util.mjs
@@ -14,10 +14,6 @@ var $$String = {
capitalize: capitalize
};
-function make(url) {
- return new URL(url);
-}
-
var isAbsolute = (function(str) {
var r = new RegExp('^(?:[a-z]+:)?//', 'i');
if (r.test(str))
@@ -27,6 +23,10 @@ var isAbsolute = (function(str) {
return false;
});
+var Url = {
+ isAbsolute: isAbsolute
+};
+
function toDayMonthYear(date) {
return new (Intl.DateTimeFormat)("en-US", {
month: "short",
@@ -39,11 +39,6 @@ var $$Date = {
toDayMonthYear: toDayMonthYear
};
-var Url = {
- isAbsolute: isAbsolute,
- make: make
-};
-
var Unsafe = {
elementAsString: (function (prim) {
return prim;
diff --git a/src/common/Util.res b/src/common/Util.res
index e47b353d2..86fb2179a 100644
--- a/src/common/Util.res
+++ b/src/common/Util.res
@@ -60,21 +60,6 @@ module Json = {
}
module Url = {
- type t = {
- hash: string,
- host: string,
- hostname: string,
- href: string,
- origin: string,
- password: string,
- pathname: string,
- port: string,
- protocol: string,
- search: string
- }
- @new external interfaceURL: string => t = "URL"
- let make = url => interfaceURL(url)
-
let isAbsolute: string => bool = %raw(`
function(str) {
var r = new RegExp('^(?:[a-z]+:)?//', 'i');
diff --git a/src/common/Util.resi b/src/common/Util.resi
index 093c2ccd1..b1d2d4647 100644
--- a/src/common/Util.resi
+++ b/src/common/Util.resi
@@ -1,18 +1,5 @@
module Url: {
- type t = {
- hash: string,
- host: string,
- hostname: string,
- href: string,
- origin: string,
- password: string,
- pathname: string,
- port: string,
- protocol: string,
- search: string
- }
let isAbsolute: string => bool
- let make: string => t
}
module Unsafe: {
diff --git a/src/components/Search.mjs b/src/components/Search.mjs
index 95348990f..71943102f 100644
--- a/src/components/Search.mjs
+++ b/src/components/Search.mjs
@@ -1,6 +1,5 @@
// Generated by ReScript, PLEASE EDIT WITH CARE
-import * as Next from "../bindings/Next.mjs";
import * as React from "react";
import * as React$1 from "@docsearch/react";
@@ -11,16 +10,10 @@ var indexName = "rescript-lang";
var appId = "BH4D9OD16A";
function Search(Props) {
- var router = Next.Router.useRouter(undefined);
return React.createElement(React$1.DocSearch, {
appId: appId,
indexName: indexName,
- apiKey: apiKey,
- navigator: {
- navigate: (function (param) {
- return Next.Router.push(router, param.itemUrl);
- })
- }
+ apiKey: apiKey
});
}
@@ -33,4 +26,4 @@ export {
make ,
}
-/* Next Not a pure module */
+/* react Not a pure module */
diff --git a/src/components/Search.res b/src/components/Search.res
index 40c8aeafb..e85c6c2ae 100644
--- a/src/components/Search.res
+++ b/src/components/Search.res
@@ -4,27 +4,9 @@ let appId = "BH4D9OD16A"
@react.component
let make = () => {
- let router = Next.Router.useRouter()
-
{
- // items->Belt.Array.map(item => {
- // let new_url = Util.Url.make(item.url)
- // {...item, url: `${new_url.pathname}${new_url.hash}`}
- // })
- // }}
- // hitComponent={({hit, children}) => {
- // children
- // }}
- navigator={{
- navigate: {
- ({itemUrl}) => {
- router->Next.Router.push(itemUrl)
- }
- },
- }}
/>
}
\ No newline at end of file
From 8cd42e892b8bd23873fe15d403f688632dc8927c Mon Sep 17 00:00:00 2001
From: Pedro Castro
Date: Fri, 9 Dec 2022 01:09:59 -0300
Subject: [PATCH 03/22] initial refactor
---
package-lock.json | 461 +++++++++++++++++-----------------
package.json | 2 +-
src/bindings/DocSearch.res | 54 ++--
src/common/Util.mjs | 13 +-
src/common/Util.res | 9 +
src/common/Util.resi | 9 +
src/components/DocSearch.mjs | 193 --------------
src/components/Meta.res | 6 +-
src/components/Navigation.mjs | 53 +---
src/components/Search.mjs | 136 +++++++++-
src/components/Search.res | 97 ++++++-
styles/_docsearch.css | 4 +-
12 files changed, 510 insertions(+), 527 deletions(-)
delete mode 100644 src/components/DocSearch.mjs
diff --git a/package-lock.json b/package-lock.json
index bf9c7853f..503470bb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MIT",
"dependencies": {
- "@docsearch/react": "^3.1.1",
+ "@docsearch/react": "^3.3.0",
"@headlessui/react": "^1.2.0",
"@mdx-js/loader": "^1.5.5",
"@next/mdx": "^8.1.0",
@@ -46,147 +46,147 @@
"tailwindcss": "^2.1.4"
},
"engines": {
- "node": ">=16.17"
+ "node": "16.x"
}
},
"node_modules/@algolia/autocomplete-core": {
- "version": "1.7.1",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.1.tgz",
- "integrity": "sha512-eiZw+fxMzNQn01S8dA/hcCpoWCOCwcIIEUtHHdzN5TGB3IpzLbuhqFeTfh2OUhhgkE8Uo17+wH+QJ/wYyQmmzg==",
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.2.tgz",
+ "integrity": "sha512-eclwUDC6qfApNnEfu1uWcL/rudQsn59tjEoUYZYE2JSXZrHLRjBUGMxiCoknobU2Pva8ejb0eRxpIYDtVVqdsw==",
"dependencies": {
- "@algolia/autocomplete-shared": "1.7.1"
+ "@algolia/autocomplete-shared": "1.7.2"
}
},
"node_modules/@algolia/autocomplete-preset-algolia": {
- "version": "1.7.1",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.1.tgz",
- "integrity": "sha512-pJwmIxeJCymU1M6cGujnaIYcY3QPOVYZOXhFkWVM7IxKzy272BwCvMFMyc5NpG/QmiObBxjo7myd060OeTNJXg==",
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.2.tgz",
+ "integrity": "sha512-+RYEG6B0QiGGfRb2G3MtPfyrl0dALF3cQNTWBzBX6p5o01vCCGTTinAm2UKG3tfc2CnOMAtnPLkzNZyJUpnVJw==",
"dependencies": {
- "@algolia/autocomplete-shared": "1.7.1"
+ "@algolia/autocomplete-shared": "1.7.2"
},
"peerDependencies": {
- "@algolia/client-search": "^4.9.1",
- "algoliasearch": "^4.9.1"
+ "@algolia/client-search": ">= 4.9.1 < 6",
+ "algoliasearch": ">= 4.9.1 < 6"
}
},
"node_modules/@algolia/autocomplete-shared": {
- "version": "1.7.1",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.1.tgz",
- "integrity": "sha512-eTmGVqY3GeyBTT8IWiB2K5EuURAqhnumfktAEoHxfDY2o7vg2rSnO16ZtIG0fMgt3py28Vwgq42/bVEuaQV7pg=="
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.2.tgz",
+ "integrity": "sha512-QCckjiC7xXHIUaIL3ektBtjJ0w7tTA3iqKcAE/Hjn1lZ5omp7i3Y4e09rAr9ZybqirL7AbxCLLq0Ra5DDPKeug=="
},
"node_modules/@algolia/cache-browser-local-storage": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.13.1.tgz",
- "integrity": "sha512-UAUVG2PEfwd/FfudsZtYnidJ9eSCpS+LW9cQiesePQLz41NAcddKxBak6eP2GErqyFagSlnVXe/w2E9h2m2ttg==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.14.2.tgz",
+ "integrity": "sha512-FRweBkK/ywO+GKYfAWbrepewQsPTIEirhi1BdykX9mxvBPtGNKccYAxvGdDCumU1jL4r3cayio4psfzKMejBlA==",
"dependencies": {
- "@algolia/cache-common": "4.13.1"
+ "@algolia/cache-common": "4.14.2"
}
},
"node_modules/@algolia/cache-common": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.13.1.tgz",
- "integrity": "sha512-7Vaf6IM4L0Jkl3sYXbwK+2beQOgVJ0mKFbz/4qSxKd1iy2Sp77uTAazcX+Dlexekg1fqGUOSO7HS4Sx47ZJmjA=="
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.14.2.tgz",
+ "integrity": "sha512-SbvAlG9VqNanCErr44q6lEKD2qoK4XtFNx9Qn8FK26ePCI8I9yU7pYB+eM/cZdS9SzQCRJBbHUumVr4bsQ4uxg=="
},
"node_modules/@algolia/cache-in-memory": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.13.1.tgz",
- "integrity": "sha512-pZzybCDGApfA/nutsFK1P0Sbsq6fYJU3DwIvyKg4pURerlJM4qZbB9bfLRef0FkzfQu7W11E4cVLCIOWmyZeuQ==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.14.2.tgz",
+ "integrity": "sha512-HrOukWoop9XB/VFojPv1R5SVXowgI56T9pmezd/djh2JnVN/vXswhXV51RKy4nCpqxyHt/aGFSq2qkDvj6KiuQ==",
"dependencies": {
- "@algolia/cache-common": "4.13.1"
+ "@algolia/cache-common": "4.14.2"
}
},
"node_modules/@algolia/client-account": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.13.1.tgz",
- "integrity": "sha512-TFLiZ1KqMiir3FNHU+h3b0MArmyaHG+eT8Iojio6TdpeFcAQ1Aiy+2gb3SZk3+pgRJa/BxGmDkRUwE5E/lv3QQ==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.14.2.tgz",
+ "integrity": "sha512-WHtriQqGyibbb/Rx71YY43T0cXqyelEU0lB2QMBRXvD2X0iyeGl4qMxocgEIcbHyK7uqE7hKgjT8aBrHqhgc1w==",
"dependencies": {
- "@algolia/client-common": "4.13.1",
- "@algolia/client-search": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/client-common": "4.14.2",
+ "@algolia/client-search": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"node_modules/@algolia/client-analytics": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.13.1.tgz",
- "integrity": "sha512-iOS1JBqh7xaL5x00M5zyluZ9+9Uy9GqtYHv/2SMuzNW1qP7/0doz1lbcsP3S7KBbZANJTFHUOfuqyRLPk91iFA==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.14.2.tgz",
+ "integrity": "sha512-yBvBv2mw+HX5a+aeR0dkvUbFZsiC4FKSnfqk9rrfX+QrlNOKEhCG0tJzjiOggRW4EcNqRmaTULIYvIzQVL2KYQ==",
"dependencies": {
- "@algolia/client-common": "4.13.1",
- "@algolia/client-search": "4.13.1",
- "@algolia/requester-common": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/client-common": "4.14.2",
+ "@algolia/client-search": "4.14.2",
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"node_modules/@algolia/client-common": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.13.1.tgz",
- "integrity": "sha512-LcDoUE0Zz3YwfXJL6lJ2OMY2soClbjrrAKB6auYVMNJcoKZZ2cbhQoFR24AYoxnGUYBER/8B+9sTBj5bj/Gqbg==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.14.2.tgz",
+ "integrity": "sha512-43o4fslNLcktgtDMVaT5XwlzsDPzlqvqesRi4MjQz2x4/Sxm7zYg5LRYFol1BIhG6EwxKvSUq8HcC/KxJu3J0Q==",
"dependencies": {
- "@algolia/requester-common": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"node_modules/@algolia/client-personalization": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.13.1.tgz",
- "integrity": "sha512-1CqrOW1ypVrB4Lssh02hP//YxluoIYXAQCpg03L+/RiXJlCs+uIqlzC0ctpQPmxSlTK6h07kr50JQoYH/TIM9w==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.14.2.tgz",
+ "integrity": "sha512-ACCoLi0cL8CBZ1W/2juehSltrw2iqsQBnfiu/Rbl9W2yE6o2ZUb97+sqN/jBqYNQBS+o0ekTMKNkQjHHAcEXNw==",
"dependencies": {
- "@algolia/client-common": "4.13.1",
- "@algolia/requester-common": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/client-common": "4.14.2",
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"node_modules/@algolia/client-search": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.13.1.tgz",
- "integrity": "sha512-YQKYA83MNRz3FgTNM+4eRYbSmHi0WWpo019s5SeYcL3HUan/i5R09VO9dk3evELDFJYciiydSjbsmhBzbpPP2A==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.14.2.tgz",
+ "integrity": "sha512-L5zScdOmcZ6NGiVbLKTvP02UbxZ0njd5Vq9nJAmPFtjffUSOGEp11BmD2oMJ5QvARgx2XbX4KzTTNS5ECYIMWw==",
"dependencies": {
- "@algolia/client-common": "4.13.1",
- "@algolia/requester-common": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/client-common": "4.14.2",
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"node_modules/@algolia/logger-common": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.13.1.tgz",
- "integrity": "sha512-L6slbL/OyZaAXNtS/1A8SAbOJeEXD5JcZeDCPYDqSTYScfHu+2ePRTDMgUTY4gQ7HsYZ39N1LujOd8WBTmM2Aw=="
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.14.2.tgz",
+ "integrity": "sha512-/JGlYvdV++IcMHBnVFsqEisTiOeEr6cUJtpjz8zc0A9c31JrtLm318Njc72p14Pnkw3A/5lHHh+QxpJ6WFTmsA=="
},
"node_modules/@algolia/logger-console": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.13.1.tgz",
- "integrity": "sha512-7jQOTftfeeLlnb3YqF8bNgA2GZht7rdKkJ31OCeSH2/61haO0tWPoNRjZq9XLlgMQZH276pPo0NdiArcYPHjCA==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.14.2.tgz",
+ "integrity": "sha512-8S2PlpdshbkwlLCSAB5f8c91xyc84VM9Ar9EdfE9UmX+NrKNYnWR1maXXVDQQoto07G1Ol/tYFnFVhUZq0xV/g==",
"dependencies": {
- "@algolia/logger-common": "4.13.1"
+ "@algolia/logger-common": "4.14.2"
}
},
"node_modules/@algolia/requester-browser-xhr": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.13.1.tgz",
- "integrity": "sha512-oa0CKr1iH6Nc7CmU6RE7TnXMjHnlyp7S80pP/LvZVABeJHX3p/BcSCKovNYWWltgTxUg0U1o+2uuy8BpMKljwA==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.14.2.tgz",
+ "integrity": "sha512-CEh//xYz/WfxHFh7pcMjQNWgpl4wFB85lUMRyVwaDPibNzQRVcV33YS+63fShFWc2+42YEipFGH2iPzlpszmDw==",
"dependencies": {
- "@algolia/requester-common": "4.13.1"
+ "@algolia/requester-common": "4.14.2"
}
},
"node_modules/@algolia/requester-common": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.13.1.tgz",
- "integrity": "sha512-eGVf0ID84apfFEuXsaoSgIxbU3oFsIbz4XiotU3VS8qGCJAaLVUC5BUJEkiFENZIhon7hIB4d0RI13HY4RSA+w=="
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.14.2.tgz",
+ "integrity": "sha512-73YQsBOKa5fvVV3My7iZHu1sUqmjjfs9TteFWwPwDmnad7T0VTCopttcsM3OjLxZFtBnX61Xxl2T2gmG2O4ehg=="
},
"node_modules/@algolia/requester-node-http": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.13.1.tgz",
- "integrity": "sha512-7C0skwtLdCz5heKTVe/vjvrqgL/eJxmiEjHqXdtypcE5GCQCYI15cb+wC4ytYioZDMiuDGeVYmCYImPoEgUGPw==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.14.2.tgz",
+ "integrity": "sha512-oDbb02kd1o5GTEld4pETlPZLY0e+gOSWjWMJHWTgDXbv9rm/o2cF7japO6Vj1ENnrqWvLBmW1OzV9g6FUFhFXg==",
"dependencies": {
- "@algolia/requester-common": "4.13.1"
+ "@algolia/requester-common": "4.14.2"
}
},
"node_modules/@algolia/transporter": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.13.1.tgz",
- "integrity": "sha512-pICnNQN7TtrcYJqqPEXByV8rJ8ZRU2hCiIKLTLRyNpghtQG3VAFk6fVtdzlNfdUGZcehSKGarPIZEHlQXnKjgw==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.14.2.tgz",
+ "integrity": "sha512-t89dfQb2T9MFQHidjHcfhh6iGMNwvuKUvojAj+JsrHAGbuSy7yE4BylhLX6R0Q1xYRoC4Vvv+O5qIw/LdnQfsQ==",
"dependencies": {
- "@algolia/cache-common": "4.13.1",
- "@algolia/logger-common": "4.13.1",
- "@algolia/requester-common": "4.13.1"
+ "@algolia/cache-common": "4.14.2",
+ "@algolia/logger-common": "4.14.2",
+ "@algolia/requester-common": "4.14.2"
}
},
"node_modules/@babel/code-frame": {
@@ -481,24 +481,35 @@
}
},
"node_modules/@docsearch/css": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.1.1.tgz",
- "integrity": "sha512-utLgg7E1agqQeqCJn05DWC7XXMk4tMUUnL7MZupcknRu2OzGN13qwey2qA/0NAKkVBGugiWtON0+rlU0QIPojg=="
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.3.0.tgz",
+ "integrity": "sha512-rODCdDtGyudLj+Va8b6w6Y85KE85bXRsps/R4Yjwt5vueXKXZQKYw0aA9knxLBT6a/bI/GMrAcmCR75KYOM6hg=="
},
"node_modules/@docsearch/react": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.1.1.tgz",
- "integrity": "sha512-cfoql4qvtsVRqBMYxhlGNpvyy/KlCoPqjIsJSZYqYf9AplZncKjLBTcwBu6RXFMVCe30cIFljniI4OjqAU67pQ==",
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.3.0.tgz",
+ "integrity": "sha512-fhS5adZkae2SSdMYEMVg6pxI5a/cE+tW16ki1V0/ur4Fdok3hBRkmN/H8VvlXnxzggkQIIRIVvYPn00JPjen3A==",
"dependencies": {
- "@algolia/autocomplete-core": "1.7.1",
- "@algolia/autocomplete-preset-algolia": "1.7.1",
- "@docsearch/css": "3.1.1",
+ "@algolia/autocomplete-core": "1.7.2",
+ "@algolia/autocomplete-preset-algolia": "1.7.2",
+ "@docsearch/css": "3.3.0",
"algoliasearch": "^4.0.0"
},
"peerDependencies": {
"@types/react": ">= 16.8.0 < 19.0.0",
"react": ">= 16.8.0 < 19.0.0",
"react-dom": ">= 16.8.0 < 19.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "react": {
+ "optional": true
+ },
+ "react-dom": {
+ "optional": true
+ }
}
},
"node_modules/@hapi/accept": {
@@ -1004,6 +1015,7 @@
"version": "15.7.5",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==",
+ "optional": true,
"peer": true
},
"node_modules/@types/q": {
@@ -1016,6 +1028,7 @@
"version": "18.0.15",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
"integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
+ "optional": true,
"peer": true,
"dependencies": {
"@types/prop-types": "*",
@@ -1027,6 +1040,7 @@
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
+ "optional": true,
"peer": true
},
"node_modules/@types/unist": {
@@ -1279,24 +1293,24 @@
}
},
"node_modules/algoliasearch": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.13.1.tgz",
- "integrity": "sha512-dtHUSE0caWTCE7liE1xaL+19AFf6kWEcyn76uhcitWpntqvicFHXKFoZe5JJcv9whQOTRM6+B8qJz6sFj+rDJA==",
- "dependencies": {
- "@algolia/cache-browser-local-storage": "4.13.1",
- "@algolia/cache-common": "4.13.1",
- "@algolia/cache-in-memory": "4.13.1",
- "@algolia/client-account": "4.13.1",
- "@algolia/client-analytics": "4.13.1",
- "@algolia/client-common": "4.13.1",
- "@algolia/client-personalization": "4.13.1",
- "@algolia/client-search": "4.13.1",
- "@algolia/logger-common": "4.13.1",
- "@algolia/logger-console": "4.13.1",
- "@algolia/requester-browser-xhr": "4.13.1",
- "@algolia/requester-common": "4.13.1",
- "@algolia/requester-node-http": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.14.2.tgz",
+ "integrity": "sha512-ngbEQonGEmf8dyEh5f+uOIihv4176dgbuOZspiuhmTTBRBuzWu3KCGHre6uHj5YyuC7pNvQGzB6ZNJyZi0z+Sg==",
+ "dependencies": {
+ "@algolia/cache-browser-local-storage": "4.14.2",
+ "@algolia/cache-common": "4.14.2",
+ "@algolia/cache-in-memory": "4.14.2",
+ "@algolia/client-account": "4.14.2",
+ "@algolia/client-analytics": "4.14.2",
+ "@algolia/client-common": "4.14.2",
+ "@algolia/client-personalization": "4.14.2",
+ "@algolia/client-search": "4.14.2",
+ "@algolia/logger-common": "4.14.2",
+ "@algolia/logger-console": "4.14.2",
+ "@algolia/requester-browser-xhr": "4.14.2",
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/requester-node-http": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"node_modules/alphanum-sort": {
@@ -2670,6 +2684,7 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
"integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==",
+ "optional": true,
"peer": true
},
"node_modules/dashdash": {
@@ -8595,18 +8610,9 @@
}
},
"node_modules/rescript": {
-<<<<<<< HEAD
- "version": "9.1.2",
- "resolved": "https://registry.npmjs.org/rescript/-/rescript-9.1.2.tgz",
- "integrity": "sha512-4wHvTDv3nyYnAPJHcg1RGG8z7u3HDiBf6RN3P/dITDv859Qo35aKOzJWQtfBzbAs0EKNafLqei3TnUqiAv6BwQ==",
-||||||| 37814f5
- "version": "9.1.2",
- "integrity": "sha512-4wHvTDv3nyYnAPJHcg1RGG8z7u3HDiBf6RN3P/dITDv859Qo35aKOzJWQtfBzbAs0EKNafLqei3TnUqiAv6BwQ==",
-=======
"version": "10.1.0-rc.4",
- "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.0-rc.4.tgz",
+ "resolved": "https://registry.npmjs.org/rescript/-/rescript-9.1.2.tgz",
"integrity": "sha512-xvUfEKBs1U/WN1mFX8YipvNj7KUChX/ULvyb1TP2wSR2qgNrcRAy+dW7jc2F2tv0Qbrc47HEZi/1Ni0z3nVvmw==",
->>>>>>> master
"dev": true,
"hasInstallScript": true,
"bin": {
@@ -10746,139 +10752,139 @@
},
"dependencies": {
"@algolia/autocomplete-core": {
- "version": "1.7.1",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.1.tgz",
- "integrity": "sha512-eiZw+fxMzNQn01S8dA/hcCpoWCOCwcIIEUtHHdzN5TGB3IpzLbuhqFeTfh2OUhhgkE8Uo17+wH+QJ/wYyQmmzg==",
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.2.tgz",
+ "integrity": "sha512-eclwUDC6qfApNnEfu1uWcL/rudQsn59tjEoUYZYE2JSXZrHLRjBUGMxiCoknobU2Pva8ejb0eRxpIYDtVVqdsw==",
"requires": {
- "@algolia/autocomplete-shared": "1.7.1"
+ "@algolia/autocomplete-shared": "1.7.2"
}
},
"@algolia/autocomplete-preset-algolia": {
- "version": "1.7.1",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.1.tgz",
- "integrity": "sha512-pJwmIxeJCymU1M6cGujnaIYcY3QPOVYZOXhFkWVM7IxKzy272BwCvMFMyc5NpG/QmiObBxjo7myd060OeTNJXg==",
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.2.tgz",
+ "integrity": "sha512-+RYEG6B0QiGGfRb2G3MtPfyrl0dALF3cQNTWBzBX6p5o01vCCGTTinAm2UKG3tfc2CnOMAtnPLkzNZyJUpnVJw==",
"requires": {
- "@algolia/autocomplete-shared": "1.7.1"
+ "@algolia/autocomplete-shared": "1.7.2"
}
},
"@algolia/autocomplete-shared": {
- "version": "1.7.1",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.1.tgz",
- "integrity": "sha512-eTmGVqY3GeyBTT8IWiB2K5EuURAqhnumfktAEoHxfDY2o7vg2rSnO16ZtIG0fMgt3py28Vwgq42/bVEuaQV7pg=="
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.2.tgz",
+ "integrity": "sha512-QCckjiC7xXHIUaIL3ektBtjJ0w7tTA3iqKcAE/Hjn1lZ5omp7i3Y4e09rAr9ZybqirL7AbxCLLq0Ra5DDPKeug=="
},
"@algolia/cache-browser-local-storage": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.13.1.tgz",
- "integrity": "sha512-UAUVG2PEfwd/FfudsZtYnidJ9eSCpS+LW9cQiesePQLz41NAcddKxBak6eP2GErqyFagSlnVXe/w2E9h2m2ttg==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.14.2.tgz",
+ "integrity": "sha512-FRweBkK/ywO+GKYfAWbrepewQsPTIEirhi1BdykX9mxvBPtGNKccYAxvGdDCumU1jL4r3cayio4psfzKMejBlA==",
"requires": {
- "@algolia/cache-common": "4.13.1"
+ "@algolia/cache-common": "4.14.2"
}
},
"@algolia/cache-common": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.13.1.tgz",
- "integrity": "sha512-7Vaf6IM4L0Jkl3sYXbwK+2beQOgVJ0mKFbz/4qSxKd1iy2Sp77uTAazcX+Dlexekg1fqGUOSO7HS4Sx47ZJmjA=="
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.14.2.tgz",
+ "integrity": "sha512-SbvAlG9VqNanCErr44q6lEKD2qoK4XtFNx9Qn8FK26ePCI8I9yU7pYB+eM/cZdS9SzQCRJBbHUumVr4bsQ4uxg=="
},
"@algolia/cache-in-memory": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.13.1.tgz",
- "integrity": "sha512-pZzybCDGApfA/nutsFK1P0Sbsq6fYJU3DwIvyKg4pURerlJM4qZbB9bfLRef0FkzfQu7W11E4cVLCIOWmyZeuQ==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.14.2.tgz",
+ "integrity": "sha512-HrOukWoop9XB/VFojPv1R5SVXowgI56T9pmezd/djh2JnVN/vXswhXV51RKy4nCpqxyHt/aGFSq2qkDvj6KiuQ==",
"requires": {
- "@algolia/cache-common": "4.13.1"
+ "@algolia/cache-common": "4.14.2"
}
},
"@algolia/client-account": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.13.1.tgz",
- "integrity": "sha512-TFLiZ1KqMiir3FNHU+h3b0MArmyaHG+eT8Iojio6TdpeFcAQ1Aiy+2gb3SZk3+pgRJa/BxGmDkRUwE5E/lv3QQ==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.14.2.tgz",
+ "integrity": "sha512-WHtriQqGyibbb/Rx71YY43T0cXqyelEU0lB2QMBRXvD2X0iyeGl4qMxocgEIcbHyK7uqE7hKgjT8aBrHqhgc1w==",
"requires": {
- "@algolia/client-common": "4.13.1",
- "@algolia/client-search": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/client-common": "4.14.2",
+ "@algolia/client-search": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"@algolia/client-analytics": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.13.1.tgz",
- "integrity": "sha512-iOS1JBqh7xaL5x00M5zyluZ9+9Uy9GqtYHv/2SMuzNW1qP7/0doz1lbcsP3S7KBbZANJTFHUOfuqyRLPk91iFA==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.14.2.tgz",
+ "integrity": "sha512-yBvBv2mw+HX5a+aeR0dkvUbFZsiC4FKSnfqk9rrfX+QrlNOKEhCG0tJzjiOggRW4EcNqRmaTULIYvIzQVL2KYQ==",
"requires": {
- "@algolia/client-common": "4.13.1",
- "@algolia/client-search": "4.13.1",
- "@algolia/requester-common": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/client-common": "4.14.2",
+ "@algolia/client-search": "4.14.2",
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"@algolia/client-common": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.13.1.tgz",
- "integrity": "sha512-LcDoUE0Zz3YwfXJL6lJ2OMY2soClbjrrAKB6auYVMNJcoKZZ2cbhQoFR24AYoxnGUYBER/8B+9sTBj5bj/Gqbg==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.14.2.tgz",
+ "integrity": "sha512-43o4fslNLcktgtDMVaT5XwlzsDPzlqvqesRi4MjQz2x4/Sxm7zYg5LRYFol1BIhG6EwxKvSUq8HcC/KxJu3J0Q==",
"requires": {
- "@algolia/requester-common": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"@algolia/client-personalization": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.13.1.tgz",
- "integrity": "sha512-1CqrOW1ypVrB4Lssh02hP//YxluoIYXAQCpg03L+/RiXJlCs+uIqlzC0ctpQPmxSlTK6h07kr50JQoYH/TIM9w==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.14.2.tgz",
+ "integrity": "sha512-ACCoLi0cL8CBZ1W/2juehSltrw2iqsQBnfiu/Rbl9W2yE6o2ZUb97+sqN/jBqYNQBS+o0ekTMKNkQjHHAcEXNw==",
"requires": {
- "@algolia/client-common": "4.13.1",
- "@algolia/requester-common": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/client-common": "4.14.2",
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"@algolia/client-search": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.13.1.tgz",
- "integrity": "sha512-YQKYA83MNRz3FgTNM+4eRYbSmHi0WWpo019s5SeYcL3HUan/i5R09VO9dk3evELDFJYciiydSjbsmhBzbpPP2A==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.14.2.tgz",
+ "integrity": "sha512-L5zScdOmcZ6NGiVbLKTvP02UbxZ0njd5Vq9nJAmPFtjffUSOGEp11BmD2oMJ5QvARgx2XbX4KzTTNS5ECYIMWw==",
"requires": {
- "@algolia/client-common": "4.13.1",
- "@algolia/requester-common": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "@algolia/client-common": "4.14.2",
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"@algolia/logger-common": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.13.1.tgz",
- "integrity": "sha512-L6slbL/OyZaAXNtS/1A8SAbOJeEXD5JcZeDCPYDqSTYScfHu+2ePRTDMgUTY4gQ7HsYZ39N1LujOd8WBTmM2Aw=="
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.14.2.tgz",
+ "integrity": "sha512-/JGlYvdV++IcMHBnVFsqEisTiOeEr6cUJtpjz8zc0A9c31JrtLm318Njc72p14Pnkw3A/5lHHh+QxpJ6WFTmsA=="
},
"@algolia/logger-console": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.13.1.tgz",
- "integrity": "sha512-7jQOTftfeeLlnb3YqF8bNgA2GZht7rdKkJ31OCeSH2/61haO0tWPoNRjZq9XLlgMQZH276pPo0NdiArcYPHjCA==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.14.2.tgz",
+ "integrity": "sha512-8S2PlpdshbkwlLCSAB5f8c91xyc84VM9Ar9EdfE9UmX+NrKNYnWR1maXXVDQQoto07G1Ol/tYFnFVhUZq0xV/g==",
"requires": {
- "@algolia/logger-common": "4.13.1"
+ "@algolia/logger-common": "4.14.2"
}
},
"@algolia/requester-browser-xhr": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.13.1.tgz",
- "integrity": "sha512-oa0CKr1iH6Nc7CmU6RE7TnXMjHnlyp7S80pP/LvZVABeJHX3p/BcSCKovNYWWltgTxUg0U1o+2uuy8BpMKljwA==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.14.2.tgz",
+ "integrity": "sha512-CEh//xYz/WfxHFh7pcMjQNWgpl4wFB85lUMRyVwaDPibNzQRVcV33YS+63fShFWc2+42YEipFGH2iPzlpszmDw==",
"requires": {
- "@algolia/requester-common": "4.13.1"
+ "@algolia/requester-common": "4.14.2"
}
},
"@algolia/requester-common": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.13.1.tgz",
- "integrity": "sha512-eGVf0ID84apfFEuXsaoSgIxbU3oFsIbz4XiotU3VS8qGCJAaLVUC5BUJEkiFENZIhon7hIB4d0RI13HY4RSA+w=="
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.14.2.tgz",
+ "integrity": "sha512-73YQsBOKa5fvVV3My7iZHu1sUqmjjfs9TteFWwPwDmnad7T0VTCopttcsM3OjLxZFtBnX61Xxl2T2gmG2O4ehg=="
},
"@algolia/requester-node-http": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.13.1.tgz",
- "integrity": "sha512-7C0skwtLdCz5heKTVe/vjvrqgL/eJxmiEjHqXdtypcE5GCQCYI15cb+wC4ytYioZDMiuDGeVYmCYImPoEgUGPw==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.14.2.tgz",
+ "integrity": "sha512-oDbb02kd1o5GTEld4pETlPZLY0e+gOSWjWMJHWTgDXbv9rm/o2cF7japO6Vj1ENnrqWvLBmW1OzV9g6FUFhFXg==",
"requires": {
- "@algolia/requester-common": "4.13.1"
+ "@algolia/requester-common": "4.14.2"
}
},
"@algolia/transporter": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.13.1.tgz",
- "integrity": "sha512-pICnNQN7TtrcYJqqPEXByV8rJ8ZRU2hCiIKLTLRyNpghtQG3VAFk6fVtdzlNfdUGZcehSKGarPIZEHlQXnKjgw==",
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.14.2.tgz",
+ "integrity": "sha512-t89dfQb2T9MFQHidjHcfhh6iGMNwvuKUvojAj+JsrHAGbuSy7yE4BylhLX6R0Q1xYRoC4Vvv+O5qIw/LdnQfsQ==",
"requires": {
- "@algolia/cache-common": "4.13.1",
- "@algolia/logger-common": "4.13.1",
- "@algolia/requester-common": "4.13.1"
+ "@algolia/cache-common": "4.14.2",
+ "@algolia/logger-common": "4.14.2",
+ "@algolia/requester-common": "4.14.2"
}
},
"@babel/code-frame": {
@@ -11097,18 +11103,18 @@
}
},
"@docsearch/css": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.1.1.tgz",
- "integrity": "sha512-utLgg7E1agqQeqCJn05DWC7XXMk4tMUUnL7MZupcknRu2OzGN13qwey2qA/0NAKkVBGugiWtON0+rlU0QIPojg=="
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.3.0.tgz",
+ "integrity": "sha512-rODCdDtGyudLj+Va8b6w6Y85KE85bXRsps/R4Yjwt5vueXKXZQKYw0aA9knxLBT6a/bI/GMrAcmCR75KYOM6hg=="
},
"@docsearch/react": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.1.1.tgz",
- "integrity": "sha512-cfoql4qvtsVRqBMYxhlGNpvyy/KlCoPqjIsJSZYqYf9AplZncKjLBTcwBu6RXFMVCe30cIFljniI4OjqAU67pQ==",
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.3.0.tgz",
+ "integrity": "sha512-fhS5adZkae2SSdMYEMVg6pxI5a/cE+tW16ki1V0/ur4Fdok3hBRkmN/H8VvlXnxzggkQIIRIVvYPn00JPjen3A==",
"requires": {
- "@algolia/autocomplete-core": "1.7.1",
- "@algolia/autocomplete-preset-algolia": "1.7.1",
- "@docsearch/css": "3.1.1",
+ "@algolia/autocomplete-core": "1.7.2",
+ "@algolia/autocomplete-preset-algolia": "1.7.2",
+ "@docsearch/css": "3.3.0",
"algoliasearch": "^4.0.0"
}
},
@@ -11514,6 +11520,7 @@
"version": "15.7.5",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==",
+ "optional": true,
"peer": true
},
"@types/q": {
@@ -11526,6 +11533,7 @@
"version": "18.0.15",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.15.tgz",
"integrity": "sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==",
+ "optional": true,
"peer": true,
"requires": {
"@types/prop-types": "*",
@@ -11537,6 +11545,7 @@
"version": "0.16.2",
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
+ "optional": true,
"peer": true
},
"@types/unist": {
@@ -11771,24 +11780,24 @@
"requires": {}
},
"algoliasearch": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.13.1.tgz",
- "integrity": "sha512-dtHUSE0caWTCE7liE1xaL+19AFf6kWEcyn76uhcitWpntqvicFHXKFoZe5JJcv9whQOTRM6+B8qJz6sFj+rDJA==",
- "requires": {
- "@algolia/cache-browser-local-storage": "4.13.1",
- "@algolia/cache-common": "4.13.1",
- "@algolia/cache-in-memory": "4.13.1",
- "@algolia/client-account": "4.13.1",
- "@algolia/client-analytics": "4.13.1",
- "@algolia/client-common": "4.13.1",
- "@algolia/client-personalization": "4.13.1",
- "@algolia/client-search": "4.13.1",
- "@algolia/logger-common": "4.13.1",
- "@algolia/logger-console": "4.13.1",
- "@algolia/requester-browser-xhr": "4.13.1",
- "@algolia/requester-common": "4.13.1",
- "@algolia/requester-node-http": "4.13.1",
- "@algolia/transporter": "4.13.1"
+ "version": "4.14.2",
+ "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.14.2.tgz",
+ "integrity": "sha512-ngbEQonGEmf8dyEh5f+uOIihv4176dgbuOZspiuhmTTBRBuzWu3KCGHre6uHj5YyuC7pNvQGzB6ZNJyZi0z+Sg==",
+ "requires": {
+ "@algolia/cache-browser-local-storage": "4.14.2",
+ "@algolia/cache-common": "4.14.2",
+ "@algolia/cache-in-memory": "4.14.2",
+ "@algolia/client-account": "4.14.2",
+ "@algolia/client-analytics": "4.14.2",
+ "@algolia/client-common": "4.14.2",
+ "@algolia/client-personalization": "4.14.2",
+ "@algolia/client-search": "4.14.2",
+ "@algolia/logger-common": "4.14.2",
+ "@algolia/logger-console": "4.14.2",
+ "@algolia/requester-browser-xhr": "4.14.2",
+ "@algolia/requester-common": "4.14.2",
+ "@algolia/requester-node-http": "4.14.2",
+ "@algolia/transporter": "4.14.2"
}
},
"alphanum-sort": {
@@ -12862,6 +12871,7 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
"integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==",
+ "optional": true,
"peer": true
},
"dashdash": {
@@ -17233,18 +17243,9 @@
"dev": true
},
"rescript": {
-<<<<<<< HEAD
- "version": "9.1.2",
- "resolved": "https://registry.npmjs.org/rescript/-/rescript-9.1.2.tgz",
- "integrity": "sha512-4wHvTDv3nyYnAPJHcg1RGG8z7u3HDiBf6RN3P/dITDv859Qo35aKOzJWQtfBzbAs0EKNafLqei3TnUqiAv6BwQ==",
-||||||| 37814f5
- "version": "9.1.2",
- "integrity": "sha512-4wHvTDv3nyYnAPJHcg1RGG8z7u3HDiBf6RN3P/dITDv859Qo35aKOzJWQtfBzbAs0EKNafLqei3TnUqiAv6BwQ==",
-=======
"version": "10.1.0-rc.4",
- "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.0-rc.4.tgz",
+ "resolved": "https://registry.npmjs.org/rescript/-/rescript-9.1.2.tgz",
"integrity": "sha512-xvUfEKBs1U/WN1mFX8YipvNj7KUChX/ULvyb1TP2wSR2qgNrcRAy+dW7jc2F2tv0Qbrc47HEZi/1Ni0z3nVvmw==",
->>>>>>> master
"dev": true
},
"resolve": {
diff --git a/package.json b/package.json
index 56e8e8c57..47c1f7341 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"node": "16.x"
},
"dependencies": {
- "@docsearch/react": "^3.1.1",
+ "@docsearch/react": "^3.3.0",
"@headlessui/react": "^1.2.0",
"@mdx-js/loader": "^1.5.5",
"@next/mdx": "^8.1.0",
diff --git a/src/bindings/DocSearch.res b/src/bindings/DocSearch.res
index ad20cc50f..d00ddeb12 100644
--- a/src/bindings/DocSearch.res
+++ b/src/bindings/DocSearch.res
@@ -1,51 +1,46 @@
-// https://docsearch.algolia.com/docs/api
-type contentType =
- | Content
- | Lvl0
- | Lvl1
- | Lvl2
- | Lvl3
- | Lvl4
- | Lvl5
- | Lvl6
+// API: https://github.com/algolia/docsearch/tree/v3.3.0/packages/docsearch-react/src/types
+type contentType = [
+ | #content
+ | #lvl0
+ | #lvl1
+ | #lvl2
+ | #lvl3
+ | #lvl4
+ | #lvl5
+ | #lvl6
+]
type hierarchy = {
lvl0: string,
lvl1: string,
- lvl2: option,
- lvl3: option,
- lvl4: option,
- lvl5: option,
- lvl6: option,
+ lvl2: Js.Nullable.t,
+ lvl3: Js.Nullable.t,
+ lvl4: Js.Nullable.t,
+ lvl5: Js.Nullable.t,
+ lvl6: Js.Nullable.t,
}
type docSearchHit = {
objectID: string,
- content: option,
+ content: Js.Nullable.t,
url: string,
url_without_anchor: string,
@as("type") type_: contentType,
- anchor: option,
+ anchor: Js.Nullable.t,
hierarchy: hierarchy,
}
type transformItems = array
type hitComponent = {
hit: docSearchHit,
- children: React.element
+ children: React.element,
}
-type item = {
- itemUrl: string
-}
+type item = {itemUrl: string}
-type navigator = {
- navigate: item => unit
-}
+type navigator = {navigate: item => unit}
-type searchParameters = {
- facetFilters: array
-}
+type searchParameters = {facetFilters: array}
@module("@docsearch/react") @react.component
external make: (
@@ -55,5 +50,6 @@ external make: (
~transformItems: transformItems => transformItems=?,
~hitComponent: hitComponent => React.element=?,
~navigator: navigator=?,
- ~searchParameters: searchParameters=?
-) => React.element = "DocSearch"
+ ~onClose: unit => unit=?,
+ ~searchParameters: searchParameters=?,
+) => React.element = "DocSearchModal"
diff --git a/src/common/Util.mjs b/src/common/Util.mjs
index e3bb59d1b..2096d6431 100644
--- a/src/common/Util.mjs
+++ b/src/common/Util.mjs
@@ -23,10 +23,6 @@ var isAbsolute = (function(str) {
return false;
});
-var Url = {
- isAbsolute: isAbsolute
-};
-
function toDayMonthYear(date) {
return new (Intl.DateTimeFormat)("en-US", {
month: "short",
@@ -39,6 +35,15 @@ var $$Date = {
toDayMonthYear: toDayMonthYear
};
+function Url_make(prim) {
+ return new URL(prim);
+}
+
+var Url = {
+ isAbsolute: isAbsolute,
+ make: Url_make
+};
+
var Unsafe = {
elementAsString: (function (prim) {
return prim;
diff --git a/src/common/Util.res b/src/common/Util.res
index 86fb2179a..dfba38bc3 100644
--- a/src/common/Util.res
+++ b/src/common/Util.res
@@ -60,6 +60,14 @@ module Json = {
}
module Url = {
+ type t = {
+ hash: string,
+ host: string,
+ hostname: string,
+ href: string,
+ origin: string,
+ pathname: string
+ }
let isAbsolute: string => bool = %raw(`
function(str) {
var r = new RegExp('^(?:[a-z]+:)?//', 'i');
@@ -70,6 +78,7 @@ module Url = {
return false;
}
`) //', 'i');
+ @new external make: string => t = "URL"
}
module Date = {
diff --git a/src/common/Util.resi b/src/common/Util.resi
index b1d2d4647..158c57403 100644
--- a/src/common/Util.resi
+++ b/src/common/Util.resi
@@ -1,5 +1,14 @@
module Url: {
+ type t = {
+ hash: string,
+ host: string,
+ hostname: string,
+ href: string,
+ origin: string,
+ pathname: string
+ }
let isAbsolute: string => bool
+ let make: string => t
}
module Unsafe: {
diff --git a/src/components/DocSearch.mjs b/src/components/DocSearch.mjs
deleted file mode 100644
index ad401e741..000000000
--- a/src/components/DocSearch.mjs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Icon from "./Icon.mjs";
-import * as Curry from "rescript/lib/es6/curry.js";
-import * as React from "react";
-import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
-import * as Caml_option from "rescript/lib/es6/caml_option.js";
-
-function DocSearch(Props) {
- var inputRef = React.useRef(null);
- var match = React.useState(function () {
- return /* Inactive */1;
- });
- var setState = match[1];
- React.useEffect((function () {
- var init = window.docsearch;
- if (init !== undefined) {
- Curry._1(init, {
- apiKey: "d3d9d7cebf13a7b665e47cb85dc9c582",
- indexName: "rescript-lang",
- inputSelector: "#docsearch"
- });
- }
-
- }), []);
- React.useEffect((function () {
- var isEditableTag = function (el) {
- var match = el.tagName;
- switch (match) {
- case "INPUT" :
- case "SELECT" :
- case "TEXTAREA" :
- return true;
- default:
- return false;
- }
- };
- var focusSearch = function (e) {
- var el = document.activeElement;
- if (el !== undefined) {
- var el$1 = Caml_option.valFromOption(el);
- if (isEditableTag(el$1)) {
- return ;
- }
- if (el$1.isContentEditable) {
- return ;
- }
-
- }
- Curry._1(setState, (function (param) {
- return /* Active */0;
- }));
- Belt_Option.forEach(Caml_option.nullable_to_opt(inputRef.current), (function (prim) {
- prim.focus();
- }));
- e.preventDefault();
- };
- var handleGlobalKeyDown = function (e) {
- var match = e.key;
- switch (match) {
- case "/" :
- return focusSearch(e);
- case "k" :
- if (e.ctrlKey || e.metaKey) {
- return focusSearch(e);
- } else {
- return ;
- }
- default:
- return ;
- }
- };
- window.addEventListener("keydown", handleGlobalKeyDown);
- return (function (param) {
- window.addEventListener("keydown", handleGlobalKeyDown);
- });
- }), [setState]);
- var clearInput = function (param) {
- Belt_Option.forEach(Caml_option.nullable_to_opt(inputRef.current), (function (el) {
- el.value = "";
- }));
- };
- var onClick = function (param) {
- Curry._1(setState, (function (param) {
- return /* Active */0;
- }));
- clearInput(undefined);
- Belt_Option.forEach(Caml_option.nullable_to_opt(inputRef.current), (function (el) {
- el.focus();
- }));
- };
- var onBlur = function (param) {
- clearInput(undefined);
- Curry._1(setState, (function (param) {
- return /* Inactive */1;
- }));
- };
- var onKeyDown = function (evt) {
- var key = evt.key;
- if (key === "Escape") {
- return Belt_Option.forEach(Caml_option.nullable_to_opt(inputRef.current), (function (el) {
- el.blur();
- }));
- }
-
- };
- var isActive = match[0] ? false : true;
- var activeClass = isActive ? "text-white border border-gray-60" : "";
- var activeInput = isActive ? "w-32 mr-3" : "w-0";
- return React.createElement("div", {
- className: activeClass + " bg-gray-100 border border-gray-70 hover:text-white hover:cursor-pointer flex justify-center p-2 px-3 rounded-lg",
- onClick: onClick
- }, React.createElement("input", {
- ref: inputRef,
- className: "transition-all ease-in-out duration-150 text-white bg-gray-100 border-none focus:outline-none " + activeInput,
- id: "docsearch",
- type: "text",
- onKeyDown: onKeyDown,
- onBlur: onBlur
- }), React.createElement(Icon.MagnifierGlass.make, {
- className: "text-gray-60 w-5 h-5"
- }));
-}
-
-function DocSearch$Textbox(Props) {
- var id = Props.id;
- React.useEffect((function () {
- var init = window.docsearch;
- if (init !== undefined) {
- Curry._1(init, {
- apiKey: "d3d9d7cebf13a7b665e47cb85dc9c582",
- indexName: "rescript-lang",
- inputSelector: "#" + id
- });
- }
-
- }), []);
- var inputRef = React.useRef(null);
- var match = React.useState(function () {
- return /* Inactive */1;
- });
- var setState = match[1];
- var onClick = function (param) {
- Curry._1(setState, (function (param) {
- return /* Active */0;
- }));
- Belt_Option.forEach(Caml_option.nullable_to_opt(inputRef.current), (function (el) {
- el.focus();
- }));
- };
- var onBlur = function (param) {
- Curry._1(setState, (function (param) {
- return /* Inactive */1;
- }));
- };
- var onKeyDown = function (evt) {
- var key = evt.key;
- if (key === "Escape") {
- return Belt_Option.forEach(Caml_option.nullable_to_opt(inputRef.current), (function (el) {
- el.blur();
- }));
- }
-
- };
- var isActive = match[0] ? false : true;
- var activeClass = isActive ? "text-white border border-white-80" : "opacity-75";
- var activeInput = "";
- return React.createElement("div", {
- className: activeClass + " hover:text-white hover:cursor-pointer bg-gray-80 flex items-center p-2 px-3 rounded",
- onClick: onClick
- }, React.createElement(Icon.MagnifierGlass.make, {
- className: "w-5 h-5 mr-3"
- }), React.createElement("input", {
- ref: inputRef,
- className: "w-32 bg-gray-80 focus:outline-none " + activeInput,
- id: id,
- type: "text",
- onKeyDown: onKeyDown,
- onBlur: onBlur
- }));
-}
-
-var Textbox = {
- make: DocSearch$Textbox
-};
-
-var make = DocSearch;
-
-export {
- Textbox ,
- make ,
-}
-/* Icon Not a pure module */
diff --git a/src/components/Meta.res b/src/components/Meta.res
index 8e0a5c009..5c820281e 100644
--- a/src/components/Meta.res
+++ b/src/components/Meta.res
@@ -68,16 +68,12 @@ let make = (
/* TODO: Undo this later */
/* */
-
- /* DocSearch Metatags */
{
-
let url = Next.Router.useRouter().route->Url.parse
let version = switch url.version {
| Version(version) => version
- | NoVersion => "latest"
- | Latest => "latest"
+ | NoVersion | Latest => "latest"
}
diff --git a/src/components/Navigation.mjs b/src/components/Navigation.mjs
index f24d2ac72..c29b674aa 100644
--- a/src/components/Navigation.mjs
+++ b/src/components/Navigation.mjs
@@ -450,6 +450,7 @@ function Navigation(Props) {
switch (match$3) {
case "gentype" :
case "manual" :
+ case "react" :
break;
default:
return false;
@@ -594,18 +595,17 @@ function Navigation(Props) {
className: "hidden xs:block " + linkOrActiveLink("/community", route)
}, "Community")
})), React.createElement("div", {
-<<<<<<< HEAD
className: "md:flex"
}, React.createElement(Search.make, {}), React.createElement("div", {
className: "hidden md:flex items-center ml-5"
}, React.createElement("a", {
- className: "mr-5 no-underline block text-inherit hover:cursor-pointer hover:text-fire-30 text-gray-40 mb-px",
+ className: "mr-5 " + link,
href: githubHref,
rel: "noopener noreferrer"
}, React.createElement(Icon.GitHub.make, {
className: "w-6 h-6 opacity-50 hover:opacity-100"
})), React.createElement("a", {
- className: "mr-5 no-underline block text-inherit hover:cursor-pointer hover:text-fire-30 text-gray-40 mb-px",
+ className: "mr-5 " + link,
href: "https://twitter.com/rescriptlang",
rel: "noopener noreferrer"
}, React.createElement(Icon.Twitter.make, {
@@ -617,53 +617,6 @@ function Navigation(Props) {
}, React.createElement(Icon.Discourse.make, {
className: "w-6 h-6 opacity-50 hover:opacity-100"
})))))), React.createElement("button", {
-||||||| 37814f5
- className: "hidden md:flex items-center"
- }, React.createElement("div", {
- className: "hidden sm:block mr-6"
- }, React.createElement(DocSearch.make, {})), React.createElement("a", {
- className: "mr-5 no-underline block text-inherit hover:cursor-pointer hover:text-fire-30 text-gray-40 mb-px",
- href: githubHref,
- rel: "noopener noreferrer"
- }, React.createElement(Icon.GitHub.make, {
- className: "w-6 h-6 opacity-50 hover:opacity-100"
- })), React.createElement("a", {
- className: "mr-5 no-underline block text-inherit hover:cursor-pointer hover:text-fire-30 text-gray-40 mb-px",
- href: "https://twitter.com/rescriptlang",
- rel: "noopener noreferrer"
- }, React.createElement(Icon.Twitter.make, {
- className: "w-6 h-6 opacity-50 hover:opacity-100"
- })), React.createElement("a", {
- className: link,
- href: discourseHref,
- rel: "noopener noreferrer"
- }, React.createElement(Icon.Discourse.make, {
- className: "w-6 h-6 opacity-50 hover:opacity-100"
- }))))), React.createElement("button", {
-=======
- className: "hidden md:flex items-center"
- }, React.createElement("div", {
- className: "hidden sm:block mr-6"
- }, React.createElement(DocSearch.make, {})), React.createElement("a", {
- className: "mr-5 " + link,
- href: githubHref,
- rel: "noopener noreferrer"
- }, React.createElement(Icon.GitHub.make, {
- className: "w-6 h-6 opacity-50 hover:opacity-100"
- })), React.createElement("a", {
- className: "mr-5 " + link,
- href: "https://twitter.com/rescriptlang",
- rel: "noopener noreferrer"
- }, React.createElement(Icon.Twitter.make, {
- className: "w-6 h-6 opacity-50 hover:opacity-100"
- })), React.createElement("a", {
- className: link,
- href: discourseHref,
- rel: "noopener noreferrer"
- }, React.createElement(Icon.Discourse.make, {
- className: "w-6 h-6 opacity-50 hover:opacity-100"
- }))))), React.createElement("button", {
->>>>>>> master
className: "h-full px-4 xs:hidden flex items-center hover:text-white",
onClick: (function (evt) {
evt.preventDefault();
diff --git a/src/components/Search.mjs b/src/components/Search.mjs
index 71943102f..ef079ac53 100644
--- a/src/components/Search.mjs
+++ b/src/components/Search.mjs
@@ -1,7 +1,15 @@
// Generated by ReScript, PLEASE EDIT WITH CARE
+import * as Icon from "./Icon.mjs";
+import * as Next from "../bindings/Next.mjs";
+import * as Util from "../common/Util.mjs";
+import * as Curry from "rescript/lib/es6/curry.js";
import * as React from "react";
+import * as Js_exn from "rescript/lib/es6/js_exn.js";
+import * as ReactDom from "react-dom";
+import * as Caml_option from "rescript/lib/es6/caml_option.js";
import * as React$1 from "@docsearch/react";
+import * as Caml_js_exceptions from "rescript/lib/es6/caml_js_exceptions.js";
var apiKey = "d3d9d7cebf13a7b665e47cb85dc9c582";
@@ -10,11 +18,126 @@ var indexName = "rescript-lang";
var appId = "BH4D9OD16A";
function Search(Props) {
- return React.createElement(React$1.DocSearch, {
- appId: appId,
- indexName: indexName,
- apiKey: apiKey
- });
+ var match = React.useState(function () {
+ return /* Inactive */1;
+ });
+ var setState = match[1];
+ var state = match[0];
+ React.useEffect((function () {
+ var isEditableTag = function (el) {
+ var match = el.tagName;
+ switch (match) {
+ case "INPUT" :
+ case "SELECT" :
+ case "TEXTAREA" :
+ return true;
+ default:
+ return false;
+ }
+ };
+ var focusSearch = function (e) {
+ var el = document.activeElement;
+ if (el !== undefined) {
+ var el$1 = Caml_option.valFromOption(el);
+ if (isEditableTag(el$1) || el$1.isContentEditable) {
+ return ;
+ }
+
+ }
+ Curry._1(setState, (function (param) {
+ return /* Active */0;
+ }));
+ e.preventDefault();
+ };
+ var handleGlobalKeyDown = function (e) {
+ var match = e.key;
+ switch (match) {
+ case "/" :
+ return focusSearch(e);
+ case "Escape" :
+ return Curry._1(setState, (function (param) {
+ return /* Inactive */1;
+ }));
+ case "k" :
+ if (e.ctrlKey || e.metaKey) {
+ return focusSearch(e);
+ } else {
+ return ;
+ }
+ default:
+ return ;
+ }
+ };
+ window.addEventListener("keydown", handleGlobalKeyDown);
+ return (function (param) {
+ window.addEventListener("keydown", handleGlobalKeyDown);
+ });
+ }), [setState]);
+ var onClick = function (param) {
+ Curry._1(setState, (function (param) {
+ return /* Active */0;
+ }));
+ };
+ var onClose = React.useCallback((function (param) {
+ Curry._1(setState, (function (param) {
+ return /* Inactive */1;
+ }));
+ }), [state]);
+ var tmp;
+ if (state) {
+ tmp = null;
+ } else {
+ var element = document.querySelector("body");
+ tmp = (element == null) ? null : ReactDom.createPortal(React.createElement(React$1.DocSearchModal, {
+ appId: appId,
+ indexName: indexName,
+ apiKey: apiKey,
+ transformItems: (function (items) {
+ return items.map(function (item) {
+ var url;
+ try {
+ url = Util.Url.make(item.url).pathname;
+ }
+ catch (raw_obj){
+ var obj = Caml_js_exceptions.internalToOCamlException(raw_obj);
+ if (obj.RE_EXN_ID === Js_exn.$$Error) {
+ var m = obj._1.message;
+ if (m !== undefined) {
+ console.error("Failed to constructor URL" + m);
+ url = item.url;
+ } else {
+ url = item.url;
+ }
+ } else {
+ throw obj;
+ }
+ }
+ return {
+ objectID: item.objectID,
+ content: item.content,
+ url: url,
+ url_without_anchor: item.url_without_anchor,
+ type: item.type,
+ anchor: item.anchor,
+ hierarchy: item.hierarchy
+ };
+ });
+ }),
+ hitComponent: (function (param) {
+ return React.createElement(Next.Link.make, {
+ href: param.hit.url,
+ children: React.createElement("a", undefined, param.children)
+ });
+ }),
+ onClose: onClose
+ }), element);
+ }
+ return React.createElement("button", {
+ type: "button",
+ onClick: onClick
+ }, React.createElement(Icon.MagnifierGlass.make, {
+ className: "text-gray-60 w-5 h-5"
+ }), tmp);
}
var make = Search;
@@ -24,6 +147,5 @@ export {
indexName ,
appId ,
make ,
-
}
-/* react Not a pure module */
+/* Icon Not a pure module */
diff --git a/src/components/Search.res b/src/components/Search.res
index e85c6c2ae..253db2748 100644
--- a/src/components/Search.res
+++ b/src/components/Search.res
@@ -2,11 +2,96 @@ let apiKey = "d3d9d7cebf13a7b665e47cb85dc9c582"
let indexName = "rescript-lang"
let appId = "BH4D9OD16A"
+@val @scope("document")
+external activeElement: option = "activeElement"
+
+type keyboardEventLike = {key: string, ctrlKey: bool, metaKey: bool}
+@val @scope("window")
+external addKeyboardEventListener: (string, keyboardEventLike => unit) => unit = "addEventListener"
+
+@val @scope("window")
+external removeKeyboardEventListener: (string, keyboardEventLike => unit) => unit =
+ "addEventListener"
+
+@send
+external keyboardEventPreventDefault: keyboardEventLike => unit = "preventDefault"
+
+@get external tagName: Dom.element => string = "tagName"
+@get external isContentEditable: Dom.element => bool = "isContentEditable"
+
+type state = Active | Inactive
+
@react.component
let make = () => {
-
-}
\ No newline at end of file
+ let (state, setState) = React.useState(_ => Inactive)
+ React.useEffect1(() => {
+ let isEditableTag = el =>
+ switch el->tagName {
+ | "TEXTAREA" | "SELECT" | "INPUT" => true
+ | _ => false
+ }
+
+ let focusSearch = e => {
+ switch activeElement {
+ | Some(el) if el->isEditableTag || el->isContentEditable => ()
+ | _ =>
+ setState(_ => Active)
+ e->keyboardEventPreventDefault
+ }
+ }
+ let handleGlobalKeyDown = e => {
+ switch e.key {
+ | "/" => focusSearch(e)
+ | "k" if e.ctrlKey || e.metaKey => focusSearch(e)
+ | "Escape" => setState(_ => Inactive)
+ | _ => ()
+ }
+ }
+ addKeyboardEventListener("keydown", handleGlobalKeyDown)
+ Some(() => removeKeyboardEventListener("keydown", handleGlobalKeyDown))
+ }, [setState])
+ let onClick = _ => setState(_ => Active)
+ let onClose = React.useCallback1(() => {
+ setState(_ => Inactive)
+ }, [state])
+
+}
diff --git a/styles/_docsearch.css b/styles/_docsearch.css
index 52e4702d6..dd75962f7 100644
--- a/styles/_docsearch.css
+++ b/styles/_docsearch.css
@@ -41,8 +41,8 @@
width: 100vw;
z-index: 200;
padding: 10vh;
- cursor: auto !important;
- @apply fixed top-0 left-0 bg-white-40-tr flex flex-col backdrop-blur-sm;
+ backdrop-filter: blur(3px);
+ @apply fixed top-0 left-0 bg-white-40-tr flex flex-col;
}
.DocSearch-Container a {
From ff971aeebd0758d9d4be14e53d1f6083dd9712e4 Mon Sep 17 00:00:00 2001
From: Pedro Castro
Date: Tue, 17 Jan 2023 10:29:34 -0300
Subject: [PATCH 04/22] refactor update
---
package-lock.json | 412 ++++++++++++++++++-------------------
src/bindings/DocSearch.res | 1 +
src/components/Search.mjs | 9 +-
src/components/Search.res | 18 +-
4 files changed, 231 insertions(+), 209 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 503470bb8..09fb1f882 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,19 +50,19 @@
}
},
"node_modules/@algolia/autocomplete-core": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.2.tgz",
- "integrity": "sha512-eclwUDC6qfApNnEfu1uWcL/rudQsn59tjEoUYZYE2JSXZrHLRjBUGMxiCoknobU2Pva8ejb0eRxpIYDtVVqdsw==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.4.tgz",
+ "integrity": "sha512-daoLpQ3ps/VTMRZDEBfU8ixXd+amZcNJ4QSP3IERGyzqnL5Ch8uSRFt/4G8pUvW9c3o6GA4vtVv4I4lmnkdXyg==",
"dependencies": {
- "@algolia/autocomplete-shared": "1.7.2"
+ "@algolia/autocomplete-shared": "1.7.4"
}
},
"node_modules/@algolia/autocomplete-preset-algolia": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.2.tgz",
- "integrity": "sha512-+RYEG6B0QiGGfRb2G3MtPfyrl0dALF3cQNTWBzBX6p5o01vCCGTTinAm2UKG3tfc2CnOMAtnPLkzNZyJUpnVJw==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.4.tgz",
+ "integrity": "sha512-s37hrvLEIfcmKY8VU9LsAXgm2yfmkdHT3DnA3SgHaY93yjZ2qL57wzb5QweVkYuEBZkT2PIREvRoLXC2sxTbpQ==",
"dependencies": {
- "@algolia/autocomplete-shared": "1.7.2"
+ "@algolia/autocomplete-shared": "1.7.4"
},
"peerDependencies": {
"@algolia/client-search": ">= 4.9.1 < 6",
@@ -70,123 +70,123 @@
}
},
"node_modules/@algolia/autocomplete-shared": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.2.tgz",
- "integrity": "sha512-QCckjiC7xXHIUaIL3ektBtjJ0w7tTA3iqKcAE/Hjn1lZ5omp7i3Y4e09rAr9ZybqirL7AbxCLLq0Ra5DDPKeug=="
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.4.tgz",
+ "integrity": "sha512-2VGCk7I9tA9Ge73Km99+Qg87w0wzW4tgUruvWAn/gfey1ZXgmxZtyIRBebk35R1O8TbK77wujVtCnpsGpRy1kg=="
},
"node_modules/@algolia/cache-browser-local-storage": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.14.2.tgz",
- "integrity": "sha512-FRweBkK/ywO+GKYfAWbrepewQsPTIEirhi1BdykX9mxvBPtGNKccYAxvGdDCumU1jL4r3cayio4psfzKMejBlA==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.14.3.tgz",
+ "integrity": "sha512-hWH1yCxgG3+R/xZIscmUrWAIBnmBFHH5j30fY/+aPkEZWt90wYILfAHIOZ1/Wxhho5SkPfwFmT7ooX2d9JeQBw==",
"dependencies": {
- "@algolia/cache-common": "4.14.2"
+ "@algolia/cache-common": "4.14.3"
}
},
"node_modules/@algolia/cache-common": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.14.2.tgz",
- "integrity": "sha512-SbvAlG9VqNanCErr44q6lEKD2qoK4XtFNx9Qn8FK26ePCI8I9yU7pYB+eM/cZdS9SzQCRJBbHUumVr4bsQ4uxg=="
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.14.3.tgz",
+ "integrity": "sha512-oZJofOoD9FQOwiGTzyRnmzvh3ZP8WVTNPBLH5xU5JNF7drDbRT0ocVT0h/xB2rPHYzOeXRrLaQQBwRT/CKom0Q=="
},
"node_modules/@algolia/cache-in-memory": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.14.2.tgz",
- "integrity": "sha512-HrOukWoop9XB/VFojPv1R5SVXowgI56T9pmezd/djh2JnVN/vXswhXV51RKy4nCpqxyHt/aGFSq2qkDvj6KiuQ==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.14.3.tgz",
+ "integrity": "sha512-ES0hHQnzWjeioLQf5Nq+x1AWdZJ50znNPSH3puB/Y4Xsg4Av1bvLmTJe7SY2uqONaeMTvL0OaVcoVtQgJVw0vg==",
"dependencies": {
- "@algolia/cache-common": "4.14.2"
+ "@algolia/cache-common": "4.14.3"
}
},
"node_modules/@algolia/client-account": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.14.2.tgz",
- "integrity": "sha512-WHtriQqGyibbb/Rx71YY43T0cXqyelEU0lB2QMBRXvD2X0iyeGl4qMxocgEIcbHyK7uqE7hKgjT8aBrHqhgc1w==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.14.3.tgz",
+ "integrity": "sha512-PBcPb0+f5Xbh5UfLZNx2Ow589OdP8WYjB4CnvupfYBrl9JyC1sdH4jcq/ri8osO/mCZYjZrQsKAPIqW/gQmizQ==",
"dependencies": {
- "@algolia/client-common": "4.14.2",
- "@algolia/client-search": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/client-common": "4.14.3",
+ "@algolia/client-search": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"node_modules/@algolia/client-analytics": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.14.2.tgz",
- "integrity": "sha512-yBvBv2mw+HX5a+aeR0dkvUbFZsiC4FKSnfqk9rrfX+QrlNOKEhCG0tJzjiOggRW4EcNqRmaTULIYvIzQVL2KYQ==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.14.3.tgz",
+ "integrity": "sha512-eAwQq0Hb/aauv9NhCH5Dp3Nm29oFx28sayFN2fdOWemwSeJHIl7TmcsxVlRsO50fsD8CtPcDhtGeD3AIFLNvqw==",
"dependencies": {
- "@algolia/client-common": "4.14.2",
- "@algolia/client-search": "4.14.2",
- "@algolia/requester-common": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/client-common": "4.14.3",
+ "@algolia/client-search": "4.14.3",
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"node_modules/@algolia/client-common": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.14.2.tgz",
- "integrity": "sha512-43o4fslNLcktgtDMVaT5XwlzsDPzlqvqesRi4MjQz2x4/Sxm7zYg5LRYFol1BIhG6EwxKvSUq8HcC/KxJu3J0Q==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.14.3.tgz",
+ "integrity": "sha512-jkPPDZdi63IK64Yg4WccdCsAP4pHxSkr4usplkUZM5C1l1oEpZXsy2c579LQ0rvwCs5JFmwfNG4ahOszidfWPw==",
"dependencies": {
- "@algolia/requester-common": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"node_modules/@algolia/client-personalization": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.14.2.tgz",
- "integrity": "sha512-ACCoLi0cL8CBZ1W/2juehSltrw2iqsQBnfiu/Rbl9W2yE6o2ZUb97+sqN/jBqYNQBS+o0ekTMKNkQjHHAcEXNw==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.14.3.tgz",
+ "integrity": "sha512-UCX1MtkVNgaOL9f0e22x6tC9e2H3unZQlSUdnVaSKpZ+hdSChXGaRjp2UIT7pxmPqNCyv51F597KEX5WT60jNg==",
"dependencies": {
- "@algolia/client-common": "4.14.2",
- "@algolia/requester-common": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/client-common": "4.14.3",
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"node_modules/@algolia/client-search": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.14.2.tgz",
- "integrity": "sha512-L5zScdOmcZ6NGiVbLKTvP02UbxZ0njd5Vq9nJAmPFtjffUSOGEp11BmD2oMJ5QvARgx2XbX4KzTTNS5ECYIMWw==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.14.3.tgz",
+ "integrity": "sha512-I2U7xBx5OPFdPLA8AXKUPPxGY3HDxZ4r7+mlZ8ZpLbI8/ri6fnu6B4z3wcL7sgHhDYMwnAE8Xr0AB0h3Hnkp4A==",
"dependencies": {
- "@algolia/client-common": "4.14.2",
- "@algolia/requester-common": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/client-common": "4.14.3",
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"node_modules/@algolia/logger-common": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.14.2.tgz",
- "integrity": "sha512-/JGlYvdV++IcMHBnVFsqEisTiOeEr6cUJtpjz8zc0A9c31JrtLm318Njc72p14Pnkw3A/5lHHh+QxpJ6WFTmsA=="
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.14.3.tgz",
+ "integrity": "sha512-kUEAZaBt/J3RjYi8MEBT2QEexJR2kAE2mtLmezsmqMQZTV502TkHCxYzTwY2dE7OKcUTxi4OFlMuS4GId9CWPw=="
},
"node_modules/@algolia/logger-console": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.14.2.tgz",
- "integrity": "sha512-8S2PlpdshbkwlLCSAB5f8c91xyc84VM9Ar9EdfE9UmX+NrKNYnWR1maXXVDQQoto07G1Ol/tYFnFVhUZq0xV/g==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.14.3.tgz",
+ "integrity": "sha512-ZWqAlUITktiMN2EiFpQIFCJS10N96A++yrexqC2Z+3hgF/JcKrOxOdT4nSCQoEPvU4Ki9QKbpzbebRDemZt/hw==",
"dependencies": {
- "@algolia/logger-common": "4.14.2"
+ "@algolia/logger-common": "4.14.3"
}
},
"node_modules/@algolia/requester-browser-xhr": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.14.2.tgz",
- "integrity": "sha512-CEh//xYz/WfxHFh7pcMjQNWgpl4wFB85lUMRyVwaDPibNzQRVcV33YS+63fShFWc2+42YEipFGH2iPzlpszmDw==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.14.3.tgz",
+ "integrity": "sha512-AZeg2T08WLUPvDncl2XLX2O67W5wIO8MNaT7z5ii5LgBTuk/rU4CikTjCe2xsUleIZeFl++QrPAi4Bdxws6r/Q==",
"dependencies": {
- "@algolia/requester-common": "4.14.2"
+ "@algolia/requester-common": "4.14.3"
}
},
"node_modules/@algolia/requester-common": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.14.2.tgz",
- "integrity": "sha512-73YQsBOKa5fvVV3My7iZHu1sUqmjjfs9TteFWwPwDmnad7T0VTCopttcsM3OjLxZFtBnX61Xxl2T2gmG2O4ehg=="
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.14.3.tgz",
+ "integrity": "sha512-RrRzqNyKFDP7IkTuV3XvYGF9cDPn9h6qEDl595lXva3YUk9YSS8+MGZnnkOMHvjkrSCKfoLeLbm/T4tmoIeclw=="
},
"node_modules/@algolia/requester-node-http": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.14.2.tgz",
- "integrity": "sha512-oDbb02kd1o5GTEld4pETlPZLY0e+gOSWjWMJHWTgDXbv9rm/o2cF7japO6Vj1ENnrqWvLBmW1OzV9g6FUFhFXg==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.14.3.tgz",
+ "integrity": "sha512-O5wnPxtDRPuW2U0EaOz9rMMWdlhwP0J0eSL1Z7TtXF8xnUeeUyNJrdhV5uy2CAp6RbhM1VuC3sOJcIR6Av+vbA==",
"dependencies": {
- "@algolia/requester-common": "4.14.2"
+ "@algolia/requester-common": "4.14.3"
}
},
"node_modules/@algolia/transporter": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.14.2.tgz",
- "integrity": "sha512-t89dfQb2T9MFQHidjHcfhh6iGMNwvuKUvojAj+JsrHAGbuSy7yE4BylhLX6R0Q1xYRoC4Vvv+O5qIw/LdnQfsQ==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.14.3.tgz",
+ "integrity": "sha512-2qlKlKsnGJ008exFRb5RTeTOqhLZj0bkMCMVskxoqWejs2Q2QtWmsiH98hDfpw0fmnyhzHEt0Z7lqxBYp8bW2w==",
"dependencies": {
- "@algolia/cache-common": "4.14.2",
- "@algolia/logger-common": "4.14.2",
- "@algolia/requester-common": "4.14.2"
+ "@algolia/cache-common": "4.14.3",
+ "@algolia/logger-common": "4.14.3",
+ "@algolia/requester-common": "4.14.3"
}
},
"node_modules/@babel/code-frame": {
@@ -481,18 +481,18 @@
}
},
"node_modules/@docsearch/css": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.3.0.tgz",
- "integrity": "sha512-rODCdDtGyudLj+Va8b6w6Y85KE85bXRsps/R4Yjwt5vueXKXZQKYw0aA9knxLBT6a/bI/GMrAcmCR75KYOM6hg=="
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.3.2.tgz",
+ "integrity": "sha512-dctFYiwbvDZkksMlsmc7pj6W6By/EjnVXJq5TEPd05MwQe+dcdHJgaIn1c8wfsucxHpIsdrUcgSkACHCq6aIhw=="
},
"node_modules/@docsearch/react": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.3.0.tgz",
- "integrity": "sha512-fhS5adZkae2SSdMYEMVg6pxI5a/cE+tW16ki1V0/ur4Fdok3hBRkmN/H8VvlXnxzggkQIIRIVvYPn00JPjen3A==",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.3.2.tgz",
+ "integrity": "sha512-ugILab2TYKSh6IEHf6Z9xZbOovsYbsdfo60PBj+Bw+oMJ1MHJ7pBt1TTcmPki1hSgg8mysgKy2hDiVdPm7XWSQ==",
"dependencies": {
- "@algolia/autocomplete-core": "1.7.2",
- "@algolia/autocomplete-preset-algolia": "1.7.2",
- "@docsearch/css": "3.3.0",
+ "@algolia/autocomplete-core": "1.7.4",
+ "@algolia/autocomplete-preset-algolia": "1.7.4",
+ "@docsearch/css": "3.3.2",
"algoliasearch": "^4.0.0"
},
"peerDependencies": {
@@ -1293,24 +1293,24 @@
}
},
"node_modules/algoliasearch": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.14.2.tgz",
- "integrity": "sha512-ngbEQonGEmf8dyEh5f+uOIihv4176dgbuOZspiuhmTTBRBuzWu3KCGHre6uHj5YyuC7pNvQGzB6ZNJyZi0z+Sg==",
- "dependencies": {
- "@algolia/cache-browser-local-storage": "4.14.2",
- "@algolia/cache-common": "4.14.2",
- "@algolia/cache-in-memory": "4.14.2",
- "@algolia/client-account": "4.14.2",
- "@algolia/client-analytics": "4.14.2",
- "@algolia/client-common": "4.14.2",
- "@algolia/client-personalization": "4.14.2",
- "@algolia/client-search": "4.14.2",
- "@algolia/logger-common": "4.14.2",
- "@algolia/logger-console": "4.14.2",
- "@algolia/requester-browser-xhr": "4.14.2",
- "@algolia/requester-common": "4.14.2",
- "@algolia/requester-node-http": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.14.3.tgz",
+ "integrity": "sha512-GZTEuxzfWbP/vr7ZJfGzIl8fOsoxN916Z6FY2Egc9q2TmZ6hvq5KfAxY89pPW01oW/2HDEKA8d30f9iAH9eXYg==",
+ "dependencies": {
+ "@algolia/cache-browser-local-storage": "4.14.3",
+ "@algolia/cache-common": "4.14.3",
+ "@algolia/cache-in-memory": "4.14.3",
+ "@algolia/client-account": "4.14.3",
+ "@algolia/client-analytics": "4.14.3",
+ "@algolia/client-common": "4.14.3",
+ "@algolia/client-personalization": "4.14.3",
+ "@algolia/client-search": "4.14.3",
+ "@algolia/logger-common": "4.14.3",
+ "@algolia/logger-console": "4.14.3",
+ "@algolia/requester-browser-xhr": "4.14.3",
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/requester-node-http": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"node_modules/alphanum-sort": {
@@ -10752,139 +10752,139 @@
},
"dependencies": {
"@algolia/autocomplete-core": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.2.tgz",
- "integrity": "sha512-eclwUDC6qfApNnEfu1uWcL/rudQsn59tjEoUYZYE2JSXZrHLRjBUGMxiCoknobU2Pva8ejb0eRxpIYDtVVqdsw==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.7.4.tgz",
+ "integrity": "sha512-daoLpQ3ps/VTMRZDEBfU8ixXd+amZcNJ4QSP3IERGyzqnL5Ch8uSRFt/4G8pUvW9c3o6GA4vtVv4I4lmnkdXyg==",
"requires": {
- "@algolia/autocomplete-shared": "1.7.2"
+ "@algolia/autocomplete-shared": "1.7.4"
}
},
"@algolia/autocomplete-preset-algolia": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.2.tgz",
- "integrity": "sha512-+RYEG6B0QiGGfRb2G3MtPfyrl0dALF3cQNTWBzBX6p5o01vCCGTTinAm2UKG3tfc2CnOMAtnPLkzNZyJUpnVJw==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.4.tgz",
+ "integrity": "sha512-s37hrvLEIfcmKY8VU9LsAXgm2yfmkdHT3DnA3SgHaY93yjZ2qL57wzb5QweVkYuEBZkT2PIREvRoLXC2sxTbpQ==",
"requires": {
- "@algolia/autocomplete-shared": "1.7.2"
+ "@algolia/autocomplete-shared": "1.7.4"
}
},
"@algolia/autocomplete-shared": {
- "version": "1.7.2",
- "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.2.tgz",
- "integrity": "sha512-QCckjiC7xXHIUaIL3ektBtjJ0w7tTA3iqKcAE/Hjn1lZ5omp7i3Y4e09rAr9ZybqirL7AbxCLLq0Ra5DDPKeug=="
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.4.tgz",
+ "integrity": "sha512-2VGCk7I9tA9Ge73Km99+Qg87w0wzW4tgUruvWAn/gfey1ZXgmxZtyIRBebk35R1O8TbK77wujVtCnpsGpRy1kg=="
},
"@algolia/cache-browser-local-storage": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.14.2.tgz",
- "integrity": "sha512-FRweBkK/ywO+GKYfAWbrepewQsPTIEirhi1BdykX9mxvBPtGNKccYAxvGdDCumU1jL4r3cayio4psfzKMejBlA==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.14.3.tgz",
+ "integrity": "sha512-hWH1yCxgG3+R/xZIscmUrWAIBnmBFHH5j30fY/+aPkEZWt90wYILfAHIOZ1/Wxhho5SkPfwFmT7ooX2d9JeQBw==",
"requires": {
- "@algolia/cache-common": "4.14.2"
+ "@algolia/cache-common": "4.14.3"
}
},
"@algolia/cache-common": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.14.2.tgz",
- "integrity": "sha512-SbvAlG9VqNanCErr44q6lEKD2qoK4XtFNx9Qn8FK26ePCI8I9yU7pYB+eM/cZdS9SzQCRJBbHUumVr4bsQ4uxg=="
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.14.3.tgz",
+ "integrity": "sha512-oZJofOoD9FQOwiGTzyRnmzvh3ZP8WVTNPBLH5xU5JNF7drDbRT0ocVT0h/xB2rPHYzOeXRrLaQQBwRT/CKom0Q=="
},
"@algolia/cache-in-memory": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.14.2.tgz",
- "integrity": "sha512-HrOukWoop9XB/VFojPv1R5SVXowgI56T9pmezd/djh2JnVN/vXswhXV51RKy4nCpqxyHt/aGFSq2qkDvj6KiuQ==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.14.3.tgz",
+ "integrity": "sha512-ES0hHQnzWjeioLQf5Nq+x1AWdZJ50znNPSH3puB/Y4Xsg4Av1bvLmTJe7SY2uqONaeMTvL0OaVcoVtQgJVw0vg==",
"requires": {
- "@algolia/cache-common": "4.14.2"
+ "@algolia/cache-common": "4.14.3"
}
},
"@algolia/client-account": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.14.2.tgz",
- "integrity": "sha512-WHtriQqGyibbb/Rx71YY43T0cXqyelEU0lB2QMBRXvD2X0iyeGl4qMxocgEIcbHyK7uqE7hKgjT8aBrHqhgc1w==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.14.3.tgz",
+ "integrity": "sha512-PBcPb0+f5Xbh5UfLZNx2Ow589OdP8WYjB4CnvupfYBrl9JyC1sdH4jcq/ri8osO/mCZYjZrQsKAPIqW/gQmizQ==",
"requires": {
- "@algolia/client-common": "4.14.2",
- "@algolia/client-search": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/client-common": "4.14.3",
+ "@algolia/client-search": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"@algolia/client-analytics": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.14.2.tgz",
- "integrity": "sha512-yBvBv2mw+HX5a+aeR0dkvUbFZsiC4FKSnfqk9rrfX+QrlNOKEhCG0tJzjiOggRW4EcNqRmaTULIYvIzQVL2KYQ==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.14.3.tgz",
+ "integrity": "sha512-eAwQq0Hb/aauv9NhCH5Dp3Nm29oFx28sayFN2fdOWemwSeJHIl7TmcsxVlRsO50fsD8CtPcDhtGeD3AIFLNvqw==",
"requires": {
- "@algolia/client-common": "4.14.2",
- "@algolia/client-search": "4.14.2",
- "@algolia/requester-common": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/client-common": "4.14.3",
+ "@algolia/client-search": "4.14.3",
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"@algolia/client-common": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.14.2.tgz",
- "integrity": "sha512-43o4fslNLcktgtDMVaT5XwlzsDPzlqvqesRi4MjQz2x4/Sxm7zYg5LRYFol1BIhG6EwxKvSUq8HcC/KxJu3J0Q==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.14.3.tgz",
+ "integrity": "sha512-jkPPDZdi63IK64Yg4WccdCsAP4pHxSkr4usplkUZM5C1l1oEpZXsy2c579LQ0rvwCs5JFmwfNG4ahOszidfWPw==",
"requires": {
- "@algolia/requester-common": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"@algolia/client-personalization": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.14.2.tgz",
- "integrity": "sha512-ACCoLi0cL8CBZ1W/2juehSltrw2iqsQBnfiu/Rbl9W2yE6o2ZUb97+sqN/jBqYNQBS+o0ekTMKNkQjHHAcEXNw==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.14.3.tgz",
+ "integrity": "sha512-UCX1MtkVNgaOL9f0e22x6tC9e2H3unZQlSUdnVaSKpZ+hdSChXGaRjp2UIT7pxmPqNCyv51F597KEX5WT60jNg==",
"requires": {
- "@algolia/client-common": "4.14.2",
- "@algolia/requester-common": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/client-common": "4.14.3",
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"@algolia/client-search": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.14.2.tgz",
- "integrity": "sha512-L5zScdOmcZ6NGiVbLKTvP02UbxZ0njd5Vq9nJAmPFtjffUSOGEp11BmD2oMJ5QvARgx2XbX4KzTTNS5ECYIMWw==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.14.3.tgz",
+ "integrity": "sha512-I2U7xBx5OPFdPLA8AXKUPPxGY3HDxZ4r7+mlZ8ZpLbI8/ri6fnu6B4z3wcL7sgHhDYMwnAE8Xr0AB0h3Hnkp4A==",
"requires": {
- "@algolia/client-common": "4.14.2",
- "@algolia/requester-common": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "@algolia/client-common": "4.14.3",
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"@algolia/logger-common": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.14.2.tgz",
- "integrity": "sha512-/JGlYvdV++IcMHBnVFsqEisTiOeEr6cUJtpjz8zc0A9c31JrtLm318Njc72p14Pnkw3A/5lHHh+QxpJ6WFTmsA=="
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.14.3.tgz",
+ "integrity": "sha512-kUEAZaBt/J3RjYi8MEBT2QEexJR2kAE2mtLmezsmqMQZTV502TkHCxYzTwY2dE7OKcUTxi4OFlMuS4GId9CWPw=="
},
"@algolia/logger-console": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.14.2.tgz",
- "integrity": "sha512-8S2PlpdshbkwlLCSAB5f8c91xyc84VM9Ar9EdfE9UmX+NrKNYnWR1maXXVDQQoto07G1Ol/tYFnFVhUZq0xV/g==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.14.3.tgz",
+ "integrity": "sha512-ZWqAlUITktiMN2EiFpQIFCJS10N96A++yrexqC2Z+3hgF/JcKrOxOdT4nSCQoEPvU4Ki9QKbpzbebRDemZt/hw==",
"requires": {
- "@algolia/logger-common": "4.14.2"
+ "@algolia/logger-common": "4.14.3"
}
},
"@algolia/requester-browser-xhr": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.14.2.tgz",
- "integrity": "sha512-CEh//xYz/WfxHFh7pcMjQNWgpl4wFB85lUMRyVwaDPibNzQRVcV33YS+63fShFWc2+42YEipFGH2iPzlpszmDw==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.14.3.tgz",
+ "integrity": "sha512-AZeg2T08WLUPvDncl2XLX2O67W5wIO8MNaT7z5ii5LgBTuk/rU4CikTjCe2xsUleIZeFl++QrPAi4Bdxws6r/Q==",
"requires": {
- "@algolia/requester-common": "4.14.2"
+ "@algolia/requester-common": "4.14.3"
}
},
"@algolia/requester-common": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.14.2.tgz",
- "integrity": "sha512-73YQsBOKa5fvVV3My7iZHu1sUqmjjfs9TteFWwPwDmnad7T0VTCopttcsM3OjLxZFtBnX61Xxl2T2gmG2O4ehg=="
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.14.3.tgz",
+ "integrity": "sha512-RrRzqNyKFDP7IkTuV3XvYGF9cDPn9h6qEDl595lXva3YUk9YSS8+MGZnnkOMHvjkrSCKfoLeLbm/T4tmoIeclw=="
},
"@algolia/requester-node-http": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.14.2.tgz",
- "integrity": "sha512-oDbb02kd1o5GTEld4pETlPZLY0e+gOSWjWMJHWTgDXbv9rm/o2cF7japO6Vj1ENnrqWvLBmW1OzV9g6FUFhFXg==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.14.3.tgz",
+ "integrity": "sha512-O5wnPxtDRPuW2U0EaOz9rMMWdlhwP0J0eSL1Z7TtXF8xnUeeUyNJrdhV5uy2CAp6RbhM1VuC3sOJcIR6Av+vbA==",
"requires": {
- "@algolia/requester-common": "4.14.2"
+ "@algolia/requester-common": "4.14.3"
}
},
"@algolia/transporter": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.14.2.tgz",
- "integrity": "sha512-t89dfQb2T9MFQHidjHcfhh6iGMNwvuKUvojAj+JsrHAGbuSy7yE4BylhLX6R0Q1xYRoC4Vvv+O5qIw/LdnQfsQ==",
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.14.3.tgz",
+ "integrity": "sha512-2qlKlKsnGJ008exFRb5RTeTOqhLZj0bkMCMVskxoqWejs2Q2QtWmsiH98hDfpw0fmnyhzHEt0Z7lqxBYp8bW2w==",
"requires": {
- "@algolia/cache-common": "4.14.2",
- "@algolia/logger-common": "4.14.2",
- "@algolia/requester-common": "4.14.2"
+ "@algolia/cache-common": "4.14.3",
+ "@algolia/logger-common": "4.14.3",
+ "@algolia/requester-common": "4.14.3"
}
},
"@babel/code-frame": {
@@ -11103,18 +11103,18 @@
}
},
"@docsearch/css": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.3.0.tgz",
- "integrity": "sha512-rODCdDtGyudLj+Va8b6w6Y85KE85bXRsps/R4Yjwt5vueXKXZQKYw0aA9knxLBT6a/bI/GMrAcmCR75KYOM6hg=="
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.3.2.tgz",
+ "integrity": "sha512-dctFYiwbvDZkksMlsmc7pj6W6By/EjnVXJq5TEPd05MwQe+dcdHJgaIn1c8wfsucxHpIsdrUcgSkACHCq6aIhw=="
},
"@docsearch/react": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.3.0.tgz",
- "integrity": "sha512-fhS5adZkae2SSdMYEMVg6pxI5a/cE+tW16ki1V0/ur4Fdok3hBRkmN/H8VvlXnxzggkQIIRIVvYPn00JPjen3A==",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.3.2.tgz",
+ "integrity": "sha512-ugILab2TYKSh6IEHf6Z9xZbOovsYbsdfo60PBj+Bw+oMJ1MHJ7pBt1TTcmPki1hSgg8mysgKy2hDiVdPm7XWSQ==",
"requires": {
- "@algolia/autocomplete-core": "1.7.2",
- "@algolia/autocomplete-preset-algolia": "1.7.2",
- "@docsearch/css": "3.3.0",
+ "@algolia/autocomplete-core": "1.7.4",
+ "@algolia/autocomplete-preset-algolia": "1.7.4",
+ "@docsearch/css": "3.3.2",
"algoliasearch": "^4.0.0"
}
},
@@ -11780,24 +11780,24 @@
"requires": {}
},
"algoliasearch": {
- "version": "4.14.2",
- "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.14.2.tgz",
- "integrity": "sha512-ngbEQonGEmf8dyEh5f+uOIihv4176dgbuOZspiuhmTTBRBuzWu3KCGHre6uHj5YyuC7pNvQGzB6ZNJyZi0z+Sg==",
- "requires": {
- "@algolia/cache-browser-local-storage": "4.14.2",
- "@algolia/cache-common": "4.14.2",
- "@algolia/cache-in-memory": "4.14.2",
- "@algolia/client-account": "4.14.2",
- "@algolia/client-analytics": "4.14.2",
- "@algolia/client-common": "4.14.2",
- "@algolia/client-personalization": "4.14.2",
- "@algolia/client-search": "4.14.2",
- "@algolia/logger-common": "4.14.2",
- "@algolia/logger-console": "4.14.2",
- "@algolia/requester-browser-xhr": "4.14.2",
- "@algolia/requester-common": "4.14.2",
- "@algolia/requester-node-http": "4.14.2",
- "@algolia/transporter": "4.14.2"
+ "version": "4.14.3",
+ "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.14.3.tgz",
+ "integrity": "sha512-GZTEuxzfWbP/vr7ZJfGzIl8fOsoxN916Z6FY2Egc9q2TmZ6hvq5KfAxY89pPW01oW/2HDEKA8d30f9iAH9eXYg==",
+ "requires": {
+ "@algolia/cache-browser-local-storage": "4.14.3",
+ "@algolia/cache-common": "4.14.3",
+ "@algolia/cache-in-memory": "4.14.3",
+ "@algolia/client-account": "4.14.3",
+ "@algolia/client-analytics": "4.14.3",
+ "@algolia/client-common": "4.14.3",
+ "@algolia/client-personalization": "4.14.3",
+ "@algolia/client-search": "4.14.3",
+ "@algolia/logger-common": "4.14.3",
+ "@algolia/logger-console": "4.14.3",
+ "@algolia/requester-browser-xhr": "4.14.3",
+ "@algolia/requester-common": "4.14.3",
+ "@algolia/requester-node-http": "4.14.3",
+ "@algolia/transporter": "4.14.3"
}
},
"alphanum-sort": {
diff --git a/src/bindings/DocSearch.res b/src/bindings/DocSearch.res
index d00ddeb12..0ffb45211 100644
--- a/src/bindings/DocSearch.res
+++ b/src/bindings/DocSearch.res
@@ -52,4 +52,5 @@ external make: (
~navigator: navigator=?,
~onClose: unit => unit=?,
~searchParameters: searchParameters=?,
+ ~initialScrollY: int=?,
) => React.element = "DocSearchModal"
diff --git a/src/components/Search.mjs b/src/components/Search.mjs
index ef079ac53..a53bead9a 100644
--- a/src/components/Search.mjs
+++ b/src/components/Search.mjs
@@ -75,7 +75,11 @@ function Search(Props) {
}), [setState]);
var onClick = function (param) {
Curry._1(setState, (function (param) {
- return /* Active */0;
+ if (state) {
+ return /* Active */0;
+ } else {
+ return /* Inactive */1;
+ }
}));
};
var onClose = React.useCallback((function (param) {
@@ -129,7 +133,8 @@ function Search(Props) {
children: React.createElement("a", undefined, param.children)
});
}),
- onClose: onClose
+ onClose: onClose,
+ initialScrollY: window.scrollY
}), element);
}
return React.createElement("button", {
diff --git a/src/components/Search.res b/src/components/Search.res
index 253db2748..cf9891fc3 100644
--- a/src/components/Search.res
+++ b/src/components/Search.res
@@ -13,6 +13,10 @@ external addKeyboardEventListener: (string, keyboardEventLike => unit) => unit =
external removeKeyboardEventListener: (string, keyboardEventLike => unit) => unit =
"addEventListener"
+type window
+@val external window: window = "window"
+@get external scrollY: window => int = "scrollY"
+
@send
external keyboardEventPreventDefault: keyboardEventLike => unit = "preventDefault"
@@ -24,6 +28,7 @@ type state = Active | Inactive
@react.component
let make = () => {
let (state, setState) = React.useState(_ => Inactive)
+
React.useEffect1(() => {
let isEditableTag = el =>
switch el->tagName {
@@ -39,6 +44,7 @@ let make = () => {
e->keyboardEventPreventDefault
}
}
+
let handleGlobalKeyDown = e => {
switch e.key {
| "/" => focusSearch(e)
@@ -50,10 +56,19 @@ let make = () => {
addKeyboardEventListener("keydown", handleGlobalKeyDown)
Some(() => removeKeyboardEventListener("keydown", handleGlobalKeyDown))
}, [setState])
- let onClick = _ => setState(_ => Active)
+
+ let onClick = _ =>
+ setState(_ =>
+ switch state {
+ | Active => Inactive
+ | _ => Active
+ }
+ )
+
let onClose = React.useCallback1(() => {
setState(_ => Inactive)
}, [state])
+