Skip to content

Commit

Permalink
fix(js): rename "Reset" button to "Clear"
Browse files Browse the repository at this point in the history
BREAKING CHANGE
  • Loading branch information
francoischalifour committed Feb 22, 2021
1 parent 706939c commit 434c565
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions examples/react-renderer/src/Autocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Hit } from '@algolia/client-search';
import algoliasearch from 'algoliasearch/lite';
import React from 'react';

import { ResetIcon } from './ResetIcon';
import { ClearIcon } from './ClearIcon';
import { SearchIcon } from './SearchIcon';

const searchClient = algoliasearch(
Expand Down Expand Up @@ -126,8 +126,8 @@ export function Autocomplete(
/>
</div>
<div className="aa-InputWrapperSuffix">
<button className="aa-ResetButton" type="reset">
<ResetIcon />
<button className="aa-ClearButton" title="Clear" type="reset">
<ClearIcon />
</button>
</div>
</form>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

export function ResetIcon(props: React.SVGProps<SVGSVGElement>) {
export function ClearIcon(props: React.SVGProps<SVGSVGElement>) {
return (
<svg
width="20"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ describe('autocomplete-js', () => {
class="aa-InputWrapperSuffix"
>
<button
class="aa-ResetButton"
class="aa-ClearButton"
hidden=""
type="reset"
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component } from '../types/Component';

export const ResetIcon: Component<{}, SVGSVGElement> = () => {
export const ClearIcon: Component<{}, SVGSVGElement> = () => {
const element = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
element.setAttribute('class', 'aa-ResetIcon');

This comment has been minimized.

Copy link
@bodinsamuel

bodinsamuel Mar 1, 2021

You forgot to change this classname

This comment has been minimized.

Copy link
@bodinsamuel

This comment has been minimized.

Copy link
@francoischalifour

francoischalifour Mar 1, 2021

Author Member

Oops thank you. Fixed in 5991e77.

element.setAttribute('viewBox', '0 0 24 24');
Expand Down
2 changes: 1 addition & 1 deletion packages/autocomplete-js/src/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './ClearIcon';
export * from './Input';
export * from './LoadingIcon';
export * from './ResetIcon';
export * from './SearchIcon';
12 changes: 6 additions & 6 deletions packages/autocomplete-js/src/createAutocompleteDom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
BaseItem,
} from '@algolia/autocomplete-core';

import { Input, LoadingIcon, ResetIcon, SearchIcon } from './components';
import { ClearIcon, Input, LoadingIcon, SearchIcon } from './components';
import { createDomElement } from './createDomElement';
import {
AutocompleteClassNames,
Expand Down Expand Up @@ -83,10 +83,10 @@ export function createAutocompleteDom<TItem extends BaseItem>({
children: [submitButton],
...labelProps,
});
const resetButton = createDomElement('button', {
class: classNames.resetButton,
const clearButton = createDomElement('button', {
class: classNames.clearButton,
type: 'reset',
children: [ResetIcon({})],
children: [ClearIcon({})],
});
const loadingIndicator = createDomElement('div', {
class: classNames.loadingIndicator,
Expand All @@ -113,7 +113,7 @@ export function createAutocompleteDom<TItem extends BaseItem>({
});
const inputWrapperSuffix = createDomElement('div', {
class: classNames.inputWrapperSuffix,
children: [resetButton],
children: [clearButton],
});
const inputWrapper = createDomElement('div', {
class: classNames.inputWrapper,
Expand Down Expand Up @@ -198,7 +198,7 @@ export function createAutocompleteDom<TItem extends BaseItem>({
form,
label,
submitButton,
resetButton,
clearButton,
loadingIndicator,
panel,
};
Expand Down
4 changes: 2 additions & 2 deletions packages/autocomplete-js/src/getDefaultOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import {
import { getHTMLElement, mergeClassNames } from './utils';

const defaultClassNames: AutocompleteClassNames = {
clearButton: 'aa-ClearButton',
detachedCancelButton: 'aa-DetachedCancelButton',
detachedFormContainer: 'aa-DetachedFormContainer',
detachedContainer: 'aa-DetachedContainer',
detachedFormContainer: 'aa-DetachedFormContainer',
detachedOverlay: 'aa-DetachedOverlay',
detachedSearchButton: 'aa-DetachedSearchButton',
detachedSearchButtonIcon: 'aa-DetachedSearchButtonIcon',
Expand All @@ -33,7 +34,6 @@ const defaultClassNames: AutocompleteClassNames = {
loadingIndicator: 'aa-LoadingIndicator',
panel: 'aa-Panel',
panelLayout: 'aa-PanelLayout',
resetButton: 'aa-ResetButton',
root: 'aa-Autocomplete',
source: 'aa-Source',
sourceFooter: 'aa-SourceFooter',
Expand Down
2 changes: 1 addition & 1 deletion packages/autocomplete-js/src/render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function renderSearchBox<TItem extends BaseItem>({
);
setProperties(dom.label, { hidden: state.status === 'stalled' });
setProperties(dom.loadingIndicator, { hidden: state.status !== 'stalled' });
setProperties(dom.resetButton, { hidden: !state.query });
setProperties(dom.clearButton, { hidden: !state.query });
}

export function renderPanel<TItem extends BaseItem>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export type AutocompleteClassNames = {
loadingIndicator: string;
panel: string;
panelLayout: string;
resetButton: string;
clearButton: string;
root: string;
source: string;
sourceFooter: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/autocomplete-js/src/types/AutocompleteDom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export type AutocompleteDom = {
form: HTMLFormElement;
label: HTMLLabelElement;
submitButton: HTMLButtonElement;
resetButton: HTMLButtonElement;
clearButton: HTMLButtonElement;
loadingIndicator: HTMLDivElement;
panel: HTMLDivElement;
detachedContainer: HTMLDivElement;
Expand Down
2 changes: 1 addition & 1 deletion packages/autocomplete-theme-classic/src/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ body {
display: flex;
order: 4;
// accelerator to clear the query
.aa-ResetButton {
.aa-ClearButton {
align-items: center;
background: none;
border: 0;
Expand Down
2 changes: 1 addition & 1 deletion packages/website/docs/autocomplete-js.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ type ClassNames = Partial<{
loadingIndicator: string;
panel: string;
panelLayout: string;
resetButton: string;
clearButton: string;
root: string;
source: string;
sourceFooter: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/website/docs/creating-a-renderer.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function Autocomplete() {
/>
</div>
<div className="aa-InputWrapperSuffix">
<button className="aa-ResetButton" type="reset">
<button className="aa-ClearButton" title="Clear" type="reset">
</button>
</div>
Expand Down

0 comments on commit 434c565

Please sign in to comment.