Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
scottybollinger authored Jun 11, 2024
2 parents b38e9cd + 94d8f2a commit 7beb585
Show file tree
Hide file tree
Showing 16 changed files with 99 additions and 65 deletions.
20 changes: 10 additions & 10 deletions examples/sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"elastic",
"elasticsearch"
],
"version": "1.21.4",
"version": "1.21.5",
"private": true,
"dependencies": {
"@elastic/behavioral-analytics-javascript-tracker": "^2.1.3",
"@elastic/datemath": "^5.0.3",
"@elastic/eui": "^49.0.0",
"@elastic/react-search-ui": "1.21.4",
"@elastic/react-search-ui-views": "1.21.4",
"@elastic/search-ui": "1.21.4",
"@elastic/search-ui-analytics-plugin": "1.21.4",
"@elastic/search-ui-app-search-connector": "1.21.4",
"@elastic/search-ui-elasticsearch-connector": "1.21.4",
"@elastic/search-ui-engines-connector": "1.21.4",
"@elastic/search-ui-site-search-connector": "1.21.4",
"@elastic/search-ui-workplace-search-connector": "1.21.4",
"@elastic/react-search-ui": "1.21.5",
"@elastic/react-search-ui-views": "1.21.5",
"@elastic/search-ui": "1.21.5",
"@elastic/search-ui-analytics-plugin": "1.21.5",
"@elastic/search-ui-app-search-connector": "1.21.5",
"@elastic/search-ui-elasticsearch-connector": "1.21.5",
"@elastic/search-ui-engines-connector": "1.21.5",
"@elastic/search-ui-site-search-connector": "1.21.5",
"@elastic/search-ui-workplace-search-connector": "1.21.5",
"@emotion/react": "^11.8.1",
"autoprefixer": "^10.4.7",
"moment": "^2.24.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@vitejs/plugin-vue-jsx": "^1.3.10",
"@vue/eslint-config-prettier": "^7.0.0",
"eslint": "^8.5.0",
"eslint-plugin-vue": "^9.0.0",
"eslint-plugin-vue": "^9.26.0",
"prettier": "^2.5.1",
"vite": "^2.9.12"
}
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages": ["examples/*", "packages/*"],
"version": "1.21.4",
"version": "1.21.5",
"useWorkspaces": true,
"npmClient": "yarn",
"command": {
Expand Down
13 changes: 8 additions & 5 deletions packages/react-search-ui-views/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/react-search-ui-views",
"version": "1.21.4",
"version": "1.21.5",
"description": "A collection of React UI components for building search experiences",
"homepage": "https://docs.elastic.co/search-ui",
"license": "Apache-2.0",
Expand Down Expand Up @@ -59,19 +59,22 @@
"react-dom": "^17.0.2",
"rimraf": "^2.6.3",
"sass": "^1.49.9",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"dependencies": {
"@elastic/search-ui": "1.21.4",
"@elastic/search-ui": "1.21.5",
"downshift": "^3.2.10",
"rc-pagination": "^4.0.4",
"react-select": "^5.0.0"
},
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./lib/styles/styles.css": "./lib/styles/styles.css"
"./lib/styles/styles.css": "./lib/styles/styles.css",
"./package": "./package.json",
"./package.json": "./package.json"
}
}
12 changes: 6 additions & 6 deletions packages/react-search-ui-views/src/Autocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ export type SearchBoxAutocompleteViewProps = {
autocompletedSuggestions: AutocompletedSuggestions;
autocompletedSuggestionsCount: number;
autocompleteSuggestions?: boolean | AutocompleteSuggestion;
getItemProps: ({
key: string,
index: number,
item: AutocompletedSuggestion
getItemProps: (value: {
key: string;
index: number;
item: AutocompletedSuggestion;
}) => any;
getMenuProps: ({ className: string }) => any;
getMenuProps: (value: { className: string }) => any;
className?: string;
};

Expand Down Expand Up @@ -121,7 +121,7 @@ function Autocomplete({
);
}
const suggestionValue =
suggestion.result[displayField]?.raw;
suggestion.result[displayField]?.raw?.toString();

return (
<li
Expand Down
1 change: 1 addition & 0 deletions packages/react-search-ui-views/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ export { default as SingleLinksFacet } from "./SingleLinksFacet";
export { default as Sorting } from "./Sorting";
export { Layout } from "./layouts";
export * from "./types";
export * as ViewHelpers from "./view-helpers";
15 changes: 9 additions & 6 deletions packages/react-search-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/react-search-ui",
"version": "1.21.4",
"version": "1.21.5",
"homepage": "https://docs.elastic.co/search-ui",
"description": "A React library for building search experiences",
"license": "Apache-2.0",
Expand Down Expand Up @@ -34,8 +34,8 @@
"url": "https://github.com/elastic/search-ui/issues"
},
"dependencies": {
"@elastic/react-search-ui-views": "1.21.4",
"@elastic/search-ui": "1.21.4"
"@elastic/react-search-ui-views": "1.21.5",
"@elastic/search-ui": "1.21.5"
},
"peerDependencies": {
"react": ">= 16.8.0 < 19",
Expand All @@ -45,12 +45,15 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rimraf": "^2.6.3",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
}
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./package": "./package.json",
"./package.json": "./package.json"
}
}
15 changes: 9 additions & 6 deletions packages/search-ui-analytics-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/search-ui-analytics-plugin",
"version": "1.21.4",
"version": "1.21.5",
"description": "Behavorial Analytics middleware plugin",
"license": "Apache-2.0",
"main": "lib/cjs/index.js",
Expand Down Expand Up @@ -34,20 +34,23 @@
"url": "https://github.com/elastic/search-ui/issues"
},
"devDependencies": {
"@elastic/search-ui": "1.21.4",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/"
},
"dependencies": {
"@elastic/behavioral-analytics-tracker-core": "^2.0.5"
"@elastic/behavioral-analytics-tracker-core": "^2.0.5",
"@elastic/search-ui": "1.21.5"
},
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
}
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./package": "./package.json",
"./package.json": "./package.json"
}
}
13 changes: 8 additions & 5 deletions packages/search-ui-app-search-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/search-ui-app-search-connector",
"version": "1.21.4",
"version": "1.21.5",
"description": "A Search UI connector for Elastic's App Search Service",
"homepage": "https://docs.elastic.co/search-ui",
"license": "Apache-2.0",
Expand Down Expand Up @@ -35,16 +35,19 @@
},
"devDependencies": {
"rimraf": "^2.6.3",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"dependencies": {
"@elastic/app-search-javascript": "^8.1.2",
"@elastic/search-ui": "1.21.4"
"@elastic/search-ui": "1.21.5"
},
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
}
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./package": "./package.json",
"./package.json": "./package.json"
}
}
13 changes: 8 additions & 5 deletions packages/search-ui-elasticsearch-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/search-ui-elasticsearch-connector",
"version": "1.21.4",
"version": "1.21.5",
"description": "A Search UI connector for Elasticsearch",
"homepage": "https://docs.elastic.co/search-ui",
"license": "Apache-2.0",
Expand Down Expand Up @@ -36,17 +36,20 @@
},
"devDependencies": {
"rimraf": "^2.6.3",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"dependencies": {
"@elastic/elasticsearch": "^8.2.1",
"@elastic/search-ui": "1.21.4",
"@elastic/search-ui": "1.21.5",
"@searchkit/sdk": "^3.0.0"
},
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
}
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./package": "./package.json",
"./package.json": "./package.json"
}
}
13 changes: 8 additions & 5 deletions packages/search-ui-engines-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/search-ui-engines-connector",
"version": "1.21.4",
"version": "1.21.5",
"description": "A Search UI connector for Engines",
"homepage": "https://docs.elastic.co/search-ui",
"license": "Apache-2.0",
Expand Down Expand Up @@ -39,10 +39,10 @@
"cross-fetch": "^3.1.4",
"nock": "^13.3.0",
"rimraf": "^2.6.3",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"dependencies": {
"@elastic/search-ui": "1.21.4",
"@elastic/search-ui": "1.21.5",
"@searchkit/sdk": "^3.0.0"
},
"publishConfig": {
Expand All @@ -52,7 +52,10 @@
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
}
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./package": "./package.json",
"./package.json": "./package.json"
}
}
13 changes: 8 additions & 5 deletions packages/search-ui-site-search-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/search-ui-site-search-connector",
"version": "1.21.4",
"version": "1.21.5",
"description": "A Search UI connector for Elastic's Site Search Service",
"homepage": "https://docs.elastic.co/search-ui",
"license": "Apache-2.0",
Expand Down Expand Up @@ -35,15 +35,18 @@
},
"devDependencies": {
"rimraf": "^2.6.3",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"dependencies": {
"@elastic/search-ui": "1.21.4"
"@elastic/search-ui": "1.21.5"
},
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
}
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./package": "./package.json",
"./package.json": "./package.json"
}
}
13 changes: 8 additions & 5 deletions packages/search-ui-workplace-search-connector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/search-ui-workplace-search-connector",
"version": "1.21.4",
"version": "1.21.5",
"description": "A Search UI connector for Elastic's Workplace Search Service",
"homepage": "https://docs.elastic.co/search-ui",
"license": "Apache-2.0",
Expand Down Expand Up @@ -36,16 +36,19 @@
},
"devDependencies": {
"rimraf": "^2.6.3",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"dependencies": {
"@elastic/search-ui": "1.21.4",
"@elastic/search-ui": "1.21.5",
"query-string": "^7.1.1"
},
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
}
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./package": "./package.json",
"./package.json": "./package.json"
}
}
11 changes: 7 additions & 4 deletions packages/search-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/search-ui",
"version": "1.21.4",
"version": "1.21.5",
"description": "A Headless Search UI library",
"license": "Apache-2.0",
"main": "lib/cjs/index.js",
Expand Down Expand Up @@ -37,7 +37,7 @@
"@types/history": "^4.7.11",
"@types/qs": "^6.9.7",
"rimraf": "^2.6.3",
"typescript": "^4.5.4"
"typescript": "^4.9.3"
},
"dependencies": {
"date-fns": "^1.30.1",
Expand All @@ -48,7 +48,10 @@
"exports": {
".": {
"import": "./lib/esm/index.js",
"require": "./lib/cjs/index.js"
}
"require": "./lib/cjs/index.js",
"types": "./lib/esm/index.d.ts"
},
"./package": "./package.json",
"./package.json": "./package.json"
}
}
1 change: 1 addition & 0 deletions packages/search-ui/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export interface AutocompletedSuggestion {
suggestion?: string;
data?: any;
queryType?: "suggestion";
index?: number;
}

export interface AutocompletedResultSuggestion {
Expand Down
Loading

0 comments on commit 7beb585

Please sign in to comment.