diff --git a/package.json b/package.json index e56114489..4c273cd1e 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,8 @@ "babel-plugin-inline-replace-variables": "1.3.1", "babel-plugin-module-resolver": "4.0.0", "bundlesize": "0.18.0", - "cssnano": "4.1.10", "concurrently": "5.3.0", + "cssnano": "4.1.10", "cypress": "4.8.0", "dotenv": "8.2.0", "eslint": "6.8.0", diff --git a/packages/autocomplete-js/src/autocomplete.ts b/packages/autocomplete-js/src/autocomplete.ts index 60e2469b6..b93fa6795 100644 --- a/packages/autocomplete-js/src/autocomplete.ts +++ b/packages/autocomplete-js/src/autocomplete.ts @@ -7,6 +7,7 @@ import { concatClassNames } from './concatClassNames'; import { debounce } from './debounce'; import { getDropdownPositionStyle } from './getDropdownPositionStyle'; import { getHTMLElement } from './getHTMLElement'; +import { resetIcon, searchIcon } from './icons'; import { renderTemplate } from './renderTemplate'; import { setProperties, setPropertiesWithoutEvents } from './setProperties'; import { @@ -84,24 +85,6 @@ export function autocomplete({ ...formProps, class: concatClassNames(['aa-Form', classNames.form]), }); - setProperties(label, { - ...autocomplete.getLabelProps(), - class: concatClassNames(['aa-Label', classNames.label]), - innerHTML: ` - -`, - }); setProperties(inputWrapper, { class: ['aa-InputWrapper', classNames.inputWrapper] .filter(Boolean) @@ -114,11 +97,16 @@ export function autocomplete({ setProperties(completion, { class: concatClassNames(['aa-Completion', classNames.completion]), }); + setProperties(label, { + ...autocomplete.getLabelProps(), + class: concatClassNames(['aa-Label', classNames.label]), + innerHTML: searchIcon, + }); setProperties(resetButton, { type: 'reset', - textContent: 'x', onClick: formProps.onReset, class: concatClassNames(['aa-ResetButton', classNames.resetButton]), + innerHTML: resetIcon, }); setProperties(dropdown, { ...autocomplete.getDropdownProps(), @@ -226,11 +214,11 @@ export function autocomplete({ renderDropdown({ root: dropdown, sections, state }); } - inputWrapper.appendChild(label); if (props.enableCompletion) { inputWrapper.appendChild(completion); } inputWrapper.appendChild(input); + inputWrapper.appendChild(label); inputWrapper.appendChild(resetButton); form.appendChild(inputWrapper); root.appendChild(form); diff --git a/packages/autocomplete-js/src/icons/index.ts b/packages/autocomplete-js/src/icons/index.ts new file mode 100644 index 000000000..0a9c0a85e --- /dev/null +++ b/packages/autocomplete-js/src/icons/index.ts @@ -0,0 +1,2 @@ +export * from './reset-icon'; +export * from './search-icon'; diff --git a/packages/autocomplete-js/src/icons/reset-icon.ts b/packages/autocomplete-js/src/icons/reset-icon.ts new file mode 100644 index 000000000..41b06d629 --- /dev/null +++ b/packages/autocomplete-js/src/icons/reset-icon.ts @@ -0,0 +1,10 @@ +export const resetIcon = ` + +`; diff --git a/packages/autocomplete-js/src/icons/search-icon.ts b/packages/autocomplete-js/src/icons/search-icon.ts new file mode 100644 index 000000000..38a106f06 --- /dev/null +++ b/packages/autocomplete-js/src/icons/search-icon.ts @@ -0,0 +1,10 @@ +export const searchIcon = ` + +`;