Skip to content

Commit 7fa17de

Browse files
committed
removing sass and refactoring strings component
1 parent be3306e commit 7fa17de

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

src/plugins/shared_ux/public/components/solution_toolbar/items/add_from_library.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
* Side Public License, v 1.
77
*/
88

9+
import { i18n } from '@kbn/i18n';
910
import React from 'react';
10-
import { ComponentStrings } from '../../../i18n/components';
1111
import { SolutionToolbarButton, Props as SolutionToolbarButtonProps } from './button';
1212

13-
const { SolutionToolbar: strings } = ComponentStrings;
13+
const strings = {
14+
getLibraryButtonLabel: () =>
15+
i18n.translate('presentationUtil.solutionToolbar.libraryButtonLabel', {
16+
defaultMessage: 'Add from library',
17+
}),
18+
};
1419

1520
export type Props = Omit<SolutionToolbarButtonProps, 'iconType' | 'label'>;
1621

src/plugins/shared_ux/public/components/solution_toolbar/items/primary_button.tsx

+1-9
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,5 @@ export interface Props extends Omit<SolutionToolbarButtonProps, 'primary'> {
1515
}
1616

1717
export const PrimaryActionButton = ({ isDarkModeEnabled, ...props }: Props) => (
18-
<SolutionToolbarButton
19-
primary={true}
20-
className={`solutionToolbar__primaryButton ${
21-
isDarkModeEnabled
22-
? 'solutionToolbar__primaryButton--dark'
23-
: 'solutionToolbar__primaryButton--light'
24-
}`}
25-
{...props}
26-
/>
18+
<SolutionToolbarButton primary={true} {...props} />
2719
);

src/plugins/shared_ux/public/components/solution_toolbar/items/quick_group.tsx

+18-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,23 @@
88

99
import React from 'react';
1010
import { EuiButtonGroup, htmlIdGenerator, EuiButtonGroupOptionProps } from '@elastic/eui';
11-
import { ComponentStrings } from '../../../i18n/components';
12-
13-
const { QuickButtonGroup: strings } = ComponentStrings;
11+
import { i18n } from '@kbn/i18n';
1412

13+
const strings = {
14+
QuickButtonGroup: {
15+
getAriaButtonLabel: (createType: string) =>
16+
i18n.translate('presentationUtil.solutionToolbar.quickButton.ariaButtonLabel', {
17+
defaultMessage: `Create new {createType}`,
18+
values: {
19+
createType,
20+
},
21+
}),
22+
getLegend: () =>
23+
i18n.translate('presentationUtil.solutionToolbar.quickButton.legendLabel', {
24+
defaultMessage: 'Quick create',
25+
}),
26+
},
27+
};
1528
export interface QuickButtonProps extends Pick<EuiButtonGroupOptionProps, 'iconType'> {
1629
createType: string;
1730
onClick: () => void;
@@ -26,7 +39,7 @@ type Option = EuiButtonGroupOptionProps & Omit<QuickButtonProps, 'createType'>;
2639
export const QuickButtonGroup = ({ buttons }: Props) => {
2740
const buttonGroupOptions: Option[] = buttons.map((button: QuickButtonProps, index) => {
2841
const { createType: label, ...rest } = button;
29-
const title = strings.getAriaButtonLabel(label);
42+
const title = strings.QuickButtonGroup.getAriaButtonLabel(label);
3043

3144
return {
3245
...rest,
@@ -46,7 +59,7 @@ export const QuickButtonGroup = ({ buttons }: Props) => {
4659
<EuiButtonGroup
4760
buttonSize="m"
4861
className="quickButtonGroup"
49-
legend={strings.getLegend()}
62+
legend={strings.QuickButtonGroup.getLegend()}
5063
options={buttonGroupOptions}
5164
onChange={onChangeIconsMulti}
5265
type="multi"

src/plugins/shared_ux/public/components/toolbar_button/toolbar_button.component.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88

99
import React from 'react';
10-
import './toolbar_button.scss';
1110
import { EuiButton, PropsOf, EuiButtonProps } from '@elastic/eui';
1211
import classNames from 'classnames';
1312

0 commit comments

Comments
 (0)