From af43a379215376cab811adfd512bc7fb60965803 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 11 Feb 2021 10:09:19 +0100 Subject: [PATCH] fix(theme): update icons and Detached mode design (#443) --- bundlesize.config.json | 6 ++--- examples/js/app.tsx | 17 +++---------- .../src/__tests__/autocomplete.test.ts | 21 ++++++---------- .../src/components/ResetIcon.ts | 10 +++----- .../src/components/SearchIcon.ts | 11 +++----- .../src/getTemplates.tsx | 17 +++---------- .../src/getTemplates.tsx | 15 +++-------- .../autocomplete-theme-classic/src/theme.scss | 25 +++++++++++-------- 8 files changed, 42 insertions(+), 80 deletions(-) diff --git a/bundlesize.config.json b/bundlesize.config.json index cc4c8d051..81c1cdd22 100644 --- a/bundlesize.config.json +++ b/bundlesize.config.json @@ -6,7 +6,7 @@ }, { "path": "packages/autocomplete-js/dist/umd/index.production.js", - "maxSize": "14 kB" + "maxSize": "14.25 kB" }, { "path": "packages/autocomplete-preset-algolia/dist/umd/index.production.js", @@ -18,11 +18,11 @@ }, { "path": "packages/autocomplete-plugin-recent-searches/dist/umd/index.production.js", - "maxSize": "3.5 kB" + "maxSize": "3.75 kB" }, { "path": "packages/autocomplete-plugin-query-suggestions/dist/umd/index.production.js", - "maxSize": "3 kB" + "maxSize": "3.25 kB" } ] } diff --git a/examples/js/app.tsx b/examples/js/app.tsx index 9b9f99590..f3ba3d66d 100644 --- a/examples/js/app.tsx +++ b/examples/js/app.tsx @@ -141,7 +141,7 @@ function ProductItem({ hit, insights }: ProductItemProps) { type="button" title="Select" > - + @@ -161,19 +161,8 @@ function ProductItem({ hit, insights }: ProductItemProps) { }); }} > - - + + diff --git a/packages/autocomplete-js/src/__tests__/autocomplete.test.ts b/packages/autocomplete-js/src/__tests__/autocomplete.test.ts index 4dc2dd635..099b97458 100644 --- a/packages/autocomplete-js/src/__tests__/autocomplete.test.ts +++ b/packages/autocomplete-js/src/__tests__/autocomplete.test.ts @@ -58,18 +58,13 @@ describe('autocomplete-js', () => { > @@ -138,14 +133,12 @@ describe('autocomplete-js', () => { diff --git a/packages/autocomplete-js/src/components/ResetIcon.ts b/packages/autocomplete-js/src/components/ResetIcon.ts index f4735b965..2c291afdf 100644 --- a/packages/autocomplete-js/src/components/ResetIcon.ts +++ b/packages/autocomplete-js/src/components/ResetIcon.ts @@ -3,18 +3,16 @@ import { Component } from '../types/Component'; export const ResetIcon: Component<{}, SVGSVGElement> = () => { const element = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); element.setAttribute('class', 'aa-ResetIcon'); - element.setAttribute('viewBox', '0 0 20 20'); - element.setAttribute('width', '20'); - element.setAttribute('height', '20'); + element.setAttribute('viewBox', '0 0 24 24'); + element.setAttribute('width', '18'); + element.setAttribute('height', '18'); element.setAttribute('fill', 'currentColor'); const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); path.setAttribute( 'd', - 'M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z' + 'M5.293 6.707l5.293 5.293-5.293 5.293c-0.391 0.391-0.391 1.024 0 1.414s1.024 0.391 1.414 0l5.293-5.293 5.293 5.293c0.391 0.391 1.024 0.391 1.414 0s0.391-1.024 0-1.414l-5.293-5.293 5.293-5.293c0.391-0.391 0.391-1.024 0-1.414s-1.024-0.391-1.414 0l-5.293 5.293-5.293-5.293c-0.391-0.391-1.024-0.391-1.414 0s-0.391 1.024 0 1.414z' ); - path.setAttribute('fill-rule', 'evenodd'); - path.setAttribute('clip-rule', 'evenodd'); element.appendChild(path); diff --git a/packages/autocomplete-js/src/components/SearchIcon.ts b/packages/autocomplete-js/src/components/SearchIcon.ts index 210685522..708097cd1 100644 --- a/packages/autocomplete-js/src/components/SearchIcon.ts +++ b/packages/autocomplete-js/src/components/SearchIcon.ts @@ -3,21 +3,16 @@ import { Component } from '../types/Component'; export const SearchIcon: Component<{}, SVGSVGElement> = () => { const element = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); element.setAttribute('class', 'aa-SubmitIcon'); - element.setAttribute('viewBox', '0 0 20 20'); + element.setAttribute('viewBox', '0 0 24 24'); element.setAttribute('width', '20'); element.setAttribute('height', '20'); + element.setAttribute('fill', 'currentColor'); const path = document.createElementNS('http://www.w3.org/2000/svg', 'path'); path.setAttribute( 'd', - 'M14.386 14.386l4.0877 4.0877-4.0877-4.0877c-2.9418 2.9419-7.7115 2.9419-10.6533 0-2.9419-2.9418-2.9419-7.7115 0-10.6533 2.9418-2.9419 7.7115-2.9419 10.6533 0 2.9419 2.9418 2.9419 7.7115 0 10.6533z' + 'M16.041 15.856c-0.034 0.026-0.067 0.055-0.099 0.087s-0.060 0.064-0.087 0.099c-1.258 1.213-2.969 1.958-4.855 1.958-1.933 0-3.682-0.782-4.95-2.050s-2.050-3.017-2.050-4.95 0.782-3.682 2.050-4.95 3.017-2.050 4.95-2.050 3.682 0.782 4.95 2.050 2.050 3.017 2.050 4.95c0 1.886-0.745 3.597-1.959 4.856zM21.707 20.293l-3.675-3.675c1.231-1.54 1.968-3.493 1.968-5.618 0-2.485-1.008-4.736-2.636-6.364s-3.879-2.636-6.364-2.636-4.736 1.008-6.364 2.636-2.636 3.879-2.636 6.364 1.008 4.736 2.636 6.364 3.879 2.636 6.364 2.636c2.125 0 4.078-0.737 5.618-1.968l3.675 3.675c0.391 0.391 1.024 0.391 1.414 0s0.391-1.024 0-1.414z' ); - path.setAttribute('stroke', 'currentColor'); - path.setAttribute('fill', 'none'); - path.setAttribute('fill-rule', 'evenodd'); - path.setAttribute('stroke-width', '1.4'); - path.setAttribute('stroke-linecap', 'round'); - path.setAttribute('stroke-linejoin', 'round'); element.appendChild(path); diff --git a/packages/autocomplete-plugin-query-suggestions/src/getTemplates.tsx b/packages/autocomplete-plugin-query-suggestions/src/getTemplates.tsx index f42b71e50..4c8499bfb 100644 --- a/packages/autocomplete-plugin-query-suggestions/src/getTemplates.tsx +++ b/packages/autocomplete-plugin-query-suggestions/src/getTemplates.tsx @@ -15,16 +15,8 @@ export function getTemplates({ return (
- - + +
@@ -47,12 +39,11 @@ export function getTemplates({ > - - +
diff --git a/packages/autocomplete-plugin-recent-searches/src/getTemplates.tsx b/packages/autocomplete-plugin-recent-searches/src/getTemplates.tsx index 23dac84a4..3468aa4ed 100644 --- a/packages/autocomplete-plugin-recent-searches/src/getTemplates.tsx +++ b/packages/autocomplete-plugin-recent-searches/src/getTemplates.tsx @@ -15,9 +15,8 @@ export function getTemplates({ return (
- - - + +
@@ -42,15 +41,9 @@ export function getTemplates({ viewBox="0 0 24 24" width="18" height="18" - fill="none" - stroke="currentColor" + fill="currentColor" > - +
diff --git a/packages/autocomplete-theme-classic/src/theme.scss b/packages/autocomplete-theme-classic/src/theme.scss index d697321b0..4fa57dc44 100644 --- a/packages/autocomplete-theme-classic/src/theme.scss +++ b/packages/autocomplete-theme-classic/src/theme.scss @@ -486,18 +486,21 @@ body { .aa-DetachedOverlay { background: var(--aa-background-color); bottom: 0; + display: flex; + flex-direction: column; left: 0; - padding: var(--aa-spacing-half) 0 var(--aa-spacing-half) - var(--aa-spacing-half); + overflow: hidden; + padding: 0; position: fixed; right: 0; top: 0; + .aa-DetachedFormContainer { border-bottom: solid 1px var(--aa-selected-color); display: flex; + flex-direction: row; justify-content: space-between; - margin-right: var(--aa-spacing-half); - padding-bottom: var(--aa-spacing-half); + padding: var(--aa-spacing-half); .aa-Form { padding: 0 var(--aa-spacing-half) 0 0; } @@ -512,18 +515,18 @@ body { } .aa-Panel { background-color: var(--aa-background-color); - height: 100vh; // TODO: compute with js - left: var(--aa-spacing-half); - overflow-y: auto; - padding-bottom: var(--aa-spacing); - padding-right: var(--aa-spacing-half); - padding-top: var(--aa-spacing-half); - right: 0; + overflow: hidden; + padding: 0 var(--aa-spacing-half); + position: relative; + .aa-PanelLayout { box-shadow: none; + height: 100%; margin: 0; max-height: none; + overflow-y: auto; padding: 0; + width: 100%; } .aa-Item { border-radius: 3px;