Skip to content

feat(faceted-search): replace faceted mode toggle by design system switch component #3846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AdelineMrtn merged 7 commits into from
Apr 7, 2022
Merged

feat(faceted-search): replace faceted mode toggle by design system switch component #3846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc4a6cb
feat(faceted-search) replace preview switch by new switch component f…
Nigui Apr 6, 2022
78c9de5
chore: add changelog
AdelineMrtn Apr 6, 2022
0515770
Update packages/faceted-search/.storybook/preview.js
AdelineMrtn Apr 6, 2022
ce0aaa8
Update packages/faceted-search/src/components/FacetedToolbar/FacetedT…
AdelineMrtn Apr 6, 2022
8341b8f
chore:refactoring Form.Switch component
AdelineMrtn Apr 7, 2022
84d5061
Merge branch 'amartineau/feat/faceted-search/replace_basic_advanced_f…
AdelineMrtn Apr 7, 2022
19eb44b
Merge branch 'master' into amartineau/feat/faceted-search/replace_bas…
Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/tiny-rocks-drive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@talend/react-faceted-search': major
---

feat(faceted-search): replace faceted mode toggle by design system switch component

breaking change: "@talend/design-system": "^2.1.0" added as peer dep
8 changes: 5 additions & 3 deletions packages/faceted-search/.storybook/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';

import { ThemeProvider } from '@talend/design-system';
import { namespaces as tuiNamespaces } from '@talend/locales-tui-components/namespaces';
import { namespaces as facetedNamespaces } from '@talend/locales-tui-faceted-search/namespaces';

Expand All @@ -24,8 +24,10 @@ export const decorators = [
padding: '3rem',
backgroundColor: 'rgba(145, 209, 237, 0.1)',
}}
>
<Story {...context} />
>
<ThemeProvider>
<Story {...context} />
</ThemeProvider>
</div>
);
},
Expand Down
2 changes: 2 additions & 0 deletions packages/faceted-search/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"@storybook/addon-actions": "^6.4.19",
"@storybook/testing-library": "^0.0.8",
"@talend/bootstrap-theme": "^6.38.6",
"@talend/design-system": "^2.1.0",
"@talend/icons": "^6.39.0",
"@talend/locales-tui-components": "^6.42.3",
"@talend/locales-tui-faceted-search": "^3.5.4",
Expand All @@ -65,6 +66,7 @@
"react-i18next": "^11.15.6"
},
"peerDependencies": {
"@talend/design-system": "^2.1.0",
"@talend/react-components": ">= 6.5.1",
"i18next": "^20.6.1",
"prop-types": "^15.5.10",
Expand Down
31 changes: 10 additions & 21 deletions packages/faceted-search/src/components/FacetedToolbar/FacetedToolbar.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,22 @@
import React from 'react';
import PropTypes from 'prop-types';
import Toggle from '@talend/react-components/lib/Toggle';
import { Form } from '@talend/design-system';
import { getTheme } from '@talend/react-components/lib/theme';

import { FACETED_MODE, USAGE_TRACKING_TAGS } from '../../constants';
import cssModule from './FacetedToolbar.scss';

const theme = getTheme(cssModule);

const SwitchFacetedMode = ({ facetedMode, onChange, t }) => {
const values = [
{
value: FACETED_MODE.BASIC,
label: t('FACETED_SEARCH_BASIC', { defaultValue: 'Basic' }),
dataFeature: USAGE_TRACKING_TAGS.BASIC,
},
{
value: FACETED_MODE.ADVANCED,
label: t('FACETED_SEARCH_ADVANCED', { defaultValue: 'Advanced' }),
dataFeature: USAGE_TRACKING_TAGS.ADVANCED,
},
];

return (
<form>
<Toggle.Label values={values} value={facetedMode} onChange={onChange} />
</form>
);
};
const SwitchFacetedMode = ({ facetedMode, onChange, t }) => (
<Form>
<Form.Switch
label={t('FACETED_SEARCH_QUERY', 'Query')}
onChange={() => onChange(facetedMode === FACETED_MODE.BASIC ? FACETED_MODE.ADVANCED : FACETED_MODE.BASIC)}
dataFeature={facetedMode === FACETED_MODE.BASIC ? USAGE_TRACKING_TAGS.BASIC : USAGE_TRACKING_TAGS.ADVANCED}
/>
</Form>
);

SwitchFacetedMode.propTypes = {
facetedMode: PropTypes.string.isRequired,
Expand Down